diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 22cdf24d695d..b767a45d23d6 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -1,102 +1,110 @@
 # New ports collection makefile for:	mod_php4
 # Date created:		Sun May 28 11:31:54 CEST 2000
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_php4
 PORTVERSION=	4.3.0
 PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
 		http://www.php3.de/${PHP_DISTDIR}/ \
 		http://au.php.net/${PHP_DISTDIR}/ \
 		http://at.php.net/${PHP_DISTDIR}/ \
 		http://br.php.net/${PHP_DISTDIR}/ \
 		http://php.easydns.com/${PHP_DISTDIR}/ \
 		http://www.php.cz/${PHP_DISTDIR}/ \
 		http://php3.globe.de/${PHP_DISTDIR}/
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	dirk@FreeBSD.org
 
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 .if defined(WITH_APACHE2)
 LIB_DEPENDS=	pth.14:${PORTSDIR}/devel/pth
 .endif
 
 PHP_DISTDIR=	distributions
 
 USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 USE_AUTOCONF_VER=213
 .if defined(WITH_APACHE2)
 APACHE_PORT?=	${PORTSDIR}/www/apache2
 .else
 APACHE_PORT?=	${PORTSDIR}/www/apache13
 .endif
 APXS?=		${LOCALBASE}/sbin/apxs
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes
 .endif
 
 .if defined(WITH_APACHE2)
 CONFIGURE_ARGS=	--with-apxs2=${PREFIX}/sbin/apxs \
 		--with-tsrm-pth
 PLIST_SUB=	MOD_DIR=libexec/apache2 \
 		NON=
 .else
 CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs
 PLIST_SUB=	MOD_DIR=libexec/apache \
 		NON=non-
 .endif
 CONFIGURE_ARGS+=--with-config-file-path=${PREFIX}/etc \
 		--enable-versioning \
 		--with-regex=system \
 		--without-gd \
 		--without-mysql
 
 CFLAGS+=	-I${PREFIX}/include
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
 		CAT="${CAT}" \
 		PHP4_OPTIONS="${PHP4_OPTIONS}" \
 		REALCURDIR="${.CURDIR}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
 .if !defined(WITH_APACHE2)
 	@${ECHO_CMD} "Define WITH_APACHE2 to build mod_php4 as an apache2 module."
 	@${ECHO_CMD} ""
 .endif
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 
 	@${ECHO_CMD} "*****************************************************************************"
 	@${ECHO_CMD} "Make sure the mime.types are connected to the php module properly and"
 	@${ECHO_CMD} "index.php is part of your DirectoryIndex."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "The following should be in your Apache configuration file:"
 	@${ECHO_CMD} "[...]"
 	@${ECHO_CMD} "DirectoryIndex index.php index.html"
 	@${ECHO_CMD} "[...]"
 	@${ECHO_CMD} "AddType application/x-httpd-php .php"
 	@${ECHO_CMD} "AddType application/x-httpd-php-source .phps"
 	@${ECHO_CMD} "[...]"
 	@${ECHO_CMD} "*****************************************************************************"
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+# XXX:
+# Has to be kept in sync with the defaults in configure.php
+.ifndef(WITHOUT_MYSQL)
+.ifmake describe
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+.endif
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 2230696ea58d..6729ade0210e 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -1,365 +1,370 @@
 #!/bin/sh
 # $FreeBSD$
 
 if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
 	exit
 fi
 
 tempfile=`/usr/bin/mktemp -t checklist`
 
 if [ "${BATCH}" ]; then
 	if [ "${PHP4_OPTIONS}" ]; then
 		set ${PHP4_OPTIONS}
 	else
 		set \"zlib\" \"MySQL\"
 	fi
 else
 	/usr/bin/dialog --title "configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
 GD1		"GD 1.x library support" OFF \
 GD2		"GD 2.x library support" OFF \
 zlib		"zlib library support" ON \
 bzip2		"bzip2 library support" OFF \
 mcrypt		"Encryption support" OFF \
 mhash		"Crypto-hashing support" OFF \
 pdflib		"pdflib support" OFF \
 IMAP		"IMAP support" OFF \
 IMAP-SSL	"IMAP-SSL support (implies IMAP)" OFF \
 MySQL		"MySQL database support" ON \
 PostgreSQL	"PostgreSQL database support" OFF \
 SybaseDB	"Sybase/MS-SQL database support (DB-lib)" OFF \
 SybaseCT	"Sybase/MS-SQL database support (CT-lib)" OFF \
 Interbase	"Interbase 6 database support (Firebird)" OFF \
 dBase		"dBase database support" OFF \
 OpenLDAP1	"OpenLDAP 1.x support" OFF \
 OpenLDAP2	"OpenLDAP 2.x support" OFF \
 OpenSSL		"OpenSSL support" OFF \
 SNMP		"SNMP support" OFF \
 XML		"XML support" OFF \
 XMLRPC		"XMLRPC-EPI support (implies XML and iconv)" OFF \
 XSLT		"Sablotron support (implies XML and iconv)" OFF \
 WDDX		"WDDX support (implies XML)" OFF \
 DOMXML		"DOM support" OFF \
 FTP		"File Transfer Protocol support" OFF \
 CURL		"CURL support" OFF \
 gettext		"gettext library support" OFF \
 iconv		"iconv support" OFF \
 pspell		"pspell support" OFF \
 mbregex		"multibyte regular expressions module" OFF \
 mbstring	"multibyte string module" OFF \
 YP		"YP/NIS support" OFF \
 BCMath		"BCMath support" OFF \
 Hyperwave	"Hyperwave support" OFF \
 mcve		"MCVE Credit Card Verification support" OFF \
 ming		"ming library support" OFF \
 MCAL		"Modular Calendar Access Library support" OFF \
 sockets		"sockets support" OFF \
 sysvsem		"System V semaphore support" OFF \
 sysvshm		"System V shared memory support" OFF \
 transsid	"Transparent session id" OFF \
 yaz		"YAZ support (ANSI/NISO Z39.50)" OFF \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
 		set `cat $tempfile`
 	fi
 	rm -f $tempfile
 
 	case $retval in
 		0)	if [ -z "$*" ]; then
 				echo "Nothing selected"
 			fi
 			;;
 		1)	echo "Cancel pressed."
 			exit 1
 			;;
 	esac
 fi
 
 ${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
 exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 
 while [ "$1" ]; do
 	case $1 in
 		\"GD1\")
 			echo "LIB_DEPENDS+=	gd.2:\${PORTSDIR}/graphics/gd"
 			echo "LIB_DEPENDS+=	freetype.9:\${PORTSDIR}/print/freetype2"
 			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
 			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
 			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
 			echo "		--enable-gd-native-ttf \\"
 			echo "		--with-freetype-dir=\${LOCALBASE} \\"
 			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
 			echo "		--with-png-dir=\${LOCALBASE}"
 			if [ "$GD2" ]; then
 				echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			GD1=1
 			;;
 
 		\"GD2\")
 			echo "LIB_DEPENDS+=	gd.4:\${PORTSDIR}/graphics/gd2"
 			echo "LIB_DEPENDS+=	freetype.9:\${PORTSDIR}/print/freetype2"
 			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
 			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
 			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
 			echo "		--enable-gd-native-ttf \\"
 			echo "		--with-freetype-dir=\${LOCALBASE} \\"
 			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
 			echo "		--with-png-dir=\${LOCALBASE}"
 			if [ "$GD1" ]; then
 				echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			GD2=1
  			;;
 		\"zlib\")
 			echo "CONFIGURE_ARGS+=--with-zlib"
 			;;
 		\"bzip2\")
 			if [ -x /usr/bin/bzip2 ]; then
 				BZ2PREFIX=/usr
 			else
 				BZ2PREFIX=/usr/local
 				echo "LIB_DEPENDS+=	bz2.1:\${PORTSDIR}/archivers/bzip2"
 			fi
 			echo "CONFIGURE_ARGS+=--with-bz2=${BZ2PREFIX}"
 			;;
 		\"mcrypt\")
 			echo "LIB_DEPENDS+=	mcrypt.8:\${PORTSDIR}/security/libmcrypt"
 			echo "CONFIGURE_ARGS+=--with-mcrypt=\${LOCALBASE}"
 			;;
 		\"mhash\")
 			echo "LIB_DEPENDS+=	mhash.2:\${PORTSDIR}/security/mhash"
 			echo "CONFIGURE_ARGS+=--with-mhash=\${LOCALBASE}"
 			;;
 		\"pdflib\")
 			echo "LIB_DEPENDS+=	pdf.4:\${PORTSDIR}/print/pdflib"
 			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
 			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
 			echo "LIB_DEPENDS+=	tiff.4:\${PORTSDIR}/graphics/tiff"
 			echo "CONFIGURE_ARGS+=--with-pdflib=\${LOCALBASE} \\"
 			echo "		--with-zlib-dir=/usr \\"
 			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
 			echo "		--with-png-dir=\${LOCALBASE} \\"
 			echo "		--with-tiff-dir=\${LOCALBASE}"
 			;;
 		\"IMAP\")
 			if [ -z "$IMAP" ]; then
 				echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"
 				echo "CONFIGURE_ARGS+=--with-imap=\${LOCALBASE}"
 				IMAP=1
 			fi
 			;;
 		\"IMAP-SSL\")
 			echo "CONFIGURE_ARGS+=--with-imap-ssl=\${LOCALBASE}"
 			if [ -z "$IMAP" ]; then
 				set $* \"IMAP\"
 			fi
  			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 			echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}"
