- Update to 2.0.39, the emergency security update.

- Unmark FORBIDDEN

PR:		ports/39477
Submitted by:	maintainer

1 files changed, 113 insertions, 81 deletions

diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 22cd156780ce..f3aa06c8089d 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -62,6 +62,7 @@ include/apache2/apr_sha1.h
 include/apache2/apr_shm.h
 include/apache2/apr_signal.h
 include/apache2/apr_strings.h
+include/apache2/apr_strmatch.h
 include/apache2/apr_tables.h
 include/apache2/apr_thread_cond.h
 include/apache2/apr_thread_mutex.h
@@ -208,12 +209,15 @@ share/apache2/program.mk
 share/apache2/rules.mk
 share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/LICENSE
-%%PORTDOCS%%share/doc/apache2/bind.html
-%%PORTDOCS%%share/doc/apache2/cgi_path.html
+%%PORTDOCS%%share/doc/apache2/bind.html.en
+%%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/cgi_path.html.en
+%%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/configuring.html.en
 %%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html
-%%PORTDOCS%%share/doc/apache2/custom-error.html
+%%PORTDOCS%%share/doc/apache2/custom-error.html.en
+%%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/API.html
 %%PORTDOCS%%share/doc/apache2/developer/debugging.html
 %%PORTDOCS%%share/doc/apache2/developer/documenting.html
@@ -227,15 +231,19 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/request.html
 %%PORTDOCS%%share/doc/apache2/dns-caveats.html
 %%PORTDOCS%%share/doc/apache2/dso.html
+%%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
-%%PORTDOCS%%share/doc/apache2/env.html
+%%PORTDOCS%%share/doc/apache2/env.html.en
+%%PORTDOCS%%share/doc/apache2/env.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/faq/index.html
-%%PORTDOCS%%share/doc/apache2/filter.html
+%%PORTDOCS%%share/doc/apache2/filter.html.en
+%%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/footer.html
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/header.html
-%%PORTDOCS%%share/doc/apache2/howto/auth.html
+%%PORTDOCS%%share/doc/apache2/howto/auth.html.en
+%%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/howto/cgi.html.en
 %%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
@@ -263,8 +271,11 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/index.html.en
 %%PORTDOCS%%share/doc/apache2/index.html.fr
 %%PORTDOCS%%share/doc/apache2/index.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/install.html
-%%PORTDOCS%%share/doc/apache2/invoking.html
+%%PORTDOCS%%share/doc/apache2/install.html.en
+%%PORTDOCS%%share/doc/apache2/install.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
+%%PORTDOCS%%share/doc/apache2/invoking.html.en
+%%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/logs.html
 %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
 %%PORTDOCS%%share/doc/apache2/misc/descriptors.html
@@ -277,124 +288,136 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
 %%PORTDOCS%%share/doc/apache2/misc/security_tips.html
 %%PORTDOCS%%share/doc/apache2/misc/tutorials.html
+%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
-%%PORTDOCS%%share/doc/apache2/mod/core.html
+%%PORTDOCS%%share/doc/apache2/mod/core.html.en
 %%PORTDOCS%%share/doc/apache2/mod/core.xml
 %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
-%%PORTDOCS%%share/doc/apache2/mod/directives.html
+%%PORTDOCS%%share/doc/apache2/mod/directives.html.en
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
 %%PORTDOCS%%share/doc/apache2/mod/footer.html
 %%PORTDOCS%%share/doc/apache2/mod/header.html
-%%PORTDOCS%%share/doc/apache2/mod/index-bytype.html
-%%PORTDOCS%%share/doc/apache2/mod/index.html
+%%PORTDOCS%%share/doc/apache2/mod/index.html.en
 %%PORTDOCS%%share/doc/apache2/mod/index.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_TEMPLATE.html
-%%PORTDOCS%%share/doc/apache2/mod/mod_access.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.html
-%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_cgi.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_cgi.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_cgid.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_cgid.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_charset_lite.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_env.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_example.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_expires.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_ext_filter.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_file_cache.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_headers.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_headers.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_imap.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_imap.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_include.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_include.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_include.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_info.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_isapi.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_isapi.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.html
-%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_log_config.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_log_config.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_mime.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_mmap_static.html
-%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_rewrite.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_so.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_status.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_status.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_status.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_suexec.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_unique_id.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_userdir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
-%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html
+%%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html
-%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
-%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html
+%%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
-%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html
+%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml
-%%PORTDOCS%%share/doc/apache2/mod/perchild.html
+%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/perchild.html.en
 %%PORTDOCS%%share/doc/apache2/mod/perchild.xml
-%%PORTDOCS%%share/doc/apache2/mod/prefork.html
+%%PORTDOCS%%share/doc/apache2/mod/prefork.html.en
+%%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/prefork.xml
-%%PORTDOCS%%share/doc/apache2/mod/worker.html
+%%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/worker.html.en
+%%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/worker.xml
-%%PORTDOCS%%share/doc/apache2/mpm.html
+%%PORTDOCS%%share/doc/apache2/mod/worker.xml.ja
+%%PORTDOCS%%share/doc/apache2/mpm.html.en
+%%PORTDOCS%%share/doc/apache2/mpm.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/mpm.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.de
 %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.en
 %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.fr
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/platform/footer.html
 %%PORTDOCS%%share/doc/apache2/platform/header.html
 %%PORTDOCS%%share/doc/apache2/platform/netware.html
@@ -417,13 +440,15 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/programs/rotatelogs.html
 %%PORTDOCS%%share/doc/apache2/programs/suexec.html
 %%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
-%%PORTDOCS%%share/doc/apache2/sections.html
+%%PORTDOCS%%share/doc/apache2/sections.html.en
+%%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/sitemap.html
 %%PORTDOCS%%share/doc/apache2/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
-%%PORTDOCS%%share/doc/apache2/ssl/index.html
+%%PORTDOCS%%share/doc/apache2/ssl/index.html.en
+%%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_title.jpg
@@ -438,27 +463,36 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
 %%PORTDOCS%%share/doc/apache2/stopping.html
+%%PORTDOCS%%share/doc/apache2/style/Makefile
 %%PORTDOCS%%share/doc/apache2/style/build.sh
 %%PORTDOCS%%share/doc/apache2/style/build.xml
+%%PORTDOCS%%share/doc/apache2/style/common.xsl
 %%PORTDOCS%%share/doc/apache2/style/en.xml
+%%PORTDOCS%%share/doc/apache2/style/ja.xml
 %%PORTDOCS%%share/doc/apache2/style/manual.css
-%%PORTDOCS%%share/doc/apache2/style/manual.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
-%%PORTDOCS%%share/doc/apache2/style/settings.xsl
 %%PORTDOCS%%share/doc/apache2/style/sv.xml
-%%PORTDOCS%%share/doc/apache2/suexec.html
+%%PORTDOCS%%share/doc/apache2/suexec.html.en
+%%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/upgrading.html.en
 %%PORTDOCS%%share/doc/apache2/upgrading.html.fr
+%%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/urlmapping.html
 %%PORTDOCS%%share/doc/apache2/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
-%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html
+%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
+%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/vhosts/footer.html
 %%PORTDOCS%%share/doc/apache2/vhosts/header.html
-%%PORTDOCS%%share/doc/apache2/vhosts/index.html
+%%PORTDOCS%%share/doc/apache2/vhosts/index.html.en
+%%PORTDOCS%%share/doc/apache2/vhosts/index.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/vhosts/ip-based.html
 %%PORTDOCS%%share/doc/apache2/vhosts/mass.html
-%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html
+%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.en
+%%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.ja.jis
 @exec mkdir -p %D/www
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
@@ -485,9 +519,8 @@ www/data.default/index.html.he.iso8859-8
 www/data.default/index.html.hr.iso8859-2
 www/data.default/index.html.it
 www/data.default/index.html.ja.iso2022-jp
-www/data.default/index.html.kr.iso2022-kr
-www/data.default/index.html.ltz.utf8
-www/data.default/index.html.lu.utf8
+www/data.default/index.html.ko.euc-kr
+www/data.default/index.html.lb.utf8
 www/data.default/index.html.nl
 www/data.default/index.html.nn
 www/data.default/index.html.no
@@ -500,9 +533,8 @@ www/data.default/index.html.ru.iso-ru
 www/data.default/index.html.ru.koi8-r
 www/data.default/index.html.ru.utf8
 www/data.default/index.html.se
-www/data.default/index.html.tw
-www/data.default/index.html.tw.Big5
 www/data.default/index.html.var
+www/data.default/index.html.zh
 www/error/HTTP_BAD_GATEWAY.html.var
 www/error/HTTP_BAD_REQUEST.html.var
 www/error/HTTP_FORBIDDEN.html.var
@@ -572,6 +604,8 @@ www/icons/continued.gif
 www/icons/continued.png
 www/icons/dir.gif
 www/icons/dir.png
+www/icons/diskimg.gif
+www/icons/diskimg.png
 www/icons/down.gif
 www/icons/down.png
 www/icons/dvi.gif
@@ -771,5 +805,3 @@ www/icons/world2.png
 @dirrm lib/apache2
 @dirrm include/apache2
 @dirrm etc/apache2
-@exec [ -d %%DESTDIR%%/var/log ] || mkdir -p %%DESTDIR%%/var/log
-@exec [ -d %%DESTDIR%%/var/run ] || mkdir -p %%DESTDIR%%/var/run