Update to 2.0.44

New knob IPV6_V6ONLY=yes disables accepting v4 connection via v4-mapped
v6 socket.

3 files changed, 83 insertions, 36 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 45d4809bd426..acdf9d96ea4e 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.43
-PORTREVISION=	2
+PORTVERSION=	2.0.44
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
@@ -55,6 +54,10 @@ MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
+.if !defined(IPV6_V6ONLY)
+CONFIGURE_ARGS+= --enable-v4-mapped
+.endif
+
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 .endif
@@ -126,7 +129,7 @@ PLIST_SUB+=	EXPERIMENTAL="@comment "
 CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}" ${CONFIGURE_TARGET}
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
+MAN8=		ab.8 apxs.8 logresolve.8 rotatelogs.8 suexec.8
 
 post-extract:
 	@${INSTALL_DATA} ${DISTDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 0b7d94b98644..2f0ffa4038be 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.43.tar.gz) = 8051de5d160c43d4ed2cc47dc9be6fd3
+MD5 (httpd-2.0.44.tar.gz) = 786c8d62bf18c6c88d2d82a9443cd1e1
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index ec4f439a4d65..98c1f6b61c40 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -21,6 +21,7 @@ include/apache2/ap_config_layout.h
 include/apache2/ap_listen.h
 include/apache2/ap_mmn.h
 include/apache2/ap_mpm.h
+include/apache2/ap_provider.h
 include/apache2/ap_regkey.h
 include/apache2/ap_release.h
 include/apache2/apr.h
@@ -44,6 +45,7 @@ include/apache2/apr_hash.h
 include/apache2/apr_hooks.h
 include/apache2/apr_inherit.h
 include/apache2/apr_ldap.h
+include/apache2/apr_ldap_url.h
 include/apache2/apr_lib.h
 include/apache2/apr_md4.h
 include/apache2/apr_md5.h
@@ -218,6 +220,8 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/bind.xml.ja
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.en
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/cgi_path.xml
+%%PORTDOCS%%share/doc/apache2/cgi_path.xml.ja
 %%PORTDOCS%%share/doc/apache2/configuring.html.en
 %%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/configuring.xml
@@ -244,7 +248,9 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/request.html
 %%PORTDOCS%%share/doc/apache2/developer/thread_safety.html
 %%PORTDOCS%%share/doc/apache2/dns-caveats.html.en
+%%PORTDOCS%%share/doc/apache2/dns-caveats.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dns-caveats.xml
+%%PORTDOCS%%share/doc/apache2/dns-caveats.xml.ja
 %%PORTDOCS%%share/doc/apache2/dso.html.en
 %%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
@@ -253,6 +259,7 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/env.xml
+%%PORTDOCS%%share/doc/apache2/env.xml.ja
 %%PORTDOCS%%share/doc/apache2/faq/index.html
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
@@ -271,15 +278,19 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/howto/cgi.html.en
 %%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/howto/cgi.xml
+%%PORTDOCS%%share/doc/apache2/howto/cgi.xml.ja
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
 %%PORTDOCS%%share/doc/apache2/howto/htaccess.html.en
 %%PORTDOCS%%share/doc/apache2/howto/htaccess.xml
+%%PORTDOCS%%share/doc/apache2/howto/index.html.en
+%%PORTDOCS%%share/doc/apache2/howto/index.xml
 %%PORTDOCS%%share/doc/apache2/howto/public_html.html.en
 %%PORTDOCS%%share/doc/apache2/howto/public_html.xml
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.en
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/howto/ssi.xml
+%%PORTDOCS%%share/doc/apache2/howto/ssi.xml.ja
 %%PORTDOCS%%share/doc/apache2/images/apache_header.gif
 %%PORTDOCS%%share/doc/apache2/images/apache_header.png
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.gif
@@ -304,6 +315,7 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/images/sub.gif
 %%PORTDOCS%%share/doc/apache2/images/sub.png
 %%PORTDOCS%%share/doc/apache2/images/up.gif
+%%PORTDOCS%%share/doc/apache2/index.html.de
 %%PORTDOCS%%share/doc/apache2/index.html.en
 %%PORTDOCS%%share/doc/apache2/index.html.fr
 %%PORTDOCS%%share/doc/apache2/index.html.ja.jis
@@ -311,12 +323,16 @@ share/apache2/build/special.mk
 %%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/install.html.ru.koi8-r
 %%PORTDOCS%%share/doc/apache2/install.xml
 %%PORTDOCS%%share/doc/apache2/install.xml.de
 %%PORTDOCS%%share/doc/apache2/install.xml.ja
+%%PORTDOCS%%share/doc/apache2/install.xml.ru
+%%PORTDOCS%%share/doc/apache2/invoking.html.de
 %%PORTDOCS%%share/doc/apache2/invoking.html.en
 %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/invoking.xml
+%%PORTDOCS%%share/doc/apache2/invoking.xml.de
 %%PORTDOCS%%share/doc/apache2/invoking.xml.ja
 %%PORTDOCS%%share/doc/apache2/logs.html.en
 %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
