portlint clean up and sync with www/apache13.

PR:		ports/117461
Submiited by:	"Philip M. Gollucci" <pgollucci@p6m7g8.com>

5 files changed, 356 insertions, 342 deletions

diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 4871610a5f4f..26803606bac6 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -5,16 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME=	apache+ipv6
+PORTNAME=	apache
 PORTVERSION=	1.3.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
+PKGNAMESUFFIX=	+ipv6
 DISTNAME=	apache_${PORTVERSION}
 
 PATCH_SITES=	http://www.don.to/arc/
 PATCHFILES=	apache-1.3.39-v6-20070911.diff.gz
-PATCH_DIST_STRIP= -p1
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	The extremely popular Apache http server. Very fast, very clean
@@ -23,10 +24,10 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
 		apache+mod_ssl+mod_snmp+mod_accel-1.* \
 		apache+ssl-1.* apache-1.* apache-2.* apache_fp-1.* \
-		caudium-devel-1.* caudium10-1.* caudium12-* \
+		caudium-devel-1.* caudium10-1.* caudium12-1.* \
 		ru-apache+mod_ssl-1.* ru-apache-1.*
 USE_PERL5=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	apache
 
 .if defined(APACHE_DATADIR)
 DATADIR=${APACHE_DATADIR}
@@ -44,7 +45,6 @@ CGIBIN_ROOT=${APACHE_CGIBIN_ROOT}
 CGIBIN_ROOT=${DATADIR}/cgi-bin
 .endif
 DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin
-RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 .if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes
 EXPAT_CONF+=	--disable-rule=EXPAT
@@ -90,6 +90,12 @@ SUEXEC_MAN=
 
 .endif  # !SUEXEC
 
+.if !defined(NOPORTDOC)
+PLIST_SUB+=	NODOCS=""
+.else
+PLIST_SUB+=	NODOCS="@comment "
+.endif
+
 HAS_CONFIGURE=	yes
 # += for child ports
 CONFIGURE_ARGS+=	\
@@ -145,19 +151,15 @@ MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
 		${SUEXEC_MAN}
 
-post-extract:
-	@${SED}	${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKSRC}/apache.sh
+post-patch:
+.if defined(NOPORTDOC)
+	@(cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/no_port_doc)
+.endif
 
 pre-install:
-	-@${CHMOD} u+w ${DOCUMENT_ROOT}-dist ${CGIBIN_ROOT}-dist
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh
-	@${TOUCH} ${DOCUMENT_ROOT}-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-	@${TOUCH} ${CGIBIN_ROOT}-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-	@${CHMOD} a-w ${DOCUMENT_ROOT}-dist ${CGIBIN_ROOT}-dist
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/apache13+ipv6/files/apache.sh b/www/apache13+ipv6/files/apache.in
index 1bea1411b8be..1bea1411b8be 100644
--- a/www/apache13+ipv6/files/apache.sh
+++ b/www/apache13+ipv6/files/apache.in
diff --git a/www/apache13+ipv6/files/no_port_doc b/www/apache13+ipv6/files/no_port_doc
new file mode 100644
index 000000000000..36190f286bd0
--- /dev/null
+++ b/www/apache13+ipv6/files/no_port_doc
@@ -0,0 +1,22 @@
+--- Makefile.tmpl.orig	2007-10-15 23:37:45.000000000 -0400
++++ Makefile.tmpl    	2007-10-15 23:37:59.000000000 -0400
+@@ -229,7 +229,6 @@
+ 	$(MKDIR) $(root)$(sysconfdir)
+ 	$(MKDIR) $(root)$(htdocsdir)/
+ 	$(MKDIR) $(root)$(htdocsdir)-dist
+-	$(MKDIR) $(root)$(manualdir)
+ 	$(MKDIR) $(root)$(iconsdir)
+ 	$(MKDIR) $(root)$(cgidir)/
+ 	$(MKDIR) $(root)$(cgidir)-dist
+@@ -423,11 +422,6 @@
+ 		(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 ;
+ 		for script in printenv test-cgi; do \
+ 			cat $(TOP)/cgi-bin/$${script} |\
+ 			sed -e 's;^#!/.*perl;#!$(PERL);' \
diff --git a/www/apache13+ipv6/files/patch-ab b/www/apache13+ipv6/files/patch-ab
index 567c58ca2e00..986749781248 100644
--- a/www/apache13+ipv6/files/patch-ab
+++ b/www/apache13+ipv6/files/patch-ab
@@ -1,19 +1,21 @@
---- Makefile.tmpl.orig	Thu Mar 14 00:05:27 2002
-+++ Makefile.tmpl	Sat Jun 22 09:33:52 2002
-@@ -270,10 +270,10 @@
+--- Makefile.tmpl.orig	2006-07-12 12:16:05.000000000 +0400
++++ Makefile.tmpl	2007-10-01 09:21:04.000000000 +0400
+@@ -227,10 +227,12 @@
  	$(MKDIR) $(root)$(mandir)/man1
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
 -	$(MKDIR) $(root)$(htdocsdir)
++	$(MKDIR) $(root)$(htdocsdir)/
 +	$(MKDIR) $(root)$(htdocsdir)-dist
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
 -	$(MKDIR) $(root)$(cgidir)
++	$(MKDIR) $(root)$(cgidir)/
 +	$(MKDIR) $(root)$(cgidir)-dist
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(includedir)/xml
  	$(MKDIR) $(root)$(runtimedir)
-@@ -459,33 +459,29 @@
+@@ -416,33 +418,23 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -36,13 +38,11 @@
  		(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
+-	fi
 -	-@if [ -f $(root)$(cgidir)/printenv ]; then \
 -		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
 -	else \
++		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
@@ -54,13 +54,10 @@
 +			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 -); \
-@@ -524,10 +520,10 @@
+@@ -481,10 +473,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;' \
@@ -73,9 +70,9 @@
 +			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
 +			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
- 			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
- 			-e 's;User nobody;User $(conf_user);' \
-@@ -537,8 +533,8 @@
+ 			-e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \
+ 			-e 's;conf/access.conf;$(sysconfdir)/access.conf;' \
+@@ -496,8 +488,8 @@
  			-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
  			-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
  			> $(TOP)/$(SRC)/.apaci.install.tmp && \
@@ -86,7 +83,7 @@
  		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}; \
-@@ -547,8 +543,8 @@
+@@ -506,8 +498,8 @@
  		fi; \
  	done
  	-@for conf in mime.types magic; do \
diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist
index fba15da9617d..ca524ca674e1 100644
--- a/www/apache13+ipv6/pkg-plist
+++ b/www/apache13+ipv6/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.25 2007-09-11 02:52:45 sumikawa Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.26 2007-10-26 07:08:59 sumikawa Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
@@ -18,7 +18,6 @@ etc/apache/mime.types-dist
 @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
-etc/rc.d/apache.sh
 include/apache/ap.h
 include/apache/ap_alloc.h
 include/apache/ap_compat.h
@@ -108,9 +107,7 @@ sbin/logresolve
 sbin/rotatelogs
 %%SUB_SUEXEC%%sbin/suexec
 @exec mkdir -p -m 755 %D/www/data-dist
-@unexec chmod u+w %D/www/data-dist
-www/data-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-@exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
+@exec [ -d %D/www/data/ ] || mkdir -p -m 755 %D/www/data/
 www/data-dist/apache_pb.gif
 www/data-dist/index.html.ca
 www/data-dist/index.html.cz
@@ -142,305 +139,301 @@ 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
-@exec chmod a-w %D/www/data-dist
-share/doc/apache/LICENSE
-share/doc/apache/bind.html.en
-share/doc/apache/bind.html.fr
-share/doc/apache/bind.html.html
-share/doc/apache/bind.html.ja.jis
-share/doc/apache/configuring.html.en
-share/doc/apache/configuring.html.fr
-share/doc/apache/configuring.html.html
-share/doc/apache/configuring.html.ja.jis
-share/doc/apache/content-negotiation.html.en
-share/doc/apache/content-negotiation.html.html
-share/doc/apache/content-negotiation.html.ja.jis
-share/doc/apache/custom-error.html.en
-share/doc/apache/custom-error.html.fr
-share/doc/apache/custom-error.html.html
-share/doc/apache/custom-error.html.ja.jis
-share/doc/apache/cygwin.html
-share/doc/apache/dns-caveats.html.en
-share/doc/apache/dns-caveats.html.fr
-share/doc/apache/dns-caveats.html.html
-share/doc/apache/dns-caveats.html.ja.jis
-share/doc/apache/dso.html
-share/doc/apache/ebcdic.html
-share/doc/apache/env.html.en
-share/doc/apache/env.html.html
-share/doc/apache/env.html.ja.jis
-share/doc/apache/footer.html
-share/doc/apache/handler.html.en
-share/doc/apache/handler.html.html
-share/doc/apache/handler.html.ja.jis
-share/doc/apache/header.html
-share/doc/apache/howto/auth.html
-share/doc/apache/howto/cgi.html.en
-share/doc/apache/howto/cgi.html.html
-share/doc/apache/howto/cgi.html.ja.jis
-share/doc/apache/howto/footer.html
-share/doc/apache/howto/header.html
-share/doc/apache/howto/htaccess.html
-share/doc/apache/howto/ssi.html.en
-share/doc/apache/howto/ssi.html.html
-share/doc/apache/howto/ssi.html.ja.jis
-share/doc/apache/images/apache_header.gif
-share/doc/apache/images/custom_errordocs.gif
-share/doc/apache/images/home.gif
-share/doc/apache/images/index.gif
-share/doc/apache/images/mod_rewrite_fig1.fig
-share/doc/apache/images/mod_rewrite_fig1.gif
-share/doc/apache/images/mod_rewrite_fig2.fig
-share/doc/apache/images/mod_rewrite_fig2.gif
-share/doc/apache/images/pixel.gif
-share/doc/apache/images/sub.gif
-share/doc/apache/index.html.en
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.html
-share/doc/apache/index.html.ja.jis
-share/doc/apache/install-tpf.html
-share/doc/apache/install-ztpf.html
-share/doc/apache/install.html.en
-share/doc/apache/install.html.es
-share/doc/apache/install.html.fr
-share/doc/apache/install.html.html
-share/doc/apache/install.html.ja.jis
-share/doc/apache/invoking.html.en
-share/doc/apache/invoking.html.fr
-share/doc/apache/invoking.html.html
-share/doc/apache/invoking.html.ja.jis
-share/doc/apache/keepalive.html.en
-share/doc/apache/keepalive.html.html
-share/doc/apache/keepalive.html.ja.jis
-share/doc/apache/location.html.en
-share/doc/apache/location.html.html
-share/doc/apache/location.html.ja.jis
-share/doc/apache/logs.html
-share/doc/apache/man-template.html
-share/doc/apache/misc/API.html
-share/doc/apache/misc/FAQ.html
-share/doc/apache/misc/HTTP_Features.tsv
-share/doc/apache/misc/client_block_api.html
-share/doc/apache/misc/compat_notes.html
-share/doc/apache/misc/custom_errordocs.html
-share/doc/apache/misc/descriptors.html
-share/doc/apache/misc/fin_wait_2.html
-share/doc/apache/misc/footer.html
-share/doc/apache/misc/header.html
-share/doc/apache/misc/howto.html
-share/doc/apache/misc/index.html
-share/doc/apache/misc/known_client_problems.html
-share/doc/apache/misc/nopgp.html
-share/doc/apache/misc/perf-bsd44.html
-share/doc/apache/misc/perf-dec.html
-share/doc/apache/misc/perf-hp.html
-share/doc/apache/misc/perf-tuning.html
-share/doc/apache/misc/perf.html
-share/doc/apache/misc/rewriteguide.html
-share/doc/apache/misc/security_tips.html
-share/doc/apache/misc/tutorials.html
-share/doc/apache/misc/vif-info.html
-share/doc/apache/misc/windoz_keepalive.html
-share/doc/apache/mod/core.html.en
-share/doc/apache/mod/core.html.fr
-share/doc/apache/mod/core.html.html
-share/doc/apache/mod/core.html.ja.jis
-share/doc/apache/mod/directive-dict.html.en
-share/doc/apache/mod/directive-dict.html.fr
-share/doc/apache/mod/directive-dict.html.html
-share/doc/apache/mod/directive-dict.html.ja.jis
-share/doc/apache/mod/directives.html.de
-share/doc/apache/mod/directives.html.en
-share/doc/apache/mod/directives.html.fr
-share/doc/apache/mod/directives.html.html
-share/doc/apache/mod/directives.html.ja.jis
-share/doc/apache/mod/footer.html
-share/doc/apache/mod/header.html
-share/doc/apache/mod/index-bytype.html.en
-share/doc/apache/mod/index-bytype.html.fr
-share/doc/apache/mod/index-bytype.html.html
-share/doc/apache/mod/index-bytype.html.ja.jis
-share/doc/apache/mod/index.html.en
-share/doc/apache/mod/index.html.fr
-share/doc/apache/mod/index.html.html
-share/doc/apache/mod/index.html.ja.jis
-share/doc/apache/mod/mod_access.html.en
-share/doc/apache/mod/mod_access.html.html
-share/doc/apache/mod/mod_access.html.ja.jis
-share/doc/apache/mod/mod_actions.html.en
-share/doc/apache/mod/mod_actions.html.html
-share/doc/apache/mod/mod_actions.html.ja.jis
-share/doc/apache/mod/mod_alias.html.en
-share/doc/apache/mod/mod_alias.html.html
-share/doc/apache/mod/mod_alias.html.ja.jis
-share/doc/apache/mod/mod_asis.html.en
-share/doc/apache/mod/mod_asis.html.html
-share/doc/apache/mod/mod_asis.html.ja.jis
-share/doc/apache/mod/mod_auth.html.en
-share/doc/apache/mod/mod_auth.html.html
-share/doc/apache/mod/mod_auth.html.ja.jis
-share/doc/apache/mod/mod_auth_anon.html
-share/doc/apache/mod/mod_auth_db.html
-share/doc/apache/mod/mod_auth_dbm.html
-share/doc/apache/mod/mod_auth_digest.html
-share/doc/apache/mod/mod_autoindex.html.en
-share/doc/apache/mod/mod_autoindex.html.html
-share/doc/apache/mod/mod_autoindex.html.ja.jis
-share/doc/apache/mod/mod_browser.html
-share/doc/apache/mod/mod_cern_meta.html
-share/doc/apache/mod/mod_cgi.html.en
-share/doc/apache/mod/mod_cgi.html.html
-share/doc/apache/mod/mod_cgi.html.ja.jis
-share/doc/apache/mod/mod_cookies.html
-share/doc/apache/mod/mod_digest.html
-share/doc/apache/mod/mod_dir.html.en
-share/doc/apache/mod/mod_dir.html.html
-share/doc/apache/mod/mod_dir.html.ja.jis
-share/doc/apache/mod/mod_dld.html
-share/doc/apache/mod/mod_env.html.en
-share/doc/apache/mod/mod_env.html.html
-share/doc/apache/mod/mod_env.html.ja.jis
-share/doc/apache/mod/mod_example.html
-share/doc/apache/mod/mod_expires.html
-share/doc/apache/mod/mod_headers.html
-share/doc/apache/mod/mod_imap.html
-share/doc/apache/mod/mod_include.html
-share/doc/apache/mod/mod_info.html.en
-share/doc/apache/mod/mod_info.html.html
-share/doc/apache/mod/mod_info.html.ja.jis
-share/doc/apache/mod/mod_isapi.html
-share/doc/apache/mod/mod_log_agent.html
-share/doc/apache/mod/mod_log_common.html
-share/doc/apache/mod/mod_log_config.html.en
-share/doc/apache/mod/mod_log_config.html.html
-share/doc/apache/mod/mod_log_config.html.ja.jis
-share/doc/apache/mod/mod_log_forensic.html.en
-share/doc/apache/mod/mod_log_forensic.html.html
-share/doc/apache/mod/mod_log_referer.html
-share/doc/apache/mod/mod_mime.html.en
-share/doc/apache/mod/mod_mime.html.html
-share/doc/apache/mod/mod_mime.html.ja.jis
-share/doc/apache/mod/mod_mime_magic.html
-share/doc/apache/mod/mod_mmap_static.html
-share/doc/apache/mod/mod_negotiation.html.en
-share/doc/apache/mod/mod_negotiation.html.html
-share/doc/apache/mod/mod_negotiation.html.ja.jis
-share/doc/apache/mod/mod_proxy.html
-share/doc/apache/mod/mod_rewrite.html.en
-share/doc/apache/mod/mod_rewrite.html.html
-share/doc/apache/mod/mod_rewrite.html.ja.jis
-share/doc/apache/mod/mod_setenvif.html.en
-share/doc/apache/mod/mod_setenvif.html.html
-share/doc/apache/mod/mod_setenvif.html.ja.jis
-share/doc/apache/mod/mod_so.html.en
-share/doc/apache/mod/mod_so.html.html
-share/doc/apache/mod/mod_so.html.ja.jis
-share/doc/apache/mod/mod_speling.html.en
-share/doc/apache/mod/mod_speling.html.html
-share/doc/apache/mod/mod_speling.html.ja.jis
-share/doc/apache/mod/mod_status.html
-share/doc/apache/mod/mod_unique_id.html.en
-share/doc/apache/mod/mod_unique_id.html.html
-share/doc/apache/mod/mod_unique_id.html.ja.jis
-share/doc/apache/mod/mod_userdir.html.en
-share/doc/apache/mod/mod_userdir.html.html
-share/doc/apache/mod/mod_userdir.html.ja.jis
-share/doc/apache/mod/mod_usertrack.html
-share/doc/apache/mod/mod_vhost_alias.html
-share/doc/apache/mod/module-dict.html.en
-share/doc/apache/mod/module-dict.html.html
-share/doc/apache/mod/module-dict.html.ja.jis
-share/doc/apache/mpeix.html
-share/doc/apache/multilogs.html
-share/doc/apache/netware.html
-share/doc/apache/new_features_1_0.html
-share/doc/apache/new_features_1_1.html
-share/doc/apache/new_features_1_2.html
-share/doc/apache/new_features_1_3.html.en
-share/doc/apache/new_features_1_3.html.html
-share/doc/apache/new_features_1_3.html.ja.jis
-share/doc/apache/process-model.html.en
-share/doc/apache/process-model.html.html
-share/doc/apache/process-model.html.ja.jis
-share/doc/apache/programs/ab.html
-share/doc/apache/programs/apachectl.html.en
-share/doc/apache/programs/apachectl.html.html
-share/doc/apache/programs/apachectl.html.ja.jis
-share/doc/apache/programs/apxs.html
-share/doc/apache/programs/dbmmanage.html
-share/doc/apache/programs/footer.html
-share/doc/apache/programs/header.html
-share/doc/apache/programs/htdigest.html
-share/doc/apache/programs/htpasswd.html.en
-share/doc/apache/programs/htpasswd.html.html
-share/doc/apache/programs/htpasswd.html.ja.jis
-share/doc/apache/programs/httpd.html.en
-share/doc/apache/programs/httpd.html.html
-share/doc/apache/programs/httpd.html.ja.jis
-share/doc/apache/programs/index.html.en
-share/doc/apache/programs/index.html.html
-share/doc/apache/programs/index.html.ja.jis
-share/doc/apache/programs/logresolve.html
-share/doc/apache/programs/other.html
-share/doc/apache/programs/rotatelogs.html
-share/doc/apache/programs/suexec.html.en
-share/doc/apache/programs/suexec.html.html
-share/doc/apache/programs/suexec.html.ja.jis
-share/doc/apache/readme-tpf.html
-share/doc/apache/sections.html.en
-share/doc/apache/sections.html.html
-share/doc/apache/sections.html.ja.jis
-share/doc/apache/server-wide.html.en
-share/doc/apache/server-wide.html.fr
-share/doc/apache/server-wide.html.html
-share/doc/apache/server-wide.html.ja.jis
-share/doc/apache/sitemap.html
-share/doc/apache/sourcereorg.html
-share/doc/apache/stopping.html.en
-share/doc/apache/stopping.html.fr
-share/doc/apache/stopping.html.html
-share/doc/apache/suexec.html.en
-share/doc/apache/suexec.html.html
-share/doc/apache/suexec.html.ja.jis
-share/doc/apache/suexec_1_2.html
-share/doc/apache/unixware.html
-share/doc/apache/upgrading_to_1_3.html
-share/doc/apache/urlmapping.html
-share/doc/apache/vhosts/details.html
-share/doc/apache/vhosts/details_1_2.html
-share/doc/apache/vhosts/examples.html
-share/doc/apache/vhosts/fd-limits.html.en
-share/doc/apache/vhosts/fd-limits.html.html
-share/doc/apache/vhosts/fd-limits.html.ja.jis
-share/doc/apache/vhosts/footer.html
-share/doc/apache/vhosts/header.html
-share/doc/apache/vhosts/host.html
-share/doc/apache/vhosts/index.html.en
-share/doc/apache/vhosts/index.html.html
-share/doc/apache/vhosts/index.html.ja.jis
-share/doc/apache/vhosts/ip-based.html
-share/doc/apache/vhosts/mass.html
-share/doc/apache/vhosts/name-based.html.en
-share/doc/apache/vhosts/name-based.html.html
-share/doc/apache/vhosts/name-based.html.ja.jis
-share/doc/apache/vhosts/vhosts-in-depth.html
-share/doc/apache/vhosts/virtual-host.html
-share/doc/apache/win_compiling.html.en
-share/doc/apache/win_compiling.html.html
-share/doc/apache/win_compiling.html.ja.jis
-share/doc/apache/win_service.html.en
-share/doc/apache/win_service.html.html
-share/doc/apache/win_service.html.ja.jis
-share/doc/apache/windows.html.en
-share/doc/apache/windows.html.html
-share/doc/apache/windows.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/LICENSE
+%%NODOCS%%%%DOCSDIR%%/bind.html.en
+%%NODOCS%%%%DOCSDIR%%/bind.html.fr
+%%NODOCS%%%%DOCSDIR%%/bind.html.html
+%%NODOCS%%%%DOCSDIR%%/bind.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/configuring.html.en
+%%NODOCS%%%%DOCSDIR%%/configuring.html.fr
+%%NODOCS%%%%DOCSDIR%%/configuring.html.html
+%%NODOCS%%%%DOCSDIR%%/configuring.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/content-negotiation.html.en
+%%NODOCS%%%%DOCSDIR%%/content-negotiation.html.html
+%%NODOCS%%%%DOCSDIR%%/content-negotiation.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/custom-error.html.en
+%%NODOCS%%%%DOCSDIR%%/custom-error.html.fr
+%%NODOCS%%%%DOCSDIR%%/custom-error.html.html
+%%NODOCS%%%%DOCSDIR%%/custom-error.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/cygwin.html
+%%NODOCS%%%%DOCSDIR%%/dns-caveats.html.en
+%%NODOCS%%%%DOCSDIR%%/dns-caveats.html.fr
+%%NODOCS%%%%DOCSDIR%%/dns-caveats.html.html
+%%NODOCS%%%%DOCSDIR%%/dns-caveats.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/dso.html
+%%NODOCS%%%%DOCSDIR%%/ebcdic.html
+%%NODOCS%%%%DOCSDIR%%/env.html.en
+%%NODOCS%%%%DOCSDIR%%/env.html.html
+%%NODOCS%%%%DOCSDIR%%/env.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/footer.html
+%%NODOCS%%%%DOCSDIR%%/handler.html.en
+%%NODOCS%%%%DOCSDIR%%/handler.html.html
+%%NODOCS%%%%DOCSDIR%%/handler.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/header.html
+%%NODOCS%%%%DOCSDIR%%/howto/auth.html
+%%NODOCS%%%%DOCSDIR%%/howto/cgi.html.en
+%%NODOCS%%%%DOCSDIR%%/howto/cgi.html.html
+%%NODOCS%%%%DOCSDIR%%/howto/cgi.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/howto/footer.html
+%%NODOCS%%%%DOCSDIR%%/howto/header.html
+%%NODOCS%%%%DOCSDIR%%/howto/htaccess.html
+%%NODOCS%%%%DOCSDIR%%/howto/ssi.html.en
+%%NODOCS%%%%DOCSDIR%%/howto/ssi.html.html
+%%NODOCS%%%%DOCSDIR%%/howto/ssi.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/images/apache_header.gif
+%%NODOCS%%%%DOCSDIR%%/images/custom_errordocs.gif
+%%NODOCS%%%%DOCSDIR%%/images/home.gif
+%%NODOCS%%%%DOCSDIR%%/images/index.gif
+%%NODOCS%%%%DOCSDIR%%/images/mod_rewrite_fig1.fig
+%%NODOCS%%%%DOCSDIR%%/images/mod_rewrite_fig1.gif
+%%NODOCS%%%%DOCSDIR%%/images/mod_rewrite_fig2.fig
+%%NODOCS%%%%DOCSDIR%%/images/mod_rewrite_fig2.gif
+%%NODOCS%%%%DOCSDIR%%/images/pixel.gif
+%%NODOCS%%%%DOCSDIR%%/images/sub.gif
+%%NODOCS%%%%DOCSDIR%%/index.html.en
+%%NODOCS%%%%DOCSDIR%%/index.html.fr
+%%NODOCS%%%%DOCSDIR%%/index.html.html
+%%NODOCS%%%%DOCSDIR%%/index.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/install-tpf.html
+%%NODOCS%%%%DOCSDIR%%/install-ztpf.html
+%%NODOCS%%%%DOCSDIR%%/install.html.en
+%%NODOCS%%%%DOCSDIR%%/install.html.es
+%%NODOCS%%%%DOCSDIR%%/install.html.fr
+%%NODOCS%%%%DOCSDIR%%/install.html.html
+%%NODOCS%%%%DOCSDIR%%/install.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/invoking.html.en
+%%NODOCS%%%%DOCSDIR%%/invoking.html.fr
+%%NODOCS%%%%DOCSDIR%%/invoking.html.html
+%%NODOCS%%%%DOCSDIR%%/invoking.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/keepalive.html.en
+%%NODOCS%%%%DOCSDIR%%/keepalive.html.html
+%%NODOCS%%%%DOCSDIR%%/keepalive.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/location.html.en
+%%NODOCS%%%%DOCSDIR%%/location.html.html
+%%NODOCS%%%%DOCSDIR%%/location.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/logs.html
+%%NODOCS%%%%DOCSDIR%%/man-template.html
+%%NODOCS%%%%DOCSDIR%%/misc/API.html
+%%NODOCS%%%%DOCSDIR%%/misc/FAQ.html
+%%NODOCS%%%%DOCSDIR%%/misc/HTTP_Features.tsv
+%%NODOCS%%%%DOCSDIR%%/misc/client_block_api.html
+%%NODOCS%%%%DOCSDIR%%/misc/compat_notes.html
+%%NODOCS%%%%DOCSDIR%%/misc/custom_errordocs.html
+%%NODOCS%%%%DOCSDIR%%/misc/descriptors.html
+%%NODOCS%%%%DOCSDIR%%/misc/fin_wait_2.html
+%%NODOCS%%%%DOCSDIR%%/misc/footer.html
+%%NODOCS%%%%DOCSDIR%%/misc/header.html
+%%NODOCS%%%%DOCSDIR%%/misc/howto.html
+%%NODOCS%%%%DOCSDIR%%/misc/index.html
+%%NODOCS%%%%DOCSDIR%%/misc/known_client_problems.html
+%%NODOCS%%%%DOCSDIR%%/misc/nopgp.html
+%%NODOCS%%%%DOCSDIR%%/misc/perf-bsd44.html
+%%NODOCS%%%%DOCSDIR%%/misc/perf-dec.html
+%%NODOCS%%%%DOCSDIR%%/misc/perf-hp.html
+%%NODOCS%%%%DOCSDIR%%/misc/perf-tuning.html
+%%NODOCS%%%%DOCSDIR%%/misc/perf.html
+%%NODOCS%%%%DOCSDIR%%/misc/rewriteguide.html
+%%NODOCS%%%%DOCSDIR%%/misc/security_tips.html
+%%NODOCS%%%%DOCSDIR%%/misc/tutorials.html
+%%NODOCS%%%%DOCSDIR%%/misc/vif-info.html
+%%NODOCS%%%%DOCSDIR%%/misc/windoz_keepalive.html
+%%NODOCS%%%%DOCSDIR%%/mod/core.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/core.html.fr
+%%NODOCS%%%%DOCSDIR%%/mod/core.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/core.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/directive-dict.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/directive-dict.html.fr
+%%NODOCS%%%%DOCSDIR%%/mod/directive-dict.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/directive-dict.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/directives.html.de
+%%NODOCS%%%%DOCSDIR%%/mod/directives.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/directives.html.fr
+%%NODOCS%%%%DOCSDIR%%/mod/directives.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/directives.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/footer.html
+%%NODOCS%%%%DOCSDIR%%/mod/header.html
+%%NODOCS%%%%DOCSDIR%%/mod/index-bytype.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/index-bytype.html.fr
+%%NODOCS%%%%DOCSDIR%%/mod/index-bytype.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/index-bytype.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/index.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/index.html.fr
+%%NODOCS%%%%DOCSDIR%%/mod/index.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/index.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_access.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_access.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_access.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_actions.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_actions.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_actions.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_alias.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_alias.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_alias.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_asis.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_asis.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_asis.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_auth.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_auth.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_auth.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_auth_anon.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_auth_db.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_auth_dbm.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_auth_digest.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_autoindex.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_browser.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_cern_meta.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_cgi.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_cgi.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_cgi.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_cookies.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_digest.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_dir.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_dir.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_dir.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_dld.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_env.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_env.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_env.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_example.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_expires.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_headers.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_imap.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_include.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_info.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_info.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_info.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_isapi.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_log_agent.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_log_common.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_log_config.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_log_config.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_log_config.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_log_forensic.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_log_forensic.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_log_referer.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_mime.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_mime.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_mime.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_mime_magic.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_mmap_static.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_proxy.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_rewrite.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_rewrite.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_rewrite.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_so.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_so.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_so.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_speling.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_speling.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_speling.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_status.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_userdir.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/mod_userdir.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_userdir.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mod/mod_usertrack.html
+%%NODOCS%%%%DOCSDIR%%/mod/mod_vhost_alias.html
+%%NODOCS%%%%DOCSDIR%%/mod/module-dict.html.en
+%%NODOCS%%%%DOCSDIR%%/mod/module-dict.html.html
+%%NODOCS%%%%DOCSDIR%%/mod/module-dict.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/mpeix.html
+%%NODOCS%%%%DOCSDIR%%/multilogs.html
+%%NODOCS%%%%DOCSDIR%%/netware.html
+%%NODOCS%%%%DOCSDIR%%/new_features_1_0.html
+%%NODOCS%%%%DOCSDIR%%/new_features_1_1.html
+%%NODOCS%%%%DOCSDIR%%/new_features_1_2.html
+%%NODOCS%%%%DOCSDIR%%/new_features_1_3.html.en
+%%NODOCS%%%%DOCSDIR%%/new_features_1_3.html.html
+%%NODOCS%%%%DOCSDIR%%/new_features_1_3.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/process-model.html.en
+%%NODOCS%%%%DOCSDIR%%/process-model.html.html
+%%NODOCS%%%%DOCSDIR%%/process-model.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/programs/ab.html
+%%NODOCS%%%%DOCSDIR%%/programs/apachectl.html.en
+%%NODOCS%%%%DOCSDIR%%/programs/apachectl.html.html
+%%NODOCS%%%%DOCSDIR%%/programs/apachectl.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/programs/apxs.html
+%%NODOCS%%%%DOCSDIR%%/programs/dbmmanage.html
+%%NODOCS%%%%DOCSDIR%%/programs/footer.html
+%%NODOCS%%%%DOCSDIR%%/programs/header.html
+%%NODOCS%%%%DOCSDIR%%/programs/htdigest.html
+%%NODOCS%%%%DOCSDIR%%/programs/htpasswd.html.en
+%%NODOCS%%%%DOCSDIR%%/programs/htpasswd.html.html
+%%NODOCS%%%%DOCSDIR%%/programs/htpasswd.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/programs/httpd.html.en
+%%NODOCS%%%%DOCSDIR%%/programs/httpd.html.html
+%%NODOCS%%%%DOCSDIR%%/programs/httpd.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/programs/index.html.en
+%%NODOCS%%%%DOCSDIR%%/programs/index.html.html
+%%NODOCS%%%%DOCSDIR%%/programs/index.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/programs/logresolve.html
+%%NODOCS%%%%DOCSDIR%%/programs/other.html
+%%NODOCS%%%%DOCSDIR%%/programs/rotatelogs.html
+%%NODOCS%%%%DOCSDIR%%/programs/suexec.html.en
+%%NODOCS%%%%DOCSDIR%%/programs/suexec.html.html
+%%NODOCS%%%%DOCSDIR%%/programs/suexec.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/readme-tpf.html
+%%NODOCS%%%%DOCSDIR%%/sections.html.en
+%%NODOCS%%%%DOCSDIR%%/sections.html.html
+%%NODOCS%%%%DOCSDIR%%/sections.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/server-wide.html.en
+%%NODOCS%%%%DOCSDIR%%/server-wide.html.fr
+%%NODOCS%%%%DOCSDIR%%/server-wide.html.html
+%%NODOCS%%%%DOCSDIR%%/server-wide.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/sitemap.html
+%%NODOCS%%%%DOCSDIR%%/sourcereorg.html
+%%NODOCS%%%%DOCSDIR%%/stopping.html.en
+%%NODOCS%%%%DOCSDIR%%/stopping.html.fr
+%%NODOCS%%%%DOCSDIR%%/stopping.html.html
+%%NODOCS%%%%DOCSDIR%%/suexec.html.en
+%%NODOCS%%%%DOCSDIR%%/suexec.html.html
+%%NODOCS%%%%DOCSDIR%%/suexec.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/suexec_1_2.html
+%%NODOCS%%%%DOCSDIR%%/unixware.html
+%%NODOCS%%%%DOCSDIR%%/upgrading_to_1_3.html
+%%NODOCS%%%%DOCSDIR%%/urlmapping.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/details.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/details_1_2.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/examples.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.en
+%%NODOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/vhosts/footer.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/header.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/host.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/index.html.en
+%%NODOCS%%%%DOCSDIR%%/vhosts/index.html.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/index.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/vhosts/ip-based.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/mass.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/name-based.html.en
+%%NODOCS%%%%DOCSDIR%%/vhosts/name-based.html.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/name-based.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/vhosts/vhosts-in-depth.html
+%%NODOCS%%%%DOCSDIR%%/vhosts/virtual-host.html
+%%NODOCS%%%%DOCSDIR%%/win_compiling.html.en
+%%NODOCS%%%%DOCSDIR%%/win_compiling.html.html
+%%NODOCS%%%%DOCSDIR%%/win_compiling.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/win_service.html.en
+%%NODOCS%%%%DOCSDIR%%/win_service.html.html
+%%NODOCS%%%%DOCSDIR%%/win_service.html.ja.jis
+%%NODOCS%%%%DOCSDIR%%/windows.html.en
+%%NODOCS%%%%DOCSDIR%%/windows.html.html
+%%NODOCS%%%%DOCSDIR%%/windows.html.ja.jis
 @exec mkdir -p -m 755 %D/www/cgi-bin-dist
