diff options
Diffstat (limited to 'www/php4')
| -rw-r--r-- | www/php4/Makefile.common | 4 | ||||
| -rw-r--r-- | www/php4/distinfo | 9 | ||||
| -rw-r--r-- | www/php4/patches/patch-ab | 14 | ||||
| -rw-r--r-- | www/php4/patches/patch-ai | 17 |
4 files changed, 13 insertions, 31 deletions
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index 9f8820e4e95..6ace4359d6d 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.43 2004/07/14 08:03:16 jdolecek Exp $ +# $NetBSD: Makefile.common,v 1.44 2004/09/28 12:41:13 jdolecek Exp $ DISTNAME?= php-${PHP_DIST_VERS} CATEGORIES+= www php4 @@ -15,7 +15,7 @@ HOMEPAGE?= http://www.php.net/ # PHP_DIST_VERS version number on the php distfile # PHP_BASE_VERS pkgsrc-mangled version number (convert pl -> .) # -PHP_DIST_VERS= 4.3.8 +PHP_DIST_VERS= 4.3.9 PHP_BASE_VERS= ${PHP_DIST_VERS} DISTFILES?= ${PHP_DISTFILE} diff --git a/www/php4/distinfo b/www/php4/distinfo index c8b1a56bca8..4989d9eee3f 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.31 2004/07/14 08:03:16 jdolecek Exp $ +$NetBSD: distinfo,v 1.32 2004/09/28 12:41:13 jdolecek Exp $ -SHA1 (php-4.3.8.tar.bz2) = 95da913b932859239f544a7b2f38c9257aa3d735 -Size (php-4.3.8.tar.bz2) = 3963437 bytes +SHA1 (php-4.3.9.tar.bz2) = 9995ce1f0b84a6d3c230552446dbcd91dbf426b0 +Size (php-4.3.9.tar.bz2) = 4001681 bytes SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407 -SHA1 (patch-ab) = cc7785755774377d4eb2d3d4816cea61234da167 +SHA1 (patch-ab) = fd09b2a1f56d50859f2ee632f7feab28e624fe15 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931 -SHA1 (patch-ai) = 91938849757745b13c7738c3aff662b86c41320f diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index d01c1148a88..749650d001c 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.15 2004/04/20 19:19:23 jdolecek Exp $ +$NetBSD: patch-ab,v 1.16 2004/09/28 12:41:13 jdolecek Exp $ ---- scripts/phpize.in.orig 2003-11-14 04:21:15.000000000 +0100 -+++ scripts/phpize.in 2004-04-02 20:23:49.000000000 +0200 +--- scripts/phpize.in.orig 2004-06-19 22:37:55.000000000 +0200 ++++ scripts/phpize.in 2004-09-28 11:35:45.000000000 +0200 @@ -54,18 +54,25 @@ touch install-sh mkinstalldirs missing @@ -9,8 +9,8 @@ $NetBSD: patch-ab,v 1.15 2004/04/20 19:19:23 jdolecek Exp $ -aclocal || exit 1 -autoconf || exit 1 -autoheader || exit 1 --test -x $builddir/build/shtool || chmod +x $builddir/build/shtool --if test ! -x $builddir/build/shtool; then +-test -x "$builddir/build/shtool" || chmod +x "$builddir/build/shtool" +-if test ! -x "$builddir/build/shtool"; then - echo "shtool at '$builddir/build/shtool' not executable. " - echo "Make sure that the file exists and is executable and then rerun this script. " - echo @@ -19,8 +19,8 @@ $NetBSD: patch-ab,v 1.15 2004/04/20 19:19:23 jdolecek Exp $ +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi +if [ -z "$LIBTOOLIZE" ]; then -+ test -x $builddir/build/shtool || chmod +x $builddir/build/shtool -+ if test ! -x $builddir/build/shtool; then ++ test -x "$builddir/build/shtool" || chmod +x "$builddir/build/shtool" ++ if test ! -x "$builddir/build/shtool"; then + echo "shtool at '$builddir/build/shtool' not executable. " + echo "Make sure that the file exists and is executable and then rerun this script. " + echo diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai deleted file mode 100644 index 482383b7b88..00000000000 --- a/www/php4/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.7 2004/07/13 12:22:29 jdolecek Exp $ - ---- Zend/zend_constants.c.orig 2004-07-13 14:01:27.000000000 +0200 -+++ Zend/zend_constants.c 2004-07-13 14:01:54.000000000 +0200 -@@ -265,11 +265,11 @@ - } - - if (zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) { -+ zend_error(E_NOTICE,"Constant %s already defined", name); - free(c->name); - if (!(c->flags & CONST_PERSISTENT)) { - zval_dtor(&c->value); - } -- zend_error(E_NOTICE,"Constant %s already defined", name); - ret = FAILURE; - } - if (lowercase_name) { |