Index: head/graphics/pngquant/Makefile =================================================================== --- head/graphics/pngquant/Makefile (revision 436746) +++ head/graphics/pngquant/Makefile (revision 436747) @@ -1,59 +1,54 @@ # Created by: Alex Hayward # $FreeBSD$ PORTNAME= pngquant -PORTVERSION= 2.7.2 +PORTVERSION= 2.9.0 DISTVERSIONSUFFIX= -src CATEGORIES= graphics MASTER_SITES= http://pngquant.org/ MAINTAINER= ak@FreeBSD.org COMMENT= Converts 32-bit RGBA PNGs into 8-bit RGBA-palette PNGs LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libpng.so:graphics/png WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= gmake pkgconfig HAS_CONFIGURE= yes -MAKE_ARGS+= CC="${CC}" -CPPFLAGS+= $$(libpng-config --I_opts) -LDFLAGS+= $$(libpng-config --ldflags) - PORTDOCS= CHANGELOG README.md PLIST_FILES= bin/pngquant \ man/man1/pngquant.1.gz -OPTIONS_DEFINE= OPTIMIZED_FLAGS OPENMP LCMS2 DEBUG DOCS +OPTIONS_DEFINE= OPTIMIZED_FLAGS LCMS2 DEBUG DOCS OPTIONS_DEFINE_i386= SSE +OPTIONS_DEFINE_amd64= SSE LCMS2_DESC= Support for ICC profiles via LCMS library +OPTIMIZED_FLAGS_DESC= ${OPTIMIZED_CFLAGS_DESC} +OPTIONS_DEFAULT_amd64= SSE -DEBUG_CFLAGS_OFF= -DNDEBUG +DEBUG_CONFIGURE_ON= --enable-debug 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 \ +OPTIMIZED_FLAGS_CFLAGS= -O3 -fstrict-aliasing \ -ffast-math -funroll-loops -fomit-frame-pointer \ -fexpensive-optimizations -ffinite-math-only \ -funsafe-loop-optimizations -ftree-vectorize -# SSE2 support is always enabled on amd64 -SSE_CFLAGS= -DUSE_SSE=1 -msse2 +SSE_CONFIGURE_ENABLE=sse do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pngquant ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/pngquant.1 ${STAGEDIR}${MANPREFIX}/man/man1 + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/pngquant/distinfo =================================================================== --- head/graphics/pngquant/distinfo (revision 436746) +++ head/graphics/pngquant/distinfo (revision 436747) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476836074 -SHA256 (pngquant-2.7.2-src.tar.gz) = 75801ed048c40cc4bff12773892d16d7ff00c11b9c549845c2133fd3abca17c2 -SIZE (pngquant-2.7.2-src.tar.gz) = 91721 +TIMESTAMP = 1490049268 +SHA256 (pngquant-2.9.0-src.tar.gz) = ed9ae6943a3520c7e14700692ebfbd568dad73790582efaeb4cab93104f21cfc +SIZE (pngquant-2.9.0-src.tar.gz) = 94747 Index: head/graphics/pngquant/files/patch-configure =================================================================== --- head/graphics/pngquant/files/patch-configure (revision 436746) +++ head/graphics/pngquant/files/patch-configure (revision 436747) @@ -1,187 +1,190 @@ -Index: configure +--- configure.orig 2017-03-02 11:48:03 UTC ++++ configure @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh CONFIG="config.mk" PREFIX="/usr/local" -@@ -8,7 +8,7 @@ DEBUG= +@@ -14,7 +14,7 @@ DEBUG= SSE=auto OPENMP= LIBPNG_DIR=. -if [[ "$OSTYPE" =~ "darwin" ]]; then +if echo "$OSTYPE" | grep -q "darwin"; then COCOA_READER=auto LCMS2=0 else -@@ -38,7 +38,7 @@ for i in "$@"; do +@@ -44,7 +44,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" fi help "--with-libpng= search for libpng in directory" -@@ -109,7 +109,7 @@ done +@@ -115,7 +115,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. -if [[ -f "$CONFIG" && ! -w "$CONFIG" ]]; then +if [ -f "$CONFIG" -a ! -w "$CONFIG" ]; then echo "Cannot overwrite file $CONFIG! Please delete it." exit 1 fi -@@ -146,7 +146,7 @@ find_h() { +@@ -152,7 +152,7 @@ find_h() { find_pkgconfig() { local LIBNAME=$1 - if pkg-config --exists "$LIBNAME" &> /dev/null; 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"))" -@@ -210,9 +210,13 @@ find_library() { +@@ -216,9 +216,13 @@ find_library() { return 0 fi - for i in "${DIRS[@]}"; do - DIR=($i) - 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 + if find_dynamic "$LIBNAME" "$HEADERPATTERN" "$DYNAMICPATTERN" "${DIRS_h}" "${DIRS_l}"; then return 0 fi done -@@ -262,10 +266,8 @@ fi - +@@ -272,12 +276,8 @@ fi # SSE if [ "$SSE" = 'auto' ]; then -- if [[ "$(uname -m)" =~ (amd|x86_)64 || -- "$(grep -E -m1 "^flags" /proc/cpuinfo)" =~ "sse" ]]; then -- SSE=1 + SSE=0 +- if type uname > /dev/null; then +- if [[ "$(uname -m)" =~ "amd64" || "$(uname -m)" =~ "x86_64" || +- "$(grep -E -m1 "^flags" /proc/cpuinfo)" =~ "sse" ]]; then +- SSE=1 +- fi - fi + echo $(uname -m) | grep -E -q '(amd|x86_)64' && SSE=1 + grep -E -m1 -q '^flags.*sse' /proc/cpuinfo 2>/dev/null && SSE=1 fi if [ "$SSE" -eq 1 ]; then -@@ -288,9 +290,8 @@ if [ -n "$OPENMP" ]; then +@@ -300,9 +300,8 @@ if [ -n "$OPENMP" ]; then else OPENMPFLAGS="-fopenmp" fi - if [[ "$("$CC" -xc -E $OPENMPFLAGS <(echo "#ifdef _OPENMP - #include - #endif") 2>&1)" =~ "omp_get_thread_num" ]]; then + if echo "$(printf '#ifdef _OPENMP\n#include \n#endif\n' | \ + "$CC" -xc -E $OPENMPFLAGS - 2>&1)" | grep -q omp_get_thread_num; then cflags "$OPENMPFLAGS" lflags "$OPENMPFLAGS" status "OpenMP" "yes" -@@ -305,11 +306,13 @@ else +@@ -317,11 +316,13 @@ else 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" - if [ "$COCOA_READER" != 0 ] && "$CC" 2>/dev/null 1>/dev/null -xc -E <(echo "#import "); then + if [ "$COCOA_READER" != 0 ] && \ + echo "#import " | \ + "$CC" 2>/dev/null 1>/dev/null -xc -E -; then COCOA_READER=1 cflags "-DUSE_COCOA=1" lflags "-framework Cocoa" -@@ -320,25 +323,24 @@ if [[ "$OSTYPE" =~ "darwin" ]]; then +@@ -332,25 +333,24 @@ if [[ "$OSTYPE" =~ "darwin" ]]; then fi # pairs of possible *.h and lib*.so locations -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="$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 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") + 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" else SOLIBSUFFIX=so fi -@@ -350,7 +352,7 @@ HAS_LIBPNG=0 +@@ -362,7 +362,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" HAS_LIBPNG=1 fi -@@ -361,7 +363,7 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then +@@ -373,7 +373,7 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then 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%/*}" -@@ -377,14 +379,19 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then +@@ -389,14 +389,19 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then if find_pkgconfig libpng; then HAS_LIBPNG=1 else - for i in "${DIRS[@]}"; do - DIR=($i) - PNGH=$(find_h "${DIR[0]}" "png.h") + # destroys positional parameters + set -- ${DIRS} + while [ -n "$1" -a -n "$2" ]; do + DIRS_h="$1" + DIRS_l="$2" + shift 2 + + PNGH=$(find_h "${DIRS_h}" "png.h") if [ -n "$PNGH" ]; then PNGH_STRING=$(pngh_string "$PNGH") PNGH_MAJMIN=$(pngh_majmin "$PNGH") - if [[ -n "$PNGH_STRING" && -n "$PNGH_MAJMIN" ]]; then - LIBPNGSO=$(find_f "${DIR[1]}" "libpng${PNGH_MAJMIN}.$SOLIBSUFFIX*") + if [ -n "$PNGH_STRING" -a -n "$PNGH_MAJMIN" ]; then + LIBPNGSO=$(find_f "${DIRS_l}" "libpng${PNGH_MAJMIN}.$SOLIBSUFFIX*") if [ -n "$LIBPNGSO" ]; then cflags "-I${PNGH%/*}" lflags "-L${LIBPNGSO%/*} -lpng${PNGH_MAJMIN}" -@@ -398,7 +405,7 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then +@@ -410,7 +415,7 @@ if [ "$HAS_LIBPNG" -eq 0 ]; then fi fi 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 libpng16-dev` or `apt-get install libpng-dev` or `yum install libpng-devel`' Index: head/graphics/pngquant/files/patch-lib_configure =================================================================== --- head/graphics/pngquant/files/patch-lib_configure (revision 436746) +++ head/graphics/pngquant/files/patch-lib_configure (revision 436747) @@ -1,41 +1,44 @@ -Index: lib/configure +--- lib/configure.orig 2017-03-02 11:48:03 UTC ++++ lib/configure @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh CONFIG="config.mk" PREFIX="/usr/local" -@@ -80,7 +80,7 @@ +@@ -79,7 +79,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. -if [[ -f "$CONFIG" && ! -w "$CONFIG" ]]; then +if [ -f "$CONFIG" -a ! -w "$CONFIG" ]; then echo "Cannot overwrite file $CONFIG! Please delete it." exit 1 fi -@@ -135,10 +135,8 @@ - +@@ -138,12 +138,8 @@ fi # SSE if [ "$SSE" = 'auto' ]; then -- if [[ "$(uname -m)" =~ (amd|x86_)64 || -- "$(grep -E -m1 "^flags" /proc/cpuinfo)" =~ "sse" ]]; then -- SSE=1 + SSE=0 +- if type uname > /dev/null; then +- if [[ "$(uname -m)" =~ "amd64" || "$(uname -m)" =~ "x86_64" || +- "$(grep -E -m1 "^flags" /proc/cpuinfo)" =~ "sse" ]]; then +- SSE=1 +- fi - fi + echo $(uname -m) | grep -E -q '(amd|x86_)64' && SSE=1 + grep -E -m1 -q '^flags.*sse' /proc/cpuinfo 2>/dev/null && SSE=1 fi if [ "$SSE" -eq 1 ]; then -@@ -161,9 +159,8 @@ +@@ -166,9 +162,8 @@ if [ -n "$OPENMP" ]; then else OPENMPFLAGS="-fopenmp" fi - if [[ "$("$CC" -xc -E $OPENMPFLAGS <(echo "#ifdef _OPENMP - #include - #endif") 2>&1)" =~ "omp_get_thread_num" ]]; then + if echo "$(printf '#ifdef _OPENMP\n#include \n#endif\n' | \ + "$CC" -xc -E $OPENMPFLAGS - 2>&1)" | grep -q omp_get_thread_num; then cflags "$OPENMPFLAGS" lflags "$OPENMPFLAGS" status "OpenMP" "yes"