[1] Use bsd.port.(pre|post).mk

  [2] Use DOCSDIR

2 files changed, 340 insertions, 330 deletions

diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index f57eaab92b09..59f7ccc74e16 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -36,11 +36,21 @@ APACHE_VERSION=	1.3.28
 GZCAT=sh -c 'tar -zxf $$0 -C ${WRKSRC};${CAT} ${WRKSRC}/RA-1.3rusPL${RA_VERSION}.patch'
 
 #
+# Set proper docsdir
+#
+DOCSDIR=	${PREFIX}/share/doc/apache
+
+#
+# Include pre-make
+#
+.include <bsd.port.pre.mk>
+
+#
 # some defaults
 #
 
-DATADIR=${PREFIX}/www
-DOCUMENT_ROOT=${DATADIR}/data
+DATADIR?=${PREFIX}/www
+DOCUMENT_ROOT?=${DATADIR}/data
 DEFAULT_PATH?=/bin:/usr/bin:${PREFIX}/bin
 
 #
@@ -177,4 +187,4 @@ post-install:
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/russian/apache13/pkg-plist b/russian/apache13/pkg-plist
index 2018be662dd3..c94150e41ee5 100644
--- a/russian/apache13/pkg-plist
+++ b/russian/apache13/pkg-plist
@@ -251,329 +251,329 @@ sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
 %%SUEXEC%%sbin/suexec
