Update patches for png-1.5.

13 files changed, 36 insertions, 37 deletions

diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 19d14497def..1be1621de76 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2010/12/07 16:58:12 drochner Exp $
+$NetBSD: distinfo,v 1.55 2011/01/13 13:52:52 wiz Exp $
 
 SHA1 (fontforge_full-20100501.tar.bz2) = 483425116c6af6ad90e37f9ada0c28e34f251ec3
 RMD160 (fontforge_full-20100501.tar.bz2) = 4dee2ecdbd32bf3854105f195984d9cabf198fd8
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = e6846a21c973aaa265bb46ba63d145d5f9c00714
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
 SHA1 (patch-ae) = ca532490137e83ff328ad32c0102d57bed7bb453
 SHA1 (patch-ai) = 4b30556509007d1c74ccdfc9d27f7f23f30bbdb1
-SHA1 (patch-aj) = cb38a2569357af3aa3c1f728afaf4d19f1c0f1ce
-SHA1 (patch-ak) = b158179cb8a8cedb2f507c7864d482278105dd39
+SHA1 (patch-aj) = ca7741e7186e2797368ee1c85dfc329abe571f02
+SHA1 (patch-ak) = 57167ede3fbb5f9bebf85cc74a605c667e3ed324
 SHA1 (patch-al) = f34104791646030bb76df20e5ddb88bf21842b02
diff --git a/fonts/fontforge/patches/patch-aj b/fonts/fontforge/patches/patch-aj
index c909d006c68..7af6e2aa12d 100644
--- a/fonts/fontforge/patches/patch-aj
+++ b/fonts/fontforge/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2010/12/07 16:58:12 drochner Exp $
+$NetBSD: patch-aj,v 1.2 2011/01/13 13:52:52 wiz Exp $
 
 --- gutils/gimagereadpng.c.orig	2010-04-29 03:53:22.000000000 +0000
 +++ gutils/gimagereadpng.c
@@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.1 2010/12/07 16:58:12 drochner Exp $
  
  #  if !defined(_LIBPNG12)
 -    libpng = dlopen("libpng" SO_EXT,RTLD_LAZY);
-+    libpng = dlopen("libpng14" SO_EXT,RTLD_LAZY);
++    libpng = dlopen("libpng15" SO_EXT,RTLD_LAZY);
  #    ifdef SO_2_EXT
      if ( libpng==NULL )
  	libpng = dlopen("libpng" SO_2_EXT,RTLD_LAZY);
diff --git a/fonts/fontforge/patches/patch-ak b/fonts/fontforge/patches/patch-ak
index ad2a94b1c5b..de893e7bc95 100644
--- a/fonts/fontforge/patches/patch-ak
+++ b/fonts/fontforge/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2010/12/07 16:58:12 drochner Exp $
+$NetBSD: patch-ak,v 1.2 2011/01/13 13:52:52 wiz Exp $
 
 --- gutils/gimagewritepng.c.orig	2010-04-29 17:52:54.000000000 +0000
 +++ gutils/gimagewritepng.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ak,v 1.1 2010/12/07 16:58:12 drochner Exp $
      }
  #  if !defined(_LIBPNG12)
 -    libpng = dlopen("libpng" SO_EXT,RTLD_LAZY);
-+    libpng = dlopen("libpng14" SO_EXT,RTLD_LAZY);
++    libpng = dlopen("libpng15" SO_EXT,RTLD_LAZY);
  #    ifdef SO_2_EXT
      if ( libpng==NULL )
  	libpng = dlopen("libpng" SO_2_EXT,RTLD_LAZY);
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index d2e9aee536b..30cc2f4cee1 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2011/01/12 11:46:28 adam Exp $
+$NetBSD: distinfo,v 1.8 2011/01/13 13:52:53 wiz Exp $
 
 SHA1 (hugin-2010.4.0.tar.bz2) = 47f25c0a8b97c27108e567bcd22203c87f268d07
 RMD160 (hugin-2010.4.0.tar.bz2) = f97b8d37470443eb81c3e915e5f5efa91227b135
 Size (hugin-2010.4.0.tar.bz2) = 11009978 bytes
-SHA1 (patch-ab) = 41542f252de828f6a798f1172894f195b6ef46c8
+SHA1 (patch-ab) = 6faee5f634ff3af345f909b41f03d1a8cdc414b5
 SHA1 (patch-ac) = aac60aa6d3b99a632fce03749660e10ea82ad028
diff --git a/graphics/hugin/patches/patch-ab b/graphics/hugin/patches/patch-ab
index 7715bbfb24c..564f941a288 100644
--- a/graphics/hugin/patches/patch-ab
+++ b/graphics/hugin/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2010/10/19 10:33:39 adam Exp $
+$NetBSD: patch-ab,v 1.6 2011/01/13 13:52:53 wiz Exp $
 
 --- CMakeModules/FindPNG.cmake.orig	2010-09-28 22:06:45.000000000 +0000
 +++ CMakeModules/FindPNG.cmake
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.5 2010/10/19 10:33:39 adam Exp $
    find_library_with_debug(PNG_LIBRARIES
      WIN32_DEBUG_POSTFIX d
      NAMES png libpng libpng14 wxpng
-+    NAMES png libpng png14 libpng14 wxpng
++    NAMES png libpng png15 libpng15 wxpng
      PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
    )
  
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 38d535c5ad8..50a7cc0cb3d 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.84 2011/01/07 09:16:26 taca Exp $
+$NetBSD: distinfo,v 1.85 2011/01/13 13:52:53 wiz Exp $
 
 SHA1 (php-5.2.17/php-5.2.17.tar.bz2) = d68f3b09f766990d815a3c4c63c157db8dab8095
 RMD160 (php-5.2.17/php-5.2.17.tar.bz2) = 567fa8d718b93fb83a89494c83a8bec224ac99e9
 Size (php-5.2.17/php-5.2.17.tar.bz2) = 9092312 bytes
 SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
-SHA1 (patch-ab) = feeb73834db284e8b3acabc11fb4c934837cb13f
 SHA1 (patch-af) = 68c5a31dccf1854ba1aff653e4c524767d6a64f6
 SHA1 (patch-ag) = 5e3e822657925a77fbccaca63f283863a1cc6d94
 SHA1 (patch-ah) = a25cb7fa3d1f5b9fb99493a4348fdba69d3d4728
 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
-SHA1 (patch-al) = 3945eef039ed285e623273cdde4c51c4c6bc978b
+SHA1 (patch-al) = 257129124d46a84f7342b1a00f0cab073066e7cb
 SHA1 (patch-an) = 8f4174627b8cb5f8bfbc59413c95f71e26b9e602
 SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce
 SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df
diff --git a/lang/php5/patches/patch-al b/lang/php5/patches/patch-al
index f04664be2b4..faecd32d88e 100644
--- a/lang/php5/patches/patch-al
+++ b/lang/php5/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.4 2010/06/13 22:44:51 wiz Exp $
+$NetBSD: patch-al,v 1.5 2011/01/13 13:52:53 wiz Exp $
 
 --- ext/gd/config.m4.orig	2007-07-03 17:25:43.000000000 +0000
 +++ ext/gd/config.m4
@@ -35,12 +35,12 @@ $NetBSD: patch-al,v 1.4 2010/06/13 22:44:51 wiz Exp $
  
      for i in $PHP_PNG_DIR /usr/local /usr; do
 -      test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
-+      test -f $i/$PHP_LIBDIR/libpng14.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng14.a && GD_PNG_DIR=$i && break
++      test -f $i/$PHP_LIBDIR/libpng15.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng15.a && GD_PNG_DIR=$i && break
      done
  
      if test -z "$GD_PNG_DIR"; then
 -      AC_MSG_ERROR([libpng.(a|so) not found.])
-+      AC_MSG_ERROR([libpng14.(a|so) not found.])
++      AC_MSG_ERROR([libpng15.(a|so) not found.])
      fi
  
      if test "$PHP_ZLIB_DIR" = "no"; then
@@ -49,15 +49,15 @@ $NetBSD: patch-al,v 1.4 2010/06/13 22:44:51 wiz Exp $
      fi
  
 -    PHP_CHECK_LIBRARY(png,png_write_image,
-+    PHP_CHECK_LIBRARY(png14,png_write_image,
++    PHP_CHECK_LIBRARY(png15,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(png14, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++      PHP_ADD_LIBRARY_WITH_PATH(png15, $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 libpng14.(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.])
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index daa464234df..6777b97839d 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2011/01/07 09:20:16 taca Exp $
+$NetBSD: distinfo,v 1.10 2011/01/13 13:52:53 wiz Exp $
 
 SHA1 (php-5.3.5/php-5.3.5.tar.bz2) = 355701b723fcb497581c368be4d6e572c150a5ea
 RMD160 (php-5.3.5/php-5.3.5.tar.bz2) = 831018429b87c46da7571397e0d463b81ded11eb
 Size (php-5.3.5/php-5.3.5.tar.bz2) = 10806092 bytes
 SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09
 SHA1 (patch-ab) = 7aeb5148056e7f0b150388c4cf60a139f6aeec44
-SHA1 (patch-ac) = a896371d3343c07a5cf46c79d9ca9e1b2164797a
+SHA1 (patch-ac) = 07a3d6c9ee4c316033afd8c7db71eb21045a3afd
 SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
 SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
 SHA1 (patch-af) = 6e903ea7ff501226601fa73ce74c272d44d7346b
diff --git a/lang/php53/patches/patch-ac b/lang/php53/patches/patch-ac
index d5da9e97de3..70d74f440fd 100644
--- a/lang/php53/patches/patch-ac
+++ b/lang/php53/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2010/06/13 22:44:51 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2011/01/13 13:52:53 wiz Exp $
 
 --- ext/gd/config.m4.orig	2009-05-27 08:18:24.000000000 +0000
 +++ ext/gd/config.m4
@@ -35,12 +35,12 @@ $NetBSD: patch-ac,v 1.2 2010/06/13 22:44:51 wiz Exp $
  
      for i in $PHP_PNG_DIR /usr/local /usr; do
 -      test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
-+      test -f $i/$PHP_LIBDIR/libpng14.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng14.a && GD_PNG_DIR=$i && break
++      test -f $i/$PHP_LIBDIR/libpng15.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng15.a && GD_PNG_DIR=$i && break
      done
  
      if test -z "$GD_PNG_DIR"; then
 -      AC_MSG_ERROR([libpng.(a|so) not found.])
-+      AC_MSG_ERROR([libpng14.(a|so) not found.])
++      AC_MSG_ERROR([libpng15.(a|so) not found.])
      fi
  
      if test "$PHP_ZLIB_DIR" = "no"; then
@@ -49,15 +49,15 @@ $NetBSD: patch-ac,v 1.2 2010/06/13 22:44:51 wiz Exp $
      fi
  
 -    PHP_CHECK_LIBRARY(png,png_write_image,
-+    PHP_CHECK_LIBRARY(png14,png_write_image,
++    PHP_CHECK_LIBRARY(png15,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(png14, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++      PHP_ADD_LIBRARY_WITH_PATH(png15, $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 libpng14.(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.])
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])
diff --git a/www/chimera/distinfo b/www/chimera/distinfo
index c3e8ef790fe..513e02d0278 100644
--- a/www/chimera/distinfo
+++ b/www/chimera/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2010/06/13 22:45:32 wiz Exp $
+$NetBSD: distinfo,v 1.8 2011/01/13 13:52:54 wiz Exp $
 
 SHA1 (chimera-2.0a19.tar.gz) = c69b70b11cf12837e260eaa20e548bf9eb9ce309
 RMD160 (chimera-2.0a19.tar.gz) = d3f4d2ff3328c3bf5020490ed851b281e0492fe2
 Size (chimera-2.0a19.tar.gz) = 248431 bytes
-SHA1 (patch-aa) = fb77753229ef9f2b9ef1424818ce704cdead18e0
+SHA1 (patch-aa) = a49455c9e2ce2a9bd3b276ae870739ece6249373
 SHA1 (patch-ab) = 1fc2f5f97f46403359a00e42cc25f4cbf9bc5331
 SHA1 (patch-ac) = 5f18afd9a1452bfba010fe3eb4e773f5395789c6
 SHA1 (patch-ad) = fcfc16397954269a8493017ca06707f043a0cf06
diff --git a/www/chimera/patches/patch-aa b/www/chimera/patches/patch-aa
index 1f53b694041..3f5d6138645 100644
--- a/www/chimera/patches/patch-aa
+++ b/www/chimera/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:32 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2011/01/13 13:52:54 wiz Exp $
 
 --- Common.tmpl.dist.orig	1999-05-30 21:43:52.000000000 +0000
 +++ Common.tmpl.dist
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.5 2010/06/13 22:45:32 wiz Exp $
 -PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
 -*/
 +PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT) -Wl,-R$(PNGDIR)/lib
-+PNGDEPLIB = $(PNGDIR)/lib/libpng14$(IMGLEXT).a
++PNGDEPLIB = $(PNGDIR)/lib/libpng15$(IMGLEXT).a
 +
  
  /* Tells Imakefile to set the flags for debugging.  Comment for -O. */
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 0e29d42495c..cf7eb042fb7 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2010/12/11 19:08:35 chuck Exp $
+$NetBSD: distinfo,v 1.32 2011/01/13 13:52:54 wiz Exp $
 
 SHA1 (dillo-2.2.tar.bz2) = 06b325a246a639d936dabfc73d005f951d23c151
 RMD160 (dillo-2.2.tar.bz2) = 050f5bcd46042764c9bba536e6e5fd97453e1d6f
@@ -6,4 +6,4 @@ Size (dillo-2.2.tar.bz2) = 630259 bytes
 SHA1 (patch-aa) = df4222ae9a0bd58af4c5481f920b60893145dbc1
 SHA1 (patch-ab) = 827ed561c4622cf0d940090fcaac37f98d6cbab4
 SHA1 (patch-ac) = f129ed7bb341211895fc51a7b70a81c94e70b158
-SHA1 (patch-ad) = 85080e130adeb44ca0dedce473529b3c0b188346
+SHA1 (patch-ad) = 994c27f2a2d9a6e8fbe1e6ee43ee0623638a80f3
diff --git a/www/dillo/patches/patch-ad b/www/dillo/patches/patch-ad
index 24cd78ff83f..0f2598ca0a7 100644
--- a/www/dillo/patches/patch-ad
+++ b/www/dillo/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2010/12/11 19:08:35 chuck Exp $
+$NetBSD: patch-ad,v 1.3 2011/01/13 13:52:54 wiz Exp $
 
 --- configure.orig	2010-02-11 05:19:59.000000000 -0500
 +++ configure	2010-12-11 13:52:46.000000000 -0500
@@ -18,9 +18,9 @@ $NetBSD: patch-ad,v 1.2 2010/12/11 19:08:35 chuck Exp $
 +
    if test -z "$PNG_CONFIG"; then
 -    PNG_CONFIG=`which libpng12-config`
-+    PNG_CONFIG=`which libpng14-config`
++    PNG_CONFIG=`which libpng15-config`
 +    if test -z "$PNG_CONFIG"; then
-+      PNG_CONFIG=`which libpng12-config`
++      PNG_CONFIG=`which libpng15-config`
 +    fi
      if test -z "$PNG_CONFIG"; then
        PNG_CONFIG=`which libpng-config`