@@ -337,22 +353,30 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/security_tips.html.en
 %%PORTDOCS%%share/doc/apache2/misc/security_tips.xml
 %%PORTDOCS%%share/doc/apache2/misc/tutorials.html
+%%PORTDOCS%%share/doc/apache2/mod/beos.html.en
+%%PORTDOCS%%share/doc/apache2/mod/beos.xml
 %%PORTDOCS%%share/doc/apache2/mod/core.html.en
 %%PORTDOCS%%share/doc/apache2/mod/core.xml
 %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en
 %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml
 %%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/directives.html.de
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.en
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
+%%PORTDOCS%%share/doc/apache2/mod/directives.xml.de
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/footer.html
 %%PORTDOCS%%share/doc/apache2/mod/header.html
+%%PORTDOCS%%share/doc/apache2/mod/index.html.de
 %%PORTDOCS%%share/doc/apache2/mod/index.html.en
 %%PORTDOCS%%share/doc/apache2/mod/index.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/index.xml
+%%PORTDOCS%%share/doc/apache2/mod/index.xml.de
 %%PORTDOCS%%share/doc/apache2/mod/index.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/leader.html.en
+%%PORTDOCS%%share/doc/apache2/mod/leader.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
@@ -401,6 +425,8 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_dav_fs.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_dav_fs.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
@@ -432,7 +458,9 @@ share/apache2/build/special.mk
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_include.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_include.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_include.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_info.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_info.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
@@ -448,7 +476,9 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_mem_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_mime.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_mime.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_mime.xml.ja
 %%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_negotiation.html.en
@@ -457,6 +487,12 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy_connect.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy_connect.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy_ftp.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy_ftp.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy_http.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_proxy_http.xml
 %%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.en
@@ -505,16 +541,22 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mpmt_os2.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mpmt_os2.xml
 %%PORTDOCS%%share/doc/apache2/mod/perchild.html.en
 %%PORTDOCS%%share/doc/apache2/mod/perchild.xml
 %%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/prefork.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.de
 %%PORTDOCS%%share/doc/apache2/mod/quickreference.html.en
 %%PORTDOCS%%share/doc/apache2/mod/quickreference.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/quickreference.xml
+%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.de
 %%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/threadpool.html.en
+%%PORTDOCS%%share/doc/apache2/mod/threadpool.xml
 %%PORTDOCS%%share/doc/apache2/mod/worker.html.en
 %%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/worker.xml
@@ -529,9 +571,11 @@ share/apache2/build/special.mk
 %%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/new_features_2_0.html.ru.koi8-r
 %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml
 %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de
 %%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.ja
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.ru
 %%PORTDOCS%%share/doc/apache2/platform/ebcdic.html.en
 %%PORTDOCS%%share/doc/apache2/platform/ebcdic.xml
 %%PORTDOCS%%share/doc/apache2/platform/footer.html
@@ -544,20 +588,21 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/platform/perf-hp.xml
 %%PORTDOCS%%share/doc/apache2/platform/win_compiling.html.en
 %%PORTDOCS%%share/doc/apache2/platform/win_compiling.xml
-%%PORTDOCS%%share/doc/apache2/platform/win_service.html.en
-%%PORTDOCS%%share/doc/apache2/platform/win_service.xml
 %%PORTDOCS%%share/doc/apache2/platform/windows.html.en
 %%PORTDOCS%%share/doc/apache2/platform/windows.xml
 %%PORTDOCS%%share/doc/apache2/programs/ab.html
-%%PORTDOCS%%share/doc/apache2/programs/apachectl.html
+%%PORTDOCS%%share/doc/apache2/programs/apachectl.html.en
+%%PORTDOCS%%share/doc/apache2/programs/apachectl.xml
 %%PORTDOCS%%share/doc/apache2/programs/apxs.html
 %%PORTDOCS%%share/doc/apache2/programs/dbmmanage.html
 %%PORTDOCS%%share/doc/apache2/programs/footer.html
 %%PORTDOCS%%share/doc/apache2/programs/header.html
 %%PORTDOCS%%share/doc/apache2/programs/htdigest.html
 %%PORTDOCS%%share/doc/apache2/programs/htpasswd.html
-%%PORTDOCS%%share/doc/apache2/programs/httpd.html
-%%PORTDOCS%%share/doc/apache2/programs/index.html
+%%PORTDOCS%%share/doc/apache2/programs/httpd.html.en
+%%PORTDOCS%%share/doc/apache2/programs/httpd.xml
+%%PORTDOCS%%share/doc/apache2/programs/index.html.en
+%%PORTDOCS%%share/doc/apache2/programs/index.xml
 %%PORTDOCS%%share/doc/apache2/programs/logresolve.html
 %%PORTDOCS%%share/doc/apache2/programs/other.html
 %%PORTDOCS%%share/doc/apache2/programs/rotatelogs.html
@@ -570,15 +615,18 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/server-wide.xml
 %%PORTDOCS%%share/doc/apache2/server-wide.xml.ja