+			MYSQL=1
 			;;
 		\"PostgreSQL\")
 			echo "POSTGRESQL_PORT?=	databases/postgresql7"
 			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 			if [ -x ${LOCALBASE}/pgsql/bin/postgres -a ! -x ${LOCALBASE}/bin/postgres ]; then
 				PGPREFIX=${LOCALBASE}/pgsql
 			else
 				PGPREFIX=${LOCALBASE}
 				echo "CFLAGS+=-I\${LOCALBASE}/include/pgsql"
 			fi
 			echo "PGPREFIX=${PGPREFIX}"
 			echo "CONFIGURE_ARGS+=--with-pgsql=\${PGPREFIX}"
 			if /usr/bin/ldd ${PGPREFIX}/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; then
 				echo "USE_OPENSSL=	yes"
 				LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
 			fi
 			;;
 		\"SybaseDB\")
 			echo "LIB_DEPENDS+=	sybdb.1:\${PORTSDIR}/databases/freetds"
 			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
 			echo "CONFIGURE_ARGS+=--with-sybase=\${LOCALBASE}"
 			if [ "$SYBASECT" ]; then
 				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			SYBASEDB=1
 			;;
 		\"SybaseCT\")
 			echo "LIB_DEPENDS+=	ct.0:\${PORTSDIR}/databases/freetds"
 			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
 			echo "CONFIGURE_ARGS+=--with-sybase-ct=\${LOCALBASE}"
 			if [ "$SYBASEDB" ]; then
 				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			SYBASECT=1
 			;;
 		\"Interbase\")
 			echo "LIB_DEPENDS+=	gds.1:\${PORTSDIR}/databases/firebird"
 			echo "CONFIGURE_ARGS+=--with-interbase=\${LOCALBASE}/firebird"
 			;;
 		\"dBase\")
 			echo "CONFIGURE_ARGS+=--with-dbase"
 			;;
 		\"OpenLDAP1\")
 			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap"
 			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap"
 			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
 			if [ "$OPENLDAP2" ]; then
 				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
 				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
 			fi
 			OPENLDAP1=1
 			;;
 		\"OpenLDAP2\")
 			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap2"
 			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap2"
 			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
 			if [ "$OPENLDAP1" ]; then
 				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
 				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
 			fi
 			OPENLDAP2=1
 			;;
 		\"OpenSSL\")
 			echo "USE_OPENSSL=yes"
 			echo "CONFIGURE_ARGS+=--with-openssl=\${OPENSSLBASE}"
 			;;
 		\"SNMP\")
 			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/net-snmp4"
 			echo "CONFIGURE_ARGS+=--with-snmp=\${LOCALBASE} --enable-ucd-snmp-hack --with-openssl=\${OPENSSLBASE}"
 			echo "USE_OPENSSL=	yes"
 			LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
 			;;
 		\"XML\")
 			if [ -z "$XML" ]; then
 				echo "LIB_DEPENDS+=	expat.4:\${PORTSDIR}/textproc/expat2"
 				echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}"
 				XML=1
 			fi
 			;;
 		\"XMLRPC\")
 			echo "CONFIGURE_ARGS+=--with-xmlrpc"
 			if [ -z "$XML" ]; then
 				set $* \"XML\"
 			fi
 			if [ -z "$ICONV" ]; then
 				set $* \"iconv\"
 			fi
 			;;
 		\"XSLT\")
 			echo "LIB_DEPENDS+=	sablot.69:\${PORTSDIR}/textproc/sablotron"
 			echo "CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot=\${LOCALBASE}"
 			if [ -z "$XML" ]; then
 				set $* \"XML\"
 			fi
 			if [ -z "$ICONV" ]; then
 				set $* \"iconv\"
 			fi
 			;;
 		\"WDDX\")
 			echo "CONFIGURE_ARGS+=--enable-wddx"
 			if [ -z "$XML" ]; then
 				set $* \"XML\"
 			fi
 			;;
 		\"DOMXML\")
 			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
 			echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
 			;;
 		\"FTP\")
 			echo "CONFIGURE_ARGS+=--enable-ftp"
 			;;
 		\"CURL\")
 			echo "CONFIGURE_ARGS+=--with-curl=\${LOCALBASE}"
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl"
                         ;;
 		\"gettext\")
 			echo "LIB_DEPENDS+=	intl.4:\${PORTSDIR}/devel/gettext"
 			echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
 			;;
 		\"iconv\")
 			if [ -z "$ICONV" ]; then
 				echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
 				echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}"
 				ICONV=1
 			fi
 			;;
 		\"pspell\")
 			echo "LIB_DEPENDS+=	aspell.15:\${PORTSDIR}/textproc/aspell"
 			echo "CONFIGURE_ARGS+=--with-pspell=\${LOCALBASE}"
 			;;
 		\"mbregex\")
 			echo "CONFIGURE_ARGS+=--enable-mbregex"
 			;;
 		\"mbstring\")
 			echo "CONFIGURE_ARGS+=--enable-mbstring"
 			;;
 		\"YP\")
 			echo "CONFIGURE_ARGS+=--enable-yp"
 			;;
 		\"BCMath\")
 			echo "CONFIGURE_ARGS+=--enable-bcmath"
 			;;
 		\"Hyperwave\")
 			echo "CONFIGURE_ARGS+=--with-hyperwave=yes"
 			;;
 		\"mcve\")
 			echo "LIB_DEPENDS+=	mcve.3:\${PORTSDIR}/devel/libmcve"
 			echo "CONFIGURE_ARGS+=--with-mcve=\${LOCALBASE}"
  			;;
 		\"ming\")
 			echo "LIB_DEPENDS+=	ming.3:\${PORTSDIR}/graphics/ming"
 			echo "CONFIGURE_ARGS+=--with-ming=\${LOCALBASE}"
 			;;
 		\"MCAL\")
 			echo "CONFIGURE_ARGS+=--with-mcal=\${LOCALBASE}"
 			echo "LIB_DEPENDS+=	mcal.0:\${PORTSDIR}/misc/libmcal"
 			;;
 		\"sockets\")
 			echo "CONFIGURE_ARGS+=--enable-sockets"
 			;;
 		\"sysvsem\")
 			echo "CONFIGURE_ARGS+=--enable-sysvsem"
 			;;
 		\"sysvshm\")
 			echo "CONFIGURE_ARGS+=--enable-sysvshm"
 			;;
 		\"transsid\")
 			echo "CONFIGURE_ARGS+=--enable-trans-sid"
 			;;
 		\"yaz\")
 			echo "LIB_DEPENDS+=	yaz.1:\${PORTSDIR}/net/yaz"
 			echo "CONFIGURE_ARGS+=--with-yaz=\${LOCALBASE}/bin"
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
 	shift
 done
 
 if [ "${LIBS}" ]; then
 	echo "CONFIGURE_ENV+=	LIBS='${LIBS}'"
 fi
