diff options
| author | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
| commit | 1c3f6b6c2cf3f63b145d6432ec954fd675323060 (patch) | |
| tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /lang/php53 | |
| parent | 5db65af1585863fee1adec6a430a04af777f8c9d (diff) | |
| download | pkgsrc-1c3f6b6c2cf3f63b145d6432ec954fd675323060.tar.gz | |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'lang/php53')
| -rw-r--r-- | lang/php53/distinfo | 4 | ||||
| -rw-r--r-- | lang/php53/patches/patch-ac | 33 |
2 files changed, 34 insertions, 3 deletions
diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 502c902c166..8a65ef0e52a 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2010/05/28 15:31:04 joerg Exp $ +$NetBSD: distinfo,v 1.5 2010/06/13 22:44:51 wiz Exp $ SHA1 (php-5.3.2/php-5.3.2.tar.bz2) = 79ea4ee3da3a7542d1e348ac963a5b38bcbb4b6b RMD160 (php-5.3.2/php-5.3.2.tar.bz2) = 60a8aac0d51511ecaf8dcad9d31bdf072c0c99cf @@ -8,7 +8,7 @@ RMD160 (php-5.3.2/suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 64d8b7ec2ec91fd7a43b0c Size (php-5.3.2/suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 40847 bytes SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09 SHA1 (patch-ab) = 07c1a5463a302ea155aba10da0d6b0ee0aee43a8 -SHA1 (patch-ac) = f1a0c3ebe65bc3c486c44411b384bc882288b55d +SHA1 (patch-ac) = a896371d3343c07a5cf46c79d9ca9e1b2164797a 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 a76a602da46..d5da9e97de3 100644 --- a/lang/php53/patches/patch-ac +++ b/lang/php53/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $ +$NetBSD: patch-ac,v 1.2 2010/06/13 22:44:51 wiz Exp $ --- ext/gd/config.m4.orig 2009-05-27 08:18:24.000000000 +0000 +++ ext/gd/config.m4 @@ -30,3 +30,34 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $ ]) AC_DEFUN([PHP_GD_JPEG],[ +@@ -97,11 +85,11 @@ AC_DEFUN([PHP_GD_PNG],[ + if test "$PHP_PNG_DIR" != "no"; then + + 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 + done + + if test -z "$GD_PNG_DIR"; then +- AC_MSG_ERROR([libpng.(a|so) not found.]) ++ AC_MSG_ERROR([libpng14.(a|so) not found.]) + fi + + if test "$PHP_ZLIB_DIR" = "no"; then +@@ -112,13 +100,13 @@ AC_DEFUN([PHP_GD_PNG],[ + AC_MSG_ERROR([png.h not found.]) + fi + +- PHP_CHECK_LIBRARY(png,png_write_image, ++ PHP_CHECK_LIBRARY(png14,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) + ],[ +- 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.]) + ],[ + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR + ]) |