summaryrefslogtreecommitdiff
path: root/www/php4
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2002-08-26 00:42:34 +0000
committergrant <grant@pkgsrc.org>2002-08-26 00:42:34 +0000
commit1debbed618e4bb73db604f4936d1fe05afae3c5d (patch)
tree22d535af8203ba7041fe6e5644c9060c8a5645ad /www/php4
parent4032b2d34cb5e60a5fc590d522dd769f13fae2f0 (diff)
downloadpkgsrc-1debbed618e4bb73db604f4936d1fe05afae3c5d.tar.gz
backout previous, the problem seems to lie with our Apache pkg on Solaris.
Diffstat (limited to 'www/php4')
-rw-r--r--www/php4/distinfo4
-rw-r--r--www/php4/patches/patch-ad32
2 files changed, 9 insertions, 27 deletions
diff --git a/www/php4/distinfo b/www/php4/distinfo
index ffe6125283a..ed9b18827e0 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2002/08/26 00:32:44 grant Exp $
+$NetBSD: distinfo,v 1.11 2002/08/26 00:42:59 grant Exp $
SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466
Size (php-4.1.2.tar.gz) = 3359964 bytes
SHA1 (patch-aa) = 08f98c6b41c24a2aa8fa417bba50cf0cb5f711af
SHA1 (patch-ac) = 9478c18dbe18e8c4c05dffce31fa3f923562c832
-SHA1 (patch-ad) = 9a3c5faf4530325d8998777f09f470684a3ab47e
+SHA1 (patch-ad) = 4ac02d0e0e5bd612254020d46292534a0e9445b0
SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78
SHA1 (patch-af) = 34ec060ed3cdbcfc44286323f85f9938a79b0444
SHA1 (patch-ag) = 91e84f6d6862a328d3f66f87260e8f2b2953fc11
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index a53d92fdb8f..4a5faeed9f8 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,26 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2002/08/26 00:32:22 grant Exp $
+$NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $
---- configure.orig Wed Feb 27 20:18:32 2002
+--- configure.orig Wed Feb 27 04:18:32 2002
+++ configure
-@@ -3074,7 +3074,7 @@ if test "${with_apxs+set}" = set; then
-
- if test "$withval" = "yes"; then
- APXS=apxs
-- $APXS -q CFLAGS >/dev/null 2>&1
-+ $APXS -q CFLAGS= >/dev/null 2>&1
- if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x
- APXS=/usr/sbin/apxs
- fi
-@@ -3092,7 +3092,7 @@ if test "${with_apxs+set}" = set; then
-
- fi
-
-- $APXS -q CFLAGS >/dev/null 2>&1
-+ $APXS -q CFLAGS= >/dev/null 2>&1
- if test "$?" != "0"; then
- echo "$ac_t""" 1>&6
- echo "$ac_t""" 1>&6
-@@ -5138,11 +5138,6 @@ EOF
+@@ -5138,11 +5138,6 @@
fi
@@ -32,7 +14,7 @@ $NetBSD: patch-ad,v 1.9 2002/08/26 00:32:22 grant Exp $
INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
-@@ -16148,10 +16143,6 @@ EOF
+@@ -16148,10 +16143,6 @@
else
echo "$ac_t""no" 1>&6
@@ -43,7 +25,7 @@ $NetBSD: patch-ad,v 1.9 2002/08/26 00:32:22 grant Exp $
fi
-@@ -23572,19 +23563,10 @@ EOF
+@@ -23572,19 +23563,10 @@
else
@@ -63,7 +45,7 @@ $NetBSD: patch-ad,v 1.9 2002/08/26 00:32:22 grant Exp $
echo "$ac_t""no" 1>&6
fi
-@@ -58680,7 +58662,7 @@ esac
+@@ -58680,7 +58662,7 @@
TSRM_LIB='TSRM/libtsrm.la'
TSRM_DIR=TSRM
@@ -72,7 +54,7 @@ $NetBSD: patch-ad,v 1.9 2002/08/26 00:32:22 grant Exp $
if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
cat >> confdefs.h <<\EOF
-@@ -63418,7 +63400,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -63418,7 +63400,7 @@
if test "$enable_debug" != "yes"; then