Update to 2.0.35 (first GA release!)

PR: 36834 Submitted by: maintainer
author: Patrick Li <pat@FreeBSD.org> 2002-04-08 06:45:33 +0000
committer: Patrick Li <pat@FreeBSD.org> 2002-04-08 06:45:33 +0000
commit: c856fac3aba20f738ceb19056dc475d32bb9401f (patch)
tree: a148bd51c6cd52c84349a0f2433fcc10d6aa0841 /www/apache2
parent: Fix a typo. (diff)
15 files changed, 710 insertions, 690 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 487783ebdc6d..6f869f77c00e 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.32
+PORTVERSION=	2.0.35
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
-		http://www.freebsd.org/gifs/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
-		http://www2.freebsd.org/gifs/ \
 		http://apache.missouri.edu/dist/httpd/ \
 		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
-		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/ \
+		http://www.freebsd.org/gifs/:freebsd \
+		http://www2.freebsd.org/gifs/:freebsd
 DISTNAME=	httpd-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif
+DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif:freebsd
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER?=	perky@fallin.lv
 
 LATEST_LINK=	apache2
 
-WRKSRC=		${WRKDIR}/httpd-${PORTVERSION}
-WITH_MPM?=	prefork # or worker, perchild (neither of them is working yet)
+WITH_MPM?=	prefork # or worker, perchild (neither of them still has a problem on FreeBSD)
 HTTP_PORT?=	80
 
 GNU_CONFIGURE=	yes
@@ -33,34 +32,66 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
 		--enable-so \
-		--with-suexec-docroot=${PREFIX}/www/data \
 		--with-mpm=${WITH_MPM} \
 		--with-port=${HTTP_PORT} \
-		--libdir=${PREFIX}/lib/apache \
-		--includedir=${PREFIX}/include/apache
+		--libdir=${PREFIX}/lib/apache2 \
+		--includedir=${PREFIX}/include/apache2
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
-SHARED_MODULES=	all cgid cache file-cache disk-cache proxy proxy-connect \
-		proxy-ftp proxy-http
+SHARED_MODULES= all cgid charset_lite ext_filter case_filter case_filter_in \
+		deflate bucketeer
+RC_SUB=		-e 's,@@PREFIX@@,${PREFIX},g'
 
 .if defined(NOPORTDOCS)
 MAKE_ENV+=	NOPORTDOCS=YES
 .endif
 
+.if !defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+= --enable-threads
+.endif
+
 .if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
 SHARED_MODULES+= ssl
-PLIST_SUB+=	SSLOPT=""
+PLIST_SUB+=	MODSSL=""
+RC_SUB+=	-e 's,@@SSL@@,ssl,g'
+.else
+PLIST_SUB+=	MODSSL="@comment "
+RC_SUB+=	-e 's,@@SSL@@,,g'
+.endif
+
+.if defined(WITH_SUEXEC)
+SUEXEC_USERDIR?= public_html
+CONFIGURE_ARGS+= --enable-suexec \
+		--with-suexec-caller=www \
+		--with-suexec-userdir="${SUEXEC_USERDIR}" \
+		--with-suexec-uidmim=1000 --with-suexec-gidmin=1000 \
+		--with-suexec-docroot="${PREFIX}/www/data" \
+		--with-suexec-safepath="${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin" \
+		--with-suexec-logfile="/var/log/httpd-suexec.log"
+PLIST_SUB+=	SUEXEC=""
+.else
+PLIST_SUB+=	SUEXEC="@comment "
+.endif
+
+.if !defined(WITHOUT_CACHE) && !defined(WITHOUT_THREADS)
+SHARED_MODULES+= cache file-cache disk-cache mem_cache
+PLIST_SUB+=	MODCACHE=""
 .else
-PLIST_SUB+=	SSLOPT="@comment "
+PLIST_SUB+=	MODCACHE="@comment "
+.endif
+
+.if !defined(WITHOUT_PROXY)
+SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
+PLIST_SUB+=	MODPROXY=""
+.else
+PLIST_SUB+=	MODPROXY="@comment "
 .endif
 
 .if ${WITH_MPM} != "prefork"
-CONFIGURE_ARGS+= --enable-threads
-SHARED_MODULES+= mem-cache
-PLIST_SUB+=	THREADONLY=""
 PKGNAMESUFFIX=	-${WITH_MPM}
-.else
-PLIST_SUB+=	THREADONLY="@comment "
+.if defined(WITHOUT_THREADS)
+IGNORE=		"requires threads for ${WITH_MPM} mpm"
+.endif
 .endif
 
 CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
@@ -68,10 +99,7 @@ CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
 
-pre-extract:
-.if !defined(WITHOUT_SSL)
-	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
-.endif
+.include <bsd.port.pre.mk>
 
 post-extract:
 	@${CP} ${DISTDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
@@ -82,14 +110,19 @@ post-patch:
 	  ${PERL} -pi -e 's,apache_pb,icons/freebsd.gif" ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
 	 ); done
 	@${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
+	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
+.if ${OSVERSION} >= 500032
+	@${PERL} -pi.orig -e 's|expr|expr --|' \
+		${WRKSRC}/srclib/apr/build/ltmain.sh
+.endif
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache2.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup file."; \
+		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index d6ec7b902c9a..b50dc1e491d5 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.32-beta.tar.gz) = 61914c52d997c7a957a101399fe4eaff
+MD5 (httpd-2.0.35.tar.gz) = 29ec330f01594d1fd81f30c7a18752c6
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
index ca4321814e5a..ab1a71895d0c 100644
--- a/www/apache2/files/apache.sh
+++ b/www/apache2/files/apache.sh
@@ -1,16 +1,13 @@
 #!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+PREFIX=@@PREFIX@@
 
 case "$1" in
 start)
-	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'
+	[ "@@SSL@@" = "ssl" -a -f "$PREFIX/etc/apache2/ssl.crt/server.crt" ] && SSL=ssl
+	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
 	;;
 stop)
