3 files changed, 21 insertions, 46 deletions

diff --git a/graphics/mozjpeg/Makefile b/graphics/mozjpeg/Makefile
index 50c5449fcdca..cf290a7a6645 100644
--- a/graphics/mozjpeg/Makefile
+++ b/graphics/mozjpeg/Makefile
@@ -2,74 +2,51 @@
 # $FreeBSD$
 
 PORTNAME=	mozjpeg
-PORTVERSION=	2.1
-PORTREVISION=	2
+PORTVERSION=	3.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
 MAINTAINER=	horia@racoviceanu.com
 COMMENT=	Advanced JPEG encoder for the Web
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mozilla
-GH_TAGNAME=	594b725
 
-USES=		autoreconf libtool
+USES=		autoreconf libtool pkgconfig
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir=${PREFIX}/share/doc/${PORTNAME} \
 		--includedir=${PREFIX}/include/${PORTNAME} \
 		--libdir=${PREFIX}/lib/${PORTNAME} \
-		--with-jpeg8
+		--with-jpeg8 \
+		--disable-static
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	PORTNAME=${PORTNAME}
 
 PORTDOCS=	*
-
-DOCSRCDIR1=	${WRKSRC}/doc/html
-DOCSDIR1=	${DOCSDIR}/html
-
-DOCSRCDIR2=	${DOCSRCDIR1}/search
-DOCSDIR2=	${DOCSDIR1}/search
-
-DOC_FILES=	*.css *.html *.js *.png
-
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES GCC SIMD TURBOJPEG
-
-OPTIONS_MULTI=	LIBRARIES
-OPTIONS_MULTI_LIBRARIES=	SHARED STATIC
-
-OPTIONS_DEFAULT=GCC SHARED TURBOJPEG
-
+OPTIONS_DEFINE=	DOCS EXAMPLES SIMD TURBOJPEG
+OPTIONS_DEFAULT=SIMD TURBOJPEG
 OPTIONS_SUB=	yes
 
-GCC_DESC=	Use the GNU Compiler Collection (GCC) for best performance
-SIMD_DESC=	Include SIMD extensions (MMX, SSE2, NEON)
+SIMD_DESC=	Include SIMD extensions
 TURBOJPEG_DESC=	Include the TurboJPEG wrapper library and associated tests
 
-STATIC_DESC=	Build static libraries
-SHARED_DESC=	Build shared libraries
-
-GCC_USE=	GCC=yes
-SIMD_CONFIGURE_WITH=	simd
-SIMD_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+SIMD_CONFIGURE_WITH=		simd
+SIMD_BUILD_DEPENDS=		yasm:${PORTSDIR}/devel/yasm
 TURBOJPEG_CONFIGURE_WITH=	turbojpeg
 
-STATIC_CONFIGURE_ENABLE=	static
-SHARED_CONFIGURE_ENABLE=	shared
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|&/mozjpeg|; \
+	@${REINPLACE_CMD} -e '/^docdir/s|=.*|= ${DOCSDIR}|; \
 		/^exampledir/s|=.*|= ${EXAMPLESDIR}|' \
 			${WRKSRC}/Makefile.am
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR1}
-	${INSTALL_DATA} ${DOC_FILES:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/mozjpeg/distinfo b/graphics/mozjpeg/distinfo
index 99ef9fe60e69..37885aac47f5 100644
--- a/graphics/mozjpeg/distinfo
+++ b/graphics/mozjpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mozilla-mozjpeg-2.1-594b725_GH0.tar.gz) = 17590416c1d9fd465001e53f82432650f685e29978ec89074f6a7042317b4efd
-SIZE (mozilla-mozjpeg-2.1-594b725_GH0.tar.gz) = 1051671
+SHA256 (mozilla-mozjpeg-v3.1_GH0.tar.gz) = 11823198f3c677b1832fa2dcf702e458f70c959661c4bec9c8922b7c36e94739
+SIZE (mozilla-mozjpeg-v3.1_GH0.tar.gz) = 1180063
diff --git a/graphics/mozjpeg/pkg-plist b/graphics/mozjpeg/pkg-plist
index 0df47e3c7435..fd490b782bd3 100644
--- a/graphics/mozjpeg/pkg-plist
+++ b/graphics/mozjpeg/pkg-plist
@@ -9,14 +9,12 @@ include/%%PORTNAME%%/jerror.h
 include/%%PORTNAME%%/jmorecfg.h
 include/%%PORTNAME%%/jpeglib.h
 %%TURBOJPEG%%include/%%PORTNAME%%/turbojpeg.h
-%%STATIC%%lib/%%PORTNAME%%/libjpeg.a
-%%SHARED%%lib/%%PORTNAME%%/libjpeg.so
-%%SHARED%%lib/%%PORTNAME%%/libjpeg.so.8
-%%SHARED%%lib/%%PORTNAME%%/libjpeg.so.8.0.2
-%%STATIC%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.a
-%%SHARED%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so
-%%SHARED%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so.0
-%%SHARED%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so.0.1.0
+lib/%%PORTNAME%%/libjpeg.so
+lib/%%PORTNAME%%/libjpeg.so.8
+lib/%%PORTNAME%%/libjpeg.so.8.1.2
+%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so
+%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so.0
+%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so.0.1.0
 man/man1/cjpeg.1.gz
 man/man1/djpeg.1.gz
 man/man1/jpegtran.1.gz