- Update to 2.7.2

- License changed to GPL3
- Add LCMS2 option

PR:	213617
Submitted by:	Anton Yuzhaninov <citrin+pr@citrin.ru>

3 files changed, 55 insertions, 44 deletions

diff --git a/graphics/pngquant/Makefile b/graphics/pngquant/Makefile
index f8750ecf9572..af8afa9ba4f2 100644
--- a/graphics/pngquant/Makefile
+++ b/graphics/pngquant/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pngquant
-PORTVERSION=	2.5.2
-PORTREVISION=	1
+PORTVERSION=	2.7.2
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	graphics
 MASTER_SITES=	http://pngquant.org/
@@ -11,14 +10,15 @@ MASTER_SITES=	http://pngquant.org/
 MAINTAINER=	ak@FreeBSD.org
 COMMENT=	Converts 32-bit RGBA PNGs into 8-bit RGBA-palette PNGs
 
-LICENSE=	BSD3CLAUSE
+LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=	gmake tar:bzip2
+USES=	gmake pkgconfig
+HAS_CONFIGURE=	yes
 MAKE_ARGS+=	CC="${CC}"
 
 CPPFLAGS+=	$$(libpng-config --I_opts)
@@ -28,8 +28,19 @@ PORTDOCS=	CHANGELOG README.md
 PLIST_FILES=	bin/pngquant \
 				man/man1/pngquant.1.gz
 
-OPTIONS_DEFINE=	OPTIMIZED_FLAGS OPENMP DEBUG DOCS
+OPTIONS_DEFINE=	OPTIMIZED_FLAGS OPENMP LCMS2 DEBUG DOCS
 OPTIONS_DEFINE_i386=	SSE
+LCMS2_DESC=	Support for ICC profiles via LCMS library
+
+DEBUG_CFLAGS_OFF=	-DNDEBUG
+
+LCMS2_CONFIGURE_WITH=	lcms2
+LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
+
+OPENMP_LIB_DEPENDS=	libomp.so:devel/openmp
+OPENMP_CPPFLAGS=	-I${LOCALBASE}/include
+OPENMP_CONFIGURE_ON=	--with-openmp
+OPENMP_CONFIGURE_ENV=	C_INCLUDE_PATH=${LOCALBASE}/include
 
 OPTIMIZED_FLAGS_CFLAGS=	-O3 -fearly-inlining -fstrict-aliasing \
 		-ffast-math -funroll-loops -fomit-frame-pointer \
@@ -39,11 +50,6 @@ OPTIMIZED_FLAGS_CFLAGS=	-O3 -fearly-inlining -fstrict-aliasing \
 # SSE2 support is always enabled on amd64
 SSE_CFLAGS=	-DUSE_SSE=1 -msse2
 
-OPENMP_CFLAGS=	-fopenmp
-OPENMP_LDFLAGS=	-lgomp -pthread
-
-DEBUG_CFLAGS_OFF=	-DNDEBUG
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pngquant ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/pngquant.1 ${STAGEDIR}${MANPREFIX}/man/man1
diff --git a/graphics/pngquant/distinfo b/graphics/pngquant/distinfo
index ddba4eececa2..5ebb963a44f4 100644
--- a/graphics/pngquant/distinfo
+++ b/graphics/pngquant/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pngquant-2.5.2-src.tar.bz2) = 5b064596305c6f765a753e96e08224dd71b31c20b72bdaf0f205da16b76a347d
-SIZE (pngquant-2.5.2-src.tar.bz2) = 54611
+TIMESTAMP = 1476836074
+SHA256 (pngquant-2.7.2-src.tar.gz) = 75801ed048c40cc4bff12773892d16d7ff00c11b9c549845c2133fd3abca17c2
+SIZE (pngquant-2.7.2-src.tar.gz) = 91721
diff --git a/graphics/pngquant/files/patch-configure b/graphics/pngquant/files/patch-configure
index 26a666fac500..197f9fec2482 100644
--- a/graphics/pngquant/files/patch-configure
+++ b/graphics/pngquant/files/patch-configure
@@ -5,7 +5,7 @@ Index: configure
  
  CONFIG="config.mk"
  PREFIX="/usr/local"
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ DEBUG=
  SSE=auto
  OPENMP=
  LIBPNG_DIR=.