-share/doc/apache/apache_pb.gif
-share/doc/apache/ra-powered.gif
+%%DOCSDIR%%/apache_pb.gif
+%%DOCSDIR%%/ra-powered.gif
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/index.html
-share/doc/apache/index.html.ca
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.de
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.el
-share/doc/apache/index.html.en
-share/doc/apache/index.html.es
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.it
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.lb.utf8
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.nn
-share/doc/apache/index.html.no
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.ru
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.utf8
-share/doc/apache/index.html.se
-share/doc/apache/index.html.zh-tw.big5
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html.en
-share/doc/apache/manual/bind.html.fr
-share/doc/apache/manual/bind.html.html
-share/doc/apache/manual/bind.html.ja.jis
-share/doc/apache/manual/cgi_path.html.en
-share/doc/apache/manual/cgi_path.html.fr
-share/doc/apache/manual/cgi_path.html.html
-share/doc/apache/manual/cgi_path.html.ja.jis
-share/doc/apache/manual/configuring.html.en
-share/doc/apache/manual/configuring.html.fr
-share/doc/apache/manual/configuring.html.html
-share/doc/apache/manual/configuring.html.ja.jis
-share/doc/apache/manual/content-negotiation.html.en
-share/doc/apache/manual/content-negotiation.html.html
-share/doc/apache/manual/content-negotiation.html.ja.jis
-share/doc/apache/manual/custom-error.html.en
-share/doc/apache/manual/custom-error.html.fr
-share/doc/apache/manual/custom-error.html.html
-share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/cygwin.html
-share/doc/apache/manual/dns-caveats.html.en
-share/doc/apache/manual/dns-caveats.html.fr
-share/doc/apache/manual/dns-caveats.html.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html.en
-share/doc/apache/manual/env.html.html
-share/doc/apache/manual/env.html.ja.jis
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/handler.html.en
-share/doc/apache/manual/handler.html.html
-share/doc/apache/manual/handler.html.ja.jis
-share/doc/apache/manual/header.html
-share/doc/apache/manual/howto/auth.html
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.html
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/htaccess.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.html
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html.en
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html.html
-share/doc/apache/manual/index.html.ja.jis
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html.en
-share/doc/apache/manual/install.html.es
-share/doc/apache/manual/install.html.fr
-share/doc/apache/manual/install.html.html
-share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html.en
-share/doc/apache/manual/invoking.html.fr
-share/doc/apache/manual/invoking.html.html
-share/doc/apache/manual/keepalive.html.en
-share/doc/apache/manual/keepalive.html.html
-share/doc/apache/manual/keepalive.html.ja.jis
-share/doc/apache/manual/location.html
-share/doc/apache/manual/logs.html
-share/doc/apache/manual/man-template.html
-share/doc/apache/manual/misc/API.html
-share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/HTTP_Features.tsv
-share/doc/apache/manual/misc/client_block_api.html
-share/doc/apache/manual/misc/compat_notes.html
-share/doc/apache/manual/misc/custom_errordocs.html
-share/doc/apache/manual/misc/descriptors.html
-share/doc/apache/manual/misc/fin_wait_2.html
-share/doc/apache/manual/misc/footer.html
-share/doc/apache/manual/misc/header.html
-share/doc/apache/manual/misc/howto.html
-share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/nopgp.html
-share/doc/apache/manual/misc/perf-bsd44.html
-share/doc/apache/manual/misc/perf-dec.html
-share/doc/apache/manual/misc/perf-hp.html
-share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/perf.html
-share/doc/apache/manual/misc/rewriteguide.html
-share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/vif-info.html
-share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html.en
-share/doc/apache/manual/mod/core.html.fr
-share/doc/apache/manual/mod/core.html.html
-share/doc/apache/manual/mod/core.html.ja.jis
-share/doc/apache/manual/mod/directive-dict.html.en
-share/doc/apache/manual/mod/directive-dict.html.fr
-share/doc/apache/manual/mod/directive-dict.html.html
-share/doc/apache/manual/mod/directive-dict.html.ja.jis
-share/doc/apache/manual/mod/directives.html.de
-share/doc/apache/manual/mod/directives.html.en
-share/doc/apache/manual/mod/directives.html.fr
-share/doc/apache/manual/mod/directives.html.html
-share/doc/apache/manual/mod/directives.html.ja.jis
-share/doc/apache/manual/mod/footer.html
-share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index-bytype.html.en
-share/doc/apache/manual/mod/index-bytype.html.fr
-share/doc/apache/manual/mod/index-bytype.html.html
-share/doc/apache/manual/mod/index-bytype.html.ja.jis
-share/doc/apache/manual/mod/index.html.en
-share/doc/apache/manual/mod/index.html.fr
-share/doc/apache/manual/mod/index.html.html
-share/doc/apache/manual/mod/index.html.ja.jis
-share/doc/apache/manual/mod/mod_access.html.en
-share/doc/apache/manual/mod/mod_access.html.html
-share/doc/apache/manual/mod/mod_access.html.ja.jis
-share/doc/apache/manual/mod/mod_actions.html.en
-share/doc/apache/manual/mod/mod_actions.html.html
-share/doc/apache/manual/mod/mod_actions.html.ja.jis
-share/doc/apache/manual/mod/mod_alias.html.en
-share/doc/apache/manual/mod/mod_alias.html.html
-share/doc/apache/manual/mod/mod_alias.html.ja.jis
-share/doc/apache/manual/mod/mod_asis.html.en
-share/doc/apache/manual/mod/mod_asis.html.html
-share/doc/apache/manual/mod/mod_asis.html.ja.jis
-share/doc/apache/manual/mod/mod_auth.html.en
-share/doc/apache/manual/mod/mod_auth.html.html
-share/doc/apache/manual/mod/mod_auth.html.ja.jis
-share/doc/apache/manual/mod/mod_auth_anon.html
-share/doc/apache/manual/mod/mod_auth_db.html
-share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_digest.html
-share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_browser.html
-share/doc/apache/manual/mod/mod_cern_meta.html
-share/doc/apache/manual/mod/mod_cgi.html.en
-share/doc/apache/manual/mod/mod_cgi.html.html
-share/doc/apache/manual/mod/mod_cgi.html.ja.jis
-share/doc/apache/manual/mod/mod_cookies.html
-share/doc/apache/manual/mod/mod_digest.html
-share/doc/apache/manual/mod/mod_dir.html.en
-share/doc/apache/manual/mod/mod_dir.html.html
-share/doc/apache/manual/mod/mod_dir.html.ja.jis
-share/doc/apache/manual/mod/mod_dld.html
-share/doc/apache/manual/mod/mod_env.html.en
-share/doc/apache/manual/mod/mod_env.html.html
-share/doc/apache/manual/mod/mod_env.html.ja.jis
-share/doc/apache/manual/mod/mod_example.html
-share/doc/apache/manual/mod/mod_expires.html
-share/doc/apache/manual/mod/mod_headers.html
-share/doc/apache/manual/mod/mod_imap.html
-share/doc/apache/manual/mod/mod_include.html
-share/doc/apache/manual/mod/mod_info.html.en
-share/doc/apache/manual/mod/mod_info.html.html
-share/doc/apache/manual/mod/mod_info.html.ja.jis
-share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_agent.html
-share/doc/apache/manual/mod/mod_log_common.html
-share/doc/apache/manual/mod/mod_log_config.html.en
-share/doc/apache/manual/mod/mod_log_config.html.html
-share/doc/apache/manual/mod/mod_log_config.html.ja.jis
-share/doc/apache/manual/mod/mod_log_referer.html
-share/doc/apache/manual/mod/mod_mime.html.en
-share/doc/apache/manual/mod/mod_mime.html.html
-share/doc/apache/manual/mod/mod_mime.html.ja.jis
-share/doc/apache/manual/mod/mod_mime_magic.html
-share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html.en
-share/doc/apache/manual/mod/mod_negotiation.html.html
-share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
-share/doc/apache/manual/mod/mod_proxy.html
-share/doc/apache/manual/mod/mod_rewrite.html
-share/doc/apache/manual/mod/mod_setenvif.html.en
-share/doc/apache/manual/mod/mod_setenvif.html.html
-share/doc/apache/manual/mod/mod_setenvif.html.ja.jis
-share/doc/apache/manual/mod/mod_so.html.en
-share/doc/apache/manual/mod/mod_so.html.html
-share/doc/apache/manual/mod/mod_so.html.ja.jis
-share/doc/apache/manual/mod/mod_speling.html.en
-share/doc/apache/manual/mod/mod_speling.html.html
-share/doc/apache/manual/mod/mod_speling.html.ja.jis
-share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.html.en
-share/doc/apache/manual/mod/mod_unique_id.html.html
-share/doc/apache/manual/mod/mod_unique_id.html.ja.jis
-share/doc/apache/manual/mod/mod_userdir.html.en
-share/doc/apache/manual/mod/mod_userdir.html.html
-share/doc/apache/manual/mod/mod_userdir.html.ja.jis
-share/doc/apache/manual/mod/mod_usertrack.html
-share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html.en
-share/doc/apache/manual/mod/module-dict.html.html
-share/doc/apache/manual/mod/module-dict.html.ja.jis
-share/doc/apache/manual/mpeix.html
-share/doc/apache/manual/multilogs.html
-share/doc/apache/manual/netware.html
-share/doc/apache/manual/new_features_1_0.html
-share/doc/apache/manual/new_features_1_1.html
-share/doc/apache/manual/new_features_1_2.html
-share/doc/apache/manual/new_features_1_3.html.en
-share/doc/apache/manual/new_features_1_3.html.html
-share/doc/apache/manual/new_features_1_3.html.ja.jis
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/process-model.html.en
-share/doc/apache/manual/process-model.html.html
-share/doc/apache/manual/process-model.html.ja.jis
-share/doc/apache/manual/programs/ab.html
-share/doc/apache/manual/programs/apachectl.html.en
-share/doc/apache/manual/programs/apachectl.html.html
-share/doc/apache/manual/programs/apachectl.html.ja.jis
-share/doc/apache/manual/programs/apxs.html
-share/doc/apache/manual/programs/dbmmanage.html
-share/doc/apache/manual/programs/footer.html
-share/doc/apache/manual/programs/header.html
-share/doc/apache/manual/programs/htdigest.html
-share/doc/apache/manual/programs/htpasswd.html.en
-share/doc/apache/manual/programs/htpasswd.html.html
-share/doc/apache/manual/programs/htpasswd.html.ja.jis
-share/doc/apache/manual/programs/httpd.html.en
-share/doc/apache/manual/programs/httpd.html.html
-share/doc/apache/manual/programs/httpd.html.ja.jis
-share/doc/apache/manual/programs/index.html.en
-share/doc/apache/manual/programs/index.html.html
-share/doc/apache/manual/programs/index.html.ja.jis
-share/doc/apache/manual/programs/logresolve.html
-share/doc/apache/manual/programs/other.html
-share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/suexec.html.en
-share/doc/apache/manual/programs/suexec.html.html
-share/doc/apache/manual/programs/suexec.html.ja.jis
-share/doc/apache/manual/readme-tpf.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/sections.html.en
-share/doc/apache/manual/sections.html.html
-share/doc/apache/manual/sections.html.ja.jis
-share/doc/apache/manual/server-wide.html.en
-share/doc/apache/manual/server-wide.html.fr
-share/doc/apache/manual/server-wide.html.html
-share/doc/apache/manual/server-wide.html.ja.jis
-share/doc/apache/manual/sitemap.html
-share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html.en
-share/doc/apache/manual/stopping.html.fr
-share/doc/apache/manual/stopping.html.html
-share/doc/apache/manual/suexec.html.en
-share/doc/apache/manual/suexec.html.html
-share/doc/apache/manual/suexec.html.ja.jis
-share/doc/apache/manual/suexec_1_2.html
-share/doc/apache/manual/unixware.html
-share/doc/apache/manual/upgrading_to_1_3.html
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/vhosts/details_1_2.html
-share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html.en
-share/doc/apache/manual/vhosts/fd-limits.html.html
-share/doc/apache/manual/vhosts/fd-limits.html.ja.jis
-share/doc/apache/manual/vhosts/footer.html
-share/doc/apache/manual/vhosts/header.html
-share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html.en
-share/doc/apache/manual/vhosts/index.html.html
-share/doc/apache/manual/vhosts/index.html.ja.jis
-share/doc/apache/manual/vhosts/ip-based.html
-share/doc/apache/manual/vhosts/mass.html
-share/doc/apache/manual/vhosts/name-based.html.en
-share/doc/apache/manual/vhosts/name-based.html.html
-share/doc/apache/manual/vhosts/name-based.html.ja.jis
-share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/win_compiling.html.en
-share/doc/apache/manual/win_compiling.html.html
-share/doc/apache/manual/win_compiling.html.ja.jis
-share/doc/apache/manual/win_service.html.en
-share/doc/apache/manual/win_service.html.html
-share/doc/apache/manual/win_service.html.ja.jis
-share/doc/apache/manual/windows.html.en
-share/doc/apache/manual/windows.html.ja.jis
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.html.ca
+%%DOCSDIR%%/index.html.cz
+%%DOCSDIR%%/index.html.de
+%%DOCSDIR%%/index.html.dk
+%%DOCSDIR%%/index.html.ee
+%%DOCSDIR%%/index.html.el
+%%DOCSDIR%%/index.html.en
+%%DOCSDIR%%/index.html.es
+%%DOCSDIR%%/index.html.fr
+%%DOCSDIR%%/index.html.he.iso8859-8
+%%DOCSDIR%%/index.html.it
+%%DOCSDIR%%/index.html.ja.jis
+%%DOCSDIR%%/index.html.kr.iso-kr
+%%DOCSDIR%%/index.html.lb.utf8
+%%DOCSDIR%%/index.html.nl
+%%DOCSDIR%%/index.html.nn
+%%DOCSDIR%%/index.html.no
+%%DOCSDIR%%/index.html.po.iso-pl
+%%DOCSDIR%%/index.html.pt
+%%DOCSDIR%%/index.html.pt-br
+%%DOCSDIR%%/index.html.ru
+%%DOCSDIR%%/index.html.ru.cp-1251
+%%DOCSDIR%%/index.html.ru.cp866
+%%DOCSDIR%%/index.html.ru.iso-ru
+%%DOCSDIR%%/index.html.ru.koi8-r
+%%DOCSDIR%%/index.html.ru.ucs2
+%%DOCSDIR%%/index.html.ru.ucs4
+%%DOCSDIR%%/index.html.ru.utf8
+%%DOCSDIR%%/index.html.se
+%%DOCSDIR%%/index.html.zh-tw.big5
+%%DOCSDIR%%/manual/LICENSE
+%%DOCSDIR%%/manual/bind.html.en
+%%DOCSDIR%%/manual/bind.html.fr
+%%DOCSDIR%%/manual/bind.html.html
+%%DOCSDIR%%/manual/bind.html.ja.jis
+%%DOCSDIR%%/manual/cgi_path.html.en
+%%DOCSDIR%%/manual/cgi_path.html.fr
+%%DOCSDIR%%/manual/cgi_path.html.html
+%%DOCSDIR%%/manual/cgi_path.html.ja.jis
+%%DOCSDIR%%/manual/configuring.html.en
+%%DOCSDIR%%/manual/configuring.html.fr
+%%DOCSDIR%%/manual/configuring.html.html
+%%DOCSDIR%%/manual/configuring.html.ja.jis
+%%DOCSDIR%%/manual/content-negotiation.html.en
+%%DOCSDIR%%/manual/content-negotiation.html.html
+%%DOCSDIR%%/manual/content-negotiation.html.ja.jis
+%%DOCSDIR%%/manual/custom-error.html.en
+%%DOCSDIR%%/manual/custom-error.html.fr
+%%DOCSDIR%%/manual/custom-error.html.html
+%%DOCSDIR%%/manual/custom-error.html.ja.jis
+%%DOCSDIR%%/manual/cygwin.html
+%%DOCSDIR%%/manual/dns-caveats.html.en
+%%DOCSDIR%%/manual/dns-caveats.html.fr
+%%DOCSDIR%%/manual/dns-caveats.html.html
+%%DOCSDIR%%/manual/dso.html
+%%DOCSDIR%%/manual/ebcdic.html
+%%DOCSDIR%%/manual/env.html.en
+%%DOCSDIR%%/manual/env.html.html
+%%DOCSDIR%%/manual/env.html.ja.jis
+%%DOCSDIR%%/manual/footer.html
+%%DOCSDIR%%/manual/handler.html.en
+%%DOCSDIR%%/manual/handler.html.html
+%%DOCSDIR%%/manual/handler.html.ja.jis
+%%DOCSDIR%%/manual/header.html
+%%DOCSDIR%%/manual/howto/auth.html
+%%DOCSDIR%%/manual/howto/cgi.html.en
+%%DOCSDIR%%/manual/howto/cgi.html.html
+%%DOCSDIR%%/manual/howto/cgi.html.ja.jis
+%%DOCSDIR%%/manual/howto/footer.html
+%%DOCSDIR%%/manual/howto/header.html
+%%DOCSDIR%%/manual/howto/htaccess.html
+%%DOCSDIR%%/manual/howto/ssi.html.en
+%%DOCSDIR%%/manual/howto/ssi.html.html
+%%DOCSDIR%%/manual/howto/ssi.html.ja.jis
+%%DOCSDIR%%/manual/images/apache_header.gif
+%%DOCSDIR%%/manual/images/custom_errordocs.gif
+%%DOCSDIR%%/manual/images/home.gif
+%%DOCSDIR%%/manual/images/index.gif
+%%DOCSDIR%%/manual/images/mod_rewrite_fig1.fig
+%%DOCSDIR%%/manual/images/mod_rewrite_fig1.gif
+%%DOCSDIR%%/manual/images/mod_rewrite_fig2.fig
+%%DOCSDIR%%/manual/images/mod_rewrite_fig2.gif
+%%DOCSDIR%%/manual/images/pixel.gif
+%%DOCSDIR%%/manual/images/sub.gif
+%%DOCSDIR%%/manual/index.html.en
+%%DOCSDIR%%/manual/index.html.fr
+%%DOCSDIR%%/manual/index.html.html
+%%DOCSDIR%%/manual/index.html.ja.jis
+%%DOCSDIR%%/manual/install-tpf.html
+%%DOCSDIR%%/manual/install.html.en
+%%DOCSDIR%%/manual/install.html.es
+%%DOCSDIR%%/manual/install.html.fr
+%%DOCSDIR%%/manual/install.html.html
+%%DOCSDIR%%/manual/install.html.ja.jis
+%%DOCSDIR%%/manual/invoking.html.en
+%%DOCSDIR%%/manual/invoking.html.fr
+%%DOCSDIR%%/manual/invoking.html.html
+%%DOCSDIR%%/manual/keepalive.html.en
+%%DOCSDIR%%/manual/keepalive.html.html
+%%DOCSDIR%%/manual/keepalive.html.ja.jis
+%%DOCSDIR%%/manual/location.html
+%%DOCSDIR%%/manual/logs.html
+%%DOCSDIR%%/manual/man-template.html
+%%DOCSDIR%%/manual/misc/API.html
+%%DOCSDIR%%/manual/misc/FAQ.html
+%%DOCSDIR%%/manual/misc/HTTP_Features.tsv
+%%DOCSDIR%%/manual/misc/client_block_api.html
+%%DOCSDIR%%/manual/misc/compat_notes.html
+%%DOCSDIR%%/manual/misc/custom_errordocs.html
+%%DOCSDIR%%/manual/misc/descriptors.html
+%%DOCSDIR%%/manual/misc/fin_wait_2.html
+%%DOCSDIR%%/manual/misc/footer.html
+%%DOCSDIR%%/manual/misc/header.html
+%%DOCSDIR%%/manual/misc/howto.html
+%%DOCSDIR%%/manual/misc/index.html
+%%DOCSDIR%%/manual/misc/known_client_problems.html
+%%DOCSDIR%%/manual/misc/nopgp.html
+%%DOCSDIR%%/manual/misc/perf-bsd44.html
+%%DOCSDIR%%/manual/misc/perf-dec.html
+%%DOCSDIR%%/manual/misc/perf-hp.html
+%%DOCSDIR%%/manual/misc/perf-tuning.html
+%%DOCSDIR%%/manual/misc/perf.html
+%%DOCSDIR%%/manual/misc/rewriteguide.html
+%%DOCSDIR%%/manual/misc/security_tips.html
+%%DOCSDIR%%/manual/misc/tutorials.html
+%%DOCSDIR%%/manual/misc/vif-info.html
+%%DOCSDIR%%/manual/misc/windoz_keepalive.html
+%%DOCSDIR%%/manual/mod/core.html.en
+%%DOCSDIR%%/manual/mod/core.html.fr
+%%DOCSDIR%%/manual/mod/core.html.html
+%%DOCSDIR%%/manual/mod/core.html.ja.jis
+%%DOCSDIR%%/manual/mod/directive-dict.html.en
+%%DOCSDIR%%/manual/mod/directive-dict.html.fr
+%%DOCSDIR%%/manual/mod/directive-dict.html.html
+%%DOCSDIR%%/manual/mod/directive-dict.html.ja.jis
+%%DOCSDIR%%/manual/mod/directives.html.de
+%%DOCSDIR%%/manual/mod/directives.html.en
+%%DOCSDIR%%/manual/mod/directives.html.fr
+%%DOCSDIR%%/manual/mod/directives.html.html
+%%DOCSDIR%%/manual/mod/directives.html.ja.jis
+%%DOCSDIR%%/manual/mod/footer.html
+%%DOCSDIR%%/manual/mod/header.html
+%%DOCSDIR%%/manual/mod/index-bytype.html.en
+%%DOCSDIR%%/manual/mod/index-bytype.html.fr
+%%DOCSDIR%%/manual/mod/index-bytype.html.html
+%%DOCSDIR%%/manual/mod/index-bytype.html.ja.jis
+%%DOCSDIR%%/manual/mod/index.html.en
+%%DOCSDIR%%/manual/mod/index.html.fr
+%%DOCSDIR%%/manual/mod/index.html.html
+%%DOCSDIR%%/manual/mod/index.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_access.html.en
+%%DOCSDIR%%/manual/mod/mod_access.html.html
+%%DOCSDIR%%/manual/mod/mod_access.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_actions.html.en
+%%DOCSDIR%%/manual/mod/mod_actions.html.html
+%%DOCSDIR%%/manual/mod/mod_actions.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_alias.html.en
+%%DOCSDIR%%/manual/mod/mod_alias.html.html
+%%DOCSDIR%%/manual/mod/mod_alias.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_asis.html.en
+%%DOCSDIR%%/manual/mod/mod_asis.html.html
+%%DOCSDIR%%/manual/mod/mod_asis.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_auth.html.en
+%%DOCSDIR%%/manual/mod/mod_auth.html.html
+%%DOCSDIR%%/manual/mod/mod_auth.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_auth_anon.html
+%%DOCSDIR%%/manual/mod/mod_auth_db.html
+%%DOCSDIR%%/manual/mod/mod_auth_dbm.html
+%%DOCSDIR%%/manual/mod/mod_auth_digest.html
+%%DOCSDIR%%/manual/mod/mod_autoindex.html
+%%DOCSDIR%%/manual/mod/mod_browser.html
+%%DOCSDIR%%/manual/mod/mod_cern_meta.html
+%%DOCSDIR%%/manual/mod/mod_cgi.html.en
+%%DOCSDIR%%/manual/mod/mod_cgi.html.html
+%%DOCSDIR%%/manual/mod/mod_cgi.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_cookies.html
+%%DOCSDIR%%/manual/mod/mod_digest.html
+%%DOCSDIR%%/manual/mod/mod_dir.html.en
+%%DOCSDIR%%/manual/mod/mod_dir.html.html
+%%DOCSDIR%%/manual/mod/mod_dir.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_dld.html
+%%DOCSDIR%%/manual/mod/mod_env.html.en
+%%DOCSDIR%%/manual/mod/mod_env.html.html
+%%DOCSDIR%%/manual/mod/mod_env.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_example.html
+%%DOCSDIR%%/manual/mod/mod_expires.html
+%%DOCSDIR%%/manual/mod/mod_headers.html
+%%DOCSDIR%%/manual/mod/mod_imap.html
+%%DOCSDIR%%/manual/mod/mod_include.html
+%%DOCSDIR%%/manual/mod/mod_info.html.en
+%%DOCSDIR%%/manual/mod/mod_info.html.html
+%%DOCSDIR%%/manual/mod/mod_info.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_isapi.html
+%%DOCSDIR%%/manual/mod/mod_log_agent.html
+%%DOCSDIR%%/manual/mod/mod_log_common.html
+%%DOCSDIR%%/manual/mod/mod_log_config.html.en
+%%DOCSDIR%%/manual/mod/mod_log_config.html.html
+%%DOCSDIR%%/manual/mod/mod_log_config.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_log_referer.html
+%%DOCSDIR%%/manual/mod/mod_mime.html.en
+%%DOCSDIR%%/manual/mod/mod_mime.html.html
+%%DOCSDIR%%/manual/mod/mod_mime.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_mime_magic.html
+%%DOCSDIR%%/manual/mod/mod_mmap_static.html
+%%DOCSDIR%%/manual/mod/mod_negotiation.html.en
+%%DOCSDIR%%/manual/mod/mod_negotiation.html.html
+%%DOCSDIR%%/manual/mod/mod_negotiation.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_proxy.html
+%%DOCSDIR%%/manual/mod/mod_rewrite.html
+%%DOCSDIR%%/manual/mod/mod_setenvif.html.en
+%%DOCSDIR%%/manual/mod/mod_setenvif.html.html
+%%DOCSDIR%%/manual/mod/mod_setenvif.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_so.html.en
+%%DOCSDIR%%/manual/mod/mod_so.html.html
+%%DOCSDIR%%/manual/mod/mod_so.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_speling.html.en
+%%DOCSDIR%%/manual/mod/mod_speling.html.html
+%%DOCSDIR%%/manual/mod/mod_speling.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_status.html
+%%DOCSDIR%%/manual/mod/mod_unique_id.html.en
+%%DOCSDIR%%/manual/mod/mod_unique_id.html.html
+%%DOCSDIR%%/manual/mod/mod_unique_id.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_userdir.html.en
+%%DOCSDIR%%/manual/mod/mod_userdir.html.html
+%%DOCSDIR%%/manual/mod/mod_userdir.html.ja.jis
+%%DOCSDIR%%/manual/mod/mod_usertrack.html
+%%DOCSDIR%%/manual/mod/mod_vhost_alias.html
+%%DOCSDIR%%/manual/mod/module-dict.html.en
+%%DOCSDIR%%/manual/mod/module-dict.html.html
+%%DOCSDIR%%/manual/mod/module-dict.html.ja.jis
+%%DOCSDIR%%/manual/mpeix.html
+%%DOCSDIR%%/manual/multilogs.html
+%%DOCSDIR%%/manual/netware.html
+%%DOCSDIR%%/manual/new_features_1_0.html
+%%DOCSDIR%%/manual/new_features_1_1.html
+%%DOCSDIR%%/manual/new_features_1_2.html
+%%DOCSDIR%%/manual/new_features_1_3.html.en
+%%DOCSDIR%%/manual/new_features_1_3.html.html
+%%DOCSDIR%%/manual/new_features_1_3.html.ja.jis
+%%DOCSDIR%%/manual/new_features_2_0.html
+%%DOCSDIR%%/manual/process-model.html.en
+%%DOCSDIR%%/manual/process-model.html.html
+%%DOCSDIR%%/manual/process-model.html.ja.jis
+%%DOCSDIR%%/manual/programs/ab.html
+%%DOCSDIR%%/manual/programs/apachectl.html.en
+%%DOCSDIR%%/manual/programs/apachectl.html.html
+%%DOCSDIR%%/manual/programs/apachectl.html.ja.jis
+%%DOCSDIR%%/manual/programs/apxs.html
+%%DOCSDIR%%/manual/programs/dbmmanage.html
+%%DOCSDIR%%/manual/programs/footer.html
+%%DOCSDIR%%/manual/programs/header.html
+%%DOCSDIR%%/manual/programs/htdigest.html
+%%DOCSDIR%%/manual/programs/htpasswd.html.en
+%%DOCSDIR%%/manual/programs/htpasswd.html.html
+%%DOCSDIR%%/manual/programs/htpasswd.html.ja.jis
+%%DOCSDIR%%/manual/programs/httpd.html.en
+%%DOCSDIR%%/manual/programs/httpd.html.html
+%%DOCSDIR%%/manual/programs/httpd.html.ja.jis
+%%DOCSDIR%%/manual/programs/index.html.en
+%%DOCSDIR%%/manual/programs/index.html.html
+%%DOCSDIR%%/manual/programs/index.html.ja.jis
+%%DOCSDIR%%/manual/programs/logresolve.html
+%%DOCSDIR%%/manual/programs/other.html
+%%DOCSDIR%%/manual/programs/rotatelogs.html
+%%DOCSDIR%%/manual/programs/suexec.html.en
+%%DOCSDIR%%/manual/programs/suexec.html.html
+%%DOCSDIR%%/manual/programs/suexec.html.ja.jis
+%%DOCSDIR%%/manual/readme-tpf.html
+%%DOCSDIR%%/manual/search/manual-index.cgi
+%%DOCSDIR%%/manual/sections.html.en
+%%DOCSDIR%%/manual/sections.html.html
+%%DOCSDIR%%/manual/sections.html.ja.jis
+%%DOCSDIR%%/manual/server-wide.html.en
+%%DOCSDIR%%/manual/server-wide.html.fr
+%%DOCSDIR%%/manual/server-wide.html.html
+%%DOCSDIR%%/manual/server-wide.html.ja.jis
+%%DOCSDIR%%/manual/sitemap.html
+%%DOCSDIR%%/manual/sourcereorg.html
+%%DOCSDIR%%/manual/stopping.html.en
+%%DOCSDIR%%/manual/stopping.html.fr
+%%DOCSDIR%%/manual/stopping.html.html
+%%DOCSDIR%%/manual/suexec.html.en
+%%DOCSDIR%%/manual/suexec.html.html
+%%DOCSDIR%%/manual/suexec.html.ja.jis
+%%DOCSDIR%%/manual/suexec_1_2.html
+%%DOCSDIR%%/manual/unixware.html
+%%DOCSDIR%%/manual/upgrading_to_1_3.html
+%%DOCSDIR%%/manual/urlmapping.html
+%%DOCSDIR%%/manual/vhosts/details.html
+%%DOCSDIR%%/manual/vhosts/details_1_2.html
+%%DOCSDIR%%/manual/vhosts/examples.html
+%%DOCSDIR%%/manual/vhosts/fd-limits.html.en
+%%DOCSDIR%%/manual/vhosts/fd-limits.html.html
+%%DOCSDIR%%/manual/vhosts/fd-limits.html.ja.jis
+%%DOCSDIR%%/manual/vhosts/footer.html
+%%DOCSDIR%%/manual/vhosts/header.html
+%%DOCSDIR%%/manual/vhosts/host.html
+%%DOCSDIR%%/manual/vhosts/index.html.en
+%%DOCSDIR%%/manual/vhosts/index.html.html
+%%DOCSDIR%%/manual/vhosts/index.html.ja.jis
+%%DOCSDIR%%/manual/vhosts/ip-based.html
+%%DOCSDIR%%/manual/vhosts/mass.html
+%%DOCSDIR%%/manual/vhosts/name-based.html.en
+%%DOCSDIR%%/manual/vhosts/name-based.html.html
+%%DOCSDIR%%/manual/vhosts/name-based.html.ja.jis
+%%DOCSDIR%%/manual/vhosts/vhosts-in-depth.html
+%%DOCSDIR%%/manual/vhosts/virtual-host.html
+%%DOCSDIR%%/manual/win_compiling.html.en
+%%DOCSDIR%%/manual/win_compiling.html.html
+%%DOCSDIR%%/manual/win_compiling.html.ja.jis
+%%DOCSDIR%%/manual/win_service.html.en
+%%DOCSDIR%%/manual/win_service.html.html
+%%DOCSDIR%%/manual/win_service.html.ja.jis
+%%DOCSDIR%%/manual/windows.html.en
+%%DOCSDIR%%/manual/windows.html.ja.jis
 www/cgi-bin.default/printenv
 www/cgi-bin.default/test-cgi
 www/icons/README
@@ -808,15 +808,15 @@ www/icons/world2.png
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/search
-@dirrm share/doc/apache/manual/vhosts
-@dirrm share/doc/apache/manual
-@dirrm share/doc/apache
+@dirrm %%DOCSDIR%%/manual/howto
+@dirrm %%DOCSDIR%%/manual/images
+@dirrm %%DOCSDIR%%/manual/misc
+@dirrm %%DOCSDIR%%/manual/mod
+@dirrm %%DOCSDIR%%/manual/programs
+@dirrm %%DOCSDIR%%/manual/search
+@dirrm %%DOCSDIR%%/manual/vhosts
+@dirrm %%DOCSDIR%%/manual
+@dirrm %%DOCSDIR%%
 @dirrm www/cgi-bin.default
 @dirrm www/icons/small
 @dirrm www/icons