15 files changed, 576 insertions, 276 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index f174f6dade6b..cd1edd56705f 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,99 +3,99 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.42 1997/10/04 14:52:58 andreas Exp $
+# $Id$
 #
 
-DISTNAME=       apache_1.2.5
-PKGNAME=	apache-php-1.2.5
+DISTNAME=	apache_1.2.6
+PKGNAME=	apache-1.2.6-php3.0
 CATEGORIES=	www
-MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
-		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
-		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.5.tar.gz php-2.0.1.tar.gz
+MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
+		http://ca.php.net/distributions/
+DISTFILES=	apache_1.2.6.tar.gz php-3.0.tar.gz
 
-MAINTAINER=     andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.ORG
 
-NO_PACKAGE=	"Too many questions"
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		gmake:${PORTSDIR}/devel/gmake
 
-#
-# Currently we support two db's: msql and mysql
-# When running in batch mode default to mysql support, because it's
-# a free and very popular database !
-#
-.if defined(BATCH)
-PHP_DBTYPE=mysql
+NO_PACKAGE=	"Support for different databases via make-variable"
+
+MAN1=		htpasswd.1
+MAN8=		httpd.8
+DOCDIR=		${PREFIX}/share/doc/apache
+
+.if defined(PATCH_DEBUG)
+PATCH_DIST_ARGS= -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
+.else
+PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
 
-.if !defined(PHP_DBTYPE)
+# Set it for local-supplied patch, f.e.
+VERS_ID = PHP-3.0
+
+PHP3_CONF_ARGS=	--prefix=${PREFIX} \
+		--with-system-regex --with-apache=${WRKSRC} \
+		--with-config-file-path=${PREFIX}/lib --disable-debug
+
+.if !defined(PHP3_DBTYPE) || ${PHP3_DBTYPE} != msql && ${PHP3_DBTYPE} != mysql && ${PHP3_DBTYPE} != pgsql
 pre-fetch:
 	@ ${ECHO}
-	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${ECHO} "You must set variable PHP3_DBTYPE to msql, mysql or pgsql by typing"
+	@ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]"
 	@ ${FALSE}
-
-.elif defined(PHP_DBTYPE)
-.if ${PHP_DBTYPE} == msql
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
-		msql:${PORTSDIR}/databases/msql
-PATCHDIR=	${.CURDIR}/patches.msql
-
-.elif ${PHP_DBTYPE} == mysql
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
-		mysql:${PORTSDIR}/databases/mysql
-PATCHDIR=	${.CURDIR}/patches.mysql
+.elif defined(PHP3_DBTYPE)
+.if ${PHP3_DBTYPE} == msql
+BUILD_DEPENDS+=		msql:${PORTSDIR}/databases/msql
+PHP3_CONF_ARGS+=	--with-msql=${PREFIX}
+.elif ${PHP3_DBTYPE} == mysql
+BUILD_DEPENDS+=		mysql:${PORTSDIR}/databases/mysql
+PHP3_CONF_ARGS+=	--with-mysql=${PREFIX}
+.elif ${PHP3_DBTYPE} == pgsql
+BUILD_DEPENDS+=		${PREFIX}/pgsql/bin/psql:${PORTSDIR}/databases/postgresql
+PHP3_CONF_ARGS+=	--with-pgsql=${PREFIX}/pgsql
 .endif
 .endif
 
-# Set it for local-supplied patch, f.e.
-VERS_ID = php-2.0.1/andreas
-
 .if defined(VERS_ID)
 post-patch:
-	@ cd ${WRKSRC}/src && \
-	${MV}  Configuration Configuration.old && \
+	@cd ${WRKSRC}/src && \
+	${MV} Configuration Configuration.old && \
 	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
 pre-configure:
-.if !defined(PHP_DBTYPE)
-	@ ${ECHO}
-	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
-	@ ${FALSE}
-.else
-	( cd ${WRKDIR}/php-2.0.1; ${SED} "s#@@PREFIX@@#${PREFIX}#" < ${FILESDIR}/install.patch | patch)
-	( cd ${WRKDIR}/php-2.0.1; ./install )
-	( cd ${WRKDIR}/php-2.0.1/src; make )
-	( cd ${WRKDIR}/php-2.0.1/src \
-	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.5/src )
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "Module php_module mod_php.o" \
-	>> Configuration )
-.if ${PHP_DBTYPE} == msql
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib -lmsql -lgd -lm" \
-	>> Configuration )
-.else
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" \
-	>> Configuration )
-.endif
+	( cd ${WRKDIR}/php-3.0 \
+	&& CC="${CC}" CFLAGS="${CFLAGS}" ./configure ${PHP3_CONF_ARGS} \
+	&& ${GMAKE} install )
+	${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration
+.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm" >> ${WRKSRC}/src/Configuration
+.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm"  >> ${WRKSRC}/src/Configuration
+.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration
 .endif
 
 post-install:
-	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+	@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} "[ -x ${PREFIX}/sbin/httpd ] && ${PREFIX}/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${SED} 's;PREFIX;${PREFIX};' < ${FILESDIR}/apache.sh.tmpl > \
+		${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	${ECHO} "AddType application/x-httpd-php .phtml" \
-		> ${PREFIX}/etc/apache/srm.conf.php
-	@ ${ECHO} "Don't forget to enable php support in \
-		${PREFIX}/etc/apache/srm.conf"
-	@ ${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man1
+.endfor
+.for i in ${MAN8}
+	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man8
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCDIR}
+.for i in README LICENSE ABOUT_APACHE
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCDIR}
+.endfor
+	@cd ${WRKSRC}/htdocs; tar cf - . | (cd ${DOCDIR}; tar xf -)
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index b3e1800fac04..3d968b813924 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.5.tar.gz) = a87b3bd7e4b9246d849844a5b370bdb0
-MD5 (php-2.0.1.tar.gz) = c538adf59ddf8e99b5637292309a1e86
+MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44
+MD5 (php-3.0.tar.gz) = d141bde22af0c6853e352537b96abf72
diff --git a/www/mod_php3/pkg-comment b/www/mod_php3/pkg-comment
index f606b52730a0..a1d1cb109ac8 100644
--- a/www/mod_php3/pkg-comment
+++ b/www/mod_php3/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server with php support.
+Apache http server with database support via compiled in PHP3 module.
diff --git a/www/mod_php3/pkg-descr b/www/mod_php3/pkg-descr
index e3800e40682e..84830d32b0b0 100644
--- a/www/mod_php3/pkg-descr
+++ b/www/mod_php3/pkg-descr
@@ -1,21 +1,16 @@
-                                 Apache / PHP
+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.
 
-What is it?
------------
+The documentation available as of the date of this release is also
+included, in HTML format, in the htdocs/manual/ directory. For the
+most up-to-date documentation, visit us on the WWW, at:
 
-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.
+	http://www.apache.org/
 
-This version includes support for the dynamic page language php,
-which is a more comprehensive embedded language than SSI, with
-built-in support for various databases (such as mSQL, mySQL, 
-postgresql, Oracle, Sybase) and page counters.
+Visit Apache Week, the best place for the latest Apache news and
+information. New issue every Friday:
 
-For more information about apache dynamic pages and php, see:
-
-	http://www.apacheweek.com/features/dynamicpages/
-	http://php.iquest.net/
-
--andreas
+	http://www.apacheweek.com/
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index 5585bc42da9a..a02a9383df1d 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -1,11 +1,106 @@
-etc/rc.d/apache.sh
-@exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf-dist
-etc/apache/srm.conf-dist
-etc/apache/srm.conf.php
 etc/apache/access.conf-dist
+etc/apache/httpd.conf-dist
 etc/apache/mime.types-dist
+etc/apache/srm.conf-dist
+etc/rc.d/apache.sh
+man/man1/htpasswd.1.gz
+man/man8/httpd.8.gz
 sbin/httpd
+share/doc/apache/ABOUT_APACHE
+share/doc/apache/LICENSE
+share/doc/apache/README
+share/doc/apache/apache_pb.gif
+share/doc/apache/index.html
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/TODO
+share/doc/apache/manual/bind.html
+share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/env.html
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/handler.html
+share/doc/apache/manual/header.html
+share/doc/apache/manual/host.html
+share/doc/apache/manual/images/home.gif
+share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/index.html
+share/doc/apache/manual/install.html
+share/doc/apache/manual/install_1_1.html
+share/doc/apache/manual/invoking.html
+share/doc/apache/manual/keepalive.html
+share/doc/apache/manual/location.html
+share/doc/apache/manual/man-template.html
+share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/misc/FAQ.html
+share/doc/apache/manual/misc/client_block_api.html
+share/doc/apache/manual/misc/compat_notes.html
+share/doc/apache/manual/misc/descriptors.html
+share/doc/apache/manual/misc/fin_wait_2.html
+share/doc/apache/manual/misc/footer.html
+share/doc/apache/manual/misc/header.html
+share/doc/apache/manual/misc/howto.html
+share/doc/apache/manual/misc/index.html
+share/doc/apache/manual/misc/known_bugs.html
+share/doc/apache/manual/misc/known_client_problems.html
+share/doc/apache/manual/misc/nopgp.html
+share/doc/apache/manual/misc/perf-bsd44.html
+share/doc/apache/manual/misc/perf-dec.html
+share/doc/apache/manual/misc/perf.html
+share/doc/apache/manual/misc/security_tips.html
+share/doc/apache/manual/misc/vif-info.html
+share/doc/apache/manual/misc/windoz_keepalive.html
+share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/directives.html
+share/doc/apache/manual/mod/footer.html
+share/doc/apache/manual/mod/header.html
+share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/mod_access.html
+share/doc/apache/manual/mod/mod_actions.html
+share/doc/apache/manual/mod/mod_alias.html
+share/doc/apache/manual/mod/mod_asis.html
+share/doc/apache/manual/mod/mod_auth.html
+share/doc/apache/manual/mod/mod_auth_anon.html
+share/doc/apache/manual/mod/mod_auth_db.html
+share/doc/apache/manual/mod/mod_auth_dbm.html
+share/doc/apache/manual/mod/mod_auth_msql.html
+share/doc/apache/manual/mod/mod_browser.html
+share/doc/apache/manual/mod/mod_cern_meta.html
+share/doc/apache/manual/mod/mod_cgi.html
+share/doc/apache/manual/mod/mod_cookies.html
+share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_dir.html
+share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_env.html
+share/doc/apache/manual/mod/mod_example.html
+share/doc/apache/manual/mod/mod_expires.html
+share/doc/apache/manual/mod/mod_headers.html
+share/doc/apache/manual/mod/mod_imap.html
+share/doc/apache/manual/mod/mod_include.html
+share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_log_agent.html
+share/doc/apache/manual/mod/mod_log_common.html
+share/doc/apache/manual/mod/mod_log_config.html
+share/doc/apache/manual/mod/mod_log_referer.html
+share/doc/apache/manual/mod/mod_mime.html
+share/doc/apache/manual/mod/mod_negotiation.html
+share/doc/apache/manual/mod/mod_proxy.html
+share/doc/apache/manual/mod/mod_rewrite.html
+share/doc/apache/manual/mod/mod_status.html
+share/doc/apache/manual/mod/mod_userdir.html
+share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/multilogs.html
+share/doc/apache/manual/new_features_1_0.html
+share/doc/apache/manual/new_features_1_1.html
+share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/process-model.html
+share/doc/apache/manual/stopping.html
+share/doc/apache/manual/suexec.html
+share/doc/apache/manual/unixware.html
+share/doc/apache/manual/vhosts-in-depth.html
+share/doc/apache/manual/virtual-host.html
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
@@ -82,3 +177,13 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+@exec mkdir -p %D/www/cgi-bin %D/www/data
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual
+@dirrm share/doc/apache
+@dirrm www/cgi-bin
+@dirrm www/data
+@dirrm www/icons
+@dirrm www
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index f174f6dade6b..cd1edd56705f 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,99 +3,99 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.42 1997/10/04 14:52:58 andreas Exp $
+# $Id$
 #
 
-DISTNAME=       apache_1.2.5
-PKGNAME=	apache-php-1.2.5
+DISTNAME=	apache_1.2.6
+PKGNAME=	apache-1.2.6-php3.0
 CATEGORIES=	www
-MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
-		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
-		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.5.tar.gz php-2.0.1.tar.gz
+MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
+		http://ca.php.net/distributions/
+DISTFILES=	apache_1.2.6.tar.gz php-3.0.tar.gz
 
-MAINTAINER=     andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.ORG
 
-NO_PACKAGE=	"Too many questions"
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		gmake:${PORTSDIR}/devel/gmake
 
-#
-# Currently we support two db's: msql and mysql
-# When running in batch mode default to mysql support, because it's
-# a free and very popular database !
-#
-.if defined(BATCH)
-PHP_DBTYPE=mysql
+NO_PACKAGE=	"Support for different databases via make-variable"
+
+MAN1=		htpasswd.1
+MAN8=		httpd.8
+DOCDIR=		${PREFIX}/share/doc/apache
+
+.if defined(PATCH_DEBUG)
+PATCH_DIST_ARGS= -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
+.else
+PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
 
-.if !defined(PHP_DBTYPE)
+# Set it for local-supplied patch, f.e.
+VERS_ID = PHP-3.0
+
+PHP3_CONF_ARGS=	--prefix=${PREFIX} \
+		--with-system-regex --with-apache=${WRKSRC} \
+		--with-config-file-path=${PREFIX}/lib --disable-debug
+
+.if !defined(PHP3_DBTYPE) || ${PHP3_DBTYPE} != msql && ${PHP3_DBTYPE} != mysql && ${PHP3_DBTYPE} != pgsql
 pre-fetch:
 	@ ${ECHO}
-	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${ECHO} "You must set variable PHP3_DBTYPE to msql, mysql or pgsql by typing"
+	@ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]"
 	@ ${FALSE}
-
-.elif defined(PHP_DBTYPE)
-.if ${PHP_DBTYPE} == msql
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
-		msql:${PORTSDIR}/databases/msql
-PATCHDIR=	${.CURDIR}/patches.msql
-
-.elif ${PHP_DBTYPE} == mysql
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
-		mysql:${PORTSDIR}/databases/mysql
-PATCHDIR=	${.CURDIR}/patches.mysql
+.elif defined(PHP3_DBTYPE)
+.if ${PHP3_DBTYPE} == msql
+BUILD_DEPENDS+=		msql:${PORTSDIR}/databases/msql
+PHP3_CONF_ARGS+=	--with-msql=${PREFIX}
+.elif ${PHP3_DBTYPE} == mysql
+BUILD_DEPENDS+=		mysql:${PORTSDIR}/databases/mysql
+PHP3_CONF_ARGS+=	--with-mysql=${PREFIX}
+.elif ${PHP3_DBTYPE} == pgsql
+BUILD_DEPENDS+=		${PREFIX}/pgsql/bin/psql:${PORTSDIR}/databases/postgresql
+PHP3_CONF_ARGS+=	--with-pgsql=${PREFIX}/pgsql
 .endif
 .endif
 
-# Set it for local-supplied patch, f.e.
-VERS_ID = php-2.0.1/andreas
-
 .if defined(VERS_ID)
 post-patch:
-	@ cd ${WRKSRC}/src && \
-	${MV}  Configuration Configuration.old && \
+	@cd ${WRKSRC}/src && \
+	${MV} Configuration Configuration.old && \
 	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
 pre-configure:
-.if !defined(PHP_DBTYPE)
-	@ ${ECHO}
-	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
-	@ ${FALSE}
-.else
-	( cd ${WRKDIR}/php-2.0.1; ${SED} "s#@@PREFIX@@#${PREFIX}#" < ${FILESDIR}/install.patch | patch)
-	( cd ${WRKDIR}/php-2.0.1; ./install )
-	( cd ${WRKDIR}/php-2.0.1/src; make )
-	( cd ${WRKDIR}/php-2.0.1/src \
-	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.5/src )
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "Module php_module mod_php.o" \
-	>> Configuration )
-.if ${PHP_DBTYPE} == msql
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib -lmsql -lgd -lm" \
-	>> Configuration )
-.else
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" \
-	>> Configuration )
-.endif
+	( cd ${WRKDIR}/php-3.0 \
+	&& CC="${CC}" CFLAGS="${CFLAGS}" ./configure ${PHP3_CONF_ARGS} \
+	&& ${GMAKE} install )
+	${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration
+.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm" >> ${WRKSRC}/src/Configuration
+.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm"  >> ${WRKSRC}/src/Configuration
+.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration
 .endif
 
 post-install:
-	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+	@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} "[ -x ${PREFIX}/sbin/httpd ] && ${PREFIX}/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${SED} 's;PREFIX;${PREFIX};' < ${FILESDIR}/apache.sh.tmpl > \
+		${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	${ECHO} "AddType application/x-httpd-php .phtml" \
-		> ${PREFIX}/etc/apache/srm.conf.php
-	@ ${ECHO} "Don't forget to enable php support in \
-		${PREFIX}/etc/apache/srm.conf"
-	@ ${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man1
+.endfor
+.for i in ${MAN8}
+	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man8
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCDIR}
+.for i in README LICENSE ABOUT_APACHE
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCDIR}
+.endfor
+	@cd ${WRKSRC}/htdocs; tar cf - . | (cd ${DOCDIR}; tar xf -)
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index b3e1800fac04..3d968b813924 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.5.tar.gz) = a87b3bd7e4b9246d849844a5b370bdb0
-MD5 (php-2.0.1.tar.gz) = c538adf59ddf8e99b5637292309a1e86
+MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44
+MD5 (php-3.0.tar.gz) = d141bde22af0c6853e352537b96abf72
diff --git a/www/mod_php4/pkg-comment b/www/mod_php4/pkg-comment
index f606b52730a0..a1d1cb109ac8 100644
--- a/www/mod_php4/pkg-comment
+++ b/www/mod_php4/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server with php support.
+Apache http server with database support via compiled in PHP3 module.
diff --git a/www/mod_php4/pkg-descr b/www/mod_php4/pkg-descr
index e3800e40682e..84830d32b0b0 100644
--- a/www/mod_php4/pkg-descr
+++ b/www/mod_php4/pkg-descr
@@ -1,21 +1,16 @@
-                                 Apache / PHP
+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.
 
-What is it?
------------
+The documentation available as of the date of this release is also
+included, in HTML format, in the htdocs/manual/ directory. For the
+most up-to-date documentation, visit us on the WWW, at:
 
-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.
+	http://www.apache.org/
 
-This version includes support for the dynamic page language php,
-which is a more comprehensive embedded language than SSI, with
-built-in support for various databases (such as mSQL, mySQL, 
-postgresql, Oracle, Sybase) and page counters.
+Visit Apache Week, the best place for the latest Apache news and
+information. New issue every Friday:
 
-For more information about apache dynamic pages and php, see:
-
-	http://www.apacheweek.com/features/dynamicpages/
-	http://php.iquest.net/
-
--andreas
+	http://www.apacheweek.com/
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index 5585bc42da9a..a02a9383df1d 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -1,11 +1,106 @@
-etc/rc.d/apache.sh
-@exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf-dist
-etc/apache/srm.conf-dist
-etc/apache/srm.conf.php
 etc/apache/access.conf-dist
+etc/apache/httpd.conf-dist
 etc/apache/mime.types-dist
+etc/apache/srm.conf-dist
+etc/rc.d/apache.sh
+man/man1/htpasswd.1.gz
+man/man8/httpd.8.gz
 sbin/httpd
+share/doc/apache/ABOUT_APACHE
+share/doc/apache/LICENSE
+share/doc/apache/README
+share/doc/apache/apache_pb.gif
+share/doc/apache/index.html
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/TODO
+share/doc/apache/manual/bind.html
+share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/env.html
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/handler.html
+share/doc/apache/manual/header.html
+share/doc/apache/manual/host.html
+share/doc/apache/manual/images/home.gif
+share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/index.html
+share/doc/apache/manual/install.html
+share/doc/apache/manual/install_1_1.html
+share/doc/apache/manual/invoking.html
+share/doc/apache/manual/keepalive.html
+share/doc/apache/manual/location.html
+share/doc/apache/manual/man-template.html
+share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/misc/FAQ.html
+share/doc/apache/manual/misc/client_block_api.html
+share/doc/apache/manual/misc/compat_notes.html
+share/doc/apache/manual/misc/descriptors.html
+share/doc/apache/manual/misc/fin_wait_2.html
+share/doc/apache/manual/misc/footer.html
+share/doc/apache/manual/misc/header.html
+share/doc/apache/manual/misc/howto.html
+share/doc/apache/manual/misc/index.html
+share/doc/apache/manual/misc/known_bugs.html
+share/doc/apache/manual/misc/known_client_problems.html
+share/doc/apache/manual/misc/nopgp.html
+share/doc/apache/manual/misc/perf-bsd44.html
+share/doc/apache/manual/misc/perf-dec.html
+share/doc/apache/manual/misc/perf.html
+share/doc/apache/manual/misc/security_tips.html
+share/doc/apache/manual/misc/vif-info.html
+share/doc/apache/manual/misc/windoz_keepalive.html
+share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/directives.html
+share/doc/apache/manual/mod/footer.html
+share/doc/apache/manual/mod/header.html
+share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/mod_access.html
+share/doc/apache/manual/mod/mod_actions.html
+share/doc/apache/manual/mod/mod_alias.html
+share/doc/apache/manual/mod/mod_asis.html
+share/doc/apache/manual/mod/mod_auth.html
+share/doc/apache/manual/mod/mod_auth_anon.html
+share/doc/apache/manual/mod/mod_auth_db.html
+share/doc/apache/manual/mod/mod_auth_dbm.html
+share/doc/apache/manual/mod/mod_auth_msql.html
+share/doc/apache/manual/mod/mod_browser.html
+share/doc/apache/manual/mod/mod_cern_meta.html
+share/doc/apache/manual/mod/mod_cgi.html
+share/doc/apache/manual/mod/mod_cookies.html
+share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_dir.html
+share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_env.html
+share/doc/apache/manual/mod/mod_example.html
+share/doc/apache/manual/mod/mod_expires.html
+share/doc/apache/manual/mod/mod_headers.html
+share/doc/apache/manual/mod/mod_imap.html
+share/doc/apache/manual/mod/mod_include.html
+share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_log_agent.html
+share/doc/apache/manual/mod/mod_log_common.html
+share/doc/apache/manual/mod/mod_log_config.html
+share/doc/apache/manual/mod/mod_log_referer.html
+share/doc/apache/manual/mod/mod_mime.html
+share/doc/apache/manual/mod/mod_negotiation.html
+share/doc/apache/manual/mod/mod_proxy.html
+share/doc/apache/manual/mod/mod_rewrite.html
+share/doc/apache/manual/mod/mod_status.html
+share/doc/apache/manual/mod/mod_userdir.html
+share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/multilogs.html
+share/doc/apache/manual/new_features_1_0.html
+share/doc/apache/manual/new_features_1_1.html
+share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/process-model.html
+share/doc/apache/manual/stopping.html
+share/doc/apache/manual/suexec.html
+share/doc/apache/manual/unixware.html
+share/doc/apache/manual/vhosts-in-depth.html
+share/doc/apache/manual/virtual-host.html
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
@@ -82,3 +177,13 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+@exec mkdir -p %D/www/cgi-bin %D/www/data
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual
+@dirrm share/doc/apache
+@dirrm www/cgi-bin
+@dirrm www/data
+@dirrm www/icons
+@dirrm www
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index f174f6dade6b..cd1edd56705f 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,99 +3,99 @@
 # Date created:		Wed Sep  3 18:28:20 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.42 1997/10/04 14:52:58 andreas Exp $
+# $Id$
 #
 
-DISTNAME=       apache_1.2.5
-PKGNAME=	apache-php-1.2.5
+DISTNAME=	apache_1.2.6
+PKGNAME=	apache-1.2.6-php3.0
 CATEGORIES=	www
-MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
-		ftp://ftp.nerosworld.com/pub/php/dist/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/www/php/ \
-		ftp://ftpza.co.za/pub/mirrors/php/
-DISTFILES=	apache_1.2.5.tar.gz php-2.0.1.tar.gz
+MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
+		http://ca.php.net/distributions/
+DISTFILES=	apache_1.2.6.tar.gz php-3.0.tar.gz
 
-MAINTAINER=     andreas@FreeBSD.ORG
+MAINTAINER=	andreas@FreeBSD.ORG
 
-NO_PACKAGE=	"Too many questions"
+BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
+		gmake:${PORTSDIR}/devel/gmake
 
-#
-# Currently we support two db's: msql and mysql
-# When running in batch mode default to mysql support, because it's
-# a free and very popular database !
-#
-.if defined(BATCH)
-PHP_DBTYPE=mysql
+NO_PACKAGE=	"Support for different databases via make-variable"
+
+MAN1=		htpasswd.1
+MAN8=		httpd.8
+DOCDIR=		${PREFIX}/share/doc/apache
+
+.if defined(PATCH_DEBUG)
+PATCH_DIST_ARGS= -d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
+.else
+PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
 
-.if !defined(PHP_DBTYPE)
+# Set it for local-supplied patch, f.e.
+VERS_ID = PHP-3.0
+
+PHP3_CONF_ARGS=	--prefix=${PREFIX} \
+		--with-system-regex --with-apache=${WRKSRC} \
+		--with-config-file-path=${PREFIX}/lib --disable-debug
+
+.if !defined(PHP3_DBTYPE) || ${PHP3_DBTYPE} != msql && ${PHP3_DBTYPE} != mysql && ${PHP3_DBTYPE} != pgsql
 pre-fetch:
 	@ ${ECHO}
-	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
+	@ ${ECHO} "You must set variable PHP3_DBTYPE to msql, mysql or pgsql by typing"
+	@ ${ECHO} "make PHP3_DBTYPE=[ msql | mysql | pgsql ]"
 	@ ${FALSE}
-
-.elif defined(PHP_DBTYPE)
-.if ${PHP_DBTYPE} == msql
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
-		msql:${PORTSDIR}/databases/msql
-PATCHDIR=	${.CURDIR}/patches.msql
-
-.elif ${PHP_DBTYPE} == mysql
-BUILD_DEPENDS=	${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd \
-		mysql:${PORTSDIR}/databases/mysql
-PATCHDIR=	${.CURDIR}/patches.mysql
+.elif defined(PHP3_DBTYPE)
+.if ${PHP3_DBTYPE} == msql
+BUILD_DEPENDS+=		msql:${PORTSDIR}/databases/msql
+PHP3_CONF_ARGS+=	--with-msql=${PREFIX}
+.elif ${PHP3_DBTYPE} == mysql
+BUILD_DEPENDS+=		mysql:${PORTSDIR}/databases/mysql
+PHP3_CONF_ARGS+=	--with-mysql=${PREFIX}
+.elif ${PHP3_DBTYPE} == pgsql
+BUILD_DEPENDS+=		${PREFIX}/pgsql/bin/psql:${PORTSDIR}/databases/postgresql
+PHP3_CONF_ARGS+=	--with-pgsql=${PREFIX}/pgsql
 .endif
 .endif
 
-# Set it for local-supplied patch, f.e.
-VERS_ID = php-2.0.1/andreas
-
 .if defined(VERS_ID)
 post-patch:
-	@ cd ${WRKSRC}/src && \
-	${MV}  Configuration Configuration.old && \
+	@cd ${WRKSRC}/src && \
+	${MV} Configuration Configuration.old && \
 	${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
 	< Configuration.old > Configuration
 .endif
 
 pre-configure:
-.if !defined(PHP_DBTYPE)
-	@ ${ECHO}
-	@ ${ECHO} "You must set variable PHP_DBTYPE to msql or mysql by typing"
-	@ ${ECHO} "make PHP_DBTYPE=[ msql | mysql ]"
-	@ ${FALSE}
-.else
-	( cd ${WRKDIR}/php-2.0.1; ${SED} "s#@@PREFIX@@#${PREFIX}#" < ${FILESDIR}/install.patch | patch)
-	( cd ${WRKDIR}/php-2.0.1; ./install )
-	( cd ${WRKDIR}/php-2.0.1/src; make )
-	( cd ${WRKDIR}/php-2.0.1/src \
-	&& ${CP} mod_php.c mod_php.h libphp.a ../../apache_1.2.5/src )
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "Module php_module mod_php.o" \
-	>> Configuration )
-.if ${PHP_DBTYPE} == msql
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib -lmsql -lgd -lm" \
-	>> Configuration )
-.else
-	( cd ${WRKDIR}/apache_1.2.5/src \
-	&& ${ECHO} "EXTRA_LIBS=-lmd libphp.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm" \
-	>> Configuration )
-.endif
+	( cd ${WRKDIR}/php-3.0 \
+	&& CC="${CC}" CFLAGS="${CFLAGS}" ./configure ${PHP3_CONF_ARGS} \
+	&& ${GMAKE} install )
+	${ECHO} "Module php3_module mod_php3.o" >> ${WRKSRC}/src/Configuration
+.if defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == msql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib -lmsql -lgd -lm" >> ${WRKSRC}/src/Configuration
+.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == mysql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/lib/mysql -lmysqlclient -L${PREFIX}/lib -lgd -lm"  >> ${WRKSRC}/src/Configuration
+.elif defined(PHP3_DBTYPE) && ${PHP3_DBTYPE} == pgsql
+	${ECHO} "EXTRA_LIBS=-lmd libphp3.a -L${PREFIX}/pgsql/lib -lpq -L${PREFIX}/lib -lgd -lm" >> ${WRKSRC}/src/Configuration
 .endif
 
 post-install:
-	@ if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
+	@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} "[ -x ${PREFIX}/sbin/httpd ] && ${PREFIX}/sbin/httpd && ${ECHO} -n ' httpd'" >> ${PREFIX}/etc/rc.d/apache.sh; \
+		${SED} 's;PREFIX;${PREFIX};' < ${FILESDIR}/apache.sh.tmpl > \
+		${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	${ECHO} "AddType application/x-httpd-php .phtml" \
-		> ${PREFIX}/etc/apache/srm.conf.php
-	@ ${ECHO} "Don't forget to enable php support in \
-		${PREFIX}/etc/apache/srm.conf"
-	@ ${ECHO} "See ${PREFIX}/etc/apache/srm.conf.php"
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man1
+.endfor
+.for i in ${MAN8}
+	${INSTALL_MAN} ${WRKSRC}/support/$i ${PREFIX}/man/man8
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCDIR}
+.for i in README LICENSE ABOUT_APACHE
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCDIR}
+.endfor
+	@cd ${WRKSRC}/htdocs; tar cf - . | (cd ${DOCDIR}; tar xf -)
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index b3e1800fac04..3d968b813924 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.5.tar.gz) = a87b3bd7e4b9246d849844a5b370bdb0
-MD5 (php-2.0.1.tar.gz) = c538adf59ddf8e99b5637292309a1e86
+MD5 (apache_1.2.6.tar.gz) = ff292bc21fe4f53b0e39dc8024019f44
+MD5 (php-3.0.tar.gz) = d141bde22af0c6853e352537b96abf72
diff --git a/www/mod_php5/pkg-comment b/www/mod_php5/pkg-comment
index f606b52730a0..a1d1cb109ac8 100644
--- a/www/mod_php5/pkg-comment
+++ b/www/mod_php5/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server with php support.
+Apache http server with database support via compiled in PHP3 module.
diff --git a/www/mod_php5/pkg-descr b/www/mod_php5/pkg-descr
index e3800e40682e..84830d32b0b0 100644
--- a/www/mod_php5/pkg-descr
+++ b/www/mod_php5/pkg-descr
@@ -1,21 +1,16 @@
-                                 Apache / PHP
+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.
 
-What is it?
------------
+The documentation available as of the date of this release is also
+included, in HTML format, in the htdocs/manual/ directory. For the
+most up-to-date documentation, visit us on the WWW, at:
 
-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.
+	http://www.apache.org/
 
-This version includes support for the dynamic page language php,
-which is a more comprehensive embedded language than SSI, with
-built-in support for various databases (such as mSQL, mySQL, 
-postgresql, Oracle, Sybase) and page counters.
+Visit Apache Week, the best place for the latest Apache news and
+information. New issue every Friday:
 