@@ -14,16 +14,16 @@ Index: configure
      COCOA_READER=auto
      LCMS2=0
  else
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ for i in "$@"; do
          echo
          help "--with-openmp=static          compile with multicore support"
          help "--with-lcms2/--without-lcms2  compile with color profile support"
 -if [[ "$OSTYPE" =~ "darwin" ]]; then
 +if echo "$OSTYPE" | grep -q "darwin"; then
          help "--with-cocoa/--without-cocoa  use Cocoa framework to read images"
-         help "--with-libpng=<dir>           search for libpng in directory"
  fi
-@@ -110,7 +110,7 @@
+         help "--with-libpng=<dir>           search for libpng in directory"
+@@ -109,7 +109,7 @@ done
  
  # If someone runs sudo make install as very first command, and configure later,
  # $CONFIG cannot be overwritten, and must be deleted before continuing.
@@ -32,37 +32,33 @@ Index: configure
      echo "Cannot overwrite file $CONFIG! Please delete it."
      exit 1
  fi
-@@ -147,7 +147,7 @@
+@@ -146,7 +146,7 @@ find_h() {
  
  find_pkgconfig() {
-     LIBNAME=$1
+     local LIBNAME=$1
 -    if pkg-config --exists "$LIBNAME" &> /dev/null; then
-+    if pkg-config --exists "$LIBNAME" >/dev/null 2>&1; then
++    if pkg-config --exists "$LIBNAME" >/dev/null; then
          cflags "$(pkg-config --cflags "$LIBNAME")"
          lflags "$(pkg-config --libs "$LIBNAME")"
          status "$LIBNAME" "shared ($(pkg-config --modversion "$LIBNAME"))"
-@@ -191,11 +191,16 @@
+@@ -210,9 +210,13 @@ find_library() {
          return 0
      fi
  
 -    for i in "${DIRS[@]}"; do
 -        DIR=($i)
--        HPATH=$(find_h "${DIR[0]}" "$HEADERPATTERN")
+-        if find_dynamic "$LIBNAME" "$HEADERPATTERN" "$DYNAMICPATTERN" "${DIR[0]}" "${DIR[1]}"; then
 +    # destroys positional parameters
 +    set -- ${DIRS}
 +    while [ -n "$1" -a -n "$2" ]; do
 +        DIRS_h="$1"
 +        DIRS_l="$2"
 +        shift 2
-+
-+        HPATH=$(find_h "${DIRS_h}" "$HEADERPATTERN")
-         if [ -n "$HPATH" ]; then
--            SOPATH=$(find_f "${DIR[1]}" "$DYNAMICPATTERN")
-+            SOPATH=$(find_f "${DIRS_l}" "$DYNAMICPATTERN")
-             if [ -n "$SOPATH" ]; then
-                 cflags "-I${HPATH%/*}"
-                 lflags "-L${SOPATH%/*} -l$DYNAMICLIBNAME"
-@@ -250,10 +255,8 @@
++        if find_dynamic "$LIBNAME" "$HEADERPATTERN" "$DYNAMICPATTERN" "${DIRS_h}" "${DIRS_l}"; then
+             return 0
+         fi
+     done
+@@ -262,10 +266,8 @@ fi
  
  # SSE
  if [ "$SSE" = 'auto' ]; then
@@ -75,7 +71,7 @@ Index: configure
  fi
  
  if [ "$SSE" -eq 1 ]; then
-@@ -276,9 +279,8 @@
+@@ -288,9 +290,8 @@ if [ -n "$OPENMP" ]; then
      else
          OPENMPFLAGS="-fopenmp"
      fi
@@ -87,7 +83,7 @@ Index: configure
          cflags "$OPENMPFLAGS"
          lflags "$OPENMPFLAGS"
          status "OpenMP" "yes"
-@@ -293,11 +295,13 @@
+@@ -305,11 +306,13 @@ else
  fi
  
  # Cocoa
@@ -103,20 +99,28 @@ Index: configure
          COCOA_READER=1
          cflags "-DUSE_COCOA=1"
          lflags "-framework Cocoa"
-@@ -308,19 +312,18 @@
+@@ -320,25 +323,24 @@ if [[ "$OSTYPE" =~ "darwin" ]]; then
  fi
  
  # pairs of possible *.h and lib*.so locations
--DIRS=("/usr/local/include /usr/local/lib"
+-DIRS=()
++DIRS=
+ 
+ if command -v >/dev/null libpng-config; then
+-    DIRS+=("$(libpng-config --prefix) $(libpng-config --libdir)")
++    DIRS="$(libpng-config --prefix) $(libpng-config --libdir)"
+ fi
+ 
+-DIRS+=("/usr/local/include /usr/local/lib"
 -      "/usr/include /usr/lib"
 -      "/opt/local/include /opt/local/lib" # macports
 -      )
-+DIRS="${PREFIX}/include ${PREFIX}/lib \
++DIRS="$DIRS /usr/local/include /usr/local/lib \
 +      /usr/include /usr/lib \
 +      /opt/local/include /opt/local/lib" # macports
  
 -if [[ "$OSTYPE" =~ "darwin" ]]; then
-+if echo "$OSTYPE" | grep -q "darwin"; then
++if echo "$OSTYPE" | grep -q "darwin" ; then
      SOLIBSUFFIX=dylib
  
      # Search Developer SDK paths, since Apple seems to have dropped the standard Unixy ones
@@ -129,16 +133,16 @@ Index: configure
  else
      SOLIBSUFFIX=so
  fi
-@@ -332,7 +335,7 @@
+@@ -350,7 +352,7 @@ HAS_LIBPNG=0
  if echo "#include \"png.h\"
      int main(){
      return !png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
 -}" | "$CC" -xc -std=c99 -o /dev/null $CFLAGS $LDFLAGS - &> /dev/null; then
 +}" | "$CC" -xc -std=c99 -o /dev/null $CFLAGS $LDFLAGS - >/dev/null 2>&1; then
      status "libpng" "custom flags"
-     SUCCESS=1
+     HAS_LIBPNG=1
  fi
-@@ -343,7 +346,7 @@
+@@ -361,7 +363,7 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then
      if [ -n "$PNGH" ]; then
          PNGH_STRING=$(pngh_string "$PNGH")
          PNGH_MAJMIN=$(pngh_majmin "$PNGH")
@@ -147,9 +151,9 @@ Index: configure
              LIBPNGA=$(find_f "$LIBPNG_DIR" "libpng${PNGH_MAJMIN}.a")
              if [ -n "$LIBPNGA" ]; then
                  cflags "-I${PNGH%/*}"
-@@ -359,14 +362,19 @@
+@@ -377,14 +379,19 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then
      if find_pkgconfig libpng; then
-         SUCCESS=1
+         HAS_LIBPNG=1
      else
 -        for i in "${DIRS[@]}"; do
 -            DIR=($i)
@@ -172,12 +176,12 @@ Index: configure
                      if [ -n "$LIBPNGSO" ]; then
                          cflags "-I${PNGH%/*}"
                          lflags "-L${LIBPNGSO%/*} -lpng${PNGH_MAJMIN}"
-@@ -380,7 +388,7 @@
+@@ -398,7 +405,7 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then
      fi
  fi
- if [ "$SUCCESS" -eq 0 ]; then
+ if [ "$HAS_LIBPNG" -eq 0 ]; then
 -    if [[ "$OSTYPE" =~ "darwin" ]]; then
 +    if echo "$OSTYPE" | grep -q "darwin"; then
          LIBPNG_CMD='`brew install libpng`'
      else
-         LIBPNG_CMD='`apt-get install libpng-dev` or `yum install libpng-devel`'
+         LIBPNG_CMD='`apt-get install libpng16-dev` or `apt-get install libpng-dev` or `yum install libpng-devel`'