-@unexec chmod u+w %D/www/cgi-bin-dist
-www/cgi-bin-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-@exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
+@exec [ -d %D/www/cgi-bin/ ] || mkdir -p -m 755 %D/www/cgi-bin/
 www/cgi-bin-dist/printenv
 www/cgi-bin-dist/test-cgi
-@exec chmod a-w %D/www/cgi-bin-dist
 www/icons/README
 www/icons/README.html
 www/icons/a.gif
@@ -660,22 +653,22 @@ www/icons/world1.png
 www/icons/world2.gif
 www/icons/world2.png
 @exec mkdir -p %D/www/proxy
-@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
 @unexec rm -f %D/etc/apache/httpd.conf.bak 2> /dev/null || true
 @dirrmtry etc/apache
 @dirrm include/apache/xml
 @dirrm include/apache
-@dirrm libexec/apache
-@dirrm share/doc/apache/howto
-@dirrm share/doc/apache/images
-@dirrm share/doc/apache/misc
-@dirrm share/doc/apache/mod
-@dirrm share/doc/apache/programs
-@dirrm share/doc/apache/vhosts
-@dirrm share/doc/apache
+@dirrmtry libexec/apache
+%%NODOCS%%@dirrm %%DOCSDIR%%/howto
+%%NODOCS%%@dirrm %%DOCSDIR%%/images
+%%NODOCS%%@dirrm %%DOCSDIR%%/misc
+%%NODOCS%%@dirrm %%DOCSDIR%%/mod
+%%NODOCS%%@dirrm %%DOCSDIR%%/programs
+%%NODOCS%%@dirrm %%DOCSDIR%%/vhosts
+%%NODOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry www/data/
 @dirrm www/data-dist
+@dirrmtry www/cgi-bin/
 @dirrm www/cgi-bin-dist
 @dirrm www/icons/small
-@dirrm www/icons
+@dirrmtry www/icons
 @dirrm www/proxy