-	[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache'
+	[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in
index dc71e6df0a20..6e19ed4299c9 100644
--- a/www/apache2/files/patch-Makefile.in
+++ b/www/apache2/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Jan 23 16:10:16 2002
-+++ Makefile.in	Fri Feb 22 03:32:58 2002
-@@ -32,7 +32,9 @@
+--- Makefile.in.orig	Sat Apr  6 04:36:06 2002
++++ Makefile.in	Sun Apr  7 08:26:45 2002
+@@ -33,12 +33,15 @@
  	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
  	@cd $(top_srcdir)/docs/conf; \
  	for i in mime.types magic; do \
@@ -9,9 +9,15 @@
 +		cp -f $$i $$i.default; \
 +		$(INSTALL_DATA) $$i.default $(sysconfdir); \
  	done; \
+ 	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
+ 		cd $$j ; \
  	for i in *-std* ssl.conf; do \
  		[ -f $$i ] || continue; \
-@@ -54,7 +56,7 @@
++		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
+ 		( \
+ 			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+ 			if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
+@@ -57,7 +60,7 @@
  						echo "<IfDefine SSL>"; \
  					fi; \
  					if test $$j != "^EOL^"; then \
@@ -20,7 +26,7 @@
  					fi; \
  					if test "x$$j" = "xssl"; then \
  						echo "</IfDefine>"; \
-@@ -106,11 +108,14 @@
+@@ -106,11 +109,14 @@
  
  install-htdocs:
  	@echo Installing HTML documents
@@ -32,23 +38,23 @@
 +.if !defined(NOPORTDOCS)
  	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
  	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
--	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+-	@test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
 +.endif
-+	@(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;
  
  install-error:
  	@echo Installing error documents
-@@ -126,9 +131,10 @@
+@@ -126,9 +132,10 @@
  
  install-cgi:
  	@echo Installing CGIs
 -	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
--	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
--	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+-	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
+-	@test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;
 +	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
 +	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
 +	@test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
-+	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test "x$(cgidir)" != "x" && cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;
  
  install-other:
  	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
diff --git a/www/apache2/files/patch-config.layout b/www/apache2/files/patch-config.layout
index 8fae2764a544..55349a330eb1 100644
--- a/www/apache2/files/patch-config.layout
+++ b/www/apache2/files/patch-config.layout
@@ -1,29 +1,29 @@
---- config.layout.orig	Thu Feb 21 03:02:06 2002
-+++ config.layout	Thu Feb 21 03:04:56 2002
-@@ -307,3 +307,26 @@
-     infodir:       $exec_prefix/share/info
-     installbuilddir: $prefix/etc/apache2/build
+--- config.layout.orig	Fri Mar 29 04:04:47 2002
++++ config.layout	Sun Apr  7 06:27:03 2002
+@@ -309,3 +309,26 @@
+     installbuilddir: ${prefix}/etc/apache2/build
+     errordir:      ${datadir}/error
  </Layout>
 +
 +<Layout FreeBSD>
 +    prefix:        /usr/local
-+    exec_prefix:   $prefix
-+    bindir:        $exec_prefix/bin
-+    sbindir:       $exec_prefix/sbin
-+    libexecdir:    $exec_prefix/libexec/apache
-+    mandir:        $prefix/man
-+    sysconfdir:    $prefix/etc/apache2
-+    datadir:       $prefix/www
-+    installbuilddir: $prefix/share/apache
-+    errordir:      $datadir/error
-+    iconsdir:      $datadir/icons
-+    htdocsdir:     $datadir/data
-+    manualdir:     $prefix/share/doc/apache
-+    cgidir:        $datadir/cgi-bin
-+    includedir:    $prefix/include/apache
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/sbin
++    libexecdir:    ${exec_prefix}/libexec/apache2
++    mandir:        ${prefix}/man
++    sysconfdir:    ${prefix}/etc/apache2
++    datadir:       ${prefix}/www
++    installbuilddir: ${prefix}/share/apache2
++    errordir:      ${datadir}/error
++    iconsdir:      ${datadir}/icons
++    htdocsdir:     ${datadir}/data
++    manualdir:     ${prefix}/share/doc/apache2
++    cgidir:        ${datadir}/cgi-bin
++    includedir:    ${prefix}/include/apache2
 +    localstatedir: /var
-+    runtimedir:    $localstatedir/run
-+    logfiledir:    $localstatedir/log
-+    proxycachedir: $datadir/proxy
-+    infodir:       $exec_prefix/share/info
++    runtimedir:    ${localstatedir}/run
++    logfiledir:    ${localstatedir}/log
++    proxycachedir: ${datadir}/proxy
++    infodir:       ${exec_prefix}/share/info
 +</Layout>
diff --git a/www/apache2/files/patch-configure b/www/apache2/files/patch-configure
index 7ceda58436da..8c3f38a5bc46 100644
--- a/www/apache2/files/patch-configure
+++ b/www/apache2/files/patch-configure
@@ -1,14 +1,12 @@
---- configure.orig	Fri Feb 22 03:43:38 2002
-+++ configure	Fri Feb 22 03:44:56 2002
-@@ -11095,7 +11095,10 @@
- EOF
+--- configure.orig	Sat Apr  6 15:19:30 2002
++++ configure	Sun Apr  7 09:13:07 2002
+@@ -12087,6 +12087,9 @@
  
  cat >> confdefs.h <<EOF
--#define SERVER_CONFIG_FILE "conf/$progname.conf"
-+#define SERVER_CONFIG_FILE "etc/apache2/$progname.conf"
-+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
-+#define AP_TYPES_CONFIG_FILE "etc/apache2/mime.types"
-+#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
+ #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
++#define DEFAULT_ERRORLOG "${rel_logfiledir}/httpd-error.log"
++#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types"
++#define DOCUMENT_LOCATION "${rel_htdocsdir}"
  EOF
  
  cat >> confdefs.h <<EOF
diff --git a/www/apache2/files/patch-docs:conf:httpd-std.conf b/www/apache2/files/patch-docs:conf:httpd-std.conf
deleted file mode 100644
index 8b0665b95c63..000000000000
--- a/www/apache2/files/patch-docs:conf:httpd-std.conf
+++ /dev/null
@@ -1,171 +0,0 @@
---- docs/conf/httpd-std.conf.orig	Fri Jan 25 09:24:47 2002
-+++ docs/conf/httpd-std.conf	Fri Feb 22 02:32:28 2002
-@@ -66,7 +66,7 @@
- #
- <IfModule !mpm_netware.c>
- <IfModule !perchild.c>
--ScoreBoardFile logs/apache_runtime_status
-+ScoreBoardFile /var/run/apache_runtime_status
- </IfModule>
- </IfModule>
- 
-@@ -76,7 +76,7 @@
- # identification number when it starts.
- #
- <IfModule !mpm_netware.c>
--PidFile logs/httpd.pid
-+PidFile /var/run/httpd.pid
- </IfModule>
- 
- #
-@@ -248,8 +248,8 @@
- #  when the value of (unsigned)Group is above 60000; 
- #  don't use Group #-1 on these systems!
- #
--User nobody
--Group #-1
-+User www
-+Group www
- </IfModule>
- </IfModule>
- 
-@@ -279,7 +279,7 @@
- # documents. By default, all requests are taken from this directory, but
- # symbolic links and aliases may be used to point to other locations.
- #
--DocumentRoot "@@ServerRoot@@/htdocs"
-+DocumentRoot "@@ServerRoot@@/www/data"
- 
- #
- # Each directory to which Apache has access can be configured with respect
-@@ -304,7 +304,7 @@
- #
- # This should be changed to whatever you set DocumentRoot to.
- #
--<Directory "@@ServerRoot@@/htdocs">
-+<Directory "@@ServerRoot@@/www/data">
- 
- #
- # Possible values for the Options directive are "None", "All",
-@@ -397,7 +397,7 @@
- # TypesConfig describes where the mime.types file (or equivalent) is
- # to be found.
- #
--TypesConfig conf/mime.types
-+TypesConfig etc/apache2/mime.types
- 
- #
- # DefaultType is the default MIME type the server will use for a document
-@@ -416,7 +416,7 @@
- # directive tells the module where the hint definitions are located.
- #
- <IfModule mod_mime_magic.c>
--    MIMEMagicFile conf/magic
-+    MIMEMagicFile etc/apache2/magic
- </IfModule>
- 
- #
-@@ -436,7 +436,7 @@
- # logged here.  If you *do* define an error logfile for a <VirtualHost>
- # container, that host's errors will be logged there and not here.
- #
--ErrorLog logs/error_log
-+ErrorLog /var/log/httpd-error.log
- 
- #
- # LogLevel: Control the number of messages logged to the error_log.
-@@ -461,20 +461,20 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+#CustomLog /var/log/httpd-access_log common
- 
- #
- # If you would like to have agent and referer logfiles, uncomment the
- # following directives.
- #
--#CustomLog logs/referer_log referer
--#CustomLog logs/agent_log agent
-+#CustomLog /var/log/httpd-referer_log referer
-+#CustomLog /var/log/httpd-agent_log agent
- 
- #
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+CustomLog /var/log/httpd-access.log combined
- 
- #
- # Optionally add a line containing the server version and virtual host
-@@ -498,9 +498,9 @@
- # We include the /icons/ alias for FancyIndexed directory listings.  If you
- # do not use FancyIndexing, you may comment this out.
- #
--Alias /icons/ "@@ServerRoot@@/icons/"
-+Alias /icons/ "@@ServerRoot@@/www/icons/"
- 
--<Directory "@@ServerRoot@@/icons">
-+<Directory "@@ServerRoot@@/www/icons">
-     Options Indexes MultiViews
-     AllowOverride None
-     Order allow,deny
-@@ -512,9 +512,9 @@
- # the manual, even if you choose to move your DocumentRoot.  You may comment
- # this out if you do not care for the documentation.
- #
--Alias /manual "@@ServerRoot@@/manual"
-+Alias /manual "@@ServerRoot@@/share/doc/apache"
- 
--<Directory "@@ServerRoot@@/manual">
-+<Directory "@@ServerRoot@@/share/doc/apache">
-     Options Indexes FollowSymLinks MultiViews
-     AllowOverride None
-     Order allow,deny
-@@ -529,21 +529,21 @@
- # The same rules about trailing "/" apply to ScriptAlias directives as to
- # Alias.
- #
--ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
-+ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
- 
- <IfModule mod_cgid.c>
- #
- # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
- # for setting UNIX socket for communicating with cgid.
- #
--#Scriptsock            logs/cgisock
-+Scriptsock            /var/run/cgisock
- </IfModule>
- 
- #
- # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
- # CGI directory exists, if you have that configured.
- #
--<Directory "@@ServerRoot@@/cgi-bin">
-+<Directory "@@ServerRoot@@/www/cgi-bin">
-     AllowOverride None
-     Options None
-     Order allow,deny
-@@ -859,9 +859,9 @@
- 
- <IfModule mod_negotiation.c>
- <IfModule mod_include.c>
--    Alias /error/ "@@ServerRoot@@/error/"
-+    Alias /error/ "@@ServerRoot@@/www/error/"
- 
--    <Directory "@@ServerRoot@@/error">
-+    <Directory "@@ServerRoot@@/www/error">
-         AllowOverride None
-         Options IncludesNoExec
-         AddOutputFilter Includes html
-@@ -974,7 +974,7 @@
- # Bring in additional module-specific configurations
- #
- <IfModule mod_ssl.c>
--    Include conf/ssl.conf
-+    Include etc/apache2/ssl.conf
- </IfModule>
- 
- 
diff --git a/www/apache2/files/patch-docs:conf:httpd-std.conf.in b/www/apache2/files/patch-docs:conf:httpd-std.conf.in
new file mode 100644
index 000000000000..91ccd0b595b0
--- /dev/null
+++ b/www/apache2/files/patch-docs:conf:httpd-std.conf.in
@@ -0,0 +1,65 @@
+--- docs/conf/httpd-std.conf.in.orig	Thu Apr  4 18:15:43 2002
++++ docs/conf/httpd-std.conf.in	Sun Apr  7 11:51:13 2002
+@@ -68,7 +68,7 @@
+ #
+ <IfModule !mpm_netware.c>
+ <IfModule !perchild.c>
+-#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
++#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
+ </IfModule>
+ </IfModule>
+ 
+@@ -78,7 +78,7 @@
+ # identification number when it starts.
+ #
+ <IfModule !mpm_netware.c>
+-PidFile @rel_logfiledir@/httpd.pid
++PidFile @rel_runtimedir@/httpd.pid
+ </IfModule>
+ 
+ #
+@@ -250,8 +250,8 @@
+ #  when the value of (unsigned)Group is above 60000; 
+ #  don't use Group #-1 on these systems!
+ #
+-User nobody
+-Group #-1
++User www
++Group www
+ </IfModule>
+ </IfModule>
+ 
+@@ -437,7 +437,7 @@
+ # logged here.  If you *do* define an error logfile for a <VirtualHost>
+ # container, that host's errors will be logged there and not here.
+ #
+-ErrorLog @rel_logfiledir@/error_log
++ErrorLog @rel_logfiledir@/httpd-error.log
+ 
+ #
+ # LogLevel: Control the number of messages logged to the error_log.
+@@ -462,20 +462,20 @@
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+-CustomLog @rel_logfiledir@/access_log common
++#CustomLog @rel_logfiledir@/httpd-access.log common
+ 
+ #
+ # If you would like to have agent and referer logfiles, uncomment the
+ # following directives.
+ #
+-#CustomLog @rel_logfiledir@/referer_log referer
+-#CustomLog @rel_logfiledir@/agent_log agent
++#CustomLog @rel_logfiledir@/httpd-referer.log referer
++#CustomLog @rel_logfiledir@/httpd-agent.log agent
+ 
+ #
+ # If you prefer a single logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can use the following directive.
+ #
+-#CustomLog @rel_logfiledir@/access_log combined
++CustomLog @rel_logfiledir@/httpd-access.log combined
+ 
+ #
+ # Optionally add a line containing the server version and virtual host
diff --git a/www/apache2/files/patch-docs:conf:ssl-std.conf b/www/apache2/files/patch-docs:conf:ssl-std.conf
index 9dcf0d50384a..b13bee04e6af 100644
--- a/www/apache2/files/patch-docs:conf:ssl-std.conf
+++ b/www/apache2/files/patch-docs:conf:ssl-std.conf
@@ -1,5 +1,5 @@
 --- docs/conf/ssl-std.conf.orig	Thu Nov  8 07:16:09 2001
-+++ docs/conf/ssl-std.conf	Fri Feb 22 02:37:27 2002
++++ docs/conf/ssl-std.conf	Sun Apr  7 09:26:02 2002
 @@ -55,15 +55,15 @@
  #   Configure the SSL Session Cache: First the mechanism 
  #   to use and second the expiring timeout (in seconds).
diff --git a/www/apache2/files/patch-srclib:apr-util:configure b/www/apache2/files/patch-srclib:apr-util:configure
index bd10fd35df68..bf6d83956754 100644
--- a/www/apache2/files/patch-srclib:apr-util:configure
+++ b/www/apache2/files/patch-srclib:apr-util:configure
@@ -1,6 +1,6 @@
---- srclib/apr-util/configure.orig	Fri Feb 22 02:55:35 2002
-+++ srclib/apr-util/configure	Fri Feb 22 02:56:03 2002
-@@ -5770,7 +5770,7 @@
+--- srclib/apr-util/configure.orig	Sat Apr  6 15:19:28 2002
++++ srclib/apr-util/configure	Sun Apr  7 06:35:09 2002
+@@ -5790,7 +5790,7 @@
  
  
  if test -z "$expat_include_dir"; then
@@ -8,4 +8,4 @@
 +  for d in xml/expat-cvs xml/expat $srcdir/xml/expat ; do
      
    echo $ac_n "checking for Expat in $d""... $ac_c" 1>&6
- echo "configure:5777: checking for Expat in $d" >&5
+ echo "configure:5797: checking for Expat in $d" >&5
diff --git a/www/apache2/files/patch-srclib:apr:include:apr_atomic.h b/www/apache2/files/patch-srclib:apr:include:apr_atomic.h
new file mode 100644
index 000000000000..b9622dfc5c8a
--- /dev/null
+++ b/www/apache2/files/patch-srclib:apr:include:apr_atomic.h
@@ -0,0 +1,17 @@
+--- srclib/apr/include/apr_atomic.h.orig	Sun Apr  7 22:54:09 2002
++++ srclib/apr/include/apr_atomic.h	Sun Apr  7 22:55:03 2002
+@@ -191,10 +191,10 @@
+ #include <machine/atomic.h>
+ 
+ #define apr_atomic_t apr_uint32_t
+-#define apr_atomic_add(mem, val)     atomic_add_int(mem,val)
+-#define apr_atomic_dec(mem)          atomic_subtract_int(mem,1)
+-#define apr_atomic_inc(mem)          atomic_add_int(mem,1)
+-#define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
++#define apr_atomic_add(mem, val)     (atomic_add_int(mem,val),mem)
++#define apr_atomic_dec(mem)          (atomic_subtract_int(mem,1),mem)
++#define apr_atomic_inc(mem)          (atomic_add_int(mem,1),mem)
++#define apr_atomic_set(mem, val)     (atomic_set_int(mem, val),mem)
+ #define apr_atomic_read(mem)         *mem
+ 
+ #define APR_ATOMIC_NEED_CAS_DEFAULT 1
diff --git a/www/apache2/files/patch-support:apachectl.in b/www/apache2/files/patch-support:apachectl.in
index 2e4ba03f6166..2c49f1d188f8 100644
--- a/www/apache2/files/patch-support:apachectl.in
+++ b/www/apache2/files/patch-support:apachectl.in
@@ -1,18 +1,14 @@
---- support/apachectl.in.orig	Sat Dec 15 22:56:36 2001
-+++ support/apachectl.in	Fri Feb 22 02:40:03 2002
-@@ -26,10 +26,10 @@
- # --------------------                              --------------------
- # 
- # the path to your PID file
--PIDFILE=@prefix@/logs/@progname@.pid
-+PIDFILE=/var/run/@progname@.pid
+--- support/apachectl.in.orig	Thu Apr  4 18:15:44 2002
++++ support/apachectl.in	Sun Apr  7 08:49:25 2002
+@@ -29,7 +29,7 @@
+ PIDFILE=@exp_runtimedir@/@progname@.pid
  #
  # the path to your httpd binary, including options if necessary
--HTTPD='@prefix@/bin/@progname@'
-+HTTPD='@prefix@/sbin/@progname@'
+-HTTPD='@exp_bindir@/@progname@'
++HTTPD='@exp_sbindir@/@progname@'
  #
  # pick up any necessary environment variables
- if test -f @prefix@/bin/envvars; then
+ if test -f @exp_bindir@/envvars; then
 @@ -47,6 +47,7 @@
  #
  # --------------------                              --------------------
diff --git a/www/apache2/files/patch-support:apxs.in b/www/apache2/files/patch-support:apxs.in
index 6ea17a914bdc..5e6f5fdf6cdc 100644
--- a/www/apache2/files/patch-support:apxs.in
+++ b/www/apache2/files/patch-support:apxs.in
@@ -1,40 +1,40 @@
---- support/apxs.in.orig	Sat Feb  2 04:25:14 2002
-+++ support/apxs.in	Fri Feb 22 02:49:11 2002
+--- support/apxs.in.orig	Thu Mar 14 05:48:05 2002
++++ support/apxs.in	Sun Apr  7 08:47:34 2002
 @@ -66,7 +66,7 @@
  
  # read the configuration variables once
  my %config_vars = ();
 -get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
-+get_config_vars("$prefix/share/apache/config_vars.mk",\%config_vars);
++get_config_vars("$prefix/share/apache2/config_vars.mk",\%config_vars);
  
  my $exec_prefix    = get_vars("exec_prefix");
  my $CFG_TARGET     = get_vars("progname");
-@@ -414,7 +414,7 @@
+@@ -415,7 +415,7 @@
          $la =~ s|\.c$|.la|;
          my $o = $s;
          $o =~ s|\.c$|.o|;
 -        push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
-+        push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
++        push(@cmds, "$prefix/share/apache2/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
          unshift(@objs, $lo);
      }
  
-@@ -439,7 +439,7 @@
+@@ -440,7 +440,7 @@
          $opt .= " -l$opt_l";
      }
  
 -    push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
-+    push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
++    push(@cmds, "$prefix/share/apache2/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
  
      #   execute the commands
      &execute_cmds(@cmds);
-@@ -470,8 +470,8 @@
+@@ -471,8 +471,8 @@
          $t =~ s|^.+/([^/]+)$|$1|;
          $t =~ s|\.la$|\.so|;
          if ($opt_i) {
 -	    push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
 -                 "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
-+	    push(@cmds, "$prefix/share/apache/instdso.sh SH_LIBTOOL='" .
-+                 "$prefix/share/apache/libtool' $f $CFG_LIBEXECDIR");
++	    push(@cmds, "$prefix/share/apache2/instdso.sh SH_LIBTOOL='" .
++                 "$prefix/share/apache2/libtool' $f $CFG_LIBEXECDIR");
  	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
          }
  
diff --git a/www/apache2/files/patch-support:log_server_status.in b/www/apache2/files/patch-support:log_server_status.in
index 20e899a9272c..191377e97c58 100644
--- a/www/apache2/files/patch-support:log_server_status.in
+++ b/www/apache2/files/patch-support:log_server_status.in
@@ -1,5 +1,5 @@
---- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
-+++ support/log_server_status.in	Fri Feb 22 02:50:20 2002
+--- support/log_server_status.in.orig	Thu Mar 14 05:48:06 2002
++++ support/log_server_status.in	Sun Apr  7 08:47:53 2002
 @@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index abe0f5cfe599..00cbaa91617d 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -15,164 +15,177 @@ etc/apache2/mime.types.default
 @unexec if cmp -s %D/etc/apache2/ssl.conf %D/etc/apache2/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
 etc/apache2/ssl-std.conf
 @exec [ -f %B/ssl.conf ] || cp %B/%f %B/ssl.conf
-etc/rc.d/apache.sh
-include/apache/ap_compat.h
-include/apache/ap_config.h
-include/apache/ap_config_auto.h
-include/apache/ap_listen.h
-include/apache/ap_mmn.h
-include/apache/ap_mpm.h
-include/apache/ap_release.h
-include/apache/apr.h
-include/apache/apr_anylock.h
-include/apache/apr_base64.h
-include/apache/apr_buckets.h
-include/apache/apr_compat.h
-include/apache/apr_date.h
-include/apache/apr_dbm.h
-include/apache/apr_dso.h
-include/apache/apr_errno.h
-include/apache/apr_file_info.h
-include/apache/apr_file_io.h
-include/apache/apr_fnmatch.h
-include/apache/apr_general.h
-include/apache/apr_getopt.h
-include/apache/apr_hash.h
-include/apache/apr_hooks.h
-include/apache/apr_inherit.h
-include/apache/apr_ldap.h
-include/apache/apr_lib.h
-include/apache/apr_lock.h
-include/apache/apr_md4.h
-include/apache/apr_md5.h
-include/apache/apr_mmap.h
-include/apache/apr_network_io.h
-include/apache/apr_optional.h
-include/apache/apr_optional_hooks.h
-include/apache/apr_pools.h
-include/apache/apr_portable.h
-include/apache/apr_proc_mutex.h
-include/apache/apr_ring.h
-include/apache/apr_rmm.h
-include/apache/apr_sdbm.h
-include/apache/apr_sha1.h
-include/apache/apr_shm.h
-include/apache/apr_signal.h
-include/apache/apr_strings.h
-include/apache/apr_tables.h
-include/apache/apr_thread_cond.h
-include/apache/apr_thread_mutex.h
-include/apache/apr_thread_proc.h
-include/apache/apr_thread_rwlock.h
-include/apache/apr_time.h
-include/apache/apr_uri.h
-include/apache/apr_user.h
-include/apache/apr_uuid.h
-include/apache/apr_version.h
-include/apache/apr_want.h
-include/apache/apr_xlate.h
-include/apache/apr_xml.h
-include/apache/apu.h
-include/apache/apu_compat.h
-include/apache/expat.h
-include/apache/http_config.h
-include/apache/http_connection.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/mod_cgi.h
-include/apache/mod_core.h
-include/apache/mod_dav.h
-include/apache/mod_include.h
-include/apache/mod_proxy.h
-include/apache/mod_ssl.h
-include/apache/mpm.h
-include/apache/mpm_common.h
-include/apache/mpm_default.h
-include/apache/os.h
-include/apache/pcre.h
-include/apache/pcreposix.h
-include/apache/rfc1413.h
-include/apache/scoreboard.h
-include/apache/ssl_expr.h
-include/apache/ssl_expr_parse.h
-include/apache/ssl_util_ssl.h
-include/apache/ssl_util_table.h
-include/apache/unixd.h
-include/apache/util_cfgtree.h
-include/apache/util_charset.h
-include/apache/util_ebcdic.h
-include/apache/util_filter.h
-include/apache/util_ldap.h
-include/apache/util_md5.h
-include/apache/util_script.h
-include/apache/util_time.h
-include/apache/util_xml.h
-lib/apache/APRVARS
-lib/apache/apr.exp
-lib/apache/aprutil.exp
-lib/apache/libapr.a
-lib/apache/libapr.la
-lib/apache/libapr.so.0
-@unexec rm -f %D/lib/apache/libapr.so
-@exec ln -fs libapr.so.0 %D/lib/apache/libapr.so
-lib/apache/libaprutil.a
-lib/apache/libaprutil.la
-lib/apache/libaprutil.so.0
-@unexec rm -f %D/lib/apache/libaprutil.so
-@exec ln -fs libaprutil.so.0 %D/lib/apache/libaprutil.so
-lib/apache/libexpat.a
-lib/apache/libexpat.la
-lib/apache/libexpat.so.1
-@unexec rm -f %D/lib/apache/libexpat.so
-@exec ln -fs libexpat.so.1 %D/lib/apache/libexpat.so
-libexec/apache/httpd.exp
-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_dbm.so
-libexec/apache/mod_auth_digest.so
-libexec/apache/mod_autoindex.so
-libexec/apache/mod_cache.so
-libexec/apache/mod_cern_meta.so
-libexec/apache/mod_cgi.so
-libexec/apache/mod_cgid.so
-libexec/apache/mod_dav.so
-libexec/apache/mod_dav_fs.so
-libexec/apache/mod_dir.so
-libexec/apache/mod_disk_cache.so
-libexec/apache/mod_env.so
-libexec/apache/mod_expires.so
-libexec/apache/mod_file_cache.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
-%%THREADONLY%%libexec/apache/mod_mem_cache.so
-libexec/apache/mod_mime.so
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_negotiation.so
-libexec/apache/mod_proxy.so
-libexec/apache/mod_proxy_connect.so
-libexec/apache/mod_proxy_ftp.so
-libexec/apache/mod_proxy_http.so
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.so
-libexec/apache/mod_speling.so
-%%SSLOPT%%libexec/apache/mod_ssl.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
+etc/rc.d/apache2.sh
+include/apache2/ap_compat.h
+include/apache2/ap_config.h
+include/apache2/ap_config_auto.h
+include/apache2/ap_config_layout.h
+include/apache2/ap_listen.h
+include/apache2/ap_mmn.h
+include/apache2/ap_mpm.h
+include/apache2/ap_release.h
+include/apache2/apr.h
+include/apache2/apr_allocator.h
+include/apache2/apr_anylock.h
+include/apache2/apr_atomic.h
+include/apache2/apr_base64.h
+include/apache2/apr_buckets.h
+include/apache2/apr_compat.h
+include/apache2/apr_date.h
+include/apache2/apr_dbm.h
+include/apache2/apr_dso.h
+include/apache2/apr_errno.h
+include/apache2/apr_file_info.h
+include/apache2/apr_file_io.h
+include/apache2/apr_fnmatch.h
+include/apache2/apr_general.h
+include/apache2/apr_getopt.h
+include/apache2/apr_global_mutex.h
+include/apache2/apr_hash.h
+include/apache2/apr_hooks.h
+include/apache2/apr_inherit.h
+include/apache2/apr_ldap.h
+include/apache2/apr_lib.h
+include/apache2/apr_lock.h
+include/apache2/apr_md4.h
+include/apache2/apr_md5.h
+include/apache2/apr_mmap.h
+include/apache2/apr_network_io.h
+include/apache2/apr_optional.h
+include/apache2/apr_optional_hooks.h
+include/apache2/apr_pools.h
+include/apache2/apr_portable.h
+include/apache2/apr_proc_mutex.h
+include/apache2/apr_ring.h
+include/apache2/apr_rmm.h
+include/apache2/apr_sdbm.h
+include/apache2/apr_sha1.h
+include/apache2/apr_shm.h
+include/apache2/apr_signal.h
+include/apache2/apr_strings.h
+include/apache2/apr_tables.h
+include/apache2/apr_thread_cond.h
+include/apache2/apr_thread_mutex.h
+include/apache2/apr_thread_proc.h
+include/apache2/apr_thread_rwlock.h
+include/apache2/apr_time.h
+include/apache2/apr_uri.h
+include/apache2/apr_user.h
+include/apache2/apr_uuid.h
+include/apache2/apr_version.h
+include/apache2/apr_want.h
+include/apache2/apr_xlate.h
+include/apache2/apr_xml.h
+include/apache2/apu.h
+include/apache2/apu_compat.h
+include/apache2/expat.h
+include/apache2/http_config.h
+include/apache2/http_connection.h
+include/apache2/http_core.h
+include/apache2/http_log.h
+include/apache2/http_main.h
+include/apache2/http_protocol.h
+include/apache2/http_request.h
+include/apache2/http_vhost.h
+include/apache2/httpd.h
+include/apache2/mod_cgi.h
+include/apache2/mod_core.h
+include/apache2/mod_dav.h
+include/apache2/mod_include.h
+include/apache2/mod_log_config.h
+include/apache2/mod_proxy.h
+include/apache2/mod_ssl.h
+include/apache2/mpm.h
+include/apache2/mpm_common.h
+include/apache2/mpm_default.h
+include/apache2/os.h
+include/apache2/pcre.h
+include/apache2/pcreposix.h
+include/apache2/rfc1413.h
+include/apache2/scoreboard.h
+include/apache2/ssl_expr.h
+include/apache2/ssl_expr_parse.h
+include/apache2/ssl_toolkit_compat.h
+include/apache2/ssl_util_ssl.h
+include/apache2/ssl_util_table.h
+include/apache2/unixd.h
+include/apache2/util_cfgtree.h
+include/apache2/util_charset.h
+include/apache2/util_ebcdic.h
+include/apache2/util_filter.h
+include/apache2/util_ldap.h
+include/apache2/util_md5.h
+include/apache2/util_script.h
+include/apache2/util_time.h
+include/apache2/util_xml.h
+lib/apache2/APRVARS
+lib/apache2/apr.exp
+lib/apache2/aprutil.exp
+lib/apache2/libapr.a
+lib/apache2/libapr.la
+lib/apache2/libapr.so.0
+@unexec rm -f %D/lib/apache2/libapr.so
+@exec ln -fs libapr.so.0 %D/lib/apache2/libapr.so
+lib/apache2/libaprutil.a
+lib/apache2/libaprutil.la
+lib/apache2/libaprutil.so.0
+@unexec rm -f %D/lib/apache2/libaprutil.so
+@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
+lib/apache2/libexpat.a
+lib/apache2/libexpat.la
+lib/apache2/libexpat.so.1
+@unexec rm -f %D/lib/apache2/libexpat.so
+@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
+libexec/apache2/httpd.exp
+libexec/apache2/mod_access.so
+libexec/apache2/mod_actions.so
+libexec/apache2/mod_alias.so
+libexec/apache2/mod_asis.so
+libexec/apache2/mod_auth.so
+libexec/apache2/mod_auth_anon.so
+libexec/apache2/mod_auth_dbm.so
+libexec/apache2/mod_auth_digest.so
+libexec/apache2/mod_autoindex.so
+libexec/apache2/mod_bucketeer.so
+%%MODCACHE%%libexec/apache2/mod_cache.so
+libexec/apache2/mod_case_filter.so
+libexec/apache2/mod_case_filter_in.so
+libexec/apache2/mod_cern_meta.so
+libexec/apache2/mod_cgi.so
+libexec/apache2/mod_cgid.so
+libexec/apache2/mod_charset_lite.so
+libexec/apache2/mod_dav.so
+libexec/apache2/mod_dav_fs.so
+libexec/apache2/mod_deflate.so
+libexec/apache2/mod_dir.so
+%%MODCACHE%%libexec/apache2/mod_disk_cache.so
+libexec/apache2/mod_env.so
+libexec/apache2/mod_expires.so
+libexec/apache2/mod_ext_filter.so
+%%MODCACHE%%libexec/apache2/mod_file_cache.so
+libexec/apache2/mod_headers.so
+libexec/apache2/mod_imap.so
+libexec/apache2/mod_include.so
+libexec/apache2/mod_info.so
+libexec/apache2/mod_log_config.so
+%%MODCACHE%%libexec/apache2/mod_mem_cache.so
+libexec/apache2/mod_mime.so
+libexec/apache2/mod_mime_magic.so
+libexec/apache2/mod_negotiation.so
+%%MODPROXY%%libexec/apache2/mod_proxy.so
+%%MODPROXY%%libexec/apache2/mod_proxy_connect.so
+%%MODPROXY%%libexec/apache2/mod_proxy_ftp.so
+%%MODPROXY%%libexec/apache2/mod_proxy_http.so
+libexec/apache2/mod_rewrite.so
+libexec/apache2/mod_setenvif.so
+libexec/apache2/mod_speling.so
+%%MODSSL%%libexec/apache2/mod_ssl.so
+libexec/apache2/mod_status.so
+%%SUEXEC%%libexec/apache2/mod_suexec.so
+libexec/apache2/mod_unique_id.so
+libexec/apache2/mod_userdir.so
+libexec/apache2/mod_usertrack.so
+libexec/apache2/mod_vhost_alias.so
 sbin/ab
 sbin/apachectl
 sbin/apxs
@@ -186,245 +199,310 @@ sbin/htpasswd
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-share/apache/config_vars.mk
-share/apache/instdso.sh
-share/apache/library.mk
-share/apache/libtool
-share/apache/ltlib.mk
-share/apache/program.mk
-share/apache/rules.mk
-share/apache/special.mk
-%%PORTDOCS%%share/doc/apache/LICENSE
-%%PORTDOCS%%share/doc/apache/bind.html
-%%PORTDOCS%%share/doc/apache/cgi_path.html
-%%PORTDOCS%%share/doc/apache/configuring.html.en
-%%PORTDOCS%%share/doc/apache/configuring.html.ja.jis
-%%PORTDOCS%%share/doc/apache/content-negotiation.html
-%%PORTDOCS%%share/doc/apache/custom-error.html
-%%PORTDOCS%%share/doc/apache/developer/API.html
-%%PORTDOCS%%share/doc/apache/developer/debugging.html
-%%PORTDOCS%%share/doc/apache/developer/documenting.html
-%%PORTDOCS%%share/doc/apache/developer/footer.html
-%%PORTDOCS%%share/doc/apache/developer/header.html
-%%PORTDOCS%%share/doc/apache/developer/hooks.html
-%%PORTDOCS%%share/doc/apache/developer/index.html
-%%PORTDOCS%%share/doc/apache/developer/layeredio.html
-%%PORTDOCS%%share/doc/apache/developer/modules.html
-%%PORTDOCS%%share/doc/apache/developer/request.html
-%%PORTDOCS%%share/doc/apache/dns-caveats.html
-%%PORTDOCS%%share/doc/apache/dso.html
-%%PORTDOCS%%share/doc/apache/ebcdic.html
-%%PORTDOCS%%share/doc/apache/env.html
-%%PORTDOCS%%share/doc/apache/faq/index.html
-%%PORTDOCS%%share/doc/apache/filter.html
-%%PORTDOCS%%share/doc/apache/footer.html
-%%PORTDOCS%%share/doc/apache/handler.html.en
-%%PORTDOCS%%share/doc/apache/handler.html.ja.jis
-%%PORTDOCS%%share/doc/apache/header.html
-%%PORTDOCS%%share/doc/apache/howto/auth.html
-%%PORTDOCS%%share/doc/apache/howto/cgi.html.en
-%%PORTDOCS%%share/doc/apache/howto/cgi.html.ja.jis
-%%PORTDOCS%%share/doc/apache/howto/footer.html
-%%PORTDOCS%%share/doc/apache/howto/header.html
-%%PORTDOCS%%share/doc/apache/howto/ssi.html.en
-%%PORTDOCS%%share/doc/apache/howto/ssi.html.ja.jis
-%%PORTDOCS%%share/doc/apache/images/apache_header.gif
-%%PORTDOCS%%share/doc/apache/images/apache_header.png
-%%PORTDOCS%%share/doc/apache/images/custom_errordocs.gif
-%%PORTDOCS%%share/doc/apache/images/custom_errordocs.png
-%%PORTDOCS%%share/doc/apache/images/home.gif
-%%PORTDOCS%%share/doc/apache/images/home.png
-%%PORTDOCS%%share/doc/apache/images/index.gif
-%%PORTDOCS%%share/doc/apache/images/index.png
-%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.fig
-%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.gif
-%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.png
-%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.fig
-%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.gif
-%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.png
-%%PORTDOCS%%share/doc/apache/images/pixel.gif
-%%PORTDOCS%%share/doc/apache/images/pixel.png
-%%PORTDOCS%%share/doc/apache/images/sub.gif
-%%PORTDOCS%%share/doc/apache/images/sub.png
-%%PORTDOCS%%share/doc/apache/index.html.en
-%%PORTDOCS%%share/doc/apache/index.html.fr
-%%PORTDOCS%%share/doc/apache/index.html.ja.jis
-%%PORTDOCS%%share/doc/apache/install.html
-%%PORTDOCS%%share/doc/apache/invoking.html
-%%PORTDOCS%%share/doc/apache/logs.html
-%%PORTDOCS%%share/doc/apache/misc/custom_errordocs.html
-%%PORTDOCS%%share/doc/apache/misc/descriptors.html
-%%PORTDOCS%%share/doc/apache/misc/fin_wait_2.html
-%%PORTDOCS%%share/doc/apache/misc/footer.html
-%%PORTDOCS%%share/doc/apache/misc/header.html
-%%PORTDOCS%%share/doc/apache/misc/index.html
-%%PORTDOCS%%share/doc/apache/misc/known_client_problems.html
-%%PORTDOCS%%share/doc/apache/misc/perf-tuning.html
-%%PORTDOCS%%share/doc/apache/misc/rewriteguide.html
-%%PORTDOCS%%share/doc/apache/misc/security_tips.html
-%%PORTDOCS%%share/doc/apache/misc/tutorials.html
-%%PORTDOCS%%share/doc/apache/mod/core.html
-%%PORTDOCS%%share/doc/apache/mod/directive-dict.html
-%%PORTDOCS%%share/doc/apache/mod/directives.html
-%%PORTDOCS%%share/doc/apache/mod/footer.html
-%%PORTDOCS%%share/doc/apache/mod/header.html
-%%PORTDOCS%%share/doc/apache/mod/index-bytype.html
-%%PORTDOCS%%share/doc/apache/mod/index.html
-%%PORTDOCS%%share/doc/apache/mod/mod_TEMPLATE.html
-%%PORTDOCS%%share/doc/apache/mod/mod_access.html
-%%PORTDOCS%%share/doc/apache/mod/mod_actions.html
-%%PORTDOCS%%share/doc/apache/mod/mod_alias.html
-%%PORTDOCS%%share/doc/apache/mod/mod_asis.html
-%%PORTDOCS%%share/doc/apache/mod/mod_auth.html
-%%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html
-%%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html
-%%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html
-%%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html
-%%PORTDOCS%%share/doc/apache/mod/mod_autoindex.html
-%%PORTDOCS%%share/doc/apache/mod/mod_cern_meta.html
-%%PORTDOCS%%share/doc/apache/mod/mod_cgi.html
-%%PORTDOCS%%share/doc/apache/mod/mod_cgid.html
-%%PORTDOCS%%share/doc/apache/mod/mod_charset_lite.html
-%%PORTDOCS%%share/doc/apache/mod/mod_dav.html
-%%PORTDOCS%%share/doc/apache/mod/mod_dir.html
-%%PORTDOCS%%share/doc/apache/mod/mod_env.html
-%%PORTDOCS%%share/doc/apache/mod/mod_example.html
-%%PORTDOCS%%share/doc/apache/mod/mod_expires.html
-%%PORTDOCS%%share/doc/apache/mod/mod_ext_filter.html
-%%PORTDOCS%%share/doc/apache/mod/mod_file_cache.html
-%%PORTDOCS%%share/doc/apache/mod/mod_headers.html
-%%PORTDOCS%%share/doc/apache/mod/mod_imap.html
-%%PORTDOCS%%share/doc/apache/mod/mod_include.html
-%%PORTDOCS%%share/doc/apache/mod/mod_info.html
-%%PORTDOCS%%share/doc/apache/mod/mod_isapi.html
-%%PORTDOCS%%share/doc/apache/mod/mod_ldap.html
-%%PORTDOCS%%share/doc/apache/mod/mod_log_config.html
-%%PORTDOCS%%share/doc/apache/mod/mod_mime.html
-%%PORTDOCS%%share/doc/apache/mod/mod_mime_magic.html
-%%PORTDOCS%%share/doc/apache/mod/mod_mmap_static.html
-%%PORTDOCS%%share/doc/apache/mod/mod_negotiation.html
-%%PORTDOCS%%share/doc/apache/mod/mod_proxy.html
-%%PORTDOCS%%share/doc/apache/mod/mod_rewrite.html
-%%PORTDOCS%%share/doc/apache/mod/mod_setenvif.html
-%%PORTDOCS%%share/doc/apache/mod/mod_so.html
-%%PORTDOCS%%share/doc/apache/mod/mod_speling.html
-%%PORTDOCS%%share/doc/apache/mod/mod_ssl.html
-%%PORTDOCS%%share/doc/apache/mod/mod_status.html
-%%PORTDOCS%%share/doc/apache/mod/mod_suexec.html
-%%PORTDOCS%%share/doc/apache/mod/mod_unique_id.html
-%%PORTDOCS%%share/doc/apache/mod/mod_userdir.html
-%%PORTDOCS%%share/doc/apache/mod/mod_usertrack.html
-%%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html
-%%PORTDOCS%%share/doc/apache/mod/module-dict.html
-%%PORTDOCS%%share/doc/apache/mod/mpm_common.html
-%%PORTDOCS%%share/doc/apache/mod/mpm_netware.html
-%%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html
-%%PORTDOCS%%share/doc/apache/mod/perchild.html
-%%PORTDOCS%%share/doc/apache/mod/prefork.html
-%%PORTDOCS%%share/doc/apache/mod/worker.html
-%%PORTDOCS%%share/doc/apache/mpm.html
-%%PORTDOCS%%share/doc/apache/new_features_2_0.html.de
-%%PORTDOCS%%share/doc/apache/new_features_2_0.html.en
-%%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr
-%%PORTDOCS%%share/doc/apache/platform/footer.html
-%%PORTDOCS%%share/doc/apache/platform/header.html
-%%PORTDOCS%%share/doc/apache/platform/netware.html
-%%PORTDOCS%%share/doc/apache/platform/perf-hp.html
-%%PORTDOCS%%share/doc/apache/platform/win_compiling.html
-%%PORTDOCS%%share/doc/apache/platform/win_service.html
-%%PORTDOCS%%share/doc/apache/platform/windows.html
-%%PORTDOCS%%share/doc/apache/programs/ab.html
-%%PORTDOCS%%share/doc/apache/programs/apachectl.html
-%%PORTDOCS%%share/doc/apache/programs/apxs.html
-%%PORTDOCS%%share/doc/apache/programs/dbmmanage.html
-%%PORTDOCS%%share/doc/apache/programs/footer.html
-%%PORTDOCS%%share/doc/apache/programs/header.html
-%%PORTDOCS%%share/doc/apache/programs/htdigest.html
-%%PORTDOCS%%share/doc/apache/programs/htpasswd.html
-%%PORTDOCS%%share/doc/apache/programs/httpd.html
-%%PORTDOCS%%share/doc/apache/programs/index.html
-%%PORTDOCS%%share/doc/apache/programs/logresolve.html
-%%PORTDOCS%%share/doc/apache/programs/other.html
-%%PORTDOCS%%share/doc/apache/programs/rotatelogs.html
-%%PORTDOCS%%share/doc/apache/programs/suexec.html
-%%PORTDOCS%%share/doc/apache/search/manual-index.cgi
-%%PORTDOCS%%share/doc/apache/sections.html
-%%PORTDOCS%%share/doc/apache/server-wide.html.en
-%%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis
-%%PORTDOCS%%share/doc/apache/sitemap.html
-%%PORTDOCS%%share/doc/apache/ssl/Makefile
-%%PORTDOCS%%share/doc/apache/ssl/footer.html
-%%PORTDOCS%%share/doc/apache/ssl/header.html
-%%PORTDOCS%%share/doc/apache/ssl/index.html
-%%PORTDOCS%%share/doc/apache/ssl/mod_ssl_sb.gif
-%%PORTDOCS%%share/doc/apache/ssl/openssl_ics.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.gfont000.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.html
-%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.wml
-%%PORTDOCS%%share/doc/apache/ssl/ssl_cover.wml
-%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_logo.jpg
-%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_title.jpg
-%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.gfont000.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.html
-%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.wml
-%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.html
-%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.wml
-%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.gfont000.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.html
-%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.wml
-%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.gfont000.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.html
-%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.wml
-%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig1.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig2.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig3.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.gfont000.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.html
-%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.wml
-%%PORTDOCS%%share/doc/apache/ssl/ssl_overview_fig1.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.gfont000.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.html
-%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.wml
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-chapter.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-1.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-2.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-3.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-4.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-5.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-6.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-7.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-000000.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-transp.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.inc
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-n.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-s.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-n.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-s.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-abstract.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-compat.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-faq.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-gloss.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-howto.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-intro.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-over.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-preface.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-ref.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-toc.gif
-%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-tutor.gif
-%%PORTDOCS%%share/doc/apache/stopping.html
-%%PORTDOCS%%share/doc/apache/suexec.html
-%%PORTDOCS%%share/doc/apache/upgrading.html.en
-%%PORTDOCS%%share/doc/apache/upgrading.html.fr
-%%PORTDOCS%%share/doc/apache/urlmapping.html
-%%PORTDOCS%%share/doc/apache/vhosts/details.html
-%%PORTDOCS%%share/doc/apache/vhosts/examples.html
-%%PORTDOCS%%share/doc/apache/vhosts/fd-limits.html
-%%PORTDOCS%%share/doc/apache/vhosts/footer.html
-%%PORTDOCS%%share/doc/apache/vhosts/header.html
-%%PORTDOCS%%share/doc/apache/vhosts/index.html
-%%PORTDOCS%%share/doc/apache/vhosts/ip-based.html
-%%PORTDOCS%%share/doc/apache/vhosts/mass.html
-%%PORTDOCS%%share/doc/apache/vhosts/name-based.html
+%%SUEXEC%%sbin/suexec
+share/apache2/config_vars.mk
+share/apache2/instdso.sh
+share/apache2/library.mk
+share/apache2/libtool
+share/apache2/ltlib.mk
+share/apache2/program.mk
+share/apache2/rules.mk
+share/apache2/special.mk
+%%PORTDOCS%%share/doc/apache2/LICENSE
+%%PORTDOCS%%share/doc/apache2/bind.html
+%%PORTDOCS%%share/doc/apache2/cgi_path.html
+%%PORTDOCS%%share/doc/apache2/configuring.html.en
+%%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html
+%%PORTDOCS%%share/doc/apache2/custom-error.html
+%%PORTDOCS%%share/doc/apache2/developer/API.html
+%%PORTDOCS%%share/doc/apache2/developer/debugging.html
+%%PORTDOCS%%share/doc/apache2/developer/documenting.html
+%%PORTDOCS%%share/doc/apache2/developer/filters.html
+%%PORTDOCS%%share/doc/apache2/developer/footer.html
+%%PORTDOCS%%share/doc/apache2/developer/header.html
+%%PORTDOCS%%share/doc/apache2/developer/hooks.html
+%%PORTDOCS%%share/doc/apache2/developer/index.html
+%%PORTDOCS%%share/doc/apache2/developer/layeredio.html
+%%PORTDOCS%%share/doc/apache2/developer/modules.html
+%%PORTDOCS%%share/doc/apache2/developer/request.html
+%%PORTDOCS%%share/doc/apache2/dns-caveats.html
+%%PORTDOCS%%share/doc/apache2/dso.html
+%%PORTDOCS%%share/doc/apache2/ebcdic.html
+%%PORTDOCS%%share/doc/apache2/env.html
+%%PORTDOCS%%share/doc/apache2/faq/index.html
+%%PORTDOCS%%share/doc/apache2/filter.html
+%%PORTDOCS%%share/doc/apache2/footer.html
+%%PORTDOCS%%share/doc/apache2/handler.html.en
+%%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/header.html
+%%PORTDOCS%%share/doc/apache2/howto/auth.html
+%%PORTDOCS%%share/doc/apache2/howto/cgi.html.en
+%%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/howto/footer.html
+%%PORTDOCS%%share/doc/apache2/howto/header.html
+%%PORTDOCS%%share/doc/apache2/howto/ssi.html.en
+%%PORTDOCS%%share/doc/apache2/howto/ssi.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/images/apache_header.gif
+%%PORTDOCS%%share/doc/apache2/images/apache_header.png
+%%PORTDOCS%%share/doc/apache2/images/custom_errordocs.gif
+%%PORTDOCS%%share/doc/apache2/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache2/images/home.gif
+%%PORTDOCS%%share/doc/apache2/images/home.png
+%%PORTDOCS%%share/doc/apache2/images/index.gif
+%%PORTDOCS%%share/doc/apache2/images/index.png
+%%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.fig
+%%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.gif
+%%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.png
+%%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig2.fig
+%%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig2.gif
+%%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig2.png
+%%PORTDOCS%%share/doc/apache2/images/pixel.gif
+%%PORTDOCS%%share/doc/apache2/images/pixel.png
+%%PORTDOCS%%share/doc/apache2/images/sub.gif
+%%PORTDOCS%%share/doc/apache2/images/sub.png
+%%PORTDOCS%%share/doc/apache2/index.html.en
+%%PORTDOCS%%share/doc/apache2/index.html.fr
+%%PORTDOCS%%share/doc/apache2/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/install.html
+%%PORTDOCS%%share/doc/apache2/invoking.html
+%%PORTDOCS%%share/doc/apache2/logs.html
+%%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
+%%PORTDOCS%%share/doc/apache2/misc/descriptors.html
+%%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html
+%%PORTDOCS%%share/doc/apache2/misc/footer.html
+%%PORTDOCS%%share/doc/apache2/misc/header.html
+%%PORTDOCS%%share/doc/apache2/misc/index.html
+%%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html
+%%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html
+%%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
+%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
+%%PORTDOCS%%share/doc/apache2/misc/tutorials.html
+%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
+%%PORTDOCS%%share/doc/apache2/mod/core.html
+%%PORTDOCS%%share/doc/apache2/mod/core.xml
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/directives.html
+%%PORTDOCS%%share/doc/apache2/mod/directives.xml
+%%PORTDOCS%%share/doc/apache2/mod/footer.html
+%%PORTDOCS%%share/doc/apache2/mod/header.html
+%%PORTDOCS%%share/doc/apache2/mod/index-bytype.html
+%%PORTDOCS%%share/doc/apache2/mod/index.html
+%%PORTDOCS%%share/doc/apache2/mod/index.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_TEMPLATE.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_example.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_expires.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_headers.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_imap.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_include.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_include.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_info.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_mime.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_mmap_static.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_status.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_status.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
+%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html
+%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
+%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html
+%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml
+%%PORTDOCS%%share/doc/apache2/mod/perchild.html
+%%PORTDOCS%%share/doc/apache2/mod/perchild.xml
+%%PORTDOCS%%share/doc/apache2/mod/prefork.html
+%%PORTDOCS%%share/doc/apache2/mod/prefork.xml
+%%PORTDOCS%%share/doc/apache2/mod/worker.html
+%%PORTDOCS%%share/doc/apache2/mod/worker.xml
+%%PORTDOCS%%share/doc/apache2/mpm.html
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.de
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.en
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.fr
+%%PORTDOCS%%share/doc/apache2/platform/footer.html
+%%PORTDOCS%%share/doc/apache2/platform/header.html
+%%PORTDOCS%%share/doc/apache2/platform/netware.html
+%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html
+%%PORTDOCS%%share/doc/apache2/platform/win_compiling.html
+%%PORTDOCS%%share/doc/apache2/platform/win_service.html
+%%PORTDOCS%%share/doc/apache2/platform/windows.html
+%%PORTDOCS%%share/doc/apache2/programs/ab.html
+%%PORTDOCS%%share/doc/apache2/programs/apachectl.html
+%%PORTDOCS%%share/doc/apache2/programs/apxs.html
+%%PORTDOCS%%share/doc/apache2/programs/dbmmanage.html
+%%PORTDOCS%%share/doc/apache2/programs/footer.html
+%%PORTDOCS%%share/doc/apache2/programs/header.html
+%%PORTDOCS%%share/doc/apache2/programs/htdigest.html
+%%PORTDOCS%%share/doc/apache2/programs/htpasswd.html
+%%PORTDOCS%%share/doc/apache2/programs/httpd.html
+%%PORTDOCS%%share/doc/apache2/programs/index.html
+%%PORTDOCS%%share/doc/apache2/programs/logresolve.html
+%%PORTDOCS%%share/doc/apache2/programs/other.html
+%%PORTDOCS%%share/doc/apache2/programs/rotatelogs.html
+%%PORTDOCS%%share/doc/apache2/programs/suexec.html
+%%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
+%%PORTDOCS%%share/doc/apache2/sections.html
+%%PORTDOCS%%share/doc/apache2/server-wide.html.en
+%%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/sitemap.html
+%%PORTDOCS%%share/doc/apache2/ssl/Makefile
+%%PORTDOCS%%share/doc/apache2/ssl/footer.html
+%%PORTDOCS%%share/doc/apache2/ssl/header.html
+%%PORTDOCS%%share/doc/apache2/ssl/index.html
+%%PORTDOCS%%share/doc/apache2/ssl/mod_ssl_sb.gif
+%%PORTDOCS%%share/doc/apache2/ssl/openssl_ics.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.gfont000.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.wml
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover.wml
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.gfont000.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.html
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_faq.wml
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.html
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_glossary.wml
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.gfont000.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.html
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_howto.wml
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.gfont000.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.html
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro.wml
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig1.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig2.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_intro_fig3.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.gfont000.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.html
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview.wml
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_overview_fig1.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.gfont000.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.html
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_reference.wml
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-chapter.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-1.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-2.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-3.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-4.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-5.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-6.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.head-num-7.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.inc
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-next-n.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-next-s.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-prev-n.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.navbut-prev-s.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-abstract.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-compat.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-faq.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-gloss.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-howto.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-intro.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-over.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-preface.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-ref.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-toc.gif
+%%PORTDOCS%%share/doc/apache2/ssl/ssl_template.title-tutor.gif
+%%PORTDOCS%%share/doc/apache2/stopping.html
+%%PORTDOCS%%share/doc/apache2/style/build.sh
+%%PORTDOCS%%share/doc/apache2/style/build.xml
+%%PORTDOCS%%share/doc/apache2/style/en.xml
+%%PORTDOCS%%share/doc/apache2/style/manual.css
+%%PORTDOCS%%share/doc/apache2/style/manual.xsl
+%%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
+%%PORTDOCS%%share/doc/apache2/style/settings.xsl
+%%PORTDOCS%%share/doc/apache2/style/sv.xml
+%%PORTDOCS%%share/doc/apache2/suexec.html
+%%PORTDOCS%%share/doc/apache2/upgrading.html.en
+%%PORTDOCS%%share/doc/apache2/upgrading.html.fr
+%%PORTDOCS%%share/doc/apache2/urlmapping.html
+%%PORTDOCS%%share/doc/apache2/vhosts/details.html
+%%PORTDOCS%%share/doc/apache2/vhosts/examples.html
+%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html
+%%PORTDOCS%%share/doc/apache2/vhosts/footer.html
+%%PORTDOCS%%share/doc/apache2/vhosts/header.html
+%%PORTDOCS%%share/doc/apache2/vhosts/index.html
+%%PORTDOCS%%share/doc/apache2/vhosts/ip-based.html
+%%PORTDOCS%%share/doc/apache2/vhosts/mass.html
+%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html
 @exec mkdir -p %D/www
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
@@ -719,20 +797,21 @@ www/icons/world2.png
 @dirrm www/data.default
 @dirrm www/cgi-bin.default
 @dirrm www
-%%PORTDOCS%%@dirrm share/doc/apache/vhosts
-%%PORTDOCS%%@dirrm share/doc/apache/ssl
-%%PORTDOCS%%@dirrm share/doc/apache/search
-%%PORTDOCS%%@dirrm share/doc/apache/programs
-%%PORTDOCS%%@dirrm share/doc/apache/platform
-%%PORTDOCS%%@dirrm share/doc/apache/mod
-%%PORTDOCS%%@dirrm share/doc/apache/misc
-%%PORTDOCS%%@dirrm share/doc/apache/images
-%%PORTDOCS%%@dirrm share/doc/apache/howto
-%%PORTDOCS%%@dirrm share/doc/apache/faq
-%%PORTDOCS%%@dirrm share/doc/apache/developer
-%%PORTDOCS%%@dirrm share/doc/apache
-@dirrm share/apache
-@dirrm libexec/apache
-@dirrm lib/apache
-@dirrm include/apache
+%%PORTDOCS%%@dirrm share/doc/apache2/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache2/style
+%%PORTDOCS%%@dirrm share/doc/apache2/ssl
+%%PORTDOCS%%@dirrm share/doc/apache2/search
+%%PORTDOCS%%@dirrm share/doc/apache2/programs
+%%PORTDOCS%%@dirrm share/doc/apache2/platform
+%%PORTDOCS%%@dirrm share/doc/apache2/mod
+%%PORTDOCS%%@dirrm share/doc/apache2/misc
+%%PORTDOCS%%@dirrm share/doc/apache2/images
+%%PORTDOCS%%@dirrm share/doc/apache2/howto
+%%PORTDOCS%%@dirrm share/doc/apache2/faq
+%%PORTDOCS%%@dirrm share/doc/apache2/developer
+%%PORTDOCS%%@dirrm share/doc/apache2
+@dirrm share/apache2
+@dirrm libexec/apache2
+@dirrm lib/apache2
+@dirrm include/apache2
 @dirrm etc/apache2
author	Patrick Li <pat@FreeBSD.org>	2002-04-08 06:45:33 +0000
committer	Patrick Li <pat@FreeBSD.org>	2002-04-08 06:45:33 +0000
commit	c856fac3aba20f738ceb19056dc475d32bb9401f (patch)
tree	a148bd51c6cd52c84349a0f2433fcc10d6aa0841 /www/apache2
parent	Fix a typo. (diff)