Changelog:

	- Sync with apache13 layout (and some patches)
	- use DOCSDIR
	- Add no_zombies.patch
	- use DIST_SUBDIR=apache

Removed files:
	- files/patch-aq
	- files/patch-ar

Added files:
	- files/patch-httpd.conf-dist
	- files/post-patch-conf:httpd.conf-dist.orig
	- files/patch-FixPatch
	- files/patch-SSLpatch
	- files/patch-Makefile.tmpl
	- files/patch-src::modules::standard::mod_auth_db.module
	- files/patch-src::support::dbmanage
	- files/patch-src::support::log_server_status
	- files/patch-configure

PR:		58403
Submitted By:	MAINTAINER

1 files changed, 338 insertions, 338 deletions

diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index beb6e741b190..eb71bfe2db49 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -2,20 +2,20 @@ bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf.default
+@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf-dist; then rm -f %D/etc/apache/access.conf; fi
+etc/apache/access.conf-dist
 @exec [ -f %B/access.conf ] || cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpsd.conf %D/etc/apache/httpsd.conf.default; then rm -f %D/etc/apache/httpsd.conf; fi
-etc/apache/httpsd.conf.default
+@unexec if cmp -s %D/etc/apache/httpsd.conf %D/etc/apache/httpsd.conf-dist; then rm -f %D/etc/apache/httpsd.conf; fi
+etc/apache/httpsd.conf-dist
 @exec [ -f %B/httpsd.conf ] || cp %B/%f %B/httpsd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic-dist; then rm -f %D/etc/apache/magic; fi
+etc/apache/magic-dist
 @exec [ -f %B/magic ] || cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types.default
+@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types-dist; then rm -f %D/etc/apache/mime.types; fi
+etc/apache/mime.types-dist
 @exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf.default
+@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi
+etc/apache/srm.conf-dist
 @exec [ -f %B/srm.conf ] || cp %B/%f %B/srm.conf
 include/apache/ap.h
 include/apache/ap_alloc.h
@@ -86,326 +86,324 @@ sbin/httpsdctl
 sbin/logresolve
 sbin/rotatelogs
 %%SUB_SUEXEC%%sbin/suexec
-@exec mkdir -p %D/www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
 www/cgi-bin/printenv
 www/cgi-bin/test-cgi
-www/htdocs/apache_pb.gif
-www/htdocs/index.html.ca
-www/htdocs/index.html.cz
-www/htdocs/index.html.de
-www/htdocs/index.html.dk
-www/htdocs/index.html.ee
-www/htdocs/index.html.el
-www/htdocs/index.html.en
-www/htdocs/index.html.es
-www/htdocs/index.html.fr
-www/htdocs/index.html.he.iso8859-8
-www/htdocs/index.html.it
-www/htdocs/index.html.ja.jis
-www/htdocs/index.html.kr.iso-kr
-www/htdocs/index.html.lb.utf8
-www/htdocs/index.html.nl
-www/htdocs/index.html.nn
-www/htdocs/index.html.no
-www/htdocs/index.html.po.iso-pl
-www/htdocs/index.html.pt
-www/htdocs/index.html.pt-br
-www/htdocs/index.html.ru.cp-1251
-www/htdocs/index.html.ru.cp866
-www/htdocs/index.html.ru.iso-ru
-www/htdocs/index.html.ru.koi8-r
-www/htdocs/index.html.ru.ucs2
-www/htdocs/index.html.ru.ucs4
-www/htdocs/index.html.ru.utf8
-www/htdocs/index.html.se
-www/htdocs/index.html.zh-tw.big5
-www/htdocs/manual/LICENSE
-www/htdocs/manual/bind.html.en
-www/htdocs/manual/bind.html.fr
-www/htdocs/manual/bind.html.html
-www/htdocs/manual/bind.html.ja.jis
-www/htdocs/manual/cgi_path.html.en
-www/htdocs/manual/cgi_path.html.fr
-www/htdocs/manual/cgi_path.html.html
-www/htdocs/manual/cgi_path.html.ja.jis
-www/htdocs/manual/configuring.html.en
-www/htdocs/manual/configuring.html.fr
-www/htdocs/manual/configuring.html.html
-www/htdocs/manual/configuring.html.ja.jis
-www/htdocs/manual/content-negotiation.html.en
-www/htdocs/manual/content-negotiation.html.html
-www/htdocs/manual/content-negotiation.html.ja.jis
-www/htdocs/manual/custom-error.html.en
-www/htdocs/manual/custom-error.html.fr
-www/htdocs/manual/custom-error.html.html
-www/htdocs/manual/custom-error.html.ja.jis
-www/htdocs/manual/cygwin.html
-www/htdocs/manual/dns-caveats.html.en
-www/htdocs/manual/dns-caveats.html.fr
-www/htdocs/manual/dns-caveats.html.html
-www/htdocs/manual/dso.html
-www/htdocs/manual/ebcdic.html
-www/htdocs/manual/env.html.en
-www/htdocs/manual/env.html.html
-www/htdocs/manual/env.html.ja.jis
-www/htdocs/manual/footer.html
-www/htdocs/manual/handler.html.en
-www/htdocs/manual/handler.html.html
-www/htdocs/manual/handler.html.ja.jis
-www/htdocs/manual/header.html
-www/htdocs/manual/howto/auth.html
-www/htdocs/manual/howto/cgi.html.en
-www/htdocs/manual/howto/cgi.html.html
-www/htdocs/manual/howto/cgi.html.ja.jis
-www/htdocs/manual/howto/footer.html
-www/htdocs/manual/howto/header.html
-www/htdocs/manual/howto/htaccess.html
-www/htdocs/manual/howto/ssi.html.en
-www/htdocs/manual/howto/ssi.html.html
-www/htdocs/manual/howto/ssi.html.ja.jis
-www/htdocs/manual/images/apache_header.gif
-www/htdocs/manual/images/custom_errordocs.gif
-www/htdocs/manual/images/home.gif
-www/htdocs/manual/images/index.gif
-www/htdocs/manual/images/mod_rewrite_fig1.fig
-www/htdocs/manual/images/mod_rewrite_fig1.gif
-www/htdocs/manual/images/mod_rewrite_fig2.fig
-www/htdocs/manual/images/mod_rewrite_fig2.gif
-www/htdocs/manual/images/pixel.gif
-www/htdocs/manual/images/sub.gif
-www/htdocs/manual/index.html.en
-www/htdocs/manual/index.html.fr
-www/htdocs/manual/index.html.html
-www/htdocs/manual/index.html.ja.jis
-www/htdocs/manual/install-tpf.html
-www/htdocs/manual/install.html.en
-www/htdocs/manual/install.html.es
-www/htdocs/manual/install.html.fr
-www/htdocs/manual/install.html.html
-www/htdocs/manual/install.html.ja.jis
-www/htdocs/manual/invoking.html.en
-www/htdocs/manual/invoking.html.fr
-www/htdocs/manual/invoking.html.html
-www/htdocs/manual/keepalive.html.en
-www/htdocs/manual/keepalive.html.html
-www/htdocs/manual/keepalive.html.ja.jis
-www/htdocs/manual/location.html
-www/htdocs/manual/logs.html
-www/htdocs/manual/man-template.html
-www/htdocs/manual/misc/API.html
-www/htdocs/manual/misc/FAQ.html
-www/htdocs/manual/misc/HTTP_Features.tsv
-www/htdocs/manual/misc/client_block_api.html
-www/htdocs/manual/misc/compat_notes.html
-www/htdocs/manual/misc/custom_errordocs.html
-www/htdocs/manual/misc/descriptors.html
-www/htdocs/manual/misc/fin_wait_2.html
-www/htdocs/manual/misc/footer.html
-www/htdocs/manual/misc/header.html
-www/htdocs/manual/misc/howto.html
-www/htdocs/manual/misc/index.html
-www/htdocs/manual/misc/known_client_problems.html
-www/htdocs/manual/misc/nopgp.html
-www/htdocs/manual/misc/perf-bsd44.html
-www/htdocs/manual/misc/perf-dec.html
-www/htdocs/manual/misc/perf-hp.html
-www/htdocs/manual/misc/perf-tuning.html
-www/htdocs/manual/misc/perf.html
-www/htdocs/manual/misc/rewriteguide.html
-www/htdocs/manual/misc/security_tips.html
-www/htdocs/manual/misc/tutorials.html
-www/htdocs/manual/misc/vif-info.html
-www/htdocs/manual/misc/windoz_keepalive.html
-www/htdocs/manual/mod/core.html.en
-www/htdocs/manual/mod/core.html.fr
-www/htdocs/manual/mod/core.html.ja.jis
-www/htdocs/manual/mod/core.html.html
-www/htdocs/manual/mod/directive-dict.html.en
-www/htdocs/manual/mod/directive-dict.html.fr
-www/htdocs/manual/mod/directive-dict.html.html
-www/htdocs/manual/mod/directive-dict.html.ja.jis
-www/htdocs/manual/mod/directives.html.de
-www/htdocs/manual/mod/directives.html.en
-www/htdocs/manual/mod/directives.html.fr
-www/htdocs/manual/mod/directives.html.html
-www/htdocs/manual/mod/directives.html.ja.jis
-www/htdocs/manual/mod/footer.html
-www/htdocs/manual/mod/header.html
-www/htdocs/manual/mod/index-bytype.html.en
-www/htdocs/manual/mod/index-bytype.html.fr
-www/htdocs/manual/mod/index-bytype.html.html
-www/htdocs/manual/mod/index-bytype.html.ja.jis
-www/htdocs/manual/mod/index.html.en
-www/htdocs/manual/mod/index.html.fr
-www/htdocs/manual/mod/index.html.html
-www/htdocs/manual/mod/index.html.ja.jis
-www/htdocs/manual/mod/mod_access.html.en
-www/htdocs/manual/mod/mod_access.html.html
-www/htdocs/manual/mod/mod_access.html.ja.jis
-www/htdocs/manual/mod/mod_actions.html.en
-www/htdocs/manual/mod/mod_actions.html.html
-www/htdocs/manual/mod/mod_actions.html.ja.jis
-www/htdocs/manual/mod/mod_alias.html.en
-www/htdocs/manual/mod/mod_alias.html.html
-www/htdocs/manual/mod/mod_alias.html.ja.jis
-www/htdocs/manual/mod/mod_asis.html.en
-www/htdocs/manual/mod/mod_asis.html.html
-www/htdocs/manual/mod/mod_asis.html.ja.jis
-www/htdocs/manual/mod/mod_auth.html.en
-www/htdocs/manual/mod/mod_auth.html.html
-www/htdocs/manual/mod/mod_auth.html.ja.jis
-www/htdocs/manual/mod/mod_auth_anon.html
-www/htdocs/manual/mod/mod_auth_db.html
-www/htdocs/manual/mod/mod_auth_dbm.html
-www/htdocs/manual/mod/mod_auth_digest.html
-www/htdocs/manual/mod/mod_autoindex.html
-www/htdocs/manual/mod/mod_browser.html
-www/htdocs/manual/mod/mod_cern_meta.html
-www/htdocs/manual/mod/mod_cgi.html.en
-www/htdocs/manual/mod/mod_cgi.html.html
-www/htdocs/manual/mod/mod_cgi.html.ja.jis
-www/htdocs/manual/mod/mod_cookies.html
-www/htdocs/manual/mod/mod_digest.html
-www/htdocs/manual/mod/mod_dir.html.en
-www/htdocs/manual/mod/mod_dir.html.html
-www/htdocs/manual/mod/mod_dir.html.ja.jis
-www/htdocs/manual/mod/mod_dld.html
-www/htdocs/manual/mod/mod_env.html.en
-www/htdocs/manual/mod/mod_env.html.html
-www/htdocs/manual/mod/mod_env.html.ja.jis
-www/htdocs/manual/mod/mod_example.html
-www/htdocs/manual/mod/mod_expires.html
-www/htdocs/manual/mod/mod_headers.html
-www/htdocs/manual/mod/mod_imap.html
-www/htdocs/manual/mod/mod_include.html
-www/htdocs/manual/mod/mod_info.html.en
-www/htdocs/manual/mod/mod_info.html.html
-www/htdocs/manual/mod/mod_info.html.ja.jis
-www/htdocs/manual/mod/mod_isapi.html
-www/htdocs/manual/mod/mod_log_agent.html
-www/htdocs/manual/mod/mod_log_common.html
-www/htdocs/manual/mod/mod_log_config.html.en
-www/htdocs/manual/mod/mod_log_config.html.html
-www/htdocs/manual/mod/mod_log_config.html.ja.jis
-www/htdocs/manual/mod/mod_log_referer.html
-www/htdocs/manual/mod/mod_mime.html.en
-www/htdocs/manual/mod/mod_mime.html.html
-www/htdocs/manual/mod/mod_mime.html.ja.jis
-www/htdocs/manual/mod/mod_mime_magic.html
-www/htdocs/manual/mod/mod_mmap_static.html
-www/htdocs/manual/mod/mod_negotiation.html.en
-www/htdocs/manual/mod/mod_negotiation.html.html
-www/htdocs/manual/mod/mod_negotiation.html.ja.jis
-www/htdocs/manual/mod/mod_proxy.html
-www/htdocs/manual/mod/mod_rewrite.html
-www/htdocs/manual/mod/mod_setenvif.html.en
-www/htdocs/manual/mod/mod_setenvif.html.html
-www/htdocs/manual/mod/mod_setenvif.html.ja.jis
-www/htdocs/manual/mod/mod_so.html.en
-www/htdocs/manual/mod/mod_so.html.html
-www/htdocs/manual/mod/mod_so.html.ja.jis
-www/htdocs/manual/mod/mod_speling.html.en
-www/htdocs/manual/mod/mod_speling.html.html
-www/htdocs/manual/mod/mod_speling.html.ja.jis
-www/htdocs/manual/mod/mod_status.html
-www/htdocs/manual/mod/mod_unique_id.html.en
-www/htdocs/manual/mod/mod_unique_id.html.html
-www/htdocs/manual/mod/mod_unique_id.html.ja.jis
-www/htdocs/manual/mod/mod_userdir.html.en
-www/htdocs/manual/mod/mod_userdir.html.html
-www/htdocs/manual/mod/mod_userdir.html.ja.jis
-www/htdocs/manual/mod/mod_usertrack.html
-www/htdocs/manual/mod/mod_vhost_alias.html
-www/htdocs/manual/mod/module-dict.html.en
-www/htdocs/manual/mod/module-dict.html.html
-www/htdocs/manual/mod/module-dict.html.ja.jis
-www/htdocs/manual/mpeix.html
-www/htdocs/manual/multilogs.html
-www/htdocs/manual/netware.html
-www/htdocs/manual/new_features_1_0.html
-www/htdocs/manual/new_features_1_1.html
-www/htdocs/manual/new_features_1_2.html
-www/htdocs/manual/new_features_1_3.html.en
-www/htdocs/manual/new_features_1_3.html.html
-www/htdocs/manual/new_features_1_3.html.ja.jis
-www/htdocs/manual/new_features_2_0.html
-www/htdocs/manual/process-model.html.en
-www/htdocs/manual/process-model.html.html
-www/htdocs/manual/process-model.html.ja.jis
-www/htdocs/manual/programs/ab.html
-www/htdocs/manual/programs/apachectl.html.en
-www/htdocs/manual/programs/apachectl.html.html
-www/htdocs/manual/programs/apachectl.html.ja.jis
-www/htdocs/manual/programs/apxs.html
-www/htdocs/manual/programs/dbmmanage.html
-www/htdocs/manual/programs/footer.html
-www/htdocs/manual/programs/header.html
-www/htdocs/manual/programs/htdigest.html
-www/htdocs/manual/programs/htpasswd.html.en
-www/htdocs/manual/programs/htpasswd.html.html
-www/htdocs/manual/programs/htpasswd.html.ja.jis
-www/htdocs/manual/programs/httpd.html.en
-www/htdocs/manual/programs/httpd.html.html
-www/htdocs/manual/programs/httpd.html.ja.jis
-www/htdocs/manual/programs/index.html.en
-www/htdocs/manual/programs/index.html.html
-www/htdocs/manual/programs/index.html.ja.jis
-www/htdocs/manual/programs/logresolve.html
-www/htdocs/manual/programs/other.html
-www/htdocs/manual/programs/rotatelogs.html
-www/htdocs/manual/programs/suexec.html.en
-www/htdocs/manual/programs/suexec.html.html
-www/htdocs/manual/programs/suexec.html.ja.jis
-www/htdocs/manual/readme-tpf.html
-www/htdocs/manual/search/manual-index.cgi
-www/htdocs/manual/sections.html.en
-www/htdocs/manual/sections.html.html
-www/htdocs/manual/sections.html.ja.jis
-www/htdocs/manual/server-wide.html.en
-www/htdocs/manual/server-wide.html.fr
-www/htdocs/manual/server-wide.html.html
-www/htdocs/manual/server-wide.html.ja.jis
-www/htdocs/manual/sitemap.html
-www/htdocs/manual/sourcereorg.html
-www/htdocs/manual/stopping.html.en
-www/htdocs/manual/stopping.html.fr
-www/htdocs/manual/stopping.html.html
-www/htdocs/manual/suexec.html.en
-www/htdocs/manual/suexec.html.html
-www/htdocs/manual/suexec.html.ja.jis
-www/htdocs/manual/suexec_1_2.html
-www/htdocs/manual/unixware.html
-www/htdocs/manual/upgrading_to_1_3.html
-www/htdocs/manual/urlmapping.html
-www/htdocs/manual/vhosts/details.html
-www/htdocs/manual/vhosts/details_1_2.html
-www/htdocs/manual/vhosts/examples.html
-www/htdocs/manual/vhosts/fd-limits.html.en
-www/htdocs/manual/vhosts/fd-limits.html.html
-www/htdocs/manual/vhosts/fd-limits.html.ja.jis
-www/htdocs/manual/vhosts/footer.html
-www/htdocs/manual/vhosts/header.html
-www/htdocs/manual/vhosts/host.html
-www/htdocs/manual/vhosts/index.html.en
-www/htdocs/manual/vhosts/index.html.html
-www/htdocs/manual/vhosts/index.html.ja.jis
-www/htdocs/manual/vhosts/ip-based.html
-www/htdocs/manual/vhosts/mass.html
-www/htdocs/manual/vhosts/name-based.html.en
-www/htdocs/manual/vhosts/name-based.html.html
-www/htdocs/manual/vhosts/name-based.html.ja.jis
-www/htdocs/manual/vhosts/vhosts-in-depth.html
-www/htdocs/manual/vhosts/virtual-host.html
-www/htdocs/manual/win_compiling.html.en
-www/htdocs/manual/win_compiling.html.html
-www/htdocs/manual/win_compiling.html.ja.jis
-www/htdocs/manual/win_service.html.en
-www/htdocs/manual/win_service.html.html
-www/htdocs/manual/win_service.html.ja.jis
-www/htdocs/manual/windows.html.en
-www/htdocs/manual/windows.html.ja.jis
+www/data-dist/apache_pb.gif
+@exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
+www/data-dist/index.html.ca
+www/data-dist/index.html.cz
+www/data-dist/index.html.de
+www/data-dist/index.html.dk
+www/data-dist/index.html.ee
+www/data-dist/index.html.el
+www/data-dist/index.html.en
+www/data-dist/index.html.es
+www/data-dist/index.html.fr
+www/data-dist/index.html.he.iso8859-8
+www/data-dist/index.html.it
+www/data-dist/index.html.ja.jis
+www/data-dist/index.html.kr.iso-kr
+www/data-dist/index.html.lb.utf8
+www/data-dist/index.html.nl
+www/data-dist/index.html.nn
+www/data-dist/index.html.no
+www/data-dist/index.html.po.iso-pl
+www/data-dist/index.html.pt
+www/data-dist/index.html.pt-br
+www/data-dist/index.html.ru.cp-1251
+www/data-dist/index.html.ru.cp866
+www/data-dist/index.html.ru.iso-ru
+www/data-dist/index.html.ru.koi8-r
+www/data-dist/index.html.ru.ucs2
+www/data-dist/index.html.ru.ucs4
+www/data-dist/index.html.ru.utf8
+www/data-dist/index.html.se
+www/data-dist/index.html.zh-tw.big5
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/bind.html.en
+%%PORTDOCS%%%%DOCSDIR%%/bind.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/bind.html.html
+%%PORTDOCS%%%%DOCSDIR%%/bind.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.en
+%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.html
+%%PORTDOCS%%%%DOCSDIR%%/cgi_path.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/configuring.html.en
+%%PORTDOCS%%%%DOCSDIR%%/configuring.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/configuring.html.html
+%%PORTDOCS%%%%DOCSDIR%%/configuring.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/content-negotiation.html.en
+%%PORTDOCS%%%%DOCSDIR%%/content-negotiation.html.html
+%%PORTDOCS%%%%DOCSDIR%%/content-negotiation.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/custom-error.html.en
+%%PORTDOCS%%%%DOCSDIR%%/custom-error.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/custom-error.html.html
+%%PORTDOCS%%%%DOCSDIR%%/custom-error.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/cygwin.html
+%%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.en
+%%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/dns-caveats.html.html
+%%PORTDOCS%%%%DOCSDIR%%/dso.html
+%%PORTDOCS%%%%DOCSDIR%%/ebcdic.html
+%%PORTDOCS%%%%DOCSDIR%%/env.html.en
+%%PORTDOCS%%%%DOCSDIR%%/env.html.html
+%%PORTDOCS%%%%DOCSDIR%%/env.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/handler.html.en
+%%PORTDOCS%%%%DOCSDIR%%/handler.html.html
+%%PORTDOCS%%%%DOCSDIR%%/handler.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/header.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/auth.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/cgi.html.en
+%%PORTDOCS%%%%DOCSDIR%%/howto/cgi.html.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/cgi.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/howto/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/header.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/htaccess.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/ssi.html.en
+%%PORTDOCS%%%%DOCSDIR%%/howto/ssi.html.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/ssi.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/images/apache_header.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/custom_errordocs.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/home.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/index.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/mod_rewrite_fig1.fig
+%%PORTDOCS%%%%DOCSDIR%%/images/mod_rewrite_fig1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/mod_rewrite_fig2.fig
+%%PORTDOCS%%%%DOCSDIR%%/images/mod_rewrite_fig2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/pixel.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/sub.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html.en
+%%PORTDOCS%%%%DOCSDIR%%/index.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/index.html.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/install-tpf.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html.en
+%%PORTDOCS%%%%DOCSDIR%%/install.html.es
+%%PORTDOCS%%%%DOCSDIR%%/install.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/install.html.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/invoking.html.en
+%%PORTDOCS%%%%DOCSDIR%%/invoking.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/invoking.html.html
+%%PORTDOCS%%%%DOCSDIR%%/keepalive.html.en
+%%PORTDOCS%%%%DOCSDIR%%/keepalive.html.html
+%%PORTDOCS%%%%DOCSDIR%%/keepalive.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/location.html
+%%PORTDOCS%%%%DOCSDIR%%/logs.html
+%%PORTDOCS%%%%DOCSDIR%%/man-template.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/API.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/HTTP_Features.tsv
+%%PORTDOCS%%%%DOCSDIR%%/misc/client_block_api.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/compat_notes.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/custom_errordocs.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/descriptors.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/fin_wait_2.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/header.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/howto.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/known_client_problems.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/nopgp.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf-bsd44.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf-dec.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf-hp.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf-tuning.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/perf.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/rewriteguide.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/security_tips.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/tutorials.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/vif-info.html
+%%PORTDOCS%%%%DOCSDIR%%/misc/windoz_keepalive.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/core.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/core.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/core.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/core.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/directive-dict.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/directive-dict.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/directive-dict.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/directive-dict.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.de
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/directives.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/header.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/index-bytype.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/index-bytype.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/index-bytype.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/index-bytype.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/index.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/index.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/mod/index.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/index.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_access.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_access.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_access.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_actions.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_actions.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_actions.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_alias.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_alias.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_alias.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_asis.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_asis.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_asis.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_anon.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_db.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_dbm.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_auth_digest.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_autoindex.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_browser.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cern_meta.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cgi.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cgi.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cgi.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_cookies.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_digest.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_dir.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_dir.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_dir.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_dld.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_env.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_env.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_env.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_example.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_expires.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_headers.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_imap.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_include.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_info.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_info.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_info.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_isapi.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_agent.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_common.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_config.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_log_referer.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mime_magic.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_mmap_static.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_negotiation.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_proxy.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_setenvif.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_so.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_so.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_so.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_speling.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_speling.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_speling.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_status.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_unique_id.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_userdir.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_userdir.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_userdir.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_usertrack.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/mod_vhost_alias.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/module-dict.html.en
+%%PORTDOCS%%%%DOCSDIR%%/mod/module-dict.html.html
+%%PORTDOCS%%%%DOCSDIR%%/mod/module-dict.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/mpeix.html
+%%PORTDOCS%%%%DOCSDIR%%/multilogs.html
+%%PORTDOCS%%%%DOCSDIR%%/netware.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_0.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_1.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_2.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.en
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.html
+%%PORTDOCS%%%%DOCSDIR%%/new_features_1_3.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/new_features_2_0.html
+%%PORTDOCS%%%%DOCSDIR%%/process-model.html.en
+%%PORTDOCS%%%%DOCSDIR%%/process-model.html.html
+%%PORTDOCS%%%%DOCSDIR%%/process-model.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/ab.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/apachectl.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/apachectl.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/apachectl.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/apxs.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/dbmmanage.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/header.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/htdigest.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/htpasswd.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/htpasswd.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/htpasswd.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/httpd.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/httpd.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/httpd.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/index.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/index.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/index.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/programs/logresolve.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/other.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/rotatelogs.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.en
+%%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.html
+%%PORTDOCS%%%%DOCSDIR%%/programs/suexec.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/readme-tpf.html
+%%PORTDOCS%%%%DOCSDIR%%/search/manual-index.cgi
+%%PORTDOCS%%%%DOCSDIR%%/sections.html.en
+%%PORTDOCS%%%%DOCSDIR%%/sections.html.html
+%%PORTDOCS%%%%DOCSDIR%%/sections.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/server-wide.html.en
+%%PORTDOCS%%%%DOCSDIR%%/server-wide.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/server-wide.html.html
+%%PORTDOCS%%%%DOCSDIR%%/server-wide.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/sitemap.html
+%%PORTDOCS%%%%DOCSDIR%%/sourcereorg.html
+%%PORTDOCS%%%%DOCSDIR%%/stopping.html.en
+%%PORTDOCS%%%%DOCSDIR%%/stopping.html.fr
+%%PORTDOCS%%%%DOCSDIR%%/stopping.html.html
+%%PORTDOCS%%%%DOCSDIR%%/suexec.html.en
+%%PORTDOCS%%%%DOCSDIR%%/suexec.html.html
+%%PORTDOCS%%%%DOCSDIR%%/suexec.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/suexec_1_2.html
+%%PORTDOCS%%%%DOCSDIR%%/unixware.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrading_to_1_3.html
+%%PORTDOCS%%%%DOCSDIR%%/urlmapping.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/details.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/details_1_2.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.en
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/fd-limits.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/header.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/host.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/index.html.en
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/index.html.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/index.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/ip-based.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/mass.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.html.en
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.html.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/vhosts-in-depth.html
+%%PORTDOCS%%%%DOCSDIR%%/vhosts/virtual-host.html
+%%PORTDOCS%%%%DOCSDIR%%/win_compiling.html.en
+%%PORTDOCS%%%%DOCSDIR%%/win_compiling.html.html
+%%PORTDOCS%%%%DOCSDIR%%/win_compiling.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/win_service.html.en
+%%PORTDOCS%%%%DOCSDIR%%/win_service.html.html
+%%PORTDOCS%%%%DOCSDIR%%/win_service.html.ja.jis
+%%PORTDOCS%%%%DOCSDIR%%/windows.html.en
+%%PORTDOCS%%%%DOCSDIR%%/windows.html.ja.jis
 www/icons/README
 www/icons/a.gif
 www/icons/a.png
@@ -629,16 +627,18 @@ www/icons/world2.png
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm www/cgi-bin
-@dirrm www/htdocs/manual/howto
-@dirrm www/htdocs/manual/images
-@dirrm www/htdocs/manual/misc
-@dirrm www/htdocs/manual/mod
-@dirrm www/htdocs/manual/programs
-@dirrm www/htdocs/manual/search
-@dirrm www/htdocs/manual/vhosts
-@dirrm www/htdocs/manual
-@dirrm www/htdocs
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/howto
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/misc
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/mod
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/programs
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/search
+@dirrm %%PORTDOCS%%%%DOCSDIR%%/vhosts
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
+@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+@dirrm www/cgi-bin-dist
+@dirrm www/data-dist
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy