diff options
| author | wiz <wiz@pkgsrc.org> | 2011-01-13 13:52:52 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-01-13 13:52:52 +0000 |
| commit | 22538e12e3f525cd419843289915758a5a78c187 (patch) | |
| tree | 436641262264a6806d9ab00f94c0b42273938c6d /lang/php5 | |
| parent | c2cb57326bba44e7829fcb1f52e31db3bf3cdb32 (diff) | |
| download | pkgsrc-22538e12e3f525cd419843289915758a5a78c187.tar.gz | |
Update patches for png-1.5.
Diffstat (limited to 'lang/php5')
| -rw-r--r-- | lang/php5/distinfo | 5 | ||||
| -rw-r--r-- | lang/php5/patches/patch-al | 12 |
2 files changed, 8 insertions, 9 deletions
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 ]) |