[75226] trunk/dports/graphics/qrencode

[jmr at macports.org]

Revision: 75226
          http://trac.macports.org/changeset/75226
Author:   jmr at macports.org
Date:     2011-01-18 07:49:26 -0800 (Tue, 18 Jan 2011)
Log Message:
-----------
qrencode: fix configure to accept libpng 1.4 (#28024)

Modified Paths:
--------------
    trunk/dports/graphics/qrencode/Portfile

Added Paths:
-----------
    trunk/dports/graphics/qrencode/files/
    trunk/dports/graphics/qrencode/files/configure-libpng.diff

Modified: trunk/dports/graphics/qrencode/Portfile
===================================================================
--- trunk/dports/graphics/qrencode/Portfile	2011-01-18 14:52:26 UTC (rev 75225)
+++ trunk/dports/graphics/qrencode/Portfile	2011-01-18 15:49:26 UTC (rev 75226)
@@ -20,5 +20,7 @@
 depends_build           port:pkgconfig
 depends_lib             port:libpng
 
+patchfiles              configure-libpng.diff
+
 test.run                yes
 test.target             verify

Added: trunk/dports/graphics/qrencode/files/configure-libpng.diff
===================================================================
--- trunk/dports/graphics/qrencode/files/configure-libpng.diff	                        (rev 0)
+++ trunk/dports/graphics/qrencode/files/configure-libpng.diff	2011-01-18 15:49:26 UTC (rev 75226)
@@ -0,0 +1,52 @@
+--- configure.orig	2010-02-03 11:43:16.000000000 +1100
++++ configure	2011-01-19 02:44:08.000000000 +1100
+@@ -11445,12 +11445,12 @@
+         pkg_cv_png_CFLAGS="$png_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\""; } >&5
++  ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null`
++  pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng"" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11463,12 +11463,12 @@
+         pkg_cv_png_LIBS="$png_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\""; } >&5
++  ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null`
++  pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng"" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11487,14 +11487,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""`
++	        png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng""`
+         else
+-	        png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""`
++	        png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng""`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$png_PKG_ERRORS" >&5
+ 
+-	as_fn_error "Package requirements (\"libpng12\") were not met:
++	as_fn_error "Package requirements (\"libpng\") were not met:
+ 
+ $png_PKG_ERRORS
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110118/189cb1b4/attachment.html>