-For more information about apache dynamic pages and php, see:
-
-	http://www.apacheweek.com/features/dynamicpages/
-	http://php.iquest.net/
-
--andreas
+	http://www.apacheweek.com/
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index 5585bc42da9a..a02a9383df1d 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -1,11 +1,106 @@
-etc/rc.d/apache.sh
-@exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf-dist
-etc/apache/srm.conf-dist
-etc/apache/srm.conf.php
 etc/apache/access.conf-dist
+etc/apache/httpd.conf-dist
 etc/apache/mime.types-dist
+etc/apache/srm.conf-dist
+etc/rc.d/apache.sh
+man/man1/htpasswd.1.gz
+man/man8/httpd.8.gz
 sbin/httpd
+share/doc/apache/ABOUT_APACHE
+share/doc/apache/LICENSE
+share/doc/apache/README
+share/doc/apache/apache_pb.gif
+share/doc/apache/index.html
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/TODO
+share/doc/apache/manual/bind.html
+share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/env.html
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/handler.html
+share/doc/apache/manual/header.html
+share/doc/apache/manual/host.html
+share/doc/apache/manual/images/home.gif
+share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/index.html
+share/doc/apache/manual/install.html
+share/doc/apache/manual/install_1_1.html
+share/doc/apache/manual/invoking.html
+share/doc/apache/manual/keepalive.html
+share/doc/apache/manual/location.html
+share/doc/apache/manual/man-template.html
+share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/misc/FAQ.html
+share/doc/apache/manual/misc/client_block_api.html
+share/doc/apache/manual/misc/compat_notes.html
+share/doc/apache/manual/misc/descriptors.html
+share/doc/apache/manual/misc/fin_wait_2.html
+share/doc/apache/manual/misc/footer.html
+share/doc/apache/manual/misc/header.html
+share/doc/apache/manual/misc/howto.html
+share/doc/apache/manual/misc/index.html
+share/doc/apache/manual/misc/known_bugs.html
+share/doc/apache/manual/misc/known_client_problems.html
+share/doc/apache/manual/misc/nopgp.html
+share/doc/apache/manual/misc/perf-bsd44.html
+share/doc/apache/manual/misc/perf-dec.html
+share/doc/apache/manual/misc/perf.html
+share/doc/apache/manual/misc/security_tips.html
+share/doc/apache/manual/misc/vif-info.html
+share/doc/apache/manual/misc/windoz_keepalive.html
+share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/directives.html
+share/doc/apache/manual/mod/footer.html
+share/doc/apache/manual/mod/header.html
+share/doc/apache/manual/mod/index.html
+share/doc/apache/manual/mod/mod_access.html
+share/doc/apache/manual/mod/mod_actions.html
+share/doc/apache/manual/mod/mod_alias.html
+share/doc/apache/manual/mod/mod_asis.html
+share/doc/apache/manual/mod/mod_auth.html
+share/doc/apache/manual/mod/mod_auth_anon.html
+share/doc/apache/manual/mod/mod_auth_db.html
+share/doc/apache/manual/mod/mod_auth_dbm.html
+share/doc/apache/manual/mod/mod_auth_msql.html
+share/doc/apache/manual/mod/mod_browser.html
+share/doc/apache/manual/mod/mod_cern_meta.html
+share/doc/apache/manual/mod/mod_cgi.html
+share/doc/apache/manual/mod/mod_cookies.html
+share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_dir.html
+share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_env.html
+share/doc/apache/manual/mod/mod_example.html
+share/doc/apache/manual/mod/mod_expires.html
+share/doc/apache/manual/mod/mod_headers.html
+share/doc/apache/manual/mod/mod_imap.html
+share/doc/apache/manual/mod/mod_include.html
+share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_log_agent.html
+share/doc/apache/manual/mod/mod_log_common.html
+share/doc/apache/manual/mod/mod_log_config.html
+share/doc/apache/manual/mod/mod_log_referer.html
+share/doc/apache/manual/mod/mod_mime.html
+share/doc/apache/manual/mod/mod_negotiation.html
+share/doc/apache/manual/mod/mod_proxy.html
+share/doc/apache/manual/mod/mod_rewrite.html
+share/doc/apache/manual/mod/mod_status.html
+share/doc/apache/manual/mod/mod_userdir.html
+share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/multilogs.html
+share/doc/apache/manual/new_features_1_0.html
+share/doc/apache/manual/new_features_1_1.html
+share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/process-model.html
+share/doc/apache/manual/stopping.html
+share/doc/apache/manual/suexec.html
+share/doc/apache/manual/unixware.html
+share/doc/apache/manual/vhosts-in-depth.html
+share/doc/apache/manual/virtual-host.html
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
@@ -82,3 +177,13 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+@exec mkdir -p %D/www/cgi-bin %D/www/data
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual
+@dirrm share/doc/apache
+@dirrm www/cgi-bin
+@dirrm www/data
+@dirrm www/icons
+@dirrm www