- Update from 1.0.1 to 2.0.1

- Update COMMENT
- Update pkg-descr
- Remove static libraries from default options
- Remove patch for warning: always_inline function might not be inlinable, fixed by upstream

PR:		ports/191964
Submitted by:	Horia Racoviceanu <horia@racoviceanu.com>

3 files changed, 15 insertions, 24 deletions

diff --git a/graphics/mozjpeg/Makefile b/graphics/mozjpeg/Makefile
index 207ae1e313d8..dfe3672b7ced 100644
--- a/graphics/mozjpeg/Makefile
+++ b/graphics/mozjpeg/Makefile
@@ -2,19 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	mozjpeg
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics
 
 MAINTAINER=	horia@racoviceanu.com
-COMMENT=	Fork of libjpeg-turbo with 'jpgcrush' functionality
+COMMENT=	Advanced JPEG encoder for the Web
 
 LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mozilla
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	0c7449c
+GH_COMMIT=	e7a135b
 
 USES=		libtool:oldver
 USE_AUTOTOOLS=	aclocal autoconf autoheader automake libtoolize
@@ -52,7 +51,7 @@ OPTIONS_MULTI_LIBRARIES=	SHARED STATIC
 OPTIONS_SINGLE=	API_ABI_EMULATION
 OPTIONS_SINGLE_API_ABI_EMULATION=	JPEG6B JPEG7 JPEG8
 
-OPTIONS_DEFAULT=	DECODING ENCODING GCC JPEG8 SHARED STATIC TURBOJPEG
+OPTIONS_DEFAULT=	DECODING ENCODING GCC JPEG8 SHARED TURBOJPEG
 
 OPTIONS_SUB=	yes
 
@@ -99,15 +98,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|&/mozjpeg|; \
 		/^exampledir/s|=.*|= ${EXAMPLESDIR}|' \
 			${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|__attribute__((always_inline))",|inline &|' \
-			${WRKSRC}/configure.ac
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
 	${INSTALL_DATA} ${DOC_FILES:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR1}
 	${INSTALL_DATA} ${DOC_FILES:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
-.endif
 
 .if ${PORT_OPTIONS:MSHARED}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libjpeg.so.${VER}
diff --git a/graphics/mozjpeg/distinfo b/graphics/mozjpeg/distinfo
index 39a9e878ea95..99b342c31516 100644
--- a/graphics/mozjpeg/distinfo
+++ b/graphics/mozjpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mozjpeg-1.0.1.tar.gz) = f3ddbdc323ef3daf6b6958ba1365fc869819d07b201727be1ab3fdaa3213b0c4
-SIZE (mozjpeg-1.0.1.tar.gz) = 1039871
+SHA256 (mozjpeg-2.0.1.tar.gz) = 3384bdb7ee89d1cf620c3a092f52ded6cf048ad828f85e357f310ab944503662
+SIZE (mozjpeg-2.0.1.tar.gz) = 1046685
diff --git a/graphics/mozjpeg/pkg-descr b/graphics/mozjpeg/pkg-descr
index eab772213d24..f3e910f39a64 100644
--- a/graphics/mozjpeg/pkg-descr
+++ b/graphics/mozjpeg/pkg-descr
@@ -1,19 +1,15 @@
 MozJPEG is a fork of libjpeg-turbo with 'jpgcrush' functionality built in.
 
-The goal is to provide a production-quality JPEG encoder that improves
-compression while maintaining compatibility with the vast majority of deployed
-decoders.
+This project's goal is to reduce the size of JPEG files without reducing quality
+or compatibility with the vast majority of the world's deployed decoders.
 
-The 'jpgcrush' feature finds the progressive coding configuration which uses the
-fewest bits. This most frequently reduces file size by 2-10%, but those are not
-hard limits. Significantly greater reductions have been observed.
+The idea is to reduce transfer times for JPEGs on the Web, thus reducing page
+load times.
 
-Library configuration defaults are the same as for libjpeg-turbo, in order to
-make transitions as painless as possible. There are new configuration options
-for new features, but they are not enabled by default.
-
-The 'cjpeg' program defaults are not the same as for the equivalent program in
-libjpeg-turbo. The 'cjpeg' defaults for mozjpeg are set to aggressively optimize
-for smaller file sizes.
+'mozjpeg' is not intended to be a general JPEG library replacement. It makes
+tradeoffs that are intended to benefit Web use cases and focuses solely on
+improving encoding. It is best used as part of a Web encoding workflow. For a
+general JPEG library (e.g. your system libjpeg), especially if you care about
+decoding, we recommend graphics/libjpeg-turbo port.
 
 WWW: https://github.com/mozilla/mozjpeg/