Upgrade to Apache 1.3.6 and mod_ssl 2.2.7.

- many minor changes inspired by apache13-modssl
  (e. g. change datadir from ${PREFIX}/www to ${PREFIX}/share/apache)
- patches.modssl/ is not needed any longer (same patches for modssl and
  non-modssl case)

4 files changed, 320 insertions, 306 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index c64b6d4c7969..18cf6ed7db0a 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.69 1999/03/13 17:11:03 billf Exp $
+# $Id: Makefile,v 1.70 1999/03/13 17:57:44 billf Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -35,52 +35,54 @@ MAINTAINER=	dirk@FreeBSD.ORG
 
 Y2K=		http://www.php.net/y2k.php3
 
-VERSION_APACHE=	1.3.4
+VERSION_APACHE=	1.3.6
 VERSION_PHP3=	3.0.7
 
-#
-# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
-#
-
+USE_PERL5=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= \
-		 --prefix=${PREFIX} \
-		 --with-layout=GNU \
-		 --sysconfdir=${PREFIX}/etc/apache \
-		 --includedir=${PREFIX}/include/apache \
-		 --logfiledir=/var/log \
-		 --runtimedir=/var/run \
-		 --datadir=${PREFIX}/www \
-		 --proxycachedir=${PREFIX}/www/proxy \
-		 --libexecdir=${PREFIX}/libexec/apache \
-		 --without-confadjust \
-		 --enable-shared=remain \
-		 --enable-module=most \
-		 --enable-module=auth_db \
-		 --disable-module=auth_dbm \
-		 --activate-module=src/modules/php3/libphp3.a
-
-# Currently perl version don't matter
-#                --with-perl=${PERL5}
-
-OPTIM=-DHARD_SERVER_LIMIT=512 \
--DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
--DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+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/php3/libphp3.a
+
+OPTIM=		-DHARD_SERVER_LIMIT=512 \
+		-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\"
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+= -DBUFFERED_LOGS
-CFLAGS+= -O6 -fomit-frame-pointer
+OPTIM+=		-DBUFFERED_LOGS -DFD_SETSIZE=1024
+CFLAGS+=	-O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \
+		-fexpensive-optimizations -ffast-math
 .endif
 
-CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
+CONFIGURE_ENV=	OPTIM='${OPTIM}' LIBS='-L${PREFIX}/lib'
 
-MAN1=	ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=	apxs.8 httpd.8 logresolve.8 rotatelogs.8
+INSTALL_TARGET=	install-quiet
+
+MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
+MAN8=		ab.8 apache.8 apachectl.8 apxs.8 logresolve.8 rotatelogs.8
 
 APACHEDOCDIR=	${PREFIX}/share/doc/apache
 PHP3DOCDIR=	${PREFIX}/share/doc/php3
 
 PHP3_CONF_ARGS=	--prefix=${PREFIX} \
+		${CONFIGURE_TARGET} \
 		--with-system-regex \
 		--with-apache=${WRKSRC} \
 		--with-config-file-path=${PREFIX}/lib \
@@ -98,7 +100,6 @@ pre-configure:
 	&& cd ${WRKDIR}/php-${VERSION_PHP3} \
 	&& ${ECHO_MSG} "===>  Configuring for PHP-${VERSION_PHP3}" \
 	&& CC="${CC}" \
-	   ac_cv_path_CC="${CC}" \
 	   CFLAGS="${CFLAGS}" \
 	   CPPFLAGS="-I${PREFIX}/include -I${PREFIX}/include/gd" \
 	   LDFLAGS=-L${PREFIX}/lib \
@@ -117,7 +118,7 @@ post-install:
 	fi
 	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/php3.ini-dist ${PREFIX}/lib
 .for i in php2 php3 phpi phps
-	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/www/icons
+	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/extra/icons/$i.gif ${PREFIX}/share/apache/icons
 .endfor
 
 .if !defined(NOPORTDOCS)
@@ -125,15 +126,6 @@ post-install:
 .for i in README LICENSE ABOUT_APACHE
 	${INSTALL_DATA} ${WRKSRC}/$i ${APACHEDOCDIR}
 .endfor
