3 files changed, 8 insertions, 11 deletions

diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 34850b1be334..a35df05b79c3 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -40,9 +40,6 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/
 DISTFILES=	apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz
 
-PATCH_SITES=	http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
-PATCHFILES=	php4_snmp.c.diff
-
 MAINTAINER=	dirk@FreeBSD.org
 
 BROKEN=		"PHP-${VERSION_PHP} is beta. Beware the bugs. Enter at your own risk!"
@@ -52,7 +49,7 @@ Y2K=		http://www.php.net/y2k.php3
 PHP_DISTDIR=	version4/downloads
 
 VERSION_APACHE=	1.3.11
-VERSION_PHP=	4.0b2
+VERSION_PHP=	4.0b3
 
 NO_LATEST_LINK=	yes
 USE_PERL5=	yes
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index ff627e504eda..57ee0806110e 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,4 +1,4 @@
 MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (php-4.0b2.tar.gz) = 509c245c2ec36d227985dd550e94240c
+MD5 (php-4.0b3.tar.gz) = f794d1650923cecbce261ab57ed42d04
 MD5 (mod_ssl-2.5.0-1.3.11.tar.gz) = 0d630dd536e2cdc6885368c79b45766f
 MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 1fe0db06279b..db3694a78309 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -56,12 +56,9 @@ while [ "$1" ]; do
 			echo "APACHE_PERF_TUNING=	YES"
 			;;
 		\"GD\")
-			echo "GD is DISABLED for now. Ignoring." > /dev/stderr
-			;;
-		\"nothing\")
 			echo "LIB_DEPENDS+=	gd.0:\${PORTSDIR}/graphics/gd"
 			echo "LIB_DEPENDS+=	ttf.4:\${PORTSDIR}/print/freetype"
-			echo "PHP_CONF_ARGS+=	--with-gd=\${PREFIX}"
+			echo "PHP_CONF_ARGS+=	--with-gd=shared,\${PREFIX}"
 			echo "PHP_CONF_ARGS+=	--with-ttf=\${PREFIX}"
 			;;
 		\"zlib\")
@@ -69,6 +66,9 @@ while [ "$1" ]; do
 			ZLIB=1
 			;;
 		\"mcrypt\")
+			echo "mhash is DISABLED for now. Ignoring." > /dev/stderr
+			;;
+		\"nothing\")
 			echo "LIB_DEPENDS+=	mcrypt.2:\${PORTSDIR}/security/libmcrypt"
 			echo "PHP_CONF_ARGS+=	--with-mcrypt=\${PREFIX}"
 			;;
@@ -100,7 +100,7 @@ while [ "$1" ]; do
 			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
-			echo "PHP_CONF_ARGS+=	--with-mysql=\${PREFIX}"
+			echo "PHP_CONF_ARGS+=	--with-mysql=shared,\${PREFIX}"
 			;;
 		\"PostgreSQL\")
 			echo "BUILD_DEPENDS+=	\${PREFIX}/pgsql/bin/psql:\${PORTSDIR}/databases/postgresql"
@@ -123,7 +123,7 @@ while [ "$1" ]; do
 			;;
 		\"SNMP\")
 			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/ucd-snmp"
-			echo "PHP_CONF_ARGS+=	--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
+			echo "PHP_CONF_ARGS+=	--with-snmp=shared,\${PREFIX} --enable-ucd-snmp-hack"
 			;;
 		\"XML\")
 			echo "BUILD_DEPENDS+=	\${PREFIX}/lib/libexpat.a:\${PORTSDIR}/textproc/expat"