summaryrefslogtreecommitdiff
path: root/www/php4/patches
diff options
context:
space:
mode:
authorjdolecek <jdolecek@pkgsrc.org>2004-04-20 19:19:23 +0000
committerjdolecek <jdolecek@pkgsrc.org>2004-04-20 19:19:23 +0000
commit13f2532a2e7983b27538b1b51a23632a9876f46a (patch)
tree26c410c1faf702da3ef6f2b139d2fe7d81d27671 /www/php4/patches
parent09a545faf4470142b5e6cecaba808cf7f7a1a17b (diff)
downloadpkgsrc-13f2532a2e7983b27538b1b51a23632a9876f46a.tar.gz
Update PHP4 package and all PHP4 modules to version 4.3.6.
Changes are bug-fixes mostly, but also synchronizes bundled GD with GD 2.0.22 and updates PCRE to version 4.5. Several NetBSD patches were integrated too, so future pkgsrc updates would be even more smooth. Full list of changes since PHP 4.3.4 is available at: http://www.php.net/ChangeLog-4.php#4.3.6 http://www.php.net/ChangeLog-4.php#4.3.5
Diffstat (limited to 'www/php4/patches')
-rw-r--r--www/php4/patches/patch-ab30
1 files changed, 23 insertions, 7 deletions
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
index 69135de6e4f..d01c1148a88 100644
--- a/www/php4/patches/patch-ab
+++ b/www/php4/patches/patch-ab
@@ -1,20 +1,36 @@
-$NetBSD: patch-ab,v 1.14 2003/11/08 06:58:10 jdolecek Exp $
+$NetBSD: patch-ab,v 1.15 2004/04/20 19:19:23 jdolecek Exp $
---- scripts/phpize.in.orig 2003-08-27 19:57:32.000000000 +0200
-+++ scripts/phpize.in 2003-11-07 21:44:48.000000000 +0100
-@@ -54,11 +54,15 @@
+--- scripts/phpize.in.orig 2003-11-14 04:21:15.000000000 +0100
++++ scripts/phpize.in 2004-04-02 20:23:49.000000000 +0200
+@@ -54,18 +54,25 @@
touch install-sh mkinstalldirs missing
-aclocal || exit 1
-autoconf || exit 1
-autoheader || exit 1
--libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
--$libtoolize -f -c || exit 1
+-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
+- exit 1
+if [ -z "$ACLOCAL" ]; then ACLOCAL=aclocal; fi
+if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi
+if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi
-+if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=`$builddir/build/shtool path glibtoolize libtoolize`; fi
++if [ -z "$LIBTOOLIZE" ]; 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
++ exit 1
++ fi
++
++ LIBTOOLIZE=`$builddir/build/shtool path glibtoolize libtoolize`;
+ fi
+-libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
+-$libtoolize -f -c || exit 1
+
+$ACLOCAL || exit 1
+$AUTOCONF || exit 1