8 files changed, 108 insertions, 605 deletions

diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 0365e0fc6266..746108478181 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -1,148 +1,85 @@
-# New ports collection makefile for:	Apache / PHP
-# Date created:		So  21 Jun 1998 16:09:39 CEST
-# Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
+# 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=	apache+php
-PORTVERSION= 	${VERSION_APACHE}+${VERSION_PHP}
+PORTNAME=	mod_php
+PORTVERSION= 	4.0.0
 CATEGORIES=	www
-MASTER_SITES=	http://www.apache.org/dist/ \
-		http://www.rge.com/pub/infosystems/apache/dist/ \
-		http://us.php.net/${PHP_DISTDIR}/ \
-		http://www.modssl.org/source/ \
-		ftp://ftp.modssl.org/source/ \
-		http://www.apache.de/dist/ \
-		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
+MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
 		http://www.php3.de/${PHP_DISTDIR}/ \
-		ftp://ftp.ecrc.net/pub/security/mod_ssl/ \
-		ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \
-		ftp://apache.compuex.com/pub/apache/dist/ \
-		ftp://apache.arctic.org/pub/apache/dist/ \
 		http://au.php.net:81/${PHP_DISTDIR}/ \
 		http://at.php.net/${PHP_DISTDIR}/ \
-		ftp://ftp.ulpgc.es/pub/mod_ssl/ \
-		ftp://glock.missouri.edu/pub/mod_ssl/ \
-		ftp://ftp.epix.net/pub/apache/dist/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \
 		http://br.php.net/${PHP_DISTDIR}/ \
 		http://php.easydns.com/${PHP_DISTDIR}/ \
-		ftp://ftp.infoscience.co.jp/pub/Crypto/SSL/mod_ssl/ \
-		ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/ \
-		ftp://ftp.connectnet.com/pub/www/apache/ \
-		ftp://apache.technomancer.com/mirrors/apache/dist/ \
 		http://www.php.cz/${PHP_DISTDIR}/ \
-		http://php3.globe.de/${PHP_DISTDIR}/ \
-		ftp://ftp.blatzheim.com/pub/mod_ssl/ \
-		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/
-DISTNAME=	apache_${VERSION_APACHE}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} php-${VERSION_PHP}${EXTRACT_SUFX}
+		http://php3.globe.de/${PHP_DISTDIR}/
+DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	dirk@FreeBSD.org
 
-FORBIDDEN=	"awaiting update"
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
 Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	version4/downloads
 
-VERSION_APACHE=	1.3.12
-VERSION_PHP=	4.0.0
-
-NO_LATEST_LINK=	yes
-USE_PERL5=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--target=apache \
-		--with-layout=GNU \
-		--with-perl=${PERL} \
-		--bindir=${PREFIX}/bin \
-		--sbindir=${PREFIX}/sbin \
-		--libexecdir=${PREFIX}/libexec/apache \
-		--mandir=${PREFIX}/man \
-		--sysconfdir=${PREFIX}/etc/apache \
-		--datadir=${PREFIX}/share/apache \
-		--includedir=${PREFIX}/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log \
-		--proxycachedir=/var/spool/apache \
-		--without-confadjust \
-		--enable-module=most \
-		--enable-module=auth_db \
-		--disable-module=auth_dbm \
-		--enable-shared=max \
-		--activate-module=src/modules/php4/libphp4.a
-
-OPTIM=		-DHARD_SERVER_LIMIT=512 \
-		-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\"
-
-CONFIGURE_ENV=	OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}"
-
-INSTALL_TARGET=	install-quiet
-
-MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 apache.8 apachectl.8 apxs.8 logresolve.8 rotatelogs.8
+APXS=		${PREFIX}/sbin/apxs
 
-APACHEDOCDIR=	${PREFIX}/share/doc/apache
-PHPDOCDIR=	${PREFIX}/share/doc/php
-
-PHP_CONF_ARGS=	--prefix=${PREFIX} \
-		${CONFIGURE_TARGET} \
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-apxs=${APXS} \
+		--enable-versioning \
 		--with-system-regex \
-		--with-apache=${WRKSRC} \
 		--with-config-file-path=${PREFIX}/etc \
 		--disable-debug \
 		--enable-track-vars \
 		--without-gd \
 		--disable-pear
 
+SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
+		TOUCH="${TOUCH}" \
+		MKDIR="${MKDIR}"
+
+.if exists(${APXS})
+AP_LIBEXEC!=	${APXS} -q LIBEXEC
+.else
+AP_LIBEXEC=	${PREFIX}/libexec/apache
+.endif
+
+PHPDOCDIR=	${PREFIX}/share/doc/php
+PLIST_SUB=	PHPDOCDIR=${PHPDOCDIR:S/^${PREFIX}\///} \
+		AP_LIBEXEC=${AP_LIBEXEC:S/^${PREFIX}\///}
+
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
 
-post-extract:
-	@${LN} -s php-${VERSION_PHP} ${WRKDIR}/php
-
-pre-configure:
-	@cd ${WRKSRC} \
-	&& CC="${CC}" CFLAGS="${CFLAGS}" ./configure > /dev/null \
-	&& cd ${WRKDIR}/php-${VERSION_PHP} \
-	&& ${ECHO_MSG} "===>  Configuring for PHP-${VERSION_PHP}" \
-	&& CC="${CC}" \
-	   CFLAGS="${CFLAGS}" \
-	   CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" \
-	   LDFLAGS=-L${PREFIX}/lib \
-	   ./configure ${PHP_CONF_ARGS} \
-	&& ${ECHO_MSG} "===>  Building for PHP-${VERSION_PHP}" \
-	&& ${MAKE} install \
-	&& ${ECHO_MSG} "===>  Configuring for Apache-${VERSION_APACHE}"
-
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		${ECHO} "[ -d ${PREFIX}/pgsql/lib ] && ${LDCONFIG} -m ${PREFIX}/pgsql/lib" >> ${PREFIX}/etc/rc.d/apache.sh; \
-		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
-		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
-	fi
-	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/php.ini-dist ${PREFIX}/etc
+	@${ECHO} "Restarting Apache..."
+	@${PREFIX}/sbin/apachectl restart
+	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${APACHEDOCDIR} ${PHPDOCDIR}
-.for i in README LICENSE ABOUT_APACHE
-	${INSTALL_DATA} ${WRKSRC}/$i ${APACHEDOCDIR}
-.endfor
+	@${MKDIR} ${PHPDOCDIR}
 .for i in CODING_STANDARDS LICENSE
-	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/$i ${PHPDOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/$i ${PHPDOCDIR}
 .endfor
-	@${ECHO} "Docs reside in ${APACHEDOCDIR}"
-	@${ECHO} "and in ${PHPDOCDIR}"
 .endif
+	@${ECHO} "*****************************************************************************"
+	@${ECHO} "Make sure the mime.types are connected to the php module properly and"
+	@${ECHO} "index.php is part of your DirectoryIndex."
+	@${ECHO} ""
+	@${ECHO} "The following should be in your Apache configuration file:"
+	@${ECHO} "[...]"
+	@${ECHO} "DirectoryIndex index.php index.html"
+	@${ECHO} "[...]"
+	@${ECHO} "AddType application/x-httpd-php .php"
+	@${ECHO} "AddType application/x-httpd-php-source .php3"
+	@${ECHO} "[...]"
+	@${ECHO} "*****************************************************************************"
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
@@ -151,9 +88,4 @@ post-clean:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-# Modssl needs to include bsd.port.pre.mk, so correct for this situation.
-.if defined(_PREMKINCLUDED)
-.include <bsd.port.post.mk>
-.else
 .include <bsd.port.mk>
-.endif
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 6b77ff0569dc..758be08ac098 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,4 +1 @@
-MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
 MD5 (php-4.0.0.tar.gz) = c273f284ee07f9b98b19d1f1deae1256
-MD5 (mod_ssl-2.6.4-1.3.12.tar.gz) = 364cde55554e29ad72a531370f52d83e
-MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55
diff --git a/www/mod_php5/files/patch-as b/www/mod_php5/files/patch-as
index 1b527785d0ae..755a0dc0e411 100644
--- a/www/mod_php5/files/patch-as
+++ b/www/mod_php5/files/patch-as
@@ -1,5 +1,5 @@
---- ../php/Makefile.in.orig	Wed May  3 06:51:11 2000
-+++ ../php/Makefile.in	Wed May 17 23:42:28 2000
+--- Makefile.in.orig	Wed May  3 06:51:11 2000
++++ Makefile.in	Wed May 17 23:42:28 2000
 @@ -1,4 +1,4 @@
 -
 + 
diff --git a/www/mod_php5/pkg-comment b/www/mod_php5/pkg-comment
index e43bd8f47d90..e7a0ad78a7f3 100644
--- a/www/mod_php5/pkg-comment
+++ b/www/mod_php5/pkg-comment
@@ -1 +1 @@
-Apache http server with compiled in PHP module
+PHP4 module for Apache
diff --git a/www/mod_php5/pkg-descr b/www/mod_php5/pkg-descr
index 77d714015a70..cea408b8d551 100644
--- a/www/mod_php5/pkg-descr
+++ b/www/mod_php5/pkg-descr
@@ -1,20 +1,4 @@
-Apache 1.3 + PHP
-================
+Server-side, cross-platform, HTML embedded scripting language which
+offers easy database integration.
 
-Apache is an HTTP server designed as a plug-in replacement for the
-NCSA server version 1.3 (or 1.4). It fixes numerous bugs in the
-NCSA server and includes many frequently requested new features,
-and has an API which allows it to be extended to meet users' needs
-more easily.
-
-This version has PHP compiled in. PHP is a server-side, cross-platform,
-HTML embedded scripting language which offers easy database integration.
-SSL support (mod_ssl + OpenSSL) is available as an option.
-
-Documentation
-=============
-
-Apache:		http://www.apache.org/
-PHP:		http://www.php.net/
-mod_ssl:	http://www.modssl.org/
-OpenSSL:	http://www.openssl.org/
+WWW:	http://www.php.net/
diff --git a/www/mod_php5/pkg-message b/www/mod_php5/pkg-message
index 03d6311ac5a9..c984c30fe061 100644
--- a/www/mod_php5/pkg-message
+++ b/www/mod_php5/pkg-message
@@ -1,9 +1,20 @@
 *****************************************************************************
-You have just installed the apache13-php3 package.
+You have installed the mod_php4 package.
 
-Have a look at the apache13-php3 port if you need additional support for
-databases or SSL.
+Have a look at the mod_php4 _port_ if you need additional support for
+databases other than MySQL, e. g.
 
 You can find it at
-ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/apache13-php3.tar
+ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/mod_php4.tar
+
+Make sure the mime.types are connected to the php module properly and
+index.php is part of your DirectoryIndex.
+
+The following should be in your Apache configuration file:
+[...]
+DirectoryIndex index.php index.html
+[...]
+AddType application/x-httpd-php .php
+AddType application/x-httpd-php-source .phps
+[...]
 *****************************************************************************
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index 71e539b7a23b..1a0151f15fcf 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -1,372 +1,8 @@
-bin/dbmmanage
-bin/htdigest
-bin/htpasswd
-etc/apache/apache.conf.default
-@exec [ ! -f %B/apache.conf ] && cp %B/%f %B/apache.conf
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
-etc/apache/mime.types.default
-@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
 etc/php.ini-dist
-etc/rc.d/apache.sh
-include/apache/alloc.h
-include/apache/ap.h
-include/apache/ap_compat.h
-include/apache/ap_config.h
-include/apache/ap_config_auto.h
-include/apache/ap_ctype.h
-include/apache/ap_md5.h
-include/apache/ap_mmn.h
-include/apache/ap_sha1.h
-include/apache/buff.h
-include/apache/compat.h
-include/apache/conf.h
-include/apache/explain.h
-include/apache/fnmatch.h
-include/apache/hsregex.h
-include/apache/http_conf_globals.h
-include/apache/http_config.h
-include/apache/http_core.h
-include/apache/http_log.h
-include/apache/http_main.h
-include/apache/http_protocol.h
-include/apache/http_request.h
-include/apache/http_vhost.h
-include/apache/httpd.h
-include/apache/multithread.h
-include/apache/os-inline.c
-include/apache/os.h
-include/apache/rfc1413.h
-include/apache/scoreboard.h
-include/apache/util_date.h
-include/apache/util_md5.h
-include/apache/util_script.h
-include/apache/util_uri.h
-include/apache/xml/asciitab.h
-include/apache/xml/hashtable.h
-include/apache/xml/iasciitab.h
-include/apache/xml/latin1tab.h
-include/apache/xml/nametab.h
-include/apache/xml/utf8tab.h
-include/apache/xml/xmldef.h
-include/apache/xml/xmlparse.h
-include/apache/xml/xmlrole.h
-include/apache/xml/xmltok.h
-include/apache/xml/xmltok_impl.h
-libexec/apache/httpd.exp
-libexec/apache/libproxy.so
-libexec/apache/mod_access.so
-libexec/apache/mod_actions.so
-libexec/apache/mod_alias.so
-libexec/apache/mod_asis.so
-libexec/apache/mod_auth.so
-libexec/apache/mod_auth_anon.so
-libexec/apache/mod_auth_db.so
-libexec/apache/mod_autoindex.so
-libexec/apache/mod_cern_meta.so
-libexec/apache/mod_cgi.so
-libexec/apache/mod_digest.so
-libexec/apache/mod_dir.so
-libexec/apache/mod_env.so
-libexec/apache/mod_expires.so
-libexec/apache/mod_headers.so
-libexec/apache/mod_imap.so
-libexec/apache/mod_include.so
-libexec/apache/mod_info.so
-libexec/apache/mod_log_config.so
-libexec/apache/mod_mime.so
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_negotiation.so
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.so
-libexec/apache/mod_speling.so
-libexec/apache/mod_status.so
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_userdir.so
-libexec/apache/mod_usertrack.so
-libexec/apache/mod_vhost_alias.so
-sbin/ab
-sbin/apache
-sbin/apachectl
-sbin/apxs
-sbin/logresolve
-sbin/rotatelogs
-share/apache/cgi-bin/printenv
-share/apache/cgi-bin/test-cgi
-share/apache/htdocs/apache_pb.gif
-share/apache/htdocs/index.html.ca
-share/apache/htdocs/index.html.cz
-share/apache/htdocs/index.html.de
-share/apache/htdocs/index.html.dk
-share/apache/htdocs/index.html.ee
-share/apache/htdocs/index.html.en
-share/apache/htdocs/index.html.es
-share/apache/htdocs/index.html.fr
-share/apache/htdocs/index.html.it
-share/apache/htdocs/index.html.ja.jis
-share/apache/htdocs/index.html.lu
-share/apache/htdocs/index.html.nl
-share/apache/htdocs/index.html.po.iso-pl
-share/apache/htdocs/index.html.pt
-share/apache/htdocs/index.html.pt-br
-share/apache/htdocs/index.html.se
-share/apache/htdocs/manual/LICENSE
-share/apache/htdocs/manual/bind.html
-share/apache/htdocs/manual/cgi_path.html
-share/apache/htdocs/manual/content-negotiation.html
-share/apache/htdocs/manual/custom-error.html
-share/apache/htdocs/manual/dns-caveats.html
-share/apache/htdocs/manual/dso.html
-share/apache/htdocs/manual/ebcdic.html
-share/apache/htdocs/manual/env.html
-share/apache/htdocs/manual/footer.html
-share/apache/htdocs/manual/handler.html
-share/apache/htdocs/manual/header.html
-share/apache/htdocs/manual/images/custom_errordocs.gif
-share/apache/htdocs/manual/images/home.gif
-share/apache/htdocs/manual/images/index.gif
-share/apache/htdocs/manual/images/mod_rewrite_fig1.fig
-share/apache/htdocs/manual/images/mod_rewrite_fig1.gif
-share/apache/htdocs/manual/images/mod_rewrite_fig2.fig
-share/apache/htdocs/manual/images/mod_rewrite_fig2.gif
-share/apache/htdocs/manual/images/sub.gif
-share/apache/htdocs/manual/index.html
-share/apache/htdocs/manual/install-tpf.html
-share/apache/htdocs/manual/install.html
-share/apache/htdocs/manual/invoking.html
-share/apache/htdocs/manual/keepalive.html
-share/apache/htdocs/manual/location.html
-share/apache/htdocs/manual/man-template.html
-share/apache/htdocs/manual/misc/API.html
-share/apache/htdocs/manual/misc/FAQ.html
-share/apache/htdocs/manual/misc/HTTP_Features.tsv
-share/apache/htdocs/manual/misc/client_block_api.html
-share/apache/htdocs/manual/misc/compat_notes.html
-share/apache/htdocs/manual/misc/custom_errordocs.html
-share/apache/htdocs/manual/misc/descriptors.html
-share/apache/htdocs/manual/misc/fin_wait_2.html
-share/apache/htdocs/manual/misc/footer.html
-share/apache/htdocs/manual/misc/header.html
-share/apache/htdocs/manual/misc/howto.html
-share/apache/htdocs/manual/misc/index.html
-share/apache/htdocs/manual/misc/known_client_problems.html
-share/apache/htdocs/manual/misc/nopgp.html
-share/apache/htdocs/manual/misc/perf-bsd44.html
-share/apache/htdocs/manual/misc/perf-dec.html
-share/apache/htdocs/manual/misc/perf-hp.html
-share/apache/htdocs/manual/misc/perf-tuning.html
-share/apache/htdocs/manual/misc/perf.html
-share/apache/htdocs/manual/misc/rewriteguide.html
-share/apache/htdocs/manual/misc/security_tips.html
-share/apache/htdocs/manual/misc/vif-info.html
-share/apache/htdocs/manual/misc/windoz_keepalive.html
-share/apache/htdocs/manual/mod/core.html
-share/apache/htdocs/manual/mod/directive-dict.html
-share/apache/htdocs/manual/mod/directives.html
-share/apache/htdocs/manual/mod/footer.html
-share/apache/htdocs/manual/mod/header.html
-share/apache/htdocs/manual/mod/index.html
-share/apache/htdocs/manual/mod/mod_access.html
-share/apache/htdocs/manual/mod/mod_actions.html
-share/apache/htdocs/manual/mod/mod_alias.html
-share/apache/htdocs/manual/mod/mod_asis.html
-share/apache/htdocs/manual/mod/mod_auth.html
-share/apache/htdocs/manual/mod/mod_auth_anon.html
-share/apache/htdocs/manual/mod/mod_auth_db.html
-share/apache/htdocs/manual/mod/mod_auth_dbm.html
-share/apache/htdocs/manual/mod/mod_auth_digest.html
-share/apache/htdocs/manual/mod/mod_autoindex.html
-share/apache/htdocs/manual/mod/mod_browser.html
-share/apache/htdocs/manual/mod/mod_cern_meta.html
-share/apache/htdocs/manual/mod/mod_cgi.html
-share/apache/htdocs/manual/mod/mod_cookies.html
-share/apache/htdocs/manual/mod/mod_digest.html
-share/apache/htdocs/manual/mod/mod_dir.html
-share/apache/htdocs/manual/mod/mod_dld.html
-share/apache/htdocs/manual/mod/mod_dll.html
-share/apache/htdocs/manual/mod/mod_env.html
-share/apache/htdocs/manual/mod/mod_example.html
-share/apache/htdocs/manual/mod/mod_expires.html
-share/apache/htdocs/manual/mod/mod_headers.html
-share/apache/htdocs/manual/mod/mod_imap.html
-share/apache/htdocs/manual/mod/mod_include.html
-share/apache/htdocs/manual/mod/mod_info.html
-share/apache/htdocs/manual/mod/mod_isapi.html
-share/apache/htdocs/manual/mod/mod_log_agent.html
-share/apache/htdocs/manual/mod/mod_log_common.html
-share/apache/htdocs/manual/mod/mod_log_config.html
-share/apache/htdocs/manual/mod/mod_log_referer.html
-share/apache/htdocs/manual/mod/mod_mime.html
-share/apache/htdocs/manual/mod/mod_mime_magic.html
-share/apache/htdocs/manual/mod/mod_mmap_static.html
-share/apache/htdocs/manual/mod/mod_negotiation.html
-share/apache/htdocs/manual/mod/mod_proxy.html
-share/apache/htdocs/manual/mod/mod_rewrite.html
-share/apache/htdocs/manual/mod/mod_setenvif.html
-share/apache/htdocs/manual/mod/mod_so.html
-share/apache/htdocs/manual/mod/mod_speling.html
-share/apache/htdocs/manual/mod/mod_status.html
-share/apache/htdocs/manual/mod/mod_unique_id.html
-share/apache/htdocs/manual/mod/mod_userdir.html
-share/apache/htdocs/manual/mod/mod_usertrack.html
-share/apache/htdocs/manual/mod/mod_vhost_alias.html
-share/apache/htdocs/manual/multilogs.html
-share/apache/htdocs/manual/netware.html
-share/apache/htdocs/manual/new_features_1_0.html
-share/apache/htdocs/manual/new_features_1_1.html
-share/apache/htdocs/manual/new_features_1_2.html
-share/apache/htdocs/manual/new_features_1_3.html
-share/apache/htdocs/manual/process-model.html
-share/apache/htdocs/manual/readme-tpf.html
-share/apache/htdocs/manual/search/manual-index.cgi
-share/apache/htdocs/manual/sections.html
-share/apache/htdocs/manual/sourcereorg.html
-share/apache/htdocs/manual/stopping.html
-share/apache/htdocs/manual/suexec.html
-share/apache/htdocs/manual/suexec_1_2.html
-share/apache/htdocs/manual/unixware.html
-share/apache/htdocs/manual/upgrading_to_1_3.html
-share/apache/htdocs/manual/vhosts/details.html
-share/apache/htdocs/manual/vhosts/details_1_2.html
-share/apache/htdocs/manual/vhosts/examples.html
-share/apache/htdocs/manual/vhosts/fd-limits.html
-share/apache/htdocs/manual/vhosts/footer.html
-share/apache/htdocs/manual/vhosts/header.html
-share/apache/htdocs/manual/vhosts/host.html
-share/apache/htdocs/manual/vhosts/index.html
-share/apache/htdocs/manual/vhosts/ip-based.html
-share/apache/htdocs/manual/vhosts/mass.html
-share/apache/htdocs/manual/vhosts/name-based.html
-share/apache/htdocs/manual/vhosts/vhosts-in-depth.html
-share/apache/htdocs/manual/vhosts/virtual-host.html
-share/apache/htdocs/manual/windows.html
-share/apache/icons/README
-share/apache/icons/a.gif
-share/apache/icons/alert.black.gif
-share/apache/icons/alert.red.gif
-share/apache/icons/apache_pb.gif
-share/apache/icons/back.gif
-share/apache/icons/ball.gray.gif
-share/apache/icons/ball.red.gif
-share/apache/icons/binary.gif
-share/apache/icons/binhex.gif
-share/apache/icons/blank.gif
-share/apache/icons/bomb.gif
-share/apache/icons/box1.gif
-share/apache/icons/box2.gif
-share/apache/icons/broken.gif
-share/apache/icons/burst.gif
-share/apache/icons/c.gif
-share/apache/icons/comp.blue.gif
-share/apache/icons/comp.gray.gif
-share/apache/icons/compressed.gif
-share/apache/icons/continued.gif
-share/apache/icons/dir.gif
-share/apache/icons/down.gif
-share/apache/icons/dvi.gif
-share/apache/icons/f.gif
-share/apache/icons/folder.gif
-share/apache/icons/folder.open.gif
-share/apache/icons/folder.sec.gif
-share/apache/icons/forward.gif
-share/apache/icons/generic.gif
-share/apache/icons/generic.red.gif
-share/apache/icons/generic.sec.gif
-share/apache/icons/hand.right.gif
-share/apache/icons/hand.up.gif
-share/apache/icons/icon.sheet.gif
-share/apache/icons/image1.gif
-share/apache/icons/image2.gif
-share/apache/icons/image3.gif
-share/apache/icons/index.gif
-share/apache/icons/layout.gif
-share/apache/icons/left.gif
-share/apache/icons/link.gif
-share/apache/icons/movie.gif
-share/apache/icons/p.gif
-share/apache/icons/patch.gif
-share/apache/icons/pdf.gif
-share/apache/icons/pie0.gif
-share/apache/icons/pie1.gif
-share/apache/icons/pie2.gif
-share/apache/icons/pie3.gif
-share/apache/icons/pie4.gif
-share/apache/icons/pie5.gif
-share/apache/icons/pie6.gif
-share/apache/icons/pie7.gif
-share/apache/icons/pie8.gif
-share/apache/icons/portal.gif
-share/apache/icons/ps.gif
-share/apache/icons/quill.gif
-share/apache/icons/right.gif
-share/apache/icons/screw1.gif
-share/apache/icons/screw2.gif
-share/apache/icons/script.gif
-share/apache/icons/small/README.txt
-share/apache/icons/small/back.gif
-share/apache/icons/small/binary.gif
-share/apache/icons/small/binhex.gif
-share/apache/icons/small/blank.gif
-share/apache/icons/small/broken.gif
-share/apache/icons/small/burst.gif
-share/apache/icons/small/comp1.gif
-share/apache/icons/small/comp2.gif
-share/apache/icons/small/compressed.gif
-share/apache/icons/small/continued.gif
-share/apache/icons/small/dir.gif
-share/apache/icons/small/dir2.gif
-share/apache/icons/small/doc.gif
-share/apache/icons/small/forward.gif
-share/apache/icons/small/generic.gif
-share/apache/icons/small/generic2.gif
-share/apache/icons/small/generic3.gif
-share/apache/icons/small/image.gif
-share/apache/icons/small/image2.gif
-share/apache/icons/small/index.gif
-share/apache/icons/small/key.gif
-share/apache/icons/small/movie.gif
-share/apache/icons/small/patch.gif
-share/apache/icons/small/ps.gif
-share/apache/icons/small/rainbow.gif
-share/apache/icons/small/sound.gif
-share/apache/icons/small/sound2.gif
-share/apache/icons/small/tar.gif
-share/apache/icons/small/text.gif
-share/apache/icons/small/transfer.gif
-share/apache/icons/small/unknown.gif
-share/apache/icons/small/uu.gif
-share/apache/icons/sound1.gif
-share/apache/icons/sound2.gif
-share/apache/icons/sphere1.gif
-share/apache/icons/sphere2.gif
-share/apache/icons/tar.gif
-share/apache/icons/tex.gif
-share/apache/icons/text.gif
-share/apache/icons/transfer.gif
-share/apache/icons/unknown.gif
-share/apache/icons/up.gif
-share/apache/icons/uu.gif
-share/apache/icons/uuencoded.gif
-share/apache/icons/world1.gif
-share/apache/icons/world2.gif
-share/doc/apache/ABOUT_APACHE
-share/doc/apache/LICENSE
-share/doc/apache/README
-share/doc/php/CODING_STANDARDS
-share/doc/php/LICENSE
-@dirrm include/apache/xml
-@dirrm include/apache
-@dirrm libexec/apache
-@dirrm share/apache/cgi-bin
-@dirrm share/apache/htdocs/manual/images
-@dirrm share/apache/htdocs/manual/misc
-@dirrm share/apache/htdocs/manual/mod
-@dirrm share/apache/htdocs/manual/search
-@dirrm share/apache/htdocs/manual/vhosts
-@dirrm share/apache/htdocs/manual
-@dirrm share/apache/htdocs
-@dirrm share/apache/icons/small
-@dirrm share/apache/icons
-@dirrm share/apache
-@dirrm share/doc/apache
-@dirrm share/doc/php
+%%AP_LIBEXEC%%/libphp4.so
+@exec %D/sbin/apxs -e -a -n php4 %f
+@unexec %D/sbin/apxs -e -A -n php4 %f
+%%PHPDOCDIR%%/CODING_STANDARDS
+%%PHPDOCDIR%%/LICENSE
+@exec %D/sbin/apachectl restart
+@unexec %D/sbin/apachectl restart
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 08fcf4265cfe..266024df7207 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -10,24 +10,22 @@ if [ "${BATCH}" ]; then
 else
 	/usr/bin/dialog --title "configuration options" --clear \
 		--checklist "\n\
-Please select desired options:" -1 -1 14 \
-tuning		"Apache: performance tuning" OFF \
-modssl		"Apache: SSL support" OFF \
-GD		"PHP:    GD library support" OFF \
-FreeType	"PHP:    TrueType font rendering (implies GD)" OFF \
-zlib		"PHP:    zlib library support" ON \
-mcrypt		"PHP:    Encryption support" OFF \
-mhash		"PHP:    Crypto-hashing support" OFF \
-pdflib		"PHP:    pdflib support (implies zlib)" OFF \
-IMAP		"PHP:    IMAP support" OFF \
-MySQL		"PHP:    MySQL database support" ON \
-PostgreSQL	"PHP:    PostgreSQL database support" OFF \
-mSQL		"PHP:    mSQL database support" OFF \
-dBase		"PHP:    dBase database support" OFF \
-OpenLDAP	"PHP:    OpenLDAP support" OFF \
-SNMP		"PHP:    SNMP support" OFF \
-XML		"PHP:    XML support" OFF \
-FTP		"PHP:    File Transfer Protocol support" OFF \
+Please select desired options:" -1 -1 16 \
+GD		"GD library support" OFF \
+FreeType	"TrueType font rendering (implies GD)" OFF \
+zlib		"zlib library support" ON \
+mcrypt		"Encryption support" OFF \
+mhash		"Crypto-hashing support" OFF \
+pdflib		"pdflib support (implies zlib)" OFF \
+IMAP		"IMAP support" OFF \
+MySQL		"MySQL database support" ON \
+PostgreSQL	"PostgreSQL database support" OFF \
+mSQL		"mSQL database support" OFF \
+dBase		"dBase database support" OFF \
+OpenLDAP	"OpenLDAP support" OFF \
+SNMP		"SNMP support" OFF \
+XML		"XML support" OFF \
+FTP		"File Transfer Protocol support" OFF \
 2> /tmp/checklist.tmp.$$
 
 	retval=$?
@@ -53,44 +51,39 @@ exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
 while [ "$1" ]; do
 	case $1 in
-		\"tuning\")
-			echo "CFLAGS+=	-O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer -fexpensive-optimizations -ffast-math"
-			echo "OPTIM+=		-DBUFFERED_LOGS -DFD_SETSIZE=1024"
-			echo "CONFIGURE_ENV+=	OPTIM='\${OPTIM}'"
-			;;
 		\"GD\")
 			echo "LIB_DEPENDS+=	gd.0:\${PORTSDIR}/graphics/gd"
-			echo "PHP_CONF_ARGS+=	--with-gd=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-gd=\${PREFIX}"
 			GD=1
 			;;
 		\"FreeType\")
 			echo "LIB_DEPENDS+=	ttf.4:\${PORTSDIR}/print/freetype"
-			echo "PHP_CONF_ARGS+=	--with-ttf=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-ttf=\${PREFIX}"
 			if [ -z "$GD" ]; then
 				set $* \"GD\"
 			fi
 			;;
 		\"zlib\")
-			echo "PHP_CONF_ARGS+=	--with-zlib"
+			echo "CONFIGURE_ARGS+=--with-zlib"
 			ZLIB=1
 			;;
 		\"mcrypt\")
 			echo "LIB_DEPENDS+=	mcrypt-2.2.2:\${PORTSDIR}/security/libmcrypt"
-			echo "PHP_CONF_ARGS+=	--with-mcrypt=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-mcrypt=\${PREFIX}"
 			;;
 		\"mhash\")
 			echo "mhash is DISABLED for now. Ignoring." > /dev/stderr
 			;;
 		\"nothing\")
 			echo "LIB_DEPENDS+=	mhash.1:\${PORTSDIR}/security/mhash"
-			echo "PHP_CONF_ARGS+=	--with-mhash=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-mhash=\${PREFIX}"
 			;;
 		\"pdflib\")
 			echo "pdflib is DISABLED for now. Ignoring." > /dev/stderr
 			;;
 		\"nothing\")
 			echo "LIB_DEPENDS+=	pdf.2:\${PORTSDIR}/print/pdflib"
-			echo "PHP_CONF_ARGS+=	--with-pdflib=\${PREFIX} \\"
+			echo "CONFIGURE_ARGS+=--with-pdflib=\${PREFIX} \\"
 			echo "		--with-jpeg-dir=\${PREFIX} \\"
 			echo "		--with-tiff-dir=\${PREFIX}"
 			if [ -z "$ZLIB" ]; then
@@ -98,97 +91,47 @@ while [ "$1" ]; do
 			fi
 			;;
 		\"IMAP\")
-			echo "IMAP is DISABLED for now. Ignoring." > /dev/stderr
-			;;
-		\"nothing\")
-			echo "BUILD_DEPENDS+=	\${PREFIX}/lib/libc-client4.a:\${PORTSDIR}/mail/imap-uw"
-			echo "PHP_CONF_ARGS+=	--with-imap=\${PREFIX}"
+			echo "LIB_DEPENDS+=	c-client4.7:\${PORTSDIR}/mail/imap-uw"
+			echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
 			;;
 		\"MySQL\")
 			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
-			echo "PHP_CONF_ARGS+=	--with-mysql=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
 			;;
 		\"PostgreSQL\")
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql"
-			echo "PHP_CONF_ARGS+=	--with-pgsql=\${PREFIX}/pgsql"
+			echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}/pgsql"
 			;;
 		\"mSQL\")
 			echo "BUILD_DEPENDS+=	msql:\${PORTSDIR}/databases/msql"
-			echo "PHP_CONF_ARGS+=	--with-msql=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-msql=\${PREFIX}"
 			;;
 		\"dBase\")
-			echo "PHP_CONF_ARGS+=	--with-dbase"
+			echo "CONFIGURE_ARGS+=--with-dbase"
 			;;
 		\"OpenLDAP\")
 			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap"
 			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap"
-			echo "PHP_CONF_ARGS+=	--with-ldap=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-ldap=\${PREFIX}"
 			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a ]; then
 				echo "CONFIGURE_ENV+=	LIBS='-lkrb -ldes -L\${PREFIX}/lib'"
 			fi
 			;;
 		\"SNMP\")
+			echo "SNMP is DISABLED for now. Ignoring." > /dev/stderr
+			;;
+		\"nothing\")
 			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/ucd-snmp"
-			echo "PHP_CONF_ARGS+=	--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
+			echo "CONFIGURE_ARGS+=--with-snmp=\${PREFIX} --enable-ucd-snmp-hack"
 			;;
 		\"XML\")
 			echo "BUILD_DEPENDS+=	\${PREFIX}/lib/libexpat.a:\${PORTSDIR}/textproc/expat"
 			echo "BUILD_DEPENDS+=	\${PREFIX}/include/xml/xmlparse.h:\${PORTSDIR}/textproc/expat"
 			echo "BUILD_DEPENDS+=	\${PREFIX}/include/xml/xmltok.h:\${PORTSDIR}/textproc/expat"
-			echo "PHP_CONF_ARGS+=	--with-xml=\${PREFIX}"
+			echo "CONFIGURE_ARGS+=--with-xml=\${PREFIX}"
 			;;
 		\"FTP\")
-			echo "PHP_CONF_ARGS+=	--with-ftp"
-			;;
-		\"modssl\")
-			cat << EOF
-PORTNAME=	apache+php+mod_ssl
-PORTVERSION=	\${VERSION_APACHE}+\${VERSION_PHP}+\${VERSION_MODSSL}
-DISTFILES+=	mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE}\${EXTRACT_SUFX}
-
-USE_OPENSSL=	RSA
-
-.include <bsd.port.pre.mk>
-
-BUILD_DEPENDS+=	mm-config:\${PORTSDIR}/devel/mm \\
-		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
-
-VERSION_MODSSL=	2.6.4
-
-CONFIGURE_ARGS+=--enable-module=ssl \\
-		--enable-module=define
-CONFIGURE_ENV+=	SSL_BASE='SYSTEM' EAPI_MM='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}"
-
-EXTRA_PATCHES+=	\${PATCHDIR}/ssl_patch-aa
-
-PLIST=		\${PKGDIR}/PLIST.modssl
-SSL=		ssl
-
-TYPE=	test
-CRT=
-KEY=
-
-pre-patch:
-	@cd \${WRKDIR}/mod_ssl-\${VERSION_MODSSL}-\${VERSION_APACHE} \\
-	&& \${ECHO_MSG} "===>  Applying mod_ssl-\${VERSION_MODSSL} extension" \\
-	&& ./configure --with-apache=../\${DISTNAME} --expert
-
-post-patch:
-	@cd \${WRKSRC} \\
-	&& find . -type f -name "*.orig" -print | xargs \${RM} -f
-
-post-build:
-	@cd \${WRKSRC} \\
-	&& \${ECHO_MSG} "===>  Creating Dummy Certificate for Server (SnakeOil)" \\
-	&& \${ECHO_MSG} "      [use 'make certificate' to create a real one]" \\
-	&& \${MAKE} certificate TYPE=dummy >/dev/null 2>&1
-
-certificate:
-	@cd \${WRKSRC} \\
-	&& \${ECHO_MSG} "===>  Creating Test Certificate for Server" \\
-	&& \${MAKE} certificate TYPE=\$(TYPE) CRT=\$(CRT) KEY=\$(KEY)
-
-EOF
+			echo "CONFIGURE_ARGS+=--enable-ftp"
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr