- add CONFLICTS

- use DOCSDIR
Submitted by:	eikemeier@fillmore-labs.com [CONFLICTS]

2 files changed, 356 insertions, 353 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index c211d38058e5..a251d7a91d44 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -21,6 +21,8 @@ COMMENT=	The Apache 1.3 webserver with SSL/TLS functionality
 LIB_DEPENDS=	mm.13:${PORTSDIR}/devel/mm
 PATCH_DEPENDS=	${BUILD_DEPENDS}
 
+CONFLICTS?=	apache+ipv6-1.* apache+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.*
 VERSION_APACHE=	1.3.28
 VERSION_MODSSL=	2.8.15
 USE_OPENSSL=	yes
@@ -35,6 +37,7 @@ MASTER_SITES_MODSSL=	http://www.modssl.org/source/ \
 .include <bsd.port.pre.mk>
 
 DATADIR=	${PREFIX}/www
+DOCSDIR=	${PREFIX}/share/doc/apache
 DOCUMENT_ROOT=	${DATADIR}/data
 
 .if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index f8c1338b64a3..b1258513dc8b 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -161,350 +161,350 @@ 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
-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/cgi_path.html.en
-share/doc/apache/cgi_path.html.fr
-share/doc/apache/cgi_path.html.html
-share/doc/apache/cgi_path.html.ja.jis
-share/doc/apache/configuring.html.fr
-share/doc/apache/configuring.html.en
-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.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/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.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.ja.jis
-share/doc/apache/howto/footer.html
-share/doc/apache/howto/header.html
-share/doc/apache/howto/htaccess.html
-share/doc/apache/images/apache_pb.gif
-share/doc/apache/images/apache_header.gif
-share/doc/apache/images/custom_errordocs.gif
-share/doc/apache/images/feather.jpg
-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/mod_ssl_sb.gif
-share/doc/apache/images/openssl_ics.gif
-share/doc/apache/images/pixel.gif
-share/doc/apache/images/sub.gif
-share/doc/apache/index.html.en
-share/doc/apache/index.html.ja.jis
-share/doc/apache/install-tpf.html
-share/doc/apache/install.html.es
-share/doc/apache/install.html.en
-share/doc/apache/install.html.ja.jis
-share/doc/apache/invoking.html.en
-share/doc/apache/invoking.html.html
-share/doc/apache/keepalive.html.en
-share/doc/apache/keepalive.html.html
-share/doc/apache/keepalive.html.ja.jis
-share/doc/apache/location.html
-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.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
-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_define.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_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.ja.jis
-share/doc/apache/mod/mod_proxy.html
-share/doc/apache/mod/mod_rewrite.html
-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_ssl/index.html
-share/doc/apache/mod/mod_ssl/ssl_compat.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_compat.html
-share/doc/apache/mod/mod_ssl/ssl_compat.wml
-share/doc/apache/mod/mod_ssl/ssl_cover.wml
-share/doc/apache/mod/mod_ssl/ssl_cover_logo.jpg
-share/doc/apache/mod/mod_ssl/ssl_cover_title.jpg
-share/doc/apache/mod/mod_ssl/ssl_faq.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_faq.html
-share/doc/apache/mod/mod_ssl/ssl_faq.wml
-share/doc/apache/mod/mod_ssl/ssl_glossary.html
-share/doc/apache/mod/mod_ssl/ssl_glossary.wml
-share/doc/apache/mod/mod_ssl/ssl_howto.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_howto.html
-share/doc/apache/mod/mod_ssl/ssl_howto.wml
-share/doc/apache/mod/mod_ssl/ssl_intro.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_intro.html
-share/doc/apache/mod/mod_ssl/ssl_intro.wml
-share/doc/apache/mod/mod_ssl/ssl_intro_fig1.gif
-share/doc/apache/mod/mod_ssl/ssl_intro_fig2.gif
-share/doc/apache/mod/mod_ssl/ssl_intro_fig3.gif
-share/doc/apache/mod/mod_ssl/ssl_overview.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_overview.html
-share/doc/apache/mod/mod_ssl/ssl_overview.wml
-share/doc/apache/mod/mod_ssl/ssl_overview_fig1.gif
-share/doc/apache/mod/mod_ssl/ssl_reference.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_reference.html
-share/doc/apache/mod/mod_ssl/ssl_reference.wml
-share/doc/apache/mod/mod_ssl/ssl_template.head-chapter.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-1.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-2.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-3.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-4.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-5.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-6.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-7.gif
-share/doc/apache/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
-share/doc/apache/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
-share/doc/apache/mod/mod_ssl/ssl_template.inc
-share/doc/apache/mod/mod_ssl/ssl_template.navbut-next-n.gif
-share/doc/apache/mod/mod_ssl/ssl_template.navbut-next-s.gif
-share/doc/apache/mod/mod_ssl/ssl_template.navbut-prev-n.gif
-share/doc/apache/mod/mod_ssl/ssl_template.navbut-prev-s.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-abstract.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-compat.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-faq.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-gloss.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-howto.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-intro.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-over.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-preface.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-ref.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-toc.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-tutor.gif
-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.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.ja.jis
-share/doc/apache/new_features_2_0.html
-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/search/manual-index.cgi
-share/doc/apache/server-wide.html.en
-share/doc/apache/server-wide.html.ja.jis
-share/doc/apache/sections.html.en
-share/doc/apache/sections.html.html
-share/doc/apache/sections.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/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.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.ja.jis
-share/doc/apache/mod/directive-dict.html.html
-share/doc/apache/mod/mod_negotiation.html.html
-share/doc/apache/mod/module-dict.html.html
-share/doc/apache/configuring.html.html
-share/doc/apache/custom-error.html.fr
-share/doc/apache/custom-error.html.html
-share/doc/apache/handler.html.html
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.html
-share/doc/apache/install.html.fr
-share/doc/apache/install.html.html
-share/doc/apache/invoking.html.fr
-share/doc/apache/new_features_1_3.html.html
-share/doc/apache/server-wide.html.fr
-share/doc/apache/server-wide.html.html
-share/doc/apache/howto/cgi.html.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/urlmapping.html
-share/doc/apache/vhosts/index.html.html
+%%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/bind.html.en
+%%DOCSDIR%%/bind.html.fr
+%%DOCSDIR%%/bind.html.html
+%%DOCSDIR%%/bind.html.ja.jis
+%%DOCSDIR%%/cgi_path.html.en
+%%DOCSDIR%%/cgi_path.html.fr
+%%DOCSDIR%%/cgi_path.html.html
+%%DOCSDIR%%/cgi_path.html.ja.jis
+%%DOCSDIR%%/configuring.html.fr
+%%DOCSDIR%%/configuring.html.en
+%%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.ja.jis
+%%DOCSDIR%%/cygwin.html
+%%DOCSDIR%%/dns-caveats.html.en
+%%DOCSDIR%%/dns-caveats.html.fr
+%%DOCSDIR%%/dns-caveats.html.html
+%%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.ja.jis
+%%DOCSDIR%%/header.html
+%%DOCSDIR%%/howto/auth.html
+%%DOCSDIR%%/howto/cgi.html.en
+%%DOCSDIR%%/howto/cgi.html.ja.jis
+%%DOCSDIR%%/howto/footer.html
+%%DOCSDIR%%/howto/header.html
+%%DOCSDIR%%/howto/htaccess.html
+%%DOCSDIR%%/images/apache_pb.gif
+%%DOCSDIR%%/images/apache_header.gif
+%%DOCSDIR%%/images/custom_errordocs.gif
+%%DOCSDIR%%/images/feather.jpg
+%%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/mod_ssl_sb.gif
+%%DOCSDIR%%/images/openssl_ics.gif
+%%DOCSDIR%%/images/pixel.gif
+%%DOCSDIR%%/images/sub.gif
+%%DOCSDIR%%/index.html.en
+%%DOCSDIR%%/index.html.ja.jis
+%%DOCSDIR%%/install-tpf.html
+%%DOCSDIR%%/install.html.es
+%%DOCSDIR%%/install.html.en
+%%DOCSDIR%%/install.html.ja.jis
+%%DOCSDIR%%/invoking.html.en
+%%DOCSDIR%%/invoking.html.html
+%%DOCSDIR%%/keepalive.html.en
+%%DOCSDIR%%/keepalive.html.html
+%%DOCSDIR%%/keepalive.html.ja.jis
+%%DOCSDIR%%/location.html
+%%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.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
+%%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_define.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_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.ja.jis
+%%DOCSDIR%%/mod/mod_proxy.html
+%%DOCSDIR%%/mod/mod_rewrite.html
+%%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_ssl/index.html
+%%DOCSDIR%%/mod/mod_ssl/ssl_compat.gfont000.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_compat.html
+%%DOCSDIR%%/mod/mod_ssl/ssl_compat.wml
+%%DOCSDIR%%/mod/mod_ssl/ssl_cover.wml
+%%DOCSDIR%%/mod/mod_ssl/ssl_cover_logo.jpg
+%%DOCSDIR%%/mod/mod_ssl/ssl_cover_title.jpg
+%%DOCSDIR%%/mod/mod_ssl/ssl_faq.gfont000.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_faq.html
+%%DOCSDIR%%/mod/mod_ssl/ssl_faq.wml
+%%DOCSDIR%%/mod/mod_ssl/ssl_glossary.html
+%%DOCSDIR%%/mod/mod_ssl/ssl_glossary.wml
+%%DOCSDIR%%/mod/mod_ssl/ssl_howto.gfont000.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_howto.html
+%%DOCSDIR%%/mod/mod_ssl/ssl_howto.wml
+%%DOCSDIR%%/mod/mod_ssl/ssl_intro.gfont000.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_intro.html
+%%DOCSDIR%%/mod/mod_ssl/ssl_intro.wml
+%%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig1.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig2.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig3.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_overview.gfont000.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_overview.html
+%%DOCSDIR%%/mod/mod_ssl/ssl_overview.wml
+%%DOCSDIR%%/mod/mod_ssl/ssl_overview_fig1.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_reference.gfont000.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_reference.html
+%%DOCSDIR%%/mod/mod_ssl/ssl_reference.wml
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-chapter.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-1.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-2.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-3.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-4.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-5.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-6.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-7.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.inc
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-next-n.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-next-s.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-prev-n.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-prev-s.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-abstract.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-compat.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-faq.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-gloss.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-howto.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-intro.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-over.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-preface.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-ref.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-toc.gif
+%%DOCSDIR%%/mod/mod_ssl/ssl_template.title-tutor.gif
+%%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.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.ja.jis
+%%DOCSDIR%%/new_features_2_0.html
+%%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%%/search/manual-index.cgi
+%%DOCSDIR%%/server-wide.html.en
+%%DOCSDIR%%/server-wide.html.ja.jis
+%%DOCSDIR%%/sections.html.en
+%%DOCSDIR%%/sections.html.html
+%%DOCSDIR%%/sections.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%%/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.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.ja.jis
+%%DOCSDIR%%/mod/directive-dict.html.html
+%%DOCSDIR%%/mod/mod_negotiation.html.html
+%%DOCSDIR%%/mod/module-dict.html.html
+%%DOCSDIR%%/configuring.html.html
+%%DOCSDIR%%/custom-error.html.fr
+%%DOCSDIR%%/custom-error.html.html
+%%DOCSDIR%%/handler.html.html
+%%DOCSDIR%%/index.html.fr
+%%DOCSDIR%%/index.html.html
+%%DOCSDIR%%/install.html.fr
+%%DOCSDIR%%/install.html.html
+%%DOCSDIR%%/invoking.html.fr
+%%DOCSDIR%%/new_features_1_3.html.html
+%%DOCSDIR%%/server-wide.html.fr
+%%DOCSDIR%%/server-wide.html.html
+%%DOCSDIR%%/howto/cgi.html.html
+%%DOCSDIR%%/howto/ssi.html.en
+%%DOCSDIR%%/howto/ssi.html.html
+%%DOCSDIR%%/howto/ssi.html.ja.jis
+%%DOCSDIR%%/urlmapping.html
+%%DOCSDIR%%/vhosts/index.html.html
 www/cgi-bin-dist/printenv
 @exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
 www/cgi-bin-dist/test-cgi
@@ -740,15 +740,15 @@ www/icons/world2.png
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/vhosts
-@dirrm share/doc/apache/search
-@dirrm share/doc/apache/mod/mod_ssl
-@dirrm share/doc/apache/mod
-@dirrm share/doc/apache/misc
-@dirrm share/doc/apache/images
-@dirrm share/doc/apache/howto
-@dirrm share/doc/apache/programs
-@dirrm share/doc/apache
+@dirrm %%DOCSDIR%%/vhosts
+@dirrm %%DOCSDIR%%/search
+@dirrm %%DOCSDIR%%/mod/mod_ssl
+@dirrm %%DOCSDIR%%/mod
+@dirrm %%DOCSDIR%%/misc
+@dirrm %%DOCSDIR%%/images
+@dirrm %%DOCSDIR%%/howto
+@dirrm %%DOCSDIR%%/programs
+@dirrm %%DOCSDIR%%
 @unexec rmdir %D/www/data-dist 2>/dev/null || true
 @unexec rmdir %D/www/cgi-bin-dist 2>/dev/null || true
 @dirrm www/icons/small