11 files changed, 563 insertions, 365 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 4709566e6f46..53c8d531ea14 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -17,14 +17,19 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+PATCH_SITES=		${MASTER_SITE_APACHE_HTTPD}
+PATCH_SITE_SUBDIR=	patches/apply_to_${APACHE_VERSION}
+PATCHFILES=		no_zombies.patch 
+
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Apache-SSL: Apache secure webserver integrating OpenSSL
 
 CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache-1.* apache-2.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
+
 APACHE_VERSION=		1.3.28
-APACHE_SSL_VERSION=	1.49
+APACHE_SSL_VERSION=	1.51
 USE_OPENSSL=		yes
 USE_PERL5=		yes
 HAS_CONFIGURE=		yes
@@ -46,7 +51,7 @@ APACHE_SUEXEC_UIDMIN?=	1000
 APACHE_SUEXEC_GIDMIN?=	1000
 APACHE_SUEXEC_CALLER?=	www
 
-SUEXEC_CONF= \
+SUEXEC_CONF=\
 	--enable-suexec \
 	--suexec-docroot=${APACHE_SUEXEC_DOCROOT} \
 	--suexec-caller=${APACHE_SUEXEC_CALLER} \
@@ -80,7 +85,7 @@ CONFIGURE_ARGS=	\
 		--server-uid=www \
 		--server-gid=www \
 		--with-perl=${PERL} \
-		--with-layout=GNU \
+		--with-layout=FreeBSD \
 		--without-confadjust \
 		--enable-shared=remain \
 		--enable-module=most \
@@ -98,6 +103,8 @@ OPTIM=		-DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT} \
 		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
 		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
+DOCSDIR=	${PREFIX}/share/doc/apache
+
 .if defined(APACHE_PERF_TUNING)
 OPTIM+=		-DBUFFERED_LOGS
 CFLAGS+=	-O6 -fomit-frame-pointer
@@ -113,18 +120,18 @@ MAN8=		ab.8 httpsdctl.8 apxs.8 httpsd.8 logresolve.8 rotatelogs.8 \
 .include <bsd.port.pre.mk>
 
 post-extract:
-	@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}
+	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${DIST_SUBDIR}/apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}
 
 post-patch:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE}
+	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist.orig
 
 post-install:
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "                       !!!! WARNING !!!!"
-	@${ECHO_CMD} " Next PORTREVISION will be a complete resync with apache13 ports layout"
-	@${ECHO_CMD} " Will change:"
-	@${ECHO_CMD} "      - Default log file names"
-	@${ECHO_CMD} "      - Default DocumentRoot (${PREFIX}/www/htdocs => ${PREFIX}/www/data)"
+	@${ECHO_CMD} "SSL is disabled by default"
+	@${ECHO_CMD} "Please read:"
+	@${ECHO_CMD} "  http://www.apache-ssl.org/docs.html"
+	@${ECHO_CMD} " to know how to configure correctly apache-ssl"
 	@${ECHO_CMD} ""
 
 certificate:
diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo
index f76b0d2fe1c9..2030a366a876 100644
--- a/www/apache13-ssl/distinfo
+++ b/www/apache13-ssl/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache_1.3.28.tar.gz) = 2cdece7b4881d541e072de6a2b65db77
-MD5 (apache_1.3.28+ssl_1.49.tar.gz) = ba794a06cdb960959264c49b5fb54815
+MD5 (apache_1.3.28+ssl_1.51.tar.gz) = 3f0d015ae183defa76a56a869a4ce03d
+MD5 (no_zombies.patch) = 815be9373ac6b0d66729ca48d1d5ff73
diff --git a/www/apache13-ssl/files/patch-Makefile.tmpl b/www/apache13-ssl/files/patch-Makefile.tmpl
new file mode 100644
index 000000000000..c07cc063ec0b
--- /dev/null
+++ b/www/apache13-ssl/files/patch-Makefile.tmpl
@@ -0,0 +1,108 @@
+--- Makefile.tmpl.orig	Mon Apr 28 15:32:12 2003
++++ Makefile.tmpl	Wed Oct 22 22:59:14 2003
+@@ -270,10 +270,10 @@
+ 	$(MKDIR) $(root)$(mandir)/man1
+ 	$(MKDIR) $(root)$(mandir)/man8
+ 	$(MKDIR) $(root)$(sysconfdir)
+-	$(MKDIR) $(root)$(htdocsdir)
++	$(MKDIR) $(root)$(htdocsdir)-dist
+ 	$(MKDIR) $(root)$(manualdir)
+ 	$(MKDIR) $(root)$(iconsdir)
+-	$(MKDIR) $(root)$(cgidir)
++	$(MKDIR) $(root)$(cgidir)-dist
+ 	$(MKDIR) $(root)$(includedir)
+ 	$(MKDIR) $(root)$(includedir)/xml
+ 	$(MKDIR) $(root)$(runtimedir)
+@@ -459,33 +459,29 @@
+ #   icons and distributed CGI scripts.
+ install-data:
+ 	@echo "===> [data: Installing initial data files]"
+-	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
+-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
+-	else \
+-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
++		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)-dist/"; \
+ 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
+-		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
+-	fi
+-	-@if [ -d $(TOP)/htdocs/manual ]; then \
++		(cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
++		find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
++		find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
+ 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
+ 		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
+ 		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
+ 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
++		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
++	if [ ! -d $(root)$(htdocsdir)/ ]; then \
++		$(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
+ 	fi
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
+-		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
+-	else \
+ 		for script in printenv test-cgi; do \
+ 			cat $(TOP)/cgi-bin/$${script} |\
+ 			sed -e 's;^#!/.*perl;#!$(PERL);' \
+ 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
+-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+-		done; \
+-	fi
++			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \
++			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \
++		done;
++	if [ ! -d $(root)$(cgidir)/ ]; then \
++		$(LN) -sf $(root)$(cgidir)-dist $(root)$(cgidir); \
++  	fi
+ 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
+ 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
+ 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
+@@ -506,7 +502,7 @@
+ 		if [ ".$(TARGET)" = .httpd ]; then \
+ 			target_prefix=""; \
+ 		else \
+-			target_prefix="$(TARGET)_"; \
++			target_prefix="$(TARGET)-"; \
+ 		fi; \
+ 		(echo "##"; \
+ 		 echo "## $${target_conf} -- Apache HTTP server configuration file"; \
+@@ -524,10 +520,10 @@
+ 			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
+ 			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
+ 			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
+-			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
+-			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
+-			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
+-			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
++			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access.log;" \
++			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error.log;" \
++			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer.log;" \
++			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent.log;" \
+ 			-e 's;conf/magic;$(sysconfdir)/magic;' \
+ 			-e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \
+ 			-e 's;conf/access.conf;$(sysconfdir)/access.conf;' \
+@@ -539,8 +535,8 @@
+ 			-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
+ 			-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
+ 			> $(TOP)/$(SRC)/.apaci.install.tmp && \
+-		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
+-		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
++		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}-dist"; \
++		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}-dist; \
+ 		if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
+ 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
+@@ -549,8 +545,8 @@
+ 		fi; \
+ 	done
+ 	-@for conf in mime.types magic; do \
+-		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
+-		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
++		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist"; \
++		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist; \
+ 		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
+ 			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
+ 			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
diff --git a/www/apache13-ssl/files/patch-ar b/www/apache13-ssl/files/patch-SSLpatch
index db93d4cec5d8..db93d4cec5d8 100644
--- a/www/apache13-ssl/files/patch-ar
+++ b/www/apache13-ssl/files/patch-SSLpatch
diff --git a/www/apache13-ssl/files/patch-aq b/www/apache13-ssl/files/patch-aq
deleted file mode 100644
index fb59d97ba8b4..000000000000
--- a/www/apache13-ssl/files/patch-aq
+++ /dev/null
@@ -1,17 +0,0 @@
---- FixPatch.orig	Sun May 23 13:34:08 1999
-+++ FixPatch	Mon May 31 09:03:49 1999
-@@ -112,13 +112,6 @@
- 	echo "Your version of patch is out-of-date. You need patch 2.1 or 2.5."
- fi
- 
--echo -n "Do you want me to apply the fixed-up Apache-SSL patch for you? [n] "
--read ans
--echo $ans | grep -i "^[ \t]*y" >/dev/null
--if [ $? = 0 ]; then
--    patch -p1 <SSLpatch.fixed-up
--else
--    echo "OK, I won't apply the fixed-up patch.  I've left it in SSLpatch.fixed-up";
--fi
-+patch -p1 <SSLpatch.fixed-up
- 
- exit
diff --git a/www/apache13-ssl/files/patch-configure b/www/apache13-ssl/files/patch-configure
new file mode 100644
index 000000000000..78be57c08eed
--- /dev/null
+++ b/www/apache13-ssl/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Tue May 21 16:24:59 2002
++++ configure	Wed Jun 19 05:27:31 2002
+@@ -1251,7 +1251,7 @@
+     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
+-    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
++    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
+     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
+     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
+     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
+@@ -1349,7 +1349,7 @@
+ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
+-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
++echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
+ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
+ echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
+ echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module b/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module
new file mode 100644
index 000000000000..f4f02e80cbc2
--- /dev/null
+++ b/www/apache13-ssl/files/patch-src::modules::standard::mod_auth_db.module
@@ -0,0 +1,31 @@
+--- src/modules/standard/mod_auth_db.module.bak	Tue Oct 16 13:12:02 2001
++++ src/modules/standard/mod_auth_db.module	Thu Feb 20 12:55:19 2003
+@@ -4,23 +4,23 @@
+     DB_LIB=''
+     if ./helpers/TestCompile func db_create; then
+         DB_VERSION='Berkeley-DB/3.x'
+-    elif ./helpers/TestCompile lib db db_create; then
++    elif ./helpers/TestCompile lib dbXXX db_create; then
+         DB_VERSION='Berkeley-DB/3.x'
+         DB_LIB='-ldb'
+     elif ./helpers/TestCompile func db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+-    elif ./helpers/TestCompile lib db db_open; then
++    elif ./helpers/TestCompile lib dbXXX db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+         DB_LIB='-ldb'
+-    elif ./helpers/TestCompile lib db2 db_open; then
++    elif ./helpers/TestCompile lib db2XXX db_open; then
+         DB_VERSION='Berkeley-DB/2.x'
+         DB_LIB='-ldb2'
+     elif ./helpers/TestCompile func dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+-    elif ./helpers/TestCompile lib db dbopen; then
++    elif ./helpers/TestCompile lib dbXXX dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+         DB_LIB='-ldb'
+-    elif ./helpers/TestCompile lib db1 dbopen; then
++    elif ./helpers/TestCompile lib db1XXX dbopen; then
+         DB_VERSION='Berkeley-DB/1.x'
+         DB_LIB='-ldb1'
+     elif TCADDINCL='#include <db.h>' INCLUDES1="$INCLUDES1 -I/usr/include/db1" TLIB="-ldb1" \
diff --git a/www/apache13-ssl/files/patch-src::support::dbmanage b/www/apache13-ssl/files/patch-src::support::dbmanage
new file mode 100644
index 000000000000..d92d2f447613
--- /dev/null
+++ b/www/apache13-ssl/files/patch-src::support::dbmanage
@@ -0,0 +1,11 @@
+--- src/support/dbmmanage.bak	Thu Mar 14 00:05:37 2002
++++ src/support/dbmmanage	Mon Jun  2 23:05:27 2003
+@@ -338,6 +338,8 @@
+     } elsif (substr($chkpass, 0, 5) eq '{SHA}') {
+         need_sha1_crypt;
+         $crypt_method = "sha1";
++    } elsif (substr($chkpass, 0, 3) eq '$1$') {
++	$crypt_method = "crypt";
+     } elsif (length($chkpass) == 13 && $chkpass ne $testpass) {
+         $crypt_method = "crypt";
+     } else {
diff --git a/www/apache13-ssl/files/patch-src::support::log_server_status b/www/apache13-ssl/files/patch-src::support::log_server_status
new file mode 100644
index 000000000000..bd792616581e
--- /dev/null
+++ b/www/apache13-ssl/files/patch-src::support::log_server_status
@@ -0,0 +1,24 @@
+--- src/support/log_server_status.orig	Mon Jan 15 20:06:38 2001
++++ src/support/log_server_status	Fri Jan 25 08:03:03 2002
+@@ -70,10 +70,10 @@
+ #
+ require 'sys/socket.ph';
+ 
+-$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
++$wherelog = "/var/log/httpd-status-";
+ $server = "localhost";          # Name of server, could be "www.foo.com"
+ $port = "80";                   # Port on server
+-$request = "/status/?auto";     # Request to send
++$request = "/server-status/?auto";     # Request to send
+ 
+ sub tcp_connect
+ {
+@@ -103,7 +103,7 @@
+ 	chomp($date);
+ 	($day,$time)=split(/:/,$date);
+ 	$res=&tcp_connect($server,$port);
+-	open(OUT,">>$wherelog$day");
++	open(OUT,">>$wherelog$day.log");
+ 	if ($res) {
+ 		print OUT "$time:-1:-1:-1:-1:$res\n";
+ 		exit 1;
diff --git a/www/apache13-ssl/files/post-patch-conf:httpd.conf-dist.orig b/www/apache13-ssl/files/post-patch-conf:httpd.conf-dist.orig
new file mode 100644
index 000000000000..864075e30d2d
--- /dev/null
+++ b/www/apache13-ssl/files/post-patch-conf:httpd.conf-dist.orig
@@ -0,0 +1,13 @@
+--- conf/httpd.conf-dist.orig	Wed Oct 22 23:09:02 2003
++++ conf/httpd.conf-dist	Wed Oct 22 23:09:14 2003
+@@ -945,8 +945,8 @@
+ # Note that all SSL options can apply to virtual hosts.
+ # Disable SSL. Useful in combination with virtual hosts. Note that SSLEnable is
+ # now also supported.
+-#SSLDisable
+-SSLEnable
++SSLDisable
++#SSLEnable
+ 
+ # Set the path for the global cache server executable.
+ # If this facility gives you trouble, you can disable it by setting
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index beb6e741b190..eb71bfe2db49 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -2,20 +2,20 @@ bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf.default
+@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf-dist; then rm -f %D/etc/apache/access.conf; fi
+etc/apache/access.conf-dist
 @exec [ -f %B/access.conf ] || cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpsd.conf %D/etc/apache/httpsd.conf.default; then rm -f %D/etc/apache/httpsd.conf; fi
-etc/apache/httpsd.conf.default
+@unexec if cmp -s %D/etc/apache/httpsd.conf %D/etc/apache/httpsd.conf-dist; then rm -f %D/etc/apache/httpsd.conf; fi
+etc/apache/httpsd.conf-dist
 @exec [ -f %B/httpsd.conf ] || cp %B/%f %B/httpsd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic-dist; then rm -f %D/etc/apache/magic; fi
+etc/apache/magic-dist
 @exec [ -f %B/magic ] || cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types.default
+@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types-dist; then rm -f %D/etc/apache/mime.types; fi
+etc/apache/mime.types-dist
 @exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf.default
+@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi
+etc/apache/srm.conf-dist
 @exec [ -f %B/srm.conf ] || cp %B/%f %B/srm.conf
 include/apache/ap.h
 include/apache/ap_alloc.h
@@ -86,326 +86,324 @@ sbin/httpsdctl
 sbin/logresolve
 sbin/rotatelogs
 %%SUB_SUEXEC%%sbin/suexec
-@exec mkdir -p %D/www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
 www/cgi-bin/printenv
 www/cgi-bin/test-cgi
-www/htdocs/apache_pb.gif
-www/htdocs/index.html.ca
-www/htdocs/index.html.cz
-www/htdocs/index.html.de
-www/htdocs/index.html.dk
-www/htdocs/index.html.ee
-www/htdocs/index.html.el
-www/htdocs/index.html.en
-www/htdocs/index.html.es
-www/htdocs/index.html.fr
-www/htdocs/index.html.he.iso8859-8
-www/htdocs/index.html.it
-www/htdocs/index.html.ja.jis
-www/htdocs/index.html.kr.iso-kr
-www/htdocs/index.html.lb.utf8
-www/htdocs/index.html.nl
-www/htdocs/index.html.nn
-www/htdocs/index.html.no
-www/htdocs/index.html.po.iso-pl
-www/htdocs/index.html.pt
-www/htdocs/index.html.pt-br
-www/htdocs/index.html.ru.cp-1251
-www/htdocs/index.html.ru.cp866
-www/htdocs/index.html.ru.iso-ru
-www/htdocs/index.html.ru.koi8-r
-www/htdocs/index.html.ru.ucs2
-www/htdocs/index.html.ru.ucs4
-www/htdocs/index.html.ru.utf8
-www/htdocs/index.html.se
-www/htdocs/index.html.zh-tw.big5
-www/htdocs/manual/LICENSE
-www/htdocs/manual/bind.html.en
-www/htdocs/manual/bind.html.fr
-www/htdocs/manual/bind.html.html
-www/htdocs/manual/bind.html.ja.jis
-www/htdocs/manual/cgi_path.html.en
-www/htdocs/manual/cgi_path.html.fr
-www/htdocs/manual/cgi_path.html.html
-www/htdocs/manual/cgi_path.html.ja.jis
-www/htdocs/manual/configuring.html.en
-www/htdocs/manual/configuring.html.fr
-www/htdocs/manual/configuring.html.html
-www/htdocs/manual/configuring.html.ja.jis
-www/htdocs/manual/content-negotiation.html.en
-www/htdocs/manual/content-negotiation.html.html
-www/htdocs/manual/content-negotiation.html.ja.jis
-www/htdocs/manual/custom-error.html.en
-www/htdocs/manual/custom-error.html.fr
-www/htdocs/manual/custom-error.html.html
-www/htdocs/manual/custom-error.html.ja.jis
-www/htdocs/manual/cygwin.html
-www/htdocs/manual/dns-caveats.html.en
-www/htdocs/manual/dns-caveats.html.fr
-www/htdocs/manual/dns-caveats.html.html
-www/htdocs/manual/dso.html
-www/htdocs/manual/ebcdic.html
-www/htdocs/manual/env.html.en
-www/htdocs/manual/env.html.html
-www/htdocs/manual/env.html.ja.jis
-www/htdocs/manual/footer.html
-www/htdocs/manual/handler.html.en
-www/htdocs/manual/handler.html.html
-www/htdocs/manual/handler.html.ja.jis
-www/htdocs/manual/header.html
-www/htdocs/manual/howto/auth.html
-www/htdocs/manual/howto/cgi.html.en
-www/htdocs/manual/howto/cgi.html.html
-www/htdocs/manual/howto/cgi.html.ja.jis
-www/htdocs/manual/howto/footer.html
-www/htdocs/manual/howto/header.html
-www/htdocs/manual/howto/htaccess.html
-www/htdocs/manual/howto/ssi.html.en
-www/htdocs/manual/howto/ssi.html.html
-www/htdocs/manual/howto/ssi.html.ja.jis
-www/htdocs/manual/images/apache_header.gif
-www/htdocs/manual/images/custom_errordocs.gif
-www/htdocs/manual/images/home.gif
-www/htdocs/manual/images/index.gif
-www/htdocs/manual/images/mod_rewrite_fig1.fig
-www/htdocs/manual/images/mod_rewrite_fig1.gif
-www/htdocs/manual/images/mod_rewrite_fig2.fig
-www/htdocs/manual/images/mod_rewrite_fig2.gif
-www/htdocs/manual/images/pixel.gif
-www/htdocs/manual/images/sub.gif
-www/htdocs/manual/index.html.en
-www/htdocs/manual/index.html.fr
-www/htdocs/manual/index.html.html
-www/htdocs/manual/index.html.ja.jis
-www/htdocs/manual/install-tpf.html
-www/htdocs/manual/install.html.en
-www/htdocs/manual/install.html.es
-www/htdocs/manual/install.html.fr
-www/htdocs/manual/install.html.html
-www/htdocs/manual/install.html.ja.jis
-www/htdocs/manual/invoking.html.en
-www/htdocs/manual/invoking.html.fr
-www/htdocs/manual/invoking.html.html
-www/htdocs/manual/keepalive.html.en
-www/htdocs/manual/keepalive.html.html
-www/htdocs/manual/keepalive.html.ja.jis
-www/htdocs/manual/location.html
-www/htdocs/manual/logs.html
-www/htdocs/manual/man-template.html
-www/htdocs/manual/misc/API.html
-www/htdocs/manual/misc/FAQ.html
-www/htdocs/manual/misc/HTTP_Features.tsv
-www/htdocs/manual/misc/client_block_api.html
-www/htdocs/manual/misc/compat_notes.html
-www/htdocs/manual/misc/custom_errordocs.html
-www/htdocs/manual/misc/descriptors.html
-www/htdocs/manual/misc/fin_wait_2.html
-www/htdocs/manual/misc/footer.html
-www/htdocs/manual/misc/header.html
-www/htdocs/manual/misc/howto.html
-www/htdocs/manual/misc/index.html
-www/htdocs/manual/misc/known_client_problems.html
-www/htdocs/manual/misc/nopgp.html
-www/htdocs/manual/misc/perf-bsd44.html
-www/htdocs/manual/misc/perf-dec.html
-www/htdocs/manual/misc/perf-hp.html
-www/htdocs/manual/misc/perf-tuning.html
-www/htdocs/manual/misc/perf.html
-www/htdocs/manual/misc/rewriteguide.html
-www/htdocs/manual/misc/security_tips.html
-www/htdocs/manual/misc/tutorials.html
-www/htdocs/manual/misc/vif-info.html
-www/htdocs/manual/misc/windoz_keepalive.html
-www/htdocs/manual/mod/core.html.en
-www/htdocs/manual/mod/core.html.fr
-www/htdocs/manual/mod/core.html.ja.jis
-www/htdocs/manual/mod/core.html.html
-www/htdocs/manual/mod/directive-dict.html.en
-www/htdocs/manual/mod/directive-dict.html.fr
-www/htdocs/manual/mod/directive-dict.html.html
-www/htdocs/manual/mod/directive-dict.html.ja.jis
-www/htdocs/manual/mod/directives.html.de
-www/htdocs/manual/mod/directives.html.en
-www/htdocs/manual/mod/directives.html.fr
-www/htdocs/manual/mod/directives.html.html
-www/htdocs/manual/mod/directives.html.ja.jis
-www/htdocs/manual/mod/footer.html
-www/htdocs/manual/mod/header.html
-www/htdocs/manual/mod/index-bytype.html.en
-www/htdocs/manual/mod/index-bytype.html.fr
-www/htdocs/manual/mod/index-bytype.html.html
-www/htdocs/manual/mod/index-bytype.html.ja.jis
-www/htdocs/manual/mod/index.html.en
-www/htdocs/manual/mod/index.html.fr
-www/htdocs/manual/mod/index.html.html
-www/htdocs/manual/mod/index.html.ja.jis
-www/htdocs/manual/mod/mod_access.html.en
-www/htdocs/manual/mod/mod_access.html.html
-www/htdocs/manual/mod/mod_access.html.ja.jis
-www/htdocs/manual/mod/mod_actions.html.en
-www/htdocs/manual/mod/mod_actions.html.html
-www/htdocs/manual/mod/mod_actions.html.ja.jis
-www/htdocs/manual/mod/mod_alias.html.en
-www/htdocs/manual/mod/mod_alias.html.html
-www/htdocs/manual/mod/mod_alias.html.ja.jis
-www/htdocs/manual/mod/mod_asis.html.en
-www/htdocs/manual/mod/mod_asis.html.html
-www/htdocs/manual/mod/mod_asis.html.ja.jis
-www/htdocs/manual/mod/mod_auth.html.en
-www/htdocs/manual/mod/mod_auth.html.html
-www/htdocs/manual/mod/mod_auth.html.ja.jis
-www/htdocs/manual/mod/mod_auth_anon.html
-www/htdocs/manual/mod/mod_auth_db.html
-www/htdocs/manual/mod/mod_auth_dbm.html
-www/htdocs/manual/mod/mod_auth_digest.html
-www/htdocs/manual/mod/mod_autoindex.html
-www/htdocs/manual/mod/mod_browser.html
-www/htdocs/manual/mod/mod_cern_meta.html
-www/htdocs/manual/mod/mod_cgi.html.en
-www/htdocs/manual/mod/mod_cgi.html.html
-www/htdocs/manual/mod/mod_cgi.html.ja.jis
-www/htdocs/manual/mod/mod_cookies.html
-www/htdocs/manual/mod/mod_digest.html
-www/htdocs/manual/mod/mod_dir.html.en
-www/htdocs/manual/mod/mod_dir.html.html
-www/htdocs/manual/mod/mod_dir.html.ja.jis
-www/htdocs/manual/mod/mod_dld.html
-www/htdocs/manual/mod/mod_env.html.en
-www/htdocs/manual/mod/mod_env.html.html
-www/htdocs/manual/mod/mod_env.html.ja.jis
-www/htdocs/manual/mod/mod_example.html
-www/htdocs/manual/mod/mod_expires.html
-www/htdocs/manual/mod/mod_headers.html
-www/htdocs/manual/mod/mod_imap.html
-www/htdocs/manual/mod/mod_include.html
-www/htdocs/manual/mod/mod_info.html.en
-www/htdocs/manual/mod/mod_info.html.html
-www/htdocs/manual/mod/mod_info.html.ja.jis
-www/htdocs/manual/mod/mod_isapi.html
-www/htdocs/manual/mod/mod_log_agent.html
-www/htdocs/manual/mod/mod_log_common.html
-www/htdocs/manual/mod/mod_log_config.html.en
-www/htdocs/manual/mod/mod_log_config.html.html
-www/htdocs/manual/mod/mod_log_config.html.ja.jis
-www/htdocs/manual/mod/mod_log_referer.html
-www/htdocs/manual/mod/mod_mime.html.en
-www/htdocs/manual/mod/mod_mime.html.html
-www/htdocs/manual/mod/mod_mime.html.ja.jis
-www/htdocs/manual/mod/mod_mime_magic.html
-www/htdocs/manual/mod/mod_mmap_static.html
-www/htdocs/manual/mod/mod_negotiation.html.en
-www/htdocs/manual/mod/mod_negotiation.html.html
-www/htdocs/manual/mod/mod_negotiation.html.ja.jis
-www/htdocs/manual/mod/mod_proxy.html
-www/htdocs/manual/mod/mod_rewrite.html
-www/htdocs/manual/mod/mod_setenvif.html.en
-www/htdocs/manual/mod/mod_setenvif.html.html
-www/htdocs/manual/mod/mod_setenvif.html.ja.jis
-www/htdocs/manual/mod/mod_so.html.en
-www/htdocs/manual/mod/mod_so.html.html
-www/htdocs/manual/mod/mod_so.html.ja.jis
-www/htdocs/manual/mod/mod_speling.html.en
-www/htdocs/manual/mod/mod_speling.html.html
-www/htdocs/manual/mod/mod_speling.html.ja.jis
-www/htdocs/manual/mod/mod_status.html
-www/htdocs/manual/mod/mod_unique_id.html.en
-www/htdocs/manual/mod/mod_unique_id.html.html
-www/htdocs/manual/mod/mod_unique_id.html.ja.jis
-www/htdocs/manual/mod/mod_userdir.html.en
-www/htdocs/manual/mod/mod_userdir.html.html
-www/htdocs/manual/mod/mod_userdir.html.ja.jis
-www/htdocs/manual/mod/mod_usertrack.html
-www/htdocs/manual/mod/mod_vhost_alias.html
-www/htdocs/manual/mod/module-dict.html.en
-www/htdocs/manual/mod/module-dict.html.html
-www/htdocs/manual/mod/module-dict.html.ja.jis
-www/htdocs/manual/mpeix.html
-www/htdocs/manual/multilogs.html
-www/htdocs/manual/netware.html
-www/htdocs/manual/new_features_1_0.html
-www/htdocs/manual/new_features_1_1.html
-www/htdocs/manual/new_features_1_2.html
-www/htdocs/manual/new_features_1_3.html.en
-www/htdocs/manual/new_features_1_3.html.html
-www/htdocs/manual/new_features_1_3.html.ja.jis
-www/htdocs/manual/new_features_2_0.html
-www/htdocs/manual/process-model.html.en
-www/htdocs/manual/process-model.html.html
-www/htdocs/manual/process-model.html.ja.jis
-www/htdocs/manual/programs/ab.html
-www/htdocs/manual/programs/apachectl.html.en
-www/htdocs/manual/programs/apachectl.html.html
-www/htdocs/manual/programs/apachectl.html.ja.jis
-www/htdocs/manual/programs/apxs.html
-www/htdocs/manual/programs/dbmmanage.html
-www/htdocs/manual/programs/footer.html
-www/htdocs/manual/programs/header.html
-www/htdocs/manual/programs/htdigest.html
-www/htdocs/manual/programs/htpasswd.html.en
-www/htdocs/manual/programs/htpasswd.html.html
-www/htdocs/manual/programs/htpasswd.html.ja.jis
-www/htdocs/manual/programs/httpd.html.en
-www/htdocs/manual/programs/httpd.html.html
-www/htdocs/manual/programs/httpd.html.ja.jis
-www/htdocs/manual/programs/index.html.en
-www/htdocs/manual/programs/index.html.html
-www/htdocs/manual/programs/index.html.ja.jis
-www/htdocs/manual/programs/logresolve.html
-www/htdocs/manual/programs/other.html
-www/htdocs/manual/programs/rotatelogs.html
-www/htdocs/manual/programs/suexec.html.en
-www/htdocs/manual/programs/suexec.html.html
-www/htdocs/manual/programs/suexec.html.ja.jis
-www/htdocs/manual/readme-tpf.html
-www/htdocs/manual/search/manual-index.cgi
-www/htdocs/manual/sections.html.en
-www/htdocs/manual/sections.html.html
-www/htdocs/manual/sections.html.ja.jis
-www/htdocs/manual/server-wide.html.en
-www/htdocs/manual/server-wide.html.fr
-www/htdocs/manual/server-wide.html.html
-www/htdocs/manual/server-wide.html.ja.jis
-www/htdocs/manual/sitemap.html
-www/htdocs/manual/sourcereorg.html
-www/htdocs/manual/stopping.html.en
-www/htdocs/manual/stopping.html.fr
-www/htdocs/manual/stopping.html.html
-www/htdocs/manual/suexec.html.en
-www/htdocs/manual/suexec.html.html
-www/htdocs/manual/suexec.html.ja.jis
-www/htdocs/manual/suexec_1_2.html
-www/htdocs/manual/unixware.html
-www/htdocs/manual/upgrading_to_1_3.html
-www/htdocs/manual/urlmapping.html
-www/htdocs/manual/vhosts/details.html
-www/htdocs/manual/vhosts/details_1_2.html
-www/htdocs/manual/vhosts/examples.html
-www/htdocs/manual/vhosts/fd-limits.html.en
-www/htdocs/manual/vhosts/fd-limits.html.html
-www/htdocs/manual/vhosts/fd-limits.html.ja.jis
-www/htdocs/manual/vhosts/footer.html
-www/htdocs/manual/vhosts/header.html
-www/htdocs/manual/vhosts/host.html
-www/htdocs/manual/vhosts/index.html.en
-www/htdocs/manual/vhosts/index.html.html
-www/htdocs/manual/vhosts/index.html.ja.jis
-www/htdocs/manual/vhosts/ip-based.html
-www/htdocs/manual/vhosts/mass.html
-www/htdocs/manual/vhosts/name-based.html.en
-www/htdocs/manual/vhosts/name-based.html.html
-www/htdocs/manual/vhosts/name-based.html.ja.jis
-www/htdocs/manual/vhosts/vhosts-in-depth.html
-www/htdocs/manual/vhosts/virtual-host.html
-www/htdocs/manual/win_compiling.html.en
-www/htdocs/manual/win_compiling.html.html
-www/htdocs/manual/win_compiling.html.ja.jis
-www/htdocs/manual/win_service.html.en
-www/htdocs/manual/win_service.html.html
-www/htdocs/manual/win_service.html.ja.jis
-www/htdocs/manual/windows.html.en
-www/htdocs/manual/windows.html.ja.jis
+www/data-dist/apache_pb.gif
+@exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
+www/data-dist/index.html.ca
+www/data-dist/index.html.cz
+www/data-dist/index.html.de
+www/data-dist/index.html.dk
+www/data-dist/index.html.ee
+www/data-dist/index.html.el
+www/data-dist/index.html.en
+www/data-dist/index.html.es
+www/data-dist/index.html.fr
+www/data-dist/index.html.he.iso8859-8
+www/data-dist/index.html.it
+www/data-dist/index.html.ja.jis
+www/data-dist/index.html.kr.iso-kr
+www/data-dist/index.html.lb.utf8
+www/data-dist/index.html.nl
+www/data-dist/index.html.nn
+www/data-dist/index.html.no
+www/data-dist/index.html.po.iso-pl
+www/data-dist/index.html.pt
+www/data-dist/index.html.pt-br
+www/data-dist/index.html.ru.cp-1251
+www/data-dist/index.html.ru.cp866
+www/data-dist/index.html.ru.iso-ru
+www/data-dist/index.html.ru.koi8-r
+www/data-dist/index.html.ru.ucs2
+www/data-dist/index.html.ru.ucs4
+www/data-dist/index.html.ru.utf8
+www/data-dist/index.html.se
+www/data-dist/index.html.zh-tw.big5
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/bind.html.en
+%%PORTDOCS%%%%DOCSDIR%%/bind.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/bind.html.html
+%%PORTDOCS%%%%DOCSDIR%%/bind.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.en
+%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.html
+%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/configuring.html.en
+%%PORTDOCS%%%%DOCSDIR%%/configuring.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/configuring.html.html
+%%PORTDOCS%%%%DOCSDIR%%/configuring.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/content-negotiation.html.en
+%%PORTDOCS%%%%DOCSDIR%%/content-negotiation.html.html
+%%PORTDOCS%%%%DOCSDIR%%/content-negotiation.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/custom-error.html.en
+%%PORTDOCS%%%%DOCSDIR%%/custom-error.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/custom-error.html.html
+%%PORTDOCS%%%%DOCSDIR%%/custom-error.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/cygwin.html
+%%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.en
+%%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.html
+%%PORTDOCS%%%%DOCSDIR%%/dso.html
+%%PORTDOCS%%%%DOCSDIR%%/ebcdic.html
+%%PORTDOCS%%%%DOCSDIR%%/env.html.en
+%%PORTDOCS%%%%DOCSDIR%%/env.html.html
+%%PORTDOCS%%%%DOCSDIR%%/env.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/handler.html.en
+%%PORTDOCS%%%%DOCSDIR%%/handler.html.html
+%%PORTDOCS%%%%DOCSDIR%%/handler.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/header.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/auth.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/cgi.html.en
+%%PORTDOCS%%%%DOCSDIR%%/howto/cgi.html.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/cgi.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/howto/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/header.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/htaccess.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/ssi.html.en
+%%PORTDOCS%%%%DOCSDIR%%/howto/ssi.html.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/ssi.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/images/apache_header.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/custom_errordocs.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/home.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/index.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/mod_rewrite_fig1.fig
+%%PORTDOCS%%%%DOCSDIR%%/images/mod_rewrite_fig1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/mod_rewrite_fig2.fig
+%%PORTDOCS%%%%DOCSDIR%%/images/mod_rewrite_fig2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/pixel.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/sub.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html.en
+%%PORTDOCS%%%%DOCSDIR%%/index.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/index.html.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/install-tpf.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html.en
+%%PORTDOCS%%%%DOCSDIR%%/install.html.es
+%%PORTDOCS%%%%DOCSDIR%%/install.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/install.html.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/invoking.html.en
+%%PORTDOCS%%%%DOCSDIR%%/invoking.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/invoking.html.html
+%%PORTDOCS%%%%DOCSDIR%%/keepalive.html.en
+%%PORTDOCS%%%%DOCSDIR%%/keepalive.html.html
+%%PORTDOCS%%%%DOCSDIR%%/keepalive.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/location.html
+%%PORTDOCS%%%%DOCSDIR%%/logs.html
+%%PORTDOCS%%%%DOCSDIR%%/man-template.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/API.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/HTTP_Features.tsv
+%%PORTDOCS%%%%DOCSDIR%%/misc/client_block_api.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/compat_notes.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/custom_errordocs.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/descriptors.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/fin_wait_2.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/header.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/howto.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/known_client_problems.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/nopgp.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf-bsd44.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf-dec.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf-hp.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf-tuning.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/rewriteguide.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/security_tips.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/tutorials.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/vif-info.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/windoz_keepalive.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/core.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/core.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/core.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/core.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/directive-dict.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/directive-dict.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/directive-dict.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/directive-dict.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.de
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/header.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/index-bytype.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/index-bytype.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/index-bytype.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/index-bytype.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/index.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/index.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/index.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/index.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_access.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_access.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_access.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_actions.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_actions.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_actions.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_alias.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_alias.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_alias.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_asis.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_asis.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_asis.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_anon.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_db.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_dbm.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_digest.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_autoindex.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_browser.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cern_meta.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cgi.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cgi.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cgi.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cookies.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_digest.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_dir.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_dir.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_dir.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_dld.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_env.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_env.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_env.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_example.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_expires.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_headers.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_imap.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_include.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_info.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_info.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_info.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_isapi.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_agent.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_common.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_referer.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime_magic.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mmap_static.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_proxy.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_so.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_so.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_so.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_speling.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_speling.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_speling.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_status.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_userdir.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_userdir.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_userdir.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_usertrack.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_vhost_alias.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/module-dict.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/module-dict.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/module-dict.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mpeix.html
+%%PORTDOCS%%%%DOCSDIR%%/multilogs.html
+%%PORTDOCS%%%%DOCSDIR%%/netware.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_0.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_1.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_2.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.en
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/new_features_2_0.html
+%%PORTDOCS%%%%DOCSDIR%%/process-model.html.en
+%%PORTDOCS%%%%DOCSDIR%%/process-model.html.html
+%%PORTDOCS%%%%DOCSDIR%%/process-model.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/ab.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/apachectl.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/apachectl.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/apachectl.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/apxs.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/dbmmanage.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/header.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/htdigest.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/htpasswd.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/htpasswd.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/htpasswd.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/httpd.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/httpd.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/httpd.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/index.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/index.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/index.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/logresolve.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/other.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/rotatelogs.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/readme-tpf.html
+%%PORTDOCS%%%%DOCSDIR%%/search/manual-index.cgi
+%%PORTDOCS%%%%DOCSDIR%%/sections.html.en
+%%PORTDOCS%%%%DOCSDIR%%/sections.html.html
+%%PORTDOCS%%%%DOCSDIR%%/sections.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/server-wide.html.en
+%%PORTDOCS%%%%DOCSDIR%%/server-wide.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/server-wide.html.html
+%%PORTDOCS%%%%DOCSDIR%%/server-wide.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/sitemap.html
+%%PORTDOCS%%%%DOCSDIR%%/sourcereorg.html
+%%PORTDOCS%%%%DOCSDIR%%/stopping.html.en
+%%PORTDOCS%%%%DOCSDIR%%/stopping.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/stopping.html.html
+%%PORTDOCS%%%%DOCSDIR%%/suexec.html.en
+%%PORTDOCS%%%%DOCSDIR%%/suexec.html.html
+%%PORTDOCS%%%%DOCSDIR%%/suexec.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/suexec_1_2.html
+%%PORTDOCS%%%%DOCSDIR%%/unixware.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrading_to_1_3.html
+%%PORTDOCS%%%%DOCSDIR%%/urlmapping.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/details.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/details_1_2.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.en
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/header.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/host.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/index.html.en
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/index.html.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/index.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/ip-based.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/mass.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.html.en
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.html.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/vhosts-in-depth.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/virtual-host.html
+%%PORTDOCS%%%%DOCSDIR%%/win_compiling.html.en
+%%PORTDOCS%%%%DOCSDIR%%/win_compiling.html.html
+%%PORTDOCS%%%%DOCSDIR%%/win_compiling.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/win_service.html.en
+%%PORTDOCS%%%%DOCSDIR%%/win_service.html.html
+%%PORTDOCS%%%%DOCSDIR%%/win_service.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/windows.html.en
+%%PORTDOCS%%%%DOCSDIR%%/windows.html.ja.jis
 www/icons/README
 www/icons/a.gif
 www/icons/a.png
@@ -629,16 +627,18 @@ www/icons/world2.png
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm www/cgi-bin
-@dirrm www/htdocs/manual/howto
-@dirrm www/htdocs/manual/images
-@dirrm www/htdocs/manual/misc
-@dirrm www/htdocs/manual/mod
-@dirrm www/htdocs/manual/programs
-@dirrm www/htdocs/manual/search
-@dirrm www/htdocs/manual/vhosts
-@dirrm www/htdocs/manual
-@dirrm www/htdocs
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/howto
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/misc
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/mod
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/programs
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/search
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/vhosts
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+@dirrm www/cgi-bin-dist
+@dirrm www/data-dist
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy