Fix build problem of graphics/php-gd with png 1.6.0.

4 files changed, 12 insertions, 12 deletions

diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 74704f48090..caa9326af6c 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2013/01/17 16:18:24 taca Exp $
+$NetBSD: distinfo,v 1.57 2013/02/17 13:10:13 taca Exp $
 
 SHA1 (php-5.3.21.tar.bz2) = d67d2569b4782cf2faa049f22b08819ad8b15009
 RMD160 (php-5.3.21.tar.bz2) = 84aa653af6fbe66c02a572ad1add3daf6e46bb1e
@@ -8,7 +8,7 @@ RMD160 (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 4f2039676592c94fd923cdf7a35255d
 Size (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 33131 bytes
 SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e
 SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b
-SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690
+SHA1 (patch-ac) = b6eb40116f3770464120b6ea9061624609b9564e
 SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
 SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
 SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc
diff --git a/lang/php53/patches/patch-ac b/lang/php53/patches/patch-ac
index 0c05512463e..aaabf371c1d 100644
--- a/lang/php53/patches/patch-ac
+++ b/lang/php53/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2011/08/20 13:55:09 taca Exp $
+$NetBSD: patch-ac,v 1.5 2013/02/17 13:10:13 taca Exp $
 
 --- ext/gd/config.m4.orig	2011-05-12 08:19:37.000000000 +0000
 +++ ext/gd/config.m4
@@ -35,15 +35,15 @@ $NetBSD: patch-ac,v 1.4 2011/08/20 13:55:09 taca Exp $
      fi
  
 -    PHP_CHECK_LIBRARY(png,png_write_image,
-+    PHP_CHECK_LIBRARY(png15,png_write_image,
++    PHP_CHECK_LIBRARY(png16,png_write_image,
      [
        PHP_ADD_INCLUDE($GD_PNG_DIR/include)
        PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
 -      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
-+      PHP_ADD_LIBRARY_WITH_PATH(png15, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++      PHP_ADD_LIBRARY_WITH_PATH(png16, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
      ],[
 -      AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
-+      AC_MSG_ERROR([Problem with libpng15.(a|so) or libz.(a|so). Please check config.log for more information.])
++      AC_MSG_ERROR([Problem with libpng16.(a|so) or libz.(a|so). Please check config.log for more information.])
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])
diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index 37be469a740..a8856aa1928 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2013/01/17 15:48:09 taca Exp $
+$NetBSD: distinfo,v 1.12 2013/02/17 13:10:13 taca Exp $
 
 SHA1 (php-5.4.11.tar.bz2) = 85666f32bf1f2850c769fe58fed788ae8fdfa1cb
 RMD160 (php-5.4.11.tar.bz2) = 33513161846240bc128eb7e917a293711c9214c3
 Size (php-5.4.11.tar.bz2) = 11147685 bytes
 SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746
 SHA1 (patch-configure) = 5930b32de104cda553c9701086ffdf35a93f8d97
-SHA1 (patch-ext_gd_config.m4) = 089f1c88bd4daa8ebc8911122423c1f88e5d84a0
+SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
 SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
diff --git a/lang/php54/patches/patch-ext_gd_config.m4 b/lang/php54/patches/patch-ext_gd_config.m4
index a292730ce34..09ddece9a94 100644
--- a/lang/php54/patches/patch-ext_gd_config.m4
+++ b/lang/php54/patches/patch-ext_gd_config.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-ext_gd_config.m4,v 1.1 2012/06/16 05:21:55 taca Exp $
+$NetBSD: patch-ext_gd_config.m4,v 1.2 2013/02/17 13:10:14 taca Exp $
 
 --- ext/gd/config.m4.orig	2012-05-03 17:10:43.000000000 +0000
 +++ ext/gd/config.m4
@@ -35,15 +35,15 @@ $NetBSD: patch-ext_gd_config.m4,v 1.1 2012/06/16 05:21:55 taca Exp $
      fi
  
 -    PHP_CHECK_LIBRARY(png,png_write_image,
-+    PHP_CHECK_LIBRARY(png15,png_write_image,
++    PHP_CHECK_LIBRARY(png16,png_write_image,
      [
        PHP_ADD_INCLUDE($GD_PNG_DIR/include)
        PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
 -      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
-+      PHP_ADD_LIBRARY_WITH_PATH(png15, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++      PHP_ADD_LIBRARY_WITH_PATH(png16, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
      ],[
 -      AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
-+      AC_MSG_ERROR([Problem with libpng15.(a|so) or libz.(a|so). Please check config.log for more information.])
++      AC_MSG_ERROR([Problem with libpng16.(a|so) or libz.(a|so). Please check config.log for more information.])
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])