3 files changed, 302 insertions, 308 deletions

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 0472b69d73d6..0331817b8ecc 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	1.3.39
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	apache_${PORTVERSION}
@@ -26,7 +27,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		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
@@ -144,16 +144,11 @@ 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
-
 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
diff --git a/www/apache13/files/apache.sh b/www/apache13/files/apache.in
index 1bea1411b8be..1bea1411b8be 100644
--- a/www/apache13/files/apache.sh
+++ b/www/apache13/files/apache.in
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index f5a471eec40b..e259706ffa73 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -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
@@ -141,297 +140,297 @@ 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
+%%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/bind.html.en
+%%DOCSDIR%%/bind.html.fr
+%%DOCSDIR%%/bind.html.html
+%%DOCSDIR%%/bind.html.ja.jis
+%%DOCSDIR%%/configuring.html.en
+%%DOCSDIR%%/configuring.html.fr
+%%DOCSDIR%%/configuring.html.html
+%%DOCSDIR%%/configuring.html.ja.jis
+%%DOCSDIR%%/content-negotiation.html.en
+%%DOCSDIR%%/content-negotiation.html.html
+%%DOCSDIR%%/content-negotiation.html.ja.jis
+%%DOCSDIR%%/custom-error.html.en
+%%DOCSDIR%%/custom-error.html.fr
+%%DOCSDIR%%/custom-error.html.html
+%%DOCSDIR%%/custom-error.html.ja.jis
+%%DOCSDIR%%/cygwin.html
+%%DOCSDIR%%/dns-caveats.html.en
+%%DOCSDIR%%/dns-caveats.html.fr
+%%DOCSDIR%%/dns-caveats.html.html
+%%DOCSDIR%%/dns-caveats.html.ja.jis
+%%DOCSDIR%%/dso.html
+%%DOCSDIR%%/ebcdic.html
+%%DOCSDIR%%/env.html.en
+%%DOCSDIR%%/env.html.html
+%%DOCSDIR%%/env.html.ja.jis
+%%DOCSDIR%%/footer.html
+%%DOCSDIR%%/handler.html.en
+%%DOCSDIR%%/handler.html.html
+%%DOCSDIR%%/handler.html.ja.jis
+%%DOCSDIR%%/header.html
+%%DOCSDIR%%/howto/auth.html
+%%DOCSDIR%%/howto/cgi.html.en
+%%DOCSDIR%%/howto/cgi.html.html
+%%DOCSDIR%%/howto/cgi.html.ja.jis
+%%DOCSDIR%%/howto/footer.html
+%%DOCSDIR%%/howto/header.html
+%%DOCSDIR%%/howto/htaccess.html
+%%DOCSDIR%%/howto/ssi.html.en
+%%DOCSDIR%%/howto/ssi.html.html
+%%DOCSDIR%%/howto/ssi.html.ja.jis
+%%DOCSDIR%%/images/apache_header.gif
+%%DOCSDIR%%/images/custom_errordocs.gif
+%%DOCSDIR%%/images/home.gif
+%%DOCSDIR%%/images/index.gif
+%%DOCSDIR%%/images/mod_rewrite_fig1.fig
+%%DOCSDIR%%/images/mod_rewrite_fig1.gif
+%%DOCSDIR%%/images/mod_rewrite_fig2.fig
+%%DOCSDIR%%/images/mod_rewrite_fig2.gif
+%%DOCSDIR%%/images/pixel.gif
+%%DOCSDIR%%/images/sub.gif
+%%DOCSDIR%%/index.html.en
+%%DOCSDIR%%/index.html.fr
+%%DOCSDIR%%/index.html.html
+%%DOCSDIR%%/index.html.ja.jis
+%%DOCSDIR%%/install-tpf.html
+%%DOCSDIR%%/install-ztpf.html
+%%DOCSDIR%%/install.html.en
+%%DOCSDIR%%/install.html.es
+%%DOCSDIR%%/install.html.fr
+%%DOCSDIR%%/install.html.html
+%%DOCSDIR%%/install.html.ja.jis
+%%DOCSDIR%%/invoking.html.en
+%%DOCSDIR%%/invoking.html.fr
+%%DOCSDIR%%/invoking.html.html
+%%DOCSDIR%%/invoking.html.ja.jis
+%%DOCSDIR%%/keepalive.html.en
+%%DOCSDIR%%/keepalive.html.html
+%%DOCSDIR%%/keepalive.html.ja.jis
+%%DOCSDIR%%/location.html.en
+%%DOCSDIR%%/location.html.html
+%%DOCSDIR%%/location.html.ja.jis
+%%DOCSDIR%%/logs.html
+%%DOCSDIR%%/man-template.html
+%%DOCSDIR%%/misc/API.html
+%%DOCSDIR%%/misc/FAQ.html
+%%DOCSDIR%%/misc/HTTP_Features.tsv
+%%DOCSDIR%%/misc/client_block_api.html
+%%DOCSDIR%%/misc/compat_notes.html
+%%DOCSDIR%%/misc/custom_errordocs.html
+%%DOCSDIR%%/misc/descriptors.html
+%%DOCSDIR%%/misc/fin_wait_2.html
+%%DOCSDIR%%/misc/footer.html
+%%DOCSDIR%%/misc/header.html
+%%DOCSDIR%%/misc/howto.html
+%%DOCSDIR%%/misc/index.html
+%%DOCSDIR%%/misc/known_client_problems.html
+%%DOCSDIR%%/misc/nopgp.html
+%%DOCSDIR%%/misc/perf-bsd44.html
+%%DOCSDIR%%/misc/perf-dec.html
+%%DOCSDIR%%/misc/perf-hp.html
+%%DOCSDIR%%/misc/perf-tuning.html
+%%DOCSDIR%%/misc/perf.html
+%%DOCSDIR%%/misc/rewriteguide.html
+%%DOCSDIR%%/misc/security_tips.html
+%%DOCSDIR%%/misc/tutorials.html
+%%DOCSDIR%%/misc/vif-info.html
+%%DOCSDIR%%/misc/windoz_keepalive.html
+%%DOCSDIR%%/mod/core.html.en
+%%DOCSDIR%%/mod/core.html.fr
+%%DOCSDIR%%/mod/core.html.html
+%%DOCSDIR%%/mod/core.html.ja.jis
+%%DOCSDIR%%/mod/directive-dict.html.en
+%%DOCSDIR%%/mod/directive-dict.html.fr
+%%DOCSDIR%%/mod/directive-dict.html.html
+%%DOCSDIR%%/mod/directive-dict.html.ja.jis
+%%DOCSDIR%%/mod/directives.html.de
+%%DOCSDIR%%/mod/directives.html.en
+%%DOCSDIR%%/mod/directives.html.fr
+%%DOCSDIR%%/mod/directives.html.html
+%%DOCSDIR%%/mod/directives.html.ja.jis
+%%DOCSDIR%%/mod/footer.html
+%%DOCSDIR%%/mod/header.html
+%%DOCSDIR%%/mod/index-bytype.html.en
+%%DOCSDIR%%/mod/index-bytype.html.fr
+%%DOCSDIR%%/mod/index-bytype.html.html
+%%DOCSDIR%%/mod/index-bytype.html.ja.jis
+%%DOCSDIR%%/mod/index.html.en
+%%DOCSDIR%%/mod/index.html.fr
+%%DOCSDIR%%/mod/index.html.html
+%%DOCSDIR%%/mod/index.html.ja.jis
+%%DOCSDIR%%/mod/mod_access.html.en
+%%DOCSDIR%%/mod/mod_access.html.html
+%%DOCSDIR%%/mod/mod_access.html.ja.jis
+%%DOCSDIR%%/mod/mod_actions.html.en
+%%DOCSDIR%%/mod/mod_actions.html.html
+%%DOCSDIR%%/mod/mod_actions.html.ja.jis
+%%DOCSDIR%%/mod/mod_alias.html.en
+%%DOCSDIR%%/mod/mod_alias.html.html
+%%DOCSDIR%%/mod/mod_alias.html.ja.jis
+%%DOCSDIR%%/mod/mod_asis.html.en
+%%DOCSDIR%%/mod/mod_asis.html.html
+%%DOCSDIR%%/mod/mod_asis.html.ja.jis
+%%DOCSDIR%%/mod/mod_auth.html.en
+%%DOCSDIR%%/mod/mod_auth.html.html
+%%DOCSDIR%%/mod/mod_auth.html.ja.jis
+%%DOCSDIR%%/mod/mod_auth_anon.html
+%%DOCSDIR%%/mod/mod_auth_db.html
+%%DOCSDIR%%/mod/mod_auth_dbm.html
+%%DOCSDIR%%/mod/mod_auth_digest.html
+%%DOCSDIR%%/mod/mod_autoindex.html.en
+%%DOCSDIR%%/mod/mod_autoindex.html.html
+%%DOCSDIR%%/mod/mod_autoindex.html.ja.jis
+%%DOCSDIR%%/mod/mod_browser.html
+%%DOCSDIR%%/mod/mod_cern_meta.html
+%%DOCSDIR%%/mod/mod_cgi.html.en
+%%DOCSDIR%%/mod/mod_cgi.html.html
+%%DOCSDIR%%/mod/mod_cgi.html.ja.jis
+%%DOCSDIR%%/mod/mod_cookies.html
+%%DOCSDIR%%/mod/mod_digest.html
+%%DOCSDIR%%/mod/mod_dir.html.en
+%%DOCSDIR%%/mod/mod_dir.html.html
+%%DOCSDIR%%/mod/mod_dir.html.ja.jis
+%%DOCSDIR%%/mod/mod_dld.html
+%%DOCSDIR%%/mod/mod_env.html.en
+%%DOCSDIR%%/mod/mod_env.html.html
+%%DOCSDIR%%/mod/mod_env.html.ja.jis
+%%DOCSDIR%%/mod/mod_example.html
+%%DOCSDIR%%/mod/mod_expires.html
+%%DOCSDIR%%/mod/mod_headers.html
+%%DOCSDIR%%/mod/mod_imap.html
+%%DOCSDIR%%/mod/mod_include.html
+%%DOCSDIR%%/mod/mod_info.html.en
+%%DOCSDIR%%/mod/mod_info.html.html
+%%DOCSDIR%%/mod/mod_info.html.ja.jis
+%%DOCSDIR%%/mod/mod_isapi.html
+%%DOCSDIR%%/mod/mod_log_agent.html
+%%DOCSDIR%%/mod/mod_log_common.html
+%%DOCSDIR%%/mod/mod_log_config.html.en
+%%DOCSDIR%%/mod/mod_log_config.html.html
+%%DOCSDIR%%/mod/mod_log_config.html.ja.jis
+%%DOCSDIR%%/mod/mod_log_forensic.html.en
+%%DOCSDIR%%/mod/mod_log_forensic.html.html
+%%DOCSDIR%%/mod/mod_log_referer.html
+%%DOCSDIR%%/mod/mod_mime.html.en
+%%DOCSDIR%%/mod/mod_mime.html.html
+%%DOCSDIR%%/mod/mod_mime.html.ja.jis
+%%DOCSDIR%%/mod/mod_mime_magic.html
+%%DOCSDIR%%/mod/mod_mmap_static.html
+%%DOCSDIR%%/mod/mod_negotiation.html.en
+%%DOCSDIR%%/mod/mod_negotiation.html.html
+%%DOCSDIR%%/mod/mod_negotiation.html.ja.jis
+%%DOCSDIR%%/mod/mod_proxy.html
+%%DOCSDIR%%/mod/mod_rewrite.html.en
+%%DOCSDIR%%/mod/mod_rewrite.html.html
+%%DOCSDIR%%/mod/mod_rewrite.html.ja.jis
+%%DOCSDIR%%/mod/mod_setenvif.html.en
+%%DOCSDIR%%/mod/mod_setenvif.html.html
+%%DOCSDIR%%/mod/mod_setenvif.html.ja.jis
+%%DOCSDIR%%/mod/mod_so.html.en
+%%DOCSDIR%%/mod/mod_so.html.html
+%%DOCSDIR%%/mod/mod_so.html.ja.jis
+%%DOCSDIR%%/mod/mod_speling.html.en
+%%DOCSDIR%%/mod/mod_speling.html.html
+%%DOCSDIR%%/mod/mod_speling.html.ja.jis
+%%DOCSDIR%%/mod/mod_status.html
+%%DOCSDIR%%/mod/mod_unique_id.html.en
+%%DOCSDIR%%/mod/mod_unique_id.html.html
+%%DOCSDIR%%/mod/mod_unique_id.html.ja.jis
+%%DOCSDIR%%/mod/mod_userdir.html.en
+%%DOCSDIR%%/mod/mod_userdir.html.html
+%%DOCSDIR%%/mod/mod_userdir.html.ja.jis
+%%DOCSDIR%%/mod/mod_usertrack.html
+%%DOCSDIR%%/mod/mod_vhost_alias.html
+%%DOCSDIR%%/mod/module-dict.html.en
+%%DOCSDIR%%/mod/module-dict.html.html
+%%DOCSDIR%%/mod/module-dict.html.ja.jis
+%%DOCSDIR%%/mpeix.html
+%%DOCSDIR%%/multilogs.html
+%%DOCSDIR%%/netware.html
+%%DOCSDIR%%/new_features_1_0.html
+%%DOCSDIR%%/new_features_1_1.html
+%%DOCSDIR%%/new_features_1_2.html
+%%DOCSDIR%%/new_features_1_3.html.en
+%%DOCSDIR%%/new_features_1_3.html.html
+%%DOCSDIR%%/new_features_1_3.html.ja.jis
+%%DOCSDIR%%/process-model.html.en
+%%DOCSDIR%%/process-model.html.html
+%%DOCSDIR%%/process-model.html.ja.jis
+%%DOCSDIR%%/programs/ab.html
+%%DOCSDIR%%/programs/apachectl.html.en
+%%DOCSDIR%%/programs/apachectl.html.html
+%%DOCSDIR%%/programs/apachectl.html.ja.jis
+%%DOCSDIR%%/programs/apxs.html
+%%DOCSDIR%%/programs/dbmmanage.html
+%%DOCSDIR%%/programs/footer.html
+%%DOCSDIR%%/programs/header.html
+%%DOCSDIR%%/programs/htdigest.html
+%%DOCSDIR%%/programs/htpasswd.html.en
+%%DOCSDIR%%/programs/htpasswd.html.html
+%%DOCSDIR%%/programs/htpasswd.html.ja.jis
+%%DOCSDIR%%/programs/httpd.html.en
+%%DOCSDIR%%/programs/httpd.html.html
+%%DOCSDIR%%/programs/httpd.html.ja.jis
+%%DOCSDIR%%/programs/index.html.en
+%%DOCSDIR%%/programs/index.html.html
+%%DOCSDIR%%/programs/index.html.ja.jis
+%%DOCSDIR%%/programs/logresolve.html
+%%DOCSDIR%%/programs/other.html
+%%DOCSDIR%%/programs/rotatelogs.html
+%%DOCSDIR%%/programs/suexec.html.en
+%%DOCSDIR%%/programs/suexec.html.html
+%%DOCSDIR%%/programs/suexec.html.ja.jis
+%%DOCSDIR%%/readme-tpf.html
+%%DOCSDIR%%/sections.html.en
+%%DOCSDIR%%/sections.html.html
+%%DOCSDIR%%/sections.html.ja.jis
+%%DOCSDIR%%/server-wide.html.en
+%%DOCSDIR%%/server-wide.html.fr
+%%DOCSDIR%%/server-wide.html.html
+%%DOCSDIR%%/server-wide.html.ja.jis
+%%DOCSDIR%%/sitemap.html
+%%DOCSDIR%%/sourcereorg.html
+%%DOCSDIR%%/stopping.html.en
+%%DOCSDIR%%/stopping.html.fr
+%%DOCSDIR%%/stopping.html.html
+%%DOCSDIR%%/suexec.html.en
+%%DOCSDIR%%/suexec.html.html
+%%DOCSDIR%%/suexec.html.ja.jis
+%%DOCSDIR%%/suexec_1_2.html
+%%DOCSDIR%%/unixware.html
+%%DOCSDIR%%/upgrading_to_1_3.html
+%%DOCSDIR%%/urlmapping.html
+%%DOCSDIR%%/vhosts/details.html
+%%DOCSDIR%%/vhosts/details_1_2.html
+%%DOCSDIR%%/vhosts/examples.html
+%%DOCSDIR%%/vhosts/fd-limits.html.en
+%%DOCSDIR%%/vhosts/fd-limits.html.html
+%%DOCSDIR%%/vhosts/fd-limits.html.ja.jis
+%%DOCSDIR%%/vhosts/footer.html
+%%DOCSDIR%%/vhosts/header.html
+%%DOCSDIR%%/vhosts/host.html
+%%DOCSDIR%%/vhosts/index.html.en
+%%DOCSDIR%%/vhosts/index.html.html
+%%DOCSDIR%%/vhosts/index.html.ja.jis
+%%DOCSDIR%%/vhosts/ip-based.html
+%%DOCSDIR%%/vhosts/mass.html
+%%DOCSDIR%%/vhosts/name-based.html.en
+%%DOCSDIR%%/vhosts/name-based.html.html
+%%DOCSDIR%%/vhosts/name-based.html.ja.jis
+%%DOCSDIR%%/vhosts/vhosts-in-depth.html
+%%DOCSDIR%%/vhosts/virtual-host.html
+%%DOCSDIR%%/win_compiling.html.en
+%%DOCSDIR%%/win_compiling.html.html
+%%DOCSDIR%%/win_compiling.html.ja.jis
+%%DOCSDIR%%/win_service.html.en
+%%DOCSDIR%%/win_service.html.html
+%%DOCSDIR%%/win_service.html.ja.jis
+%%DOCSDIR%%/windows.html.en
+%%DOCSDIR%%/windows.html.html
+%%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
@@ -664,16 +663,16 @@ www/icons/world2.png
 @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
+@dirrm %%DOCSDIR%%/howto
+@dirrm %%DOCSDIR%%/images
+@dirrm %%DOCSDIR%%/misc
+@dirrm %%DOCSDIR%%/mod
+@dirrm %%DOCSDIR%%/programs
+@dirrm %%DOCSDIR%%/vhosts
+@dirrm %%DOCSDIR%%
 @dirrm www/data-dist
 @dirrm www/cgi-bin-dist
 @dirrm www/icons/small
-@dirrm www/icons
+@dirrmtry www/icons
 @dirrm www/proxy