- Upgrade to php-4.0b4pl1, finally.

- remove BROKEN, time to test it
- remove "shared," from some php configure options

6 files changed, 10 insertions, 14 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 6561281b8fbe..673852e17e03 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -42,14 +42,12 @@ DISTFILES=	apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz
 
 MAINTAINER=	dirk@FreeBSD.org
 
-BROKEN=		"PHP-${VERSION_PHP} is beta. Beware the bugs. Enter at your own risk!"
-
 Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	version4/downloads
 
 VERSION_APACHE=	1.3.12
-VERSION_PHP=	4.0b3
+VERSION_PHP=	4.0b4pl1
 
 NO_LATEST_LINK=	yes
 USE_PERL5=	yes
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 86876792aab4..f53964e57092 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,4 +1,4 @@
 MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
-MD5 (php-4.0b3.tar.gz) = f794d1650923cecbce261ab57ed42d04
+MD5 (php-4.0b4pl1.tar.gz) = 72cb96ef3310ccf098b6c9ed886818c0
 MD5 (mod_ssl-2.6.2-1.3.12.tar.gz) = 514e45595d8bf1d3a986a38ae67a421f
 MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 4e1f8357d22d..00c003c7e769 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -60,7 +60,7 @@ while [ "$1" ]; do
 			;;
 		\"GD\")
 			echo "LIB_DEPENDS+=	gd.0:\${PORTSDIR}/graphics/gd"
-			echo "PHP_CONF_ARGS+=	--with-gd=shared,\${PREFIX}"
+			echo "PHP_CONF_ARGS+=	--with-gd=\${PREFIX}"
 			GD=1
 			;;
 		\"FreeType\")
@@ -106,7 +106,7 @@ while [ "$1" ]; do
 			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
-			echo "PHP_CONF_ARGS+=	--with-mysql=shared,\${PREFIX}"
+			echo "PHP_CONF_ARGS+=	--with-mysql=\${PREFIX}"
 			;;
 		\"PostgreSQL\")
 			echo "BUILD_DEPENDS+=	\${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql"
@@ -129,7 +129,7 @@ while [ "$1" ]; do
 			;;
 		\"SNMP\")
 			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/ucd-snmp"
-			echo "PHP_CONF_ARGS+=	--with-snmp=shared,\${PREFIX} --enable-ucd-snmp-hack"
+			echo "PHP_CONF_ARGS+=	--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
 			;;
 		\"XML\")
 			echo "BUILD_DEPENDS+=	\${PREFIX}/lib/libexpat.a:\${PORTSDIR}/textproc/expat"
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 6561281b8fbe..673852e17e03 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -42,14 +42,12 @@ DISTFILES=	apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz
 
 MAINTAINER=	dirk@FreeBSD.org
 
-BROKEN=		"PHP-${VERSION_PHP} is beta. Beware the bugs. Enter at your own risk!"
-
 Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	version4/downloads
 
 VERSION_APACHE=	1.3.12
-VERSION_PHP=	4.0b3
+VERSION_PHP=	4.0b4pl1
 
 NO_LATEST_LINK=	yes
 USE_PERL5=	yes
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 86876792aab4..f53964e57092 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,4 +1,4 @@
 MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
-MD5 (php-4.0b3.tar.gz) = f794d1650923cecbce261ab57ed42d04
+MD5 (php-4.0b4pl1.tar.gz) = 72cb96ef3310ccf098b6c9ed886818c0
 MD5 (mod_ssl-2.6.2-1.3.12.tar.gz) = 514e45595d8bf1d3a986a38ae67a421f
 MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 4e1f8357d22d..00c003c7e769 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -60,7 +60,7 @@ while [ "$1" ]; do
 			;;
 		\"GD\")
 			echo "LIB_DEPENDS+=	gd.0:\${PORTSDIR}/graphics/gd"
-			echo "PHP_CONF_ARGS+=	--with-gd=shared,\${PREFIX}"
+			echo "PHP_CONF_ARGS+=	--with-gd=\${PREFIX}"
 			GD=1
 			;;
 		\"FreeType\")
@@ -106,7 +106,7 @@ while [ "$1" ]; do
 			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
-			echo "PHP_CONF_ARGS+=	--with-mysql=shared,\${PREFIX}"
+			echo "PHP_CONF_ARGS+=	--with-mysql=\${PREFIX}"
 			;;
 		\"PostgreSQL\")
 			echo "BUILD_DEPENDS+=	\${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql"
@@ -129,7 +129,7 @@ while [ "$1" ]; do
 			;;
 		\"SNMP\")
 			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/ucd-snmp"
-			echo "PHP_CONF_ARGS+=	--with-snmp=shared,\${PREFIX} --enable-ucd-snmp-hack"
+			echo "PHP_CONF_ARGS+=	--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
 			;;
 		\"XML\")
 			echo "BUILD_DEPENDS+=	\${PREFIX}/lib/libexpat.a:\${PORTSDIR}/textproc/expat"