Upgrade to PHP-3.0.8.

10 files changed, 12 insertions, 31 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index b272c47c20fa..9e186edc35df 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.74 1999/05/04 14:50:32 dirk Exp $
+# $Id: Makefile,v 1.75 1999/05/05 20:16:06 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -36,7 +36,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 Y2K=		http://www.php.net/y2k.php3
 
 VERSION_APACHE=	1.3.6
-VERSION_PHP3=	3.0.7
+VERSION_PHP3=	3.0.8
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index ea8b41f1fdcb..5901010f06b9 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,3 +1,3 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (php-3.0.7.tar.gz) = 3881388d0bc88f0fda5bb925d908314a
+MD5 (php-3.0.8.tar.gz) = bcce7d4b7cc1f6535cab03f401dc11de
 MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5
diff --git a/www/mod_php3/files/patch-aq b/www/mod_php3/files/patch-aq
deleted file mode 100644
index e0bca678a46c..000000000000
--- a/www/mod_php3/files/patch-aq
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../php3/configure.orig	Tue Mar  2 02:35:59 1999
-+++ ../php3/configure	Sun May  2 20:15:51 1999
-@@ -4508,14 +4508,14 @@
- 		else
- 			if test -f $IMAP_DIR/lib/libimap.a; then
- 				IMAP_LIBS="-L$IMAP_DIR/lib -limap"
--			elif test ! -f $IMAP_DIR/lib/c-client.a; then
-+			elif test ! -f $IMAP_DIR/lib/libc-client4.a; then
- 				if test ! -f $IMAP_DIR/lib/libc-client4.so; then
- 					{ echo "configure: error: could not find c-client.a in $IMAP_DIR/lib !" 1>&2; exit 1; }
- 				else
- 					IMAP_LIBS="${ld_runpath_switch}$IMAP_DIR/lib -L$IMAP_DIR/lib -lc-client4"
- 				fi
- 			else
--				IMAP_LIBS="-L$IMAP_DIR/lib $IMAP_DIR/lib/c-client.a"
-+				IMAP_LIBS="-L$IMAP_DIR/lib $IMAP_DIR/lib/libc-client4.a"
- 			fi
- 		fi
- 		IMAP_INCLUDE="-I$IMAP_INC_DIR/"
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 3d9d5d2a30c0..873fc996bf38 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -6,7 +6,7 @@ fi
 
 /usr/bin/dialog --title "configuration options" --clear \
 	--checklist "\n\
-Please select desired options:" -1 -1 11 \
+Please select desired options:" -1 -1 12 \
 tuning		"Apache: performance tuning" OFF \
 modssl		"Apache: SSL support" OFF \
 GD		"PHP3:   GD library support" ON \
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index b272c47c20fa..9e186edc35df 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.74 1999/05/04 14:50:32 dirk Exp $
+# $Id: Makefile,v 1.75 1999/05/05 20:16:06 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -36,7 +36,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 Y2K=		http://www.php.net/y2k.php3
 
 VERSION_APACHE=	1.3.6
-VERSION_PHP3=	3.0.7
+VERSION_PHP3=	3.0.8
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index ea8b41f1fdcb..5901010f06b9 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,3 +1,3 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (php-3.0.7.tar.gz) = 3881388d0bc88f0fda5bb925d908314a
+MD5 (php-3.0.8.tar.gz) = bcce7d4b7cc1f6535cab03f401dc11de
 MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 3d9d5d2a30c0..873fc996bf38 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -6,7 +6,7 @@ fi
 
 /usr/bin/dialog --title "configuration options" --clear \
 	--checklist "\n\
-Please select desired options:" -1 -1 11 \
+Please select desired options:" -1 -1 12 \
 tuning		"Apache: performance tuning" OFF \
 modssl		"Apache: SSL support" OFF \
 GD		"PHP3:   GD library support" ON \
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index b272c47c20fa..9e186edc35df 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.74 1999/05/04 14:50:32 dirk Exp $
+# $Id: Makefile,v 1.75 1999/05/05 20:16:06 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -36,7 +36,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 Y2K=		http://www.php.net/y2k.php3
 
 VERSION_APACHE=	1.3.6
-VERSION_PHP3=	3.0.7
+VERSION_PHP3=	3.0.8
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index ea8b41f1fdcb..5901010f06b9 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,3 +1,3 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (php-3.0.7.tar.gz) = 3881388d0bc88f0fda5bb925d908314a
+MD5 (php-3.0.8.tar.gz) = bcce7d4b7cc1f6535cab03f401dc11de
 MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 3d9d5d2a30c0..873fc996bf38 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -6,7 +6,7 @@ fi
 
 /usr/bin/dialog --title "configuration options" --clear \
 	--checklist "\n\
-Please select desired options:" -1 -1 11 \
+Please select desired options:" -1 -1 12 \
 tuning		"Apache: performance tuning" OFF \
 modssl		"Apache: SSL support" OFF \
 GD		"PHP3:   GD library support" ON \