-	(cd ${WRKSRC}/htdocs && tar cf - *) |\
-	(cd ${APACHEDOCDIR} && tar xf -); \
-	find ${APACHEDOCDIR} -type d -exec chmod a+rx {} \; ; \
-	find ${APACHEDOCDIR} -type f -exec chmod a+r {} \;
-.for i in apache_pb.gif index.html manual
-	if [ ! -e ${PREFIX}/www/data/$i ] ; then \
-		${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i; \
-	fi
-.endfor
 .for i in CODING_STANDARDS EXTENSION_STATUS LICENSE
 	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/$i ${PHP3DOCDIR}
 .endfor
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index b87f8f79a9bc..3e326f20446a 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3
+MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
 MD5 (php-3.0.7.tar.gz) = 3881388d0bc88f0fda5bb925d908314a
-MD5 (mod_ssl-2.2.5-1.3.4.tar.gz) = bd333cddd2f3bd9a5e1999fd08fafb0f
+MD5 (mod_ssl-2.2.7-1.3.6.tar.gz) = 44a820825232c7ac3d2384dc5652b1d2
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index aded546511f5..6c974b75b722 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -3,8 +3,8 @@ bin/htdigest
 bin/htpasswd
 etc/apache/access.conf
 etc/apache/access.conf.default
-etc/apache/httpd.conf
-etc/apache/httpd.conf.default
+etc/apache/apache.conf
+etc/apache/apache.conf.default
 etc/apache/magic
 etc/apache/magic.default
 etc/apache/mime.types
@@ -46,285 +46,303 @@ include/apache/util_script.h
 include/apache/util_uri.h
 lib/php3.ini-dist
 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
 sbin/ab
+sbin/apache
 sbin/apachectl
 sbin/apxs
-sbin/httpd
 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
+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/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_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/multilogs.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/php2.gif
+share/apache/icons/php3.gif
+share/apache/icons/phpi.gif
+share/apache/icons/phps.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/apache/apache_pb.gif
-share/doc/apache/index.html
-share/doc/apache/manual/LICENSE
-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/dso.html
-share/doc/apache/manual/ebcdic.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/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.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/HTTP_Features.tsv
-share/doc/apache/manual/misc/client_block_api.html
-share/doc/apache/manual/misc/compat_notes.html
-share/doc/apache/manual/misc/custom_errordocs.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_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-hp.html
-share/doc/apache/manual/misc/perf-tuning.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/directive-dict.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_autoindex.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_dll.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_isapi.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_mime_magic.html
-share/doc/apache/manual/mod/mod_mmap_static.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_setenvif.html
-share/doc/apache/manual/mod/mod_so.html
-share/doc/apache/manual/mod/mod_speling.html
-share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.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/new_features_1_3.html
-share/doc/apache/manual/process-model.html
-share/doc/apache/manual/readme-tpf.html
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/suexec_1_2.html
-share/doc/apache/manual/unixware.html
-share/doc/apache/manual/upgrading_to_1_3.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/vhosts/details_1_2.html
-share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html
-share/doc/apache/manual/vhosts/footer.html
-share/doc/apache/manual/vhosts/header.html
-share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html
-share/doc/apache/manual/vhosts/ip-based.html
-share/doc/apache/manual/vhosts/name-based.html
-share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/windows.html
 share/doc/php3/CODING_STANDARDS
 share/doc/php3/EXTENSION_STATUS
 share/doc/php3/LICENSE
-www/cgi-bin/printenv
-www/cgi-bin/test-cgi
-www/icons/README
-www/icons/a.gif
-www/icons/alert.black.gif
-www/icons/alert.red.gif
-www/icons/apache_pb.gif
-www/icons/back.gif
-www/icons/ball.gray.gif
-www/icons/ball.red.gif
-www/icons/binary.gif
-www/icons/binhex.gif
-www/icons/blank.gif
-www/icons/bomb.gif
-www/icons/box1.gif
-www/icons/box2.gif
-www/icons/broken.gif
-www/icons/burst.gif
-www/icons/c.gif
-www/icons/comp.blue.gif
-www/icons/comp.gray.gif
-www/icons/compressed.gif
-www/icons/continued.gif
-www/icons/dir.gif
-www/icons/down.gif
-www/icons/dvi.gif
-www/icons/f.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.sec.gif
-www/icons/forward.gif
-www/icons/generic.gif
-www/icons/generic.red.gif
-www/icons/generic.sec.gif
-www/icons/hand.right.gif
-www/icons/hand.up.gif
-www/icons/icon.sheet.gif
-www/icons/image1.gif
-www/icons/image2.gif
-www/icons/image3.gif
-www/icons/index.gif
-www/icons/layout.gif
-www/icons/left.gif
-www/icons/link.gif
-www/icons/movie.gif
-www/icons/p.gif
-www/icons/patch.gif
-www/icons/pdf.gif
-www/icons/php2.gif
-www/icons/php3.gif
-www/icons/phpi.gif
-www/icons/phps.gif
-www/icons/pie0.gif
-www/icons/pie1.gif
-www/icons/pie2.gif
-www/icons/pie3.gif
-www/icons/pie4.gif
-www/icons/pie5.gif
-www/icons/pie6.gif
-www/icons/pie7.gif
-www/icons/pie8.gif
-www/icons/portal.gif
-www/icons/ps.gif
-www/icons/quill.gif
-www/icons/right.gif
-www/icons/screw1.gif
-www/icons/screw2.gif
-www/icons/script.gif
-www/icons/small/README.txt
-www/icons/small/back.gif
-www/icons/small/binary.gif
-www/icons/small/binhex.gif
-www/icons/small/blank.gif
-www/icons/small/broken.gif
-www/icons/small/burst.gif
-www/icons/small/comp1.gif
-www/icons/small/comp2.gif
-www/icons/small/compressed.gif
-www/icons/small/continued.gif
-www/icons/small/dir.gif
-www/icons/small/dir2.gif
-www/icons/small/forward.gif
-www/icons/small/generic.gif
-www/icons/small/generic2.gif
-www/icons/small/generic3.gif
-www/icons/small/image.gif
-www/icons/small/image2.gif
-www/icons/small/index.gif
-www/icons/small/key.gif
-www/icons/small/movie.gif
-www/icons/small/rainbow.gif
-www/icons/small/sound.gif
-www/icons/small/sound2.gif
-www/icons/small/tar.gif
-www/icons/small/text.gif
-www/icons/small/transfer.gif
-www/icons/small/unknown.gif
-www/icons/small/uu.gif
-www/icons/sound1.gif
-www/icons/sound2.gif
-www/icons/sphere1.gif
-www/icons/sphere2.gif
-www/icons/tar.gif
-www/icons/tex.gif
-www/icons/text.gif
-www/icons/transfer.gif
-www/icons/unknown.gif
-www/icons/up.gif
-www/icons/uu.gif
-www/icons/uuencoded.gif
-www/icons/world1.gif
-www/icons/world2.gif
-@exec mkdir -p %D/www/proxy
 @dirrm etc/apache
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/vhosts
-@dirrm share/doc/apache/manual
+@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/php3
-www/data/apache_pb.gif
-www/data/index.html
-www/data/manual
-@dirrm www/cgi-bin
-@dirrm www/data
-@dirrm www/icons/small
-@dirrm www/icons
-@dirrm www/proxy
-@dirrm www
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 5d2c15e54409..2d08d040e68d 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -104,17 +104,21 @@ BUILD_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl
 
-VERSION_MODSSL=	2.2.5
+VERSION_MODSSL=	2.2.7
 
 RESTRICTED=	"Contains cryptography"
 
-CONFIGURE_ARGS+=--enable-module=ssl
+CONFIGURE_ARGS+=--enable-module=ssl \
+		--enable-module=define
 CONFIGURE_ENV+=	SSL_BASE='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}"
 
-PATCHDIR=	\${.CURDIR}/patches.modssl
 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" \\