+
+if [ -z "${MYSQL}" ]; then
+	echo "WITHOUT_MYSQL=	1"
+fi
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 22cdf24d695d..b767a45d23d6 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -1,102 +1,110 @@
 # New ports collection makefile for:	mod_php4
 # Date created:		Sun May 28 11:31:54 CEST 2000
 # Whom:			Dirk Froemberg <dirk@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_php4
 PORTVERSION=	4.3.0
 PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
 		http://www.php3.de/${PHP_DISTDIR}/ \
 		http://au.php.net/${PHP_DISTDIR}/ \
 		http://at.php.net/${PHP_DISTDIR}/ \
 		http://br.php.net/${PHP_DISTDIR}/ \
 		http://php.easydns.com/${PHP_DISTDIR}/ \
 		http://www.php.cz/${PHP_DISTDIR}/ \
 		http://php3.globe.de/${PHP_DISTDIR}/
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	dirk@FreeBSD.org
 
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 .if defined(WITH_APACHE2)
 LIB_DEPENDS=	pth.14:${PORTSDIR}/devel/pth
 .endif
 
 PHP_DISTDIR=	distributions
 
 USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 USE_AUTOCONF_VER=213
 .if defined(WITH_APACHE2)
 APACHE_PORT?=	${PORTSDIR}/www/apache2
 .else
 APACHE_PORT?=	${PORTSDIR}/www/apache13
 .endif
 APXS?=		${LOCALBASE}/sbin/apxs
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes
 .endif
 
 .if defined(WITH_APACHE2)
 CONFIGURE_ARGS=	--with-apxs2=${PREFIX}/sbin/apxs \
 		--with-tsrm-pth
 PLIST_SUB=	MOD_DIR=libexec/apache2 \
 		NON=
 .else
 CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs
 PLIST_SUB=	MOD_DIR=libexec/apache \
 		NON=non-
 .endif
 CONFIGURE_ARGS+=--with-config-file-path=${PREFIX}/etc \
 		--enable-versioning \
 		--with-regex=system \
 		--without-gd \
 		--without-mysql
 
 CFLAGS+=	-I${PREFIX}/include
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}" \
 		CAT="${CAT}" \
 		PHP4_OPTIONS="${PHP4_OPTIONS}" \
 		REALCURDIR="${.CURDIR}"
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
 .if !defined(WITH_APACHE2)
 	@${ECHO_CMD} "Define WITH_APACHE2 to build mod_php4 as an apache2 module."
 	@${ECHO_CMD} ""
 .endif
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 
 	@${ECHO_CMD} "*****************************************************************************"
 	@${ECHO_CMD} "Make sure the mime.types are connected to the php module properly and"
 	@${ECHO_CMD} "index.php is part of your DirectoryIndex."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "The following should be in your Apache configuration file:"
 	@${ECHO_CMD} "[...]"
 	@${ECHO_CMD} "DirectoryIndex index.php index.html"
 	@${ECHO_CMD} "[...]"
 	@${ECHO_CMD} "AddType application/x-httpd-php .php"
 	@${ECHO_CMD} "AddType application/x-httpd-php-source .phps"
 	@${ECHO_CMD} "[...]"
 	@${ECHO_CMD} "*****************************************************************************"
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+# XXX:
+# Has to be kept in sync with the defaults in configure.php
+.ifndef(WITHOUT_MYSQL)
+.ifmake describe
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+.endif
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 2230696ea58d..6729ade0210e 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -1,365 +1,370 @@
 #!/bin/sh
 # $FreeBSD$
 
 if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
 	exit
 fi
 
 tempfile=`/usr/bin/mktemp -t checklist`
 
 if [ "${BATCH}" ]; then
 	if [ "${PHP4_OPTIONS}" ]; then
 		set ${PHP4_OPTIONS}
 	else
 		set \"zlib\" \"MySQL\"
 	fi
 else
 	/usr/bin/dialog --title "configuration options" --clear \
 		--checklist "\n\
 Please select desired options:" -1 -1 16 \
 GD1		"GD 1.x library support" OFF \
 GD2		"GD 2.x library support" OFF \
 zlib		"zlib library support" ON \
 bzip2		"bzip2 library support" OFF \
 mcrypt		"Encryption support" OFF \
 mhash		"Crypto-hashing support" OFF \
 pdflib		"pdflib support" OFF \
 IMAP		"IMAP support" OFF \
 IMAP-SSL	"IMAP-SSL support (implies IMAP)" OFF \
 MySQL		"MySQL database support" ON \
 PostgreSQL	"PostgreSQL database support" OFF \
 SybaseDB	"Sybase/MS-SQL database support (DB-lib)" OFF \
 SybaseCT	"Sybase/MS-SQL database support (CT-lib)" OFF \
 Interbase	"Interbase 6 database support (Firebird)" OFF \
 dBase		"dBase database support" OFF \
 OpenLDAP1	"OpenLDAP 1.x support" OFF \
 OpenLDAP2	"OpenLDAP 2.x support" OFF \
 OpenSSL		"OpenSSL support" OFF \
 SNMP		"SNMP support" OFF \
 XML		"XML support" OFF \
 XMLRPC		"XMLRPC-EPI support (implies XML and iconv)" OFF \
 XSLT		"Sablotron support (implies XML and iconv)" OFF \
 WDDX		"WDDX support (implies XML)" OFF \
 DOMXML		"DOM support" OFF \
 FTP		"File Transfer Protocol support" OFF \
 CURL		"CURL support" OFF \
 gettext		"gettext library support" OFF \
 iconv		"iconv support" OFF \
 pspell		"pspell support" OFF \
 mbregex		"multibyte regular expressions module" OFF \
 mbstring	"multibyte string module" OFF \
 YP		"YP/NIS support" OFF \
 BCMath		"BCMath support" OFF \
 Hyperwave	"Hyperwave support" OFF \
 mcve		"MCVE Credit Card Verification support" OFF \
 ming		"ming library support" OFF \
 MCAL		"Modular Calendar Access Library support" OFF \
 sockets		"sockets support" OFF \
 sysvsem		"System V semaphore support" OFF \
 sysvshm		"System V shared memory support" OFF \
 transsid	"Transparent session id" OFF \
 yaz		"YAZ support (ANSI/NISO Z39.50)" OFF \
 2> $tempfile
 
 	retval=$?
 
 	if [ -s $tempfile ]; then
 		set `cat $tempfile`
 	fi
 	rm -f $tempfile
 
 	case $retval in
 		0)	if [ -z "$*" ]; then
 				echo "Nothing selected"
 			fi
 			;;
 		1)	echo "Cancel pressed."
 			exit 1
 			;;
 	esac
 fi
 
 ${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
 exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 
 while [ "$1" ]; do
 	case $1 in
 		\"GD1\")
 			echo "LIB_DEPENDS+=	gd.2:\${PORTSDIR}/graphics/gd"
 			echo "LIB_DEPENDS+=	freetype.9:\${PORTSDIR}/print/freetype2"
 			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
 			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
 			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
 			echo "		--enable-gd-native-ttf \\"
 			echo "		--with-freetype-dir=\${LOCALBASE} \\"
 			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
 			echo "		--with-png-dir=\${LOCALBASE}"
 			if [ "$GD2" ]; then
 				echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			GD1=1
 			;;
 
 		\"GD2\")
 			echo "LIB_DEPENDS+=	gd.4:\${PORTSDIR}/graphics/gd2"
 			echo "LIB_DEPENDS+=	freetype.9:\${PORTSDIR}/print/freetype2"
 			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
 			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
 			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
 			echo "		--enable-gd-native-ttf \\"
 			echo "		--with-freetype-dir=\${LOCALBASE} \\"
 			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
 			echo "		--with-png-dir=\${LOCALBASE}"
 			if [ "$GD1" ]; then
 				echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			GD2=1
  			;;
 		\"zlib\")
 			echo "CONFIGURE_ARGS+=--with-zlib"
 			;;
 		\"bzip2\")
 			if [ -x /usr/bin/bzip2 ]; then
 				BZ2PREFIX=/usr
 			else
 				BZ2PREFIX=/usr/local
 				echo "LIB_DEPENDS+=	bz2.1:\${PORTSDIR}/archivers/bzip2"
 			fi
 			echo "CONFIGURE_ARGS+=--with-bz2=${BZ2PREFIX}"
 			;;
 		\"mcrypt\")
 			echo "LIB_DEPENDS+=	mcrypt.8:\${PORTSDIR}/security/libmcrypt"
 			echo "CONFIGURE_ARGS+=--with-mcrypt=\${LOCALBASE}"
 			;;
 		\"mhash\")
 			echo "LIB_DEPENDS+=	mhash.2:\${PORTSDIR}/security/mhash"
 			echo "CONFIGURE_ARGS+=--with-mhash=\${LOCALBASE}"
 			;;
 		\"pdflib\")
 			echo "LIB_DEPENDS+=	pdf.4:\${PORTSDIR}/print/pdflib"
 			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
 			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
 			echo "LIB_DEPENDS+=	tiff.4:\${PORTSDIR}/graphics/tiff"
 			echo "CONFIGURE_ARGS+=--with-pdflib=\${LOCALBASE} \\"
 			echo "		--with-zlib-dir=/usr \\"
 			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
 			echo "		--with-png-dir=\${LOCALBASE} \\"
 			echo "		--with-tiff-dir=\${LOCALBASE}"
 			;;
 		\"IMAP\")
 			if [ -z "$IMAP" ]; then
 				echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"
 				echo "CONFIGURE_ARGS+=--with-imap=\${LOCALBASE}"
 				IMAP=1
 			fi
 			;;
 		\"IMAP-SSL\")
 			echo "CONFIGURE_ARGS+=--with-imap-ssl=\${LOCALBASE}"
 			if [ -z "$IMAP" ]; then
 				set $* \"IMAP\"
 			fi
  			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 			echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}"