+%%PORTDOCS%%share/doc/apache2/sitemap.html.de
 %%PORTDOCS%%share/doc/apache2/sitemap.html.en
 %%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/sitemap.xml
+%%PORTDOCS%%share/doc/apache2/sitemap.xml.de
 %%PORTDOCS%%share/doc/apache2/sitemap.xml.ja
 %%PORTDOCS%%share/doc/apache2/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/ssl/index.xml
+%%PORTDOCS%%share/doc/apache2/ssl/index.xml.ja
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.html.en
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_compat.xml
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_cover_logo.jpg
@@ -595,36 +643,15 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_overview_fig1.gif
 %%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.de
 %%PORTDOCS%%share/doc/apache2/stopping.html.en
 %%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/stopping.xml
+%%PORTDOCS%%share/doc/apache2/stopping.xml.de
 %%PORTDOCS%%share/doc/apache2/stopping.xml.ja
 %%PORTDOCS%%share/doc/apache2/style/common.dtd
-%%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc-b.css
 %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-loose-90pc-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-loose-90pc.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-loose-fix13-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-loose-fix13.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-loose-fix15-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-loose-fix15.css
 %%PORTDOCS%%share/doc/apache2/style/css/manual-print.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-left-100pc-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-left-100pc.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-left-90pc-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-left-90pc.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-left-fix13-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-left-fix13.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-left-fix15-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-left-fix15.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-right-100pc-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-right-100pc.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-right-90pc-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-right-90pc.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-right-fix13-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-right-fix13.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-right-fix15-b.css
-%%PORTDOCS%%share/doc/apache2/style/css/manual-sbar-right-fix15.css
 %%PORTDOCS%%share/doc/apache2/style/css/manual.css
 %%PORTDOCS%%share/doc/apache2/style/lang/de.xml
 %%PORTDOCS%%share/doc/apache2/style/lang/en.xml
@@ -640,6 +667,11 @@ share/apache2/build/special.mk
 %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
 %%PORTDOCS%%share/doc/apache2/style/sitemap.dtd
+%%PORTDOCS%%share/doc/apache2/style/w3c/xhtml-lat1.ent
+%%PORTDOCS%%share/doc/apache2/style/w3c/xhtml-special.ent
+%%PORTDOCS%%share/doc/apache2/style/w3c/xhtml-symbol.ent
+%%PORTDOCS%%share/doc/apache2/style/w3c/xhtml1-strict.dtd
+%%PORTDOCS%%share/doc/apache2/style/w3c/xhtml1-transitional.dtd
 %%PORTDOCS%%share/doc/apache2/style/xsl/common.xsl
 %%PORTDOCS%%share/doc/apache2/style/xsl/directiveindex.xsl
 %%PORTDOCS%%share/doc/apache2/style/xsl/manualpage.xsl
@@ -656,25 +688,36 @@ share/apache2/build/special.mk
 %%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/upgrading.html.ru.koi8-r
 %%PORTDOCS%%share/doc/apache2/upgrading.xml
 %%PORTDOCS%%share/doc/apache2/upgrading.xml.de
 %%PORTDOCS%%share/doc/apache2/upgrading.xml.ja
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.ru
 %%PORTDOCS%%share/doc/apache2/urlmapping.html.en
 %%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/urlmapping.xml
 %%PORTDOCS%%share/doc/apache2/urlmapping.xml.ja
-%%PORTDOCS%%share/doc/apache2/vhosts/details.html
-%%PORTDOCS%%share/doc/apache2/vhosts/examples.html
+%%PORTDOCS%%share/doc/apache2/vhosts/details.html.en
+%%PORTDOCS%%share/doc/apache2/vhosts/details.xml
+%%PORTDOCS%%share/doc/apache2/vhosts/examples.html.en
+%%PORTDOCS%%share/doc/apache2/vhosts/examples.xml
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.xml
+%%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.xml.ja
 %%PORTDOCS%%share/doc/apache2/vhosts/footer.html
 %%PORTDOCS%%share/doc/apache2/vhosts/header.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/index.xml
+%%PORTDOCS%%share/doc/apache2/vhosts/index.xml.ja
+%%PORTDOCS%%share/doc/apache2/vhosts/ip-based.html.en
+%%PORTDOCS%%share/doc/apache2/vhosts/ip-based.xml
+%%PORTDOCS%%share/doc/apache2/vhosts/mass.html.en
+%%PORTDOCS%%share/doc/apache2/vhosts/mass.xml
 %%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.en
 %%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/vhosts/name-based.xml
 @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-dist %D/www/cgi-bin
@@ -975,6 +1018,7 @@ www/icons-dist/world2.png
 @dirrm www
 %%PORTDOCS%%@dirrm share/doc/apache2/vhosts
 %%PORTDOCS%%@dirrm share/doc/apache2/style/xsl
+%%PORTDOCS%%@dirrm share/doc/apache2/style/w3c
 %%PORTDOCS%%@dirrm share/doc/apache2/style/lang
 %%PORTDOCS%%@dirrm share/doc/apache2/style/css
 %%PORTDOCS%%@dirrm share/doc/apache2/style