Update to 4.0.0

- Remove EXAMPLES, SIMD and TURBOJPEG options

Changes:	https://github.com/mozilla/mozjpeg/releases

4 files changed, 150 insertions, 63 deletions

diff --git a/graphics/mozjpeg/Makefile b/graphics/mozjpeg/Makefile
index d05eea0a8d0a..2b93596a4fc6 100644
--- a/graphics/mozjpeg/Makefile
+++ b/graphics/mozjpeg/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mozjpeg
-PORTVERSION=	3.3.1
+PORTVERSION=	4.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
@@ -14,36 +14,18 @@ LICENSE=	BSD3CLAUSE
 BROKEN_mips64=	does not configure: error: SIMD support cannot be enabled
 BROKEN_sparc64=	does not configure: error: SIMD support cannot be enabled
 
+BUILD_DEPENDS=	nasm>=2.10,1:devel/nasm
 LIB_DEPENDS=	libpng.so:graphics/png
 
-OPTIONS_DEFINE=	DOCS EXAMPLES SIMD TURBOJPEG
-OPTIONS_DEFAULT=SIMD TURBOJPEG
-OPTIONS_SUB=	yes
-SIMD_DESC=	Include SIMD extensions
-TURBOJPEG_DESC=	Include the TurboJPEG wrapper library and associated tests
-
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
-		--includedir=${PREFIX}/include/${PORTNAME} \
-		--libdir=${PREFIX}/lib/${PORTNAME} \
-		--program-prefix=${PORTNAME}- \
-		--with-jpeg8
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
-USES=		autoreconf libtool pkgconfig
-
-PORTDOCS=	*
-PORTEXAMPLES=	*
+USES=		cmake
+
+CMAKE_OFF=	REQUIRE_SIMD WITH_12BIT WITH_ARITH_DEC WITH_ARITH_ENC WITH_JAVA WITH_JPEG7
+CMAKE_ON=	ENABLE_SHARED ENABLE_STATIC FORCE_INLINE PNG_SUPPORTED WITH_JPEG8 WITH_MEM_SRCDST WITH_SIMD WITH_TURBOJPEG
 
 GH_ACCOUNT=	mozilla
 USE_GITHUB=	yes
 