+			MYSQL=1
 			;;
 		\"PostgreSQL\")
 			echo "POSTGRESQL_PORT?=	databases/postgresql7"
 			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
 			if [ -x ${LOCALBASE}/pgsql/bin/postgres -a ! -x ${LOCALBASE}/bin/postgres ]; then
 				PGPREFIX=${LOCALBASE}/pgsql
 			else
 				PGPREFIX=${LOCALBASE}
 				echo "CFLAGS+=-I\${LOCALBASE}/include/pgsql"
 			fi
 			echo "PGPREFIX=${PGPREFIX}"
 			echo "CONFIGURE_ARGS+=--with-pgsql=\${PGPREFIX}"
 			if /usr/bin/ldd ${PGPREFIX}/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; then
 				echo "USE_OPENSSL=	yes"
 				LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
 			fi
 			;;
 		\"SybaseDB\")
 			echo "LIB_DEPENDS+=	sybdb.1:\${PORTSDIR}/databases/freetds"
 			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
 			echo "CONFIGURE_ARGS+=--with-sybase=\${LOCALBASE}"
 			if [ "$SYBASECT" ]; then
 				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			SYBASEDB=1
 			;;
 		\"SybaseCT\")
 			echo "LIB_DEPENDS+=	ct.0:\${PORTSDIR}/databases/freetds"
 			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
 			echo "CONFIGURE_ARGS+=--with-sybase-ct=\${LOCALBASE}"
 			if [ "$SYBASEDB" ]; then
 				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			SYBASECT=1
 			;;
 		\"Interbase\")
 			echo "LIB_DEPENDS+=	gds.1:\${PORTSDIR}/databases/firebird"
 			echo "CONFIGURE_ARGS+=--with-interbase=\${LOCALBASE}/firebird"
 			;;
 		\"dBase\")
 			echo "CONFIGURE_ARGS+=--with-dbase"
 			;;
 		\"OpenLDAP1\")
 			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap"
 			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap"
 			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
 			if [ "$OPENLDAP2" ]; then
 				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
 				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
 			fi
 			OPENLDAP1=1
 			;;
 		\"OpenLDAP2\")
 			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap2"
 			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap2"
 			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
 			if [ "$OPENLDAP1" ]; then
 				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
 			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
 				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
 			fi
 			OPENLDAP2=1
 			;;
 		\"OpenSSL\")
 			echo "USE_OPENSSL=yes"
 			echo "CONFIGURE_ARGS+=--with-openssl=\${OPENSSLBASE}"
 			;;
 		\"SNMP\")
 			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/net-snmp4"
 			echo "CONFIGURE_ARGS+=--with-snmp=\${LOCALBASE} --enable-ucd-snmp-hack --with-openssl=\${OPENSSLBASE}"
 			echo "USE_OPENSSL=	yes"
 			LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
 			;;
 		\"XML\")
 			if [ -z "$XML" ]; then
 				echo "LIB_DEPENDS+=	expat.4:\${PORTSDIR}/textproc/expat2"
 				echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}"
 				XML=1
 			fi
 			;;
 		\"XMLRPC\")
 			echo "CONFIGURE_ARGS+=--with-xmlrpc"
 			if [ -z "$XML" ]; then
 				set $* \"XML\"
 			fi
 			if [ -z "$ICONV" ]; then
 				set $* \"iconv\"
 			fi
 			;;
 		\"XSLT\")
 			echo "LIB_DEPENDS+=	sablot.69:\${PORTSDIR}/textproc/sablotron"
 			echo "CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot=\${LOCALBASE}"
 			if [ -z "$XML" ]; then
 				set $* \"XML\"
 			fi
 			if [ -z "$ICONV" ]; then
 				set $* \"iconv\"
 			fi
 			;;
 		\"WDDX\")
 			echo "CONFIGURE_ARGS+=--enable-wddx"
 			if [ -z "$XML" ]; then
 				set $* \"XML\"
 			fi
 			;;
 		\"DOMXML\")
 			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
 			echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
 			;;
 		\"FTP\")
 			echo "CONFIGURE_ARGS+=--enable-ftp"
 			;;
 		\"CURL\")
 			echo "CONFIGURE_ARGS+=--with-curl=\${LOCALBASE}"
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl"
                         ;;
 		\"gettext\")
 			echo "LIB_DEPENDS+=	intl.4:\${PORTSDIR}/devel/gettext"
 			echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
 			;;
 		\"iconv\")
 			if [ -z "$ICONV" ]; then
 				echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
 				echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}"
 				ICONV=1
 			fi
 			;;
 		\"pspell\")
 			echo "LIB_DEPENDS+=	aspell.15:\${PORTSDIR}/textproc/aspell"
 			echo "CONFIGURE_ARGS+=--with-pspell=\${LOCALBASE}"
 			;;
 		\"mbregex\")
 			echo "CONFIGURE_ARGS+=--enable-mbregex"
 			;;
 		\"mbstring\")
 			echo "CONFIGURE_ARGS+=--enable-mbstring"
 			;;
 		\"YP\")
 			echo "CONFIGURE_ARGS+=--enable-yp"
 			;;
 		\"BCMath\")
 			echo "CONFIGURE_ARGS+=--enable-bcmath"
 			;;
 		\"Hyperwave\")
 			echo "CONFIGURE_ARGS+=--with-hyperwave=yes"
 			;;
 		\"mcve\")
 			echo "LIB_DEPENDS+=	mcve.3:\${PORTSDIR}/devel/libmcve"
 			echo "CONFIGURE_ARGS+=--with-mcve=\${LOCALBASE}"
  			;;
 		\"ming\")
 			echo "LIB_DEPENDS+=	ming.3:\${PORTSDIR}/graphics/ming"
 			echo "CONFIGURE_ARGS+=--with-ming=\${LOCALBASE}"
 			;;
 		\"MCAL\")
 			echo "CONFIGURE_ARGS+=--with-mcal=\${LOCALBASE}"
 			echo "LIB_DEPENDS+=	mcal.0:\${PORTSDIR}/misc/libmcal"
 			;;
 		\"sockets\")
 			echo "CONFIGURE_ARGS+=--enable-sockets"
 			;;
 		\"sysvsem\")
 			echo "CONFIGURE_ARGS+=--enable-sysvsem"
 			;;
 		\"sysvshm\")
 			echo "CONFIGURE_ARGS+=--enable-sysvshm"
 			;;
 		\"transsid\")
 			echo "CONFIGURE_ARGS+=--enable-trans-sid"
 			;;
 		\"yaz\")
 			echo "LIB_DEPENDS+=	yaz.1:\${PORTSDIR}/net/yaz"
 			echo "CONFIGURE_ARGS+=--with-yaz=\${LOCALBASE}/bin"
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 			exit 1
 			;;
 	esac
 	shift
 done
 
 if [ "${LIBS}" ]; then
 	echo "CONFIGURE_ENV+=	LIBS='${LIBS}'"
 fi
+
+if [ -z "${MYSQL}" ]; then
+	echo "WITHOUT_MYSQL=	1"
+fi