svn commit: r451067 - in head/graphics/pngquant: . files
Alex Kozlov
ak at FreeBSD.org
Mon Oct 2 05:59:16 UTC 2017
Author: ak
Date: Mon Oct 2 05:59:14 2017
New Revision: 451067
URL: https://svnweb.freebsd.org/changeset/ports/451067
Log:
- Update to 2.10.1
Modified:
head/graphics/pngquant/Makefile
head/graphics/pngquant/distinfo
head/graphics/pngquant/files/patch-configure
head/graphics/pngquant/files/patch-lib_configure
Modified: head/graphics/pngquant/Makefile
==============================================================================
--- head/graphics/pngquant/Makefile Mon Oct 2 05:52:06 2017 (r451066)
+++ head/graphics/pngquant/Makefile Mon Oct 2 05:59:14 2017 (r451067)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pngquant
-PORTVERSION= 2.9.0
+PORTVERSION= 2.10.1
DISTVERSIONSUFFIX= -src
CATEGORIES= graphics
MASTER_SITES= http://pngquant.org/
Modified: head/graphics/pngquant/distinfo
==============================================================================
--- head/graphics/pngquant/distinfo Mon Oct 2 05:52:06 2017 (r451066)
+++ head/graphics/pngquant/distinfo Mon Oct 2 05:59:14 2017 (r451067)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490049268
-SHA256 (pngquant-2.9.0-src.tar.gz) = ed9ae6943a3520c7e14700692ebfbd568dad73790582efaeb4cab93104f21cfc
-SIZE (pngquant-2.9.0-src.tar.gz) = 94747
+TIMESTAMP = 1506920489
+SHA256 (pngquant-2.10.1-src.tar.gz) = e07a21fe37b6ae9fa5524f1e20a8e73b698566d42d2cc3edd469531745faa850
+SIZE (pngquant-2.10.1-src.tar.gz) = 136133
Modified: head/graphics/pngquant/files/patch-configure
==============================================================================
--- head/graphics/pngquant/files/patch-configure Mon Oct 2 05:52:06 2017 (r451066)
+++ head/graphics/pngquant/files/patch-configure Mon Oct 2 05:59:14 2017 (r451067)
@@ -1,12 +1,15 @@
---- configure.orig 2017-03-02 11:48:03 UTC
-+++ configure
-@@ -1,4 +1,4 @@
+Index: configure
+@@ -1,15 +1,15 @@
-#!/usr/bin/env bash
+#!/bin/sh
CONFIG="config.mk"
PREFIX="/usr/local"
-@@ -14,7 +14,7 @@ DEBUG=
+
+ DEBUG=
+ LIQSRCDIR=./lib
+-LIQCONFIGURE=(--quiet)
++LIQCONFIGURE=--quiet
SSE=auto
OPENMP=
LIBPNG_DIR=.
@@ -15,8 +18,8 @@
COCOA_READER=auto
LCMS2=0
else
-@@ -44,7 +44,7 @@ for i in "$@"; do
- echo
+@@ -41,7 +41,7 @@
+ help "--with-libimagequant=<dir> external libimagequant (lib/ default)"
help "--with-openmp=static compile with multicore support"
help "--with-lcms2/--without-lcms2 compile with color profile support"
-if [[ "$OSTYPE" =~ "darwin" ]]; then
@@ -24,7 +27,71 @@
help "--with-cocoa/--without-cocoa use Cocoa framework to read images"
fi
help "--with-libpng=<dir> search for libpng in directory"
-@@ -115,7 +115,7 @@ done
+@@ -56,35 +56,35 @@
+ CC=*)
+ CC=${i#*=}
+ SKIP_CC_CHECK=1
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ CFLAGS=*)
+ CFLAGS=${i#*=}
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ LDFLAGS=*)
+ LDFLAGS=${i#*=}
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ --enable-debug)
+ DEBUG=1
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ --enable-sse)
+ SSE=1
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ --disable-sse)
+ SSE=0
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ --with-openmp)
+ OPENMP=1
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ --with-openmp=static)
+ OPENMP=static
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ --with-lcms2)
+ LCMS2=1
+@@ -111,16 +111,16 @@
+ ;;
+ --prefix=*)
+ PREFIX=${i#*=}
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ # can be used multiple times or in quotes to set multiple flags
+ --extra-cflags=*)
+ EXTRA_CFLAGS="$EXTRA_CFLAGS ${i#*=}"
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ --extra-ldflags=*)
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS ${i#*=}"
+- LIQCONFIGURE+=("$i")
++ LIQCONFIGURE="$LIQCONFIGURE $i"
+ ;;
+ *)
+ echo "warning: unknown switch ${i%%=*} (see $0 --help for the list)"
+@@ -130,7 +130,7 @@
# If someone runs sudo make install as very first command, and configure later,
# $CONFIG cannot be overwritten, and must be deleted before continuing.
@@ -33,7 +100,7 @@
echo "Cannot overwrite file $CONFIG! Please delete it."
exit 1
fi
-@@ -152,7 +152,7 @@ find_h() {
+@@ -167,7 +167,7 @@
find_pkgconfig() {
local LIBNAME=$1
@@ -41,8 +108,8 @@
+ 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"))"
-@@ -216,9 +216,13 @@ find_library() {
+ LIBRARY_FOUND_VERSION=$(pkg-config --modversion "$LIBNAME")
+@@ -248,9 +248,13 @@
return 0
fi
@@ -59,7 +126,7 @@
return 0
fi
done
-@@ -272,12 +276,8 @@ fi
+@@ -305,12 +309,8 @@
# SSE
if [ "$SSE" = 'auto' ]; then
SSE=0
@@ -74,7 +141,7 @@
fi
if [ "$SSE" -eq 1 ]; then
-@@ -300,9 +300,8 @@ if [ -n "$OPENMP" ]; then
+@@ -333,9 +333,8 @@
else
OPENMPFLAGS="-fopenmp"
fi
@@ -86,7 +153,7 @@
cflags "$OPENMPFLAGS"
lflags "$OPENMPFLAGS"
status "OpenMP" "yes"
-@@ -317,11 +316,13 @@ else
+@@ -350,11 +349,13 @@
fi
# Cocoa
@@ -102,7 +169,7 @@
COCOA_READER=1
cflags "-DUSE_COCOA=1"
lflags "-framework Cocoa"
-@@ -332,25 +333,24 @@ if [[ "$OSTYPE" =~ "darwin" ]]; then
+@@ -365,32 +366,29 @@
fi
# pairs of possible *.h and lib*.so locations
@@ -114,7 +181,15 @@
+ DIRS="$(libpng-config --prefix) $(libpng-config --libdir)"
fi
--DIRS+=("/usr/local/include /usr/local/lib"
+-if [ -n $"LIQSRCDIR" ]; then
+- DIRS+=("$LIQSRCDIR" "$LIQSRCDIR") # local libimagequant
++if [ -n "$LIQSRCDIR" ]; then
++ DIRS="$DIRS $LIQSRCDIR $LIQSRCDIR" # local libimagequant
+ fi
+
+-DIRS+=(
+- "/usr/local/include /usr/local/lib"
+- "/usr/include /usr/lib64"
- "/usr/include /usr/lib"
- "/opt/local/include /opt/local/lib" # macports
- )
@@ -131,12 +206,14 @@
XCODE_PATH=$($XCODE_CMD -p)
- DIRS+=("$XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/lib")
- DIRS+=("$XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib")
+-elif [[ "$OSTYPE" =~ "msys" ]]; then
+ DIRS="$DIRS $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/lib"
+ DIRS="$DIRS $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib"
++elif echo "$OSTYPE" | grep -q "msys" ; then
+ SOLIBSUFFIX=dll
else
SOLIBSUFFIX=so
- fi
-@@ -362,7 +362,7 @@ HAS_LIBPNG=0
+@@ -431,7 +429,7 @@
if echo "#include \"png.h\"
int main(){
return !png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ -145,16 +222,16 @@
status "libpng" "custom flags"
HAS_LIBPNG=1
fi
-@@ -373,7 +373,7 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then
+@@ -442,7 +440,7 @@
if [ -n "$PNGH" ]; then
PNGH_STRING=$(pngh_string "$PNGH")
PNGH_MAJMIN=$(pngh_majmin "$PNGH")
- if [[ -n "$PNGH_STRING" && -n "$PNGH_MAJMIN" ]]; then
+ if [ -n "$PNGH_STRING" -a -n "$PNGH_MAJMIN" ]; then
LIBPNGA=$(find_f "$LIBPNG_DIR" "libpng${PNGH_MAJMIN}.a")
- if [ -n "$LIBPNGA" ]; then
- cflags "-I${PNGH%/*}"
-@@ -389,14 +389,19 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then
+ if [ -z "$LIBPNGA" ]; then
+ LIBPNGA=$(find_f "$LIBPNG_DIR" "libpng.a")
+@@ -461,14 +459,19 @@
if find_pkgconfig libpng; then
HAS_LIBPNG=1
else
@@ -179,7 +256,7 @@
if [ -n "$LIBPNGSO" ]; then
cflags "-I${PNGH%/*}"
lflags "-L${LIBPNGSO%/*} -lpng${PNGH_MAJMIN}"
-@@ -410,7 +415,7 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then
+@@ -482,7 +485,7 @@
fi
fi
if [ "$HAS_LIBPNG" -eq 0 ]; then
@@ -188,3 +265,11 @@
LIBPNG_CMD='`brew install libpng`'
else
LIBPNG_CMD='`apt-get install libpng16-dev` or `apt-get install libpng-dev` or `yum install libpng-devel`'
+@@ -550,6 +553,6 @@
+ SOLIBSUFFIX = $SOLIBSUFFIX
+ STATICLIBDEPS = $STATICLIBDEPS
+ LIQSRCDIR = $LIQSRCDIR
+-LIQCONFIGUREFLAGS = $(printf "'%s' " "${LIQCONFIGURE[@]}")
++LIQCONFIGUREFLAGS = "$LIQCONFIGURE"
+ " > "$CONFIG"
+
Modified: head/graphics/pngquant/files/patch-lib_configure
==============================================================================
--- head/graphics/pngquant/files/patch-lib_configure Mon Oct 2 05:52:06 2017 (r451066)
+++ head/graphics/pngquant/files/patch-lib_configure Mon Oct 2 05:59:14 2017 (r451067)
@@ -1,12 +1,11 @@
---- lib/configure.orig 2017-03-02 11:48:03 UTC
-+++ lib/configure
+Index: lib/configure
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
CONFIG="config.mk"
PREFIX="/usr/local"
-@@ -79,7 +79,7 @@ done
+@@ -86,7 +86,7 @@
# If someone runs sudo make install as very first command, and configure later,
# $CONFIG cannot be overwritten, and must be deleted before continuing.
@@ -15,7 +14,7 @@
echo "Cannot overwrite file $CONFIG! Please delete it."
exit 1
fi
-@@ -138,12 +138,8 @@ fi
+@@ -146,12 +146,8 @@
# SSE
if [ "$SSE" = 'auto' ]; then
SSE=0
@@ -30,7 +29,7 @@
fi
if [ "$SSE" -eq 1 ]; then
-@@ -166,9 +162,8 @@ if [ -n "$OPENMP" ]; then
+@@ -174,9 +170,8 @@
else
OPENMPFLAGS="-fopenmp"
fi
@@ -42,3 +41,29 @@
cflags "$OPENMPFLAGS"
lflags "$OPENMPFLAGS"
status "OpenMP" "yes"
+@@ -191,20 +186,20 @@
+ fi
+
+ # Cocoa
+-if [[ "$OSTYPE" =~ "darwin" ]]; then
++if echo "$OSTYPE" | grep -q "darwin" ; then
+ cflags "-mmacosx-version-min=10.6"
+ lflags "-mmacosx-version-min=10.6"
+ fi
+
+-if [[ "$OSTYPE" =~ "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
+ XCODE_CMD="xcode-select"
+ XCODE_PATH=$($XCODE_CMD -p)
+- DIRS+=("$XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/lib")
+- DIRS+=("$XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib")
+-elif [[ "$OSTYPE" =~ "msys" ]]; then
++ DIRS="$DIRS $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/lib"
++ DIRS="$DIRS $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib"
++elif echo "$OSTYPE" | grep -q "msys" ; then
+ SOLIBSUFFIX=dll
+ else
+ SOLIBSUFFIX=so
More information about the svn-ports-all
mailing list