-SIMD_BUILD_DEPENDS=	yasm:devel/yasm
-SIMD_CONFIGURE_WITH=	simd
-TURBOJPEG_CONFIGURE_WITH=	turbojpeg
-
-post-patch:
-	@${REINPLACE_CMD} -e '/pkgconfig/d; /^exampledir = / s| =.*| = ${EXAMPLESDIR}|' ${WRKSRC}/Makefile.am
+OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
diff --git a/graphics/mozjpeg/distinfo b/graphics/mozjpeg/distinfo
index f6d34481eead..2b74ae8fc702 100644
--- a/graphics/mozjpeg/distinfo
+++ b/graphics/mozjpeg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515915989
-SHA256 (mozilla-mozjpeg-v3.3.1_GH0.tar.gz) = aebbea60ea038a84a2d1ed3de38fdbca34027e2e54ee2b7d08a97578be72599d
-SIZE (mozilla-mozjpeg-v3.3.1_GH0.tar.gz) = 1250929
+TIMESTAMP = 1605426345
+SHA256 (mozilla-mozjpeg-v4.0.0_GH0.tar.gz) = 961e14e73d06a015e9b23b8af416f010187cc0bec95f6e3b0fcb28cc7e2cbdd4
+SIZE (mozilla-mozjpeg-v4.0.0_GH0.tar.gz) = 2213541
diff --git a/graphics/mozjpeg/files/patch-md5-md5.c b/graphics/mozjpeg/files/patch-md5-md5.c
deleted file mode 100644
index af83e4324e02..000000000000
--- a/graphics/mozjpeg/files/patch-md5-md5.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- md5/md5.c.orig	2019-08-25 00:26:22 UTC
-+++ md5/md5.c
-@@ -31,6 +31,8 @@
- 
- #include "./md5.h"
- 
-+#include <sys/endian.h>
-+
- #ifdef __amigaos4__
- #include <machine/endian.h>
- #define le32toh(x) (((x & 0xff) << 24) | \
diff --git a/graphics/mozjpeg/pkg-plist b/graphics/mozjpeg/pkg-plist
index 152d338f1a6d..0a04e97f9428 100644
--- a/graphics/mozjpeg/pkg-plist
+++ b/graphics/mozjpeg/pkg-plist
@@ -1,24 +1,140 @@
-bin/mozjpeg-cjpeg
-bin/mozjpeg-djpeg
-bin/mozjpeg-jpegtran
-bin/mozjpeg-rdjpgcom
-%%TURBOJPEG%%bin/mozjpeg-tjbench
-bin/mozjpeg-wrjpgcom
-include/mozjpeg/jconfig.h
-include/mozjpeg/jerror.h
-include/mozjpeg/jmorecfg.h
-include/mozjpeg/jpeglib.h
-%%TURBOJPEG%%include/mozjpeg/turbojpeg.h
-lib/mozjpeg/libjpeg.a
-lib/mozjpeg/libjpeg.so
-lib/mozjpeg/libjpeg.so.8
-lib/mozjpeg/libjpeg.so.8.1.2
-%%TURBOJPEG%%lib/mozjpeg/libturbojpeg.a
-%%TURBOJPEG%%lib/mozjpeg/libturbojpeg.so
-%%TURBOJPEG%%lib/mozjpeg/libturbojpeg.so.0
-%%TURBOJPEG%%lib/mozjpeg/libturbojpeg.so.0.1.0
-man/man1/mozjpeg-cjpeg.1.gz
-man/man1/mozjpeg-djpeg.1.gz
-man/man1/mozjpeg-jpegtran.1.gz
-man/man1/mozjpeg-rdjpgcom.1.gz
-man/man1/mozjpeg-wrjpgcom.1.gz
+bin/cjpeg
+bin/djpeg
+bin/jpegtran
+bin/rdjpgcom
+bin/tjbench
+bin/wrjpgcom
+include/jconfig.h
+include/jerror.h
+include/jmorecfg.h
+include/jpeglib.h
+include/turbojpeg.h
+lib/libjpeg.a
+lib/libjpeg.so
+lib/libjpeg.so.8
+lib/libjpeg.so.8.2.2
+lib/libturbojpeg.a
+lib/libturbojpeg.so
+lib/libturbojpeg.so.0
+lib/libturbojpeg.so.0.2.0
+libdata/pkgconfig/libjpeg.pc
+libdata/pkgconfig/libturbojpeg.pc
+man/man1/cjpeg.1.gz
+man/man1/djpeg.1.gz
+man/man1/jpegtran.1.gz
+man/man1/rdjpgcom.1.gz
+man/man1/wrjpgcom.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
+%%PORTDOCS%%%%DOCSDIR%%/README.ijg
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/example.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/html/bdwn.png
+%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/closed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen-extra.css
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/dynsections.js
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2blank.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2cl.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2doc.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderopen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2lastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2link.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mlastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mnode.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2node.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2ns.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2plastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2pnode.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ftv2vertline.png
+%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/group___turbo_j_p_e_g.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/html/open.png
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_63.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_63.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_64.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_64.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_68.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_68.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_6e.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_6e.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_72.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_72.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_74.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_74.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_77.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_77.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_78.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_78.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_79.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/all_79.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/classes_74.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/classes_74.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/close.png
+%%PORTDOCS%%%%DOCSDIR%%/html/search/enums_74.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/enums_74.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/enumvalues_74.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/enumvalues_74.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/functions_74.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/functions_74.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/groups_74.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/groups_74.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/mag_sel.png
+%%PORTDOCS%%%%DOCSDIR%%/html/search/nomatches.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/search.css
+%%PORTDOCS%%%%DOCSDIR%%/html/search/search.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/search_l.png
+%%PORTDOCS%%%%DOCSDIR%%/html/search/search_m.png
+%%PORTDOCS%%%%DOCSDIR%%/html/search/search_r.png
+%%PORTDOCS%%%%DOCSDIR%%/html/search/typedefs_74.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/typedefs_74.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_63.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_63.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_64.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_64.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_68.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_68.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_6e.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_6e.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_6f.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_6f.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_72.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_72.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_74.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_74.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_77.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_77.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_78.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_78.js
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_79.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search/variables_79.js
+%%PORTDOCS%%%%DOCSDIR%%/html/structtjregion.html
+%%PORTDOCS%%%%DOCSDIR%%/html/structtjscalingfactor.html
+%%PORTDOCS%%%%DOCSDIR%%/html/structtjtransform.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sync_off.png
+%%PORTDOCS%%%%DOCSDIR%%/html/sync_on.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/libjpeg.txt
+%%PORTDOCS%%%%DOCSDIR%%/structure.txt
+%%PORTDOCS%%%%DOCSDIR%%/tjexample.c
+%%PORTDOCS%%%%DOCSDIR%%/usage.txt
+%%PORTDOCS%%%%DOCSDIR%%/wizard.txt