12 files changed, 484 insertions, 100 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 4b2b89987c3b..2237e9b2ac90 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.40
-PORTREVISION=	1
+PORTVERSION=	2.0.42
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index d8a5b7f6874b..b97977295601 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.40.tar.gz) = fdb35bc3b5b7833e45a455b56a0d0be5
+MD5 (httpd-2.0.42.tar.gz) = 1ea73daf7626ae1e332da7618be81be9
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 7310e6844974..79829ebd3218 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -57,6 +57,7 @@ include/apache2/apr_poll.h
 include/apache2/apr_pools.h
 include/apache2/apr_portable.h
 include/apache2/apr_proc_mutex.h
+include/apache2/apr_queue.h
 include/apache2/apr_reslist.h
 include/apache2/apr_ring.h
 include/apache2/apr_rmm.h
@@ -82,6 +83,7 @@ include/apache2/apr_xlate.h
 include/apache2/apr_xml.h
 include/apache2/apu.h
 include/apache2/apu_compat.h
+include/apache2/apu_version.h
 %%WORKER%%include/apache2/fdqueue.h
 include/apache2/http_config.h
 include/apache2/http_connection.h
@@ -123,19 +125,16 @@ include/apache2/util_md5.h
 include/apache2/util_script.h
 include/apache2/util_time.h
 include/apache2/util_xml.h
-lib/apache2/APRVARS
 lib/apache2/apr.exp
 lib/apache2/aprutil.exp
 lib/apache2/libapr.a
 lib/apache2/libapr.la
-lib/apache2/libapr.so.0
-@unexec rm -f %D/lib/apache2/libapr.so
-@exec ln -fs libapr.so.0 %D/lib/apache2/libapr.so
+lib/apache2/libapr.so
+lib/apache2/libapr.so.9
 lib/apache2/libaprutil.a
 lib/apache2/libaprutil.la
-lib/apache2/libaprutil.so.0
-@unexec rm -f %D/lib/apache2/libaprutil.so
-@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
+lib/apache2/libaprutil.so
+lib/apache2/libaprutil.so.9
 libexec/apache2/httpd.exp
 libexec/apache2/mod_access.so
 libexec/apache2/mod_actions.so
@@ -225,8 +224,11 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/configuring.xml.ja
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html.en
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/content-negotiation.xml
+%%PORTDOCS%%share/doc/apache2/content-negotiation.xml.ja
 %%PORTDOCS%%share/doc/apache2/custom-error.html.en
 %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/custom-error.xml
 %%PORTDOCS%%share/doc/apache2/developer/API.html
 %%PORTDOCS%%share/doc/apache2/developer/debugging.html
 %%PORTDOCS%%share/doc/apache2/developer/documenting.html
@@ -239,10 +241,14 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/modules.html.en
 %%PORTDOCS%%share/doc/apache2/developer/modules.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/request.html
-%%PORTDOCS%%share/doc/apache2/dns-caveats.html
+%%PORTDOCS%%share/doc/apache2/developer/thread_safety.html
+%%PORTDOCS%%share/doc/apache2/dns-caveats.html.en
+%%PORTDOCS%%share/doc/apache2/dns-caveats.xml
 %%PORTDOCS%%share/doc/apache2/dso.html.en
 %%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
+%%PORTDOCS%%share/doc/apache2/dso.xml
+%%PORTDOCS%%share/doc/apache2/dso.xml.ja
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
@@ -251,29 +257,41 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/filter.xml
+%%PORTDOCS%%share/doc/apache2/filter.xml.ja
 %%PORTDOCS%%share/doc/apache2/footer.html
-%%PORTDOCS%%share/doc/apache2/glossary.html
+%%PORTDOCS%%share/doc/apache2/glossary.html.en
+%%PORTDOCS%%share/doc/apache2/glossary.xml
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/handler.xml
+%%PORTDOCS%%share/doc/apache2/handler.xml.ja
 %%PORTDOCS%%share/doc/apache2/header.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/cgi.xml
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
-%%PORTDOCS%%share/doc/apache2/howto/htaccess.html
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.html.en
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.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/images/apache_header.gif
 %%PORTDOCS%%share/doc/apache2/images/apache_header.png
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.gif
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache2/images/down.gif
+%%PORTDOCS%%share/doc/apache2/images/favicon.ico
+%%PORTDOCS%%share/doc/apache2/images/feather.gif
 %%PORTDOCS%%share/doc/apache2/images/home.gif
 %%PORTDOCS%%share/doc/apache2/images/home.png
 %%PORTDOCS%%share/doc/apache2/images/index.gif
 %%PORTDOCS%%share/doc/apache2/images/index.png
+%%PORTDOCS%%share/doc/apache2/images/left.gif
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.fig
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.gif
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.png
@@ -282,16 +300,23 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig2.png
 %%PORTDOCS%%share/doc/apache2/images/pixel.gif
 %%PORTDOCS%%share/doc/apache2/images/pixel.png
+%%PORTDOCS%%share/doc/apache2/images/right.gif
 %%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.en
 %%PORTDOCS%%share/doc/apache2/index.html.fr
 %%PORTDOCS%%share/doc/apache2/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/install.html.de
 %%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.xml
+%%PORTDOCS%%share/doc/apache2/install.xml.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.ja
 %%PORTDOCS%%share/doc/apache2/logs.html.en
 %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/logs.xml
@@ -304,7 +329,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html
 %%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
-%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
+%%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/allmodules.xml
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja
@@ -312,6 +338,7 @@ share/apache2/special.mk
 %%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/directives.html.en
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
@@ -327,11 +354,17 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
@@ -342,6 +375,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
@@ -368,6 +403,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
@@ -392,8 +429,12 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.xml
 %%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_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.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
@@ -432,6 +473,7 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
@@ -455,18 +497,27 @@ share/apache2/special.mk
 %%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/mpm.xml
+%%PORTDOCS%%share/doc/apache2/mpm.xml.ja
 %%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/new_features_2_0.xml
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de
 %%PORTDOCS%%share/doc/apache2/platform/footer.html
 %%PORTDOCS%%share/doc/apache2/platform/header.html
-%%PORTDOCS%%share/doc/apache2/platform/netware.html
-%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html
-%%PORTDOCS%%share/doc/apache2/platform/win_compiling.html
-%%PORTDOCS%%share/doc/apache2/platform/win_service.html
-%%PORTDOCS%%share/doc/apache2/platform/windows.html
+%%PORTDOCS%%share/doc/apache2/platform/netware.html.en
+%%PORTDOCS%%share/doc/apache2/platform/netware.xml
+%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html.en
+%%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/apxs.html
@@ -484,10 +535,13 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
 %%PORTDOCS%%share/doc/apache2/sections.html.en
 %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/sections.xml
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/server-wide.xml
 %%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/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
@@ -507,26 +561,66 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
 %%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/style/common.dtd
-%%PORTDOCS%%share/doc/apache2/style/common.xsl
-%%PORTDOCS%%share/doc/apache2/style/de.xml
-%%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/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
+%%PORTDOCS%%share/doc/apache2/style/lang/ja.xml
+%%PORTDOCS%%share/doc/apache2/style/lang/sv.xml
+%%PORTDOCS%%share/doc/apache2/style/manual.de.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.pt-br.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.sv.xsl
 %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
-%%PORTDOCS%%share/doc/apache2/style/sv.xml
+%%PORTDOCS%%share/doc/apache2/style/sitemap.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
+%%PORTDOCS%%share/doc/apache2/style/xsl/moduleindex.xsl
+%%PORTDOCS%%share/doc/apache2/style/xsl/sitemap.xsl
+%%PORTDOCS%%share/doc/apache2/style/xsl/synopsis.xsl
 %%PORTDOCS%%share/doc/apache2/suexec.html.en
 %%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/suexec.xml
+%%PORTDOCS%%share/doc/apache2/upgrading.html.de
 %%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/upgrading.xml
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.de
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.ja
 %%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/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
@@ -838,6 +932,9 @@ www/icons-dist/world2.png
 @dirrm www/cgi-bin-dist
 @dirrm www
 %%PORTDOCS%%@dirrm share/doc/apache2/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache2/style/xsl
+%%PORTDOCS%%@dirrm share/doc/apache2/style/lang
+%%PORTDOCS%%@dirrm share/doc/apache2/style/css
 %%PORTDOCS%%@dirrm share/doc/apache2/style
 %%PORTDOCS%%@dirrm share/doc/apache2/ssl
 %%PORTDOCS%%@dirrm share/doc/apache2/search
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 4b2b89987c3b..2237e9b2ac90 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.40
-PORTREVISION=	1
+PORTVERSION=	2.0.42
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index d8a5b7f6874b..b97977295601 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.40.tar.gz) = fdb35bc3b5b7833e45a455b56a0d0be5
+MD5 (httpd-2.0.42.tar.gz) = 1ea73daf7626ae1e332da7618be81be9
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 7310e6844974..79829ebd3218 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -57,6 +57,7 @@ include/apache2/apr_poll.h
 include/apache2/apr_pools.h
 include/apache2/apr_portable.h
 include/apache2/apr_proc_mutex.h
+include/apache2/apr_queue.h
 include/apache2/apr_reslist.h
 include/apache2/apr_ring.h
 include/apache2/apr_rmm.h
@@ -82,6 +83,7 @@ include/apache2/apr_xlate.h
 include/apache2/apr_xml.h
 include/apache2/apu.h
 include/apache2/apu_compat.h
+include/apache2/apu_version.h
 %%WORKER%%include/apache2/fdqueue.h
 include/apache2/http_config.h
 include/apache2/http_connection.h
@@ -123,19 +125,16 @@ include/apache2/util_md5.h
 include/apache2/util_script.h
 include/apache2/util_time.h
 include/apache2/util_xml.h
-lib/apache2/APRVARS
 lib/apache2/apr.exp
 lib/apache2/aprutil.exp
 lib/apache2/libapr.a
 lib/apache2/libapr.la
-lib/apache2/libapr.so.0
-@unexec rm -f %D/lib/apache2/libapr.so
-@exec ln -fs libapr.so.0 %D/lib/apache2/libapr.so
+lib/apache2/libapr.so
+lib/apache2/libapr.so.9
 lib/apache2/libaprutil.a
 lib/apache2/libaprutil.la
-lib/apache2/libaprutil.so.0
-@unexec rm -f %D/lib/apache2/libaprutil.so
-@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
+lib/apache2/libaprutil.so
+lib/apache2/libaprutil.so.9
 libexec/apache2/httpd.exp
 libexec/apache2/mod_access.so
 libexec/apache2/mod_actions.so
@@ -225,8 +224,11 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/configuring.xml.ja
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html.en
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/content-negotiation.xml
+%%PORTDOCS%%share/doc/apache2/content-negotiation.xml.ja
 %%PORTDOCS%%share/doc/apache2/custom-error.html.en
 %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/custom-error.xml
 %%PORTDOCS%%share/doc/apache2/developer/API.html
 %%PORTDOCS%%share/doc/apache2/developer/debugging.html
 %%PORTDOCS%%share/doc/apache2/developer/documenting.html
@@ -239,10 +241,14 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/modules.html.en
 %%PORTDOCS%%share/doc/apache2/developer/modules.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/request.html
-%%PORTDOCS%%share/doc/apache2/dns-caveats.html
+%%PORTDOCS%%share/doc/apache2/developer/thread_safety.html
+%%PORTDOCS%%share/doc/apache2/dns-caveats.html.en
+%%PORTDOCS%%share/doc/apache2/dns-caveats.xml
 %%PORTDOCS%%share/doc/apache2/dso.html.en
 %%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
+%%PORTDOCS%%share/doc/apache2/dso.xml
+%%PORTDOCS%%share/doc/apache2/dso.xml.ja
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
@@ -251,29 +257,41 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/filter.xml
+%%PORTDOCS%%share/doc/apache2/filter.xml.ja
 %%PORTDOCS%%share/doc/apache2/footer.html
-%%PORTDOCS%%share/doc/apache2/glossary.html
+%%PORTDOCS%%share/doc/apache2/glossary.html.en
+%%PORTDOCS%%share/doc/apache2/glossary.xml
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/handler.xml
+%%PORTDOCS%%share/doc/apache2/handler.xml.ja
 %%PORTDOCS%%share/doc/apache2/header.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/cgi.xml
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
-%%PORTDOCS%%share/doc/apache2/howto/htaccess.html
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.html.en
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.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/images/apache_header.gif
 %%PORTDOCS%%share/doc/apache2/images/apache_header.png
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.gif
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache2/images/down.gif
+%%PORTDOCS%%share/doc/apache2/images/favicon.ico
+%%PORTDOCS%%share/doc/apache2/images/feather.gif
 %%PORTDOCS%%share/doc/apache2/images/home.gif
 %%PORTDOCS%%share/doc/apache2/images/home.png
 %%PORTDOCS%%share/doc/apache2/images/index.gif
 %%PORTDOCS%%share/doc/apache2/images/index.png
+%%PORTDOCS%%share/doc/apache2/images/left.gif
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.fig
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.gif
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.png
@@ -282,16 +300,23 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig2.png
 %%PORTDOCS%%share/doc/apache2/images/pixel.gif
 %%PORTDOCS%%share/doc/apache2/images/pixel.png
+%%PORTDOCS%%share/doc/apache2/images/right.gif
 %%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.en
 %%PORTDOCS%%share/doc/apache2/index.html.fr
 %%PORTDOCS%%share/doc/apache2/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/install.html.de
 %%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.xml
+%%PORTDOCS%%share/doc/apache2/install.xml.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.ja
 %%PORTDOCS%%share/doc/apache2/logs.html.en
 %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/logs.xml
@@ -304,7 +329,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html
 %%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
-%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
+%%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/allmodules.xml
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja
@@ -312,6 +338,7 @@ share/apache2/special.mk
 %%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/directives.html.en
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
@@ -327,11 +354,17 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
@@ -342,6 +375,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
@@ -368,6 +403,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
@@ -392,8 +429,12 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.xml
 %%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_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.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
@@ -432,6 +473,7 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
@@ -455,18 +497,27 @@ share/apache2/special.mk
 %%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/mpm.xml
+%%PORTDOCS%%share/doc/apache2/mpm.xml.ja
 %%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/new_features_2_0.xml
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de
 %%PORTDOCS%%share/doc/apache2/platform/footer.html
 %%PORTDOCS%%share/doc/apache2/platform/header.html
-%%PORTDOCS%%share/doc/apache2/platform/netware.html
-%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html
-%%PORTDOCS%%share/doc/apache2/platform/win_compiling.html
-%%PORTDOCS%%share/doc/apache2/platform/win_service.html
-%%PORTDOCS%%share/doc/apache2/platform/windows.html
+%%PORTDOCS%%share/doc/apache2/platform/netware.html.en
+%%PORTDOCS%%share/doc/apache2/platform/netware.xml
+%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html.en
+%%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/apxs.html
@@ -484,10 +535,13 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
 %%PORTDOCS%%share/doc/apache2/sections.html.en
 %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/sections.xml
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/server-wide.xml
 %%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/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
@@ -507,26 +561,66 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
 %%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/style/common.dtd
-%%PORTDOCS%%share/doc/apache2/style/common.xsl
-%%PORTDOCS%%share/doc/apache2/style/de.xml
-%%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/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
+%%PORTDOCS%%share/doc/apache2/style/lang/ja.xml
+%%PORTDOCS%%share/doc/apache2/style/lang/sv.xml
+%%PORTDOCS%%share/doc/apache2/style/manual.de.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.pt-br.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.sv.xsl
 %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
-%%PORTDOCS%%share/doc/apache2/style/sv.xml
+%%PORTDOCS%%share/doc/apache2/style/sitemap.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
+%%PORTDOCS%%share/doc/apache2/style/xsl/moduleindex.xsl
+%%PORTDOCS%%share/doc/apache2/style/xsl/sitemap.xsl
+%%PORTDOCS%%share/doc/apache2/style/xsl/synopsis.xsl
 %%PORTDOCS%%share/doc/apache2/suexec.html.en
 %%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/suexec.xml
+%%PORTDOCS%%share/doc/apache2/upgrading.html.de
 %%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/upgrading.xml
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.de
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.ja
 %%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/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
@@ -838,6 +932,9 @@ www/icons-dist/world2.png
 @dirrm www/cgi-bin-dist
 @dirrm www
 %%PORTDOCS%%@dirrm share/doc/apache2/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache2/style/xsl
+%%PORTDOCS%%@dirrm share/doc/apache2/style/lang
+%%PORTDOCS%%@dirrm share/doc/apache2/style/css
 %%PORTDOCS%%@dirrm share/doc/apache2/style
 %%PORTDOCS%%@dirrm share/doc/apache2/ssl
 %%PORTDOCS%%@dirrm share/doc/apache2/search
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 4b2b89987c3b..2237e9b2ac90 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.40
-PORTREVISION=	1
+PORTVERSION=	2.0.42
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index d8a5b7f6874b..b97977295601 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.40.tar.gz) = fdb35bc3b5b7833e45a455b56a0d0be5
+MD5 (httpd-2.0.42.tar.gz) = 1ea73daf7626ae1e332da7618be81be9
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 7310e6844974..79829ebd3218 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -57,6 +57,7 @@ include/apache2/apr_poll.h
 include/apache2/apr_pools.h
 include/apache2/apr_portable.h
 include/apache2/apr_proc_mutex.h
+include/apache2/apr_queue.h
 include/apache2/apr_reslist.h
 include/apache2/apr_ring.h
 include/apache2/apr_rmm.h
@@ -82,6 +83,7 @@ include/apache2/apr_xlate.h
 include/apache2/apr_xml.h
 include/apache2/apu.h
 include/apache2/apu_compat.h
+include/apache2/apu_version.h
 %%WORKER%%include/apache2/fdqueue.h
 include/apache2/http_config.h
 include/apache2/http_connection.h
@@ -123,19 +125,16 @@ include/apache2/util_md5.h
 include/apache2/util_script.h
 include/apache2/util_time.h
 include/apache2/util_xml.h
-lib/apache2/APRVARS
 lib/apache2/apr.exp
 lib/apache2/aprutil.exp
 lib/apache2/libapr.a
 lib/apache2/libapr.la
-lib/apache2/libapr.so.0
-@unexec rm -f %D/lib/apache2/libapr.so
-@exec ln -fs libapr.so.0 %D/lib/apache2/libapr.so
+lib/apache2/libapr.so
+lib/apache2/libapr.so.9
 lib/apache2/libaprutil.a
 lib/apache2/libaprutil.la
-lib/apache2/libaprutil.so.0
-@unexec rm -f %D/lib/apache2/libaprutil.so
-@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
+lib/apache2/libaprutil.so
+lib/apache2/libaprutil.so.9
 libexec/apache2/httpd.exp
 libexec/apache2/mod_access.so
 libexec/apache2/mod_actions.so
@@ -225,8 +224,11 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/configuring.xml.ja
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html.en
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/content-negotiation.xml
+%%PORTDOCS%%share/doc/apache2/content-negotiation.xml.ja
 %%PORTDOCS%%share/doc/apache2/custom-error.html.en
 %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/custom-error.xml
 %%PORTDOCS%%share/doc/apache2/developer/API.html
 %%PORTDOCS%%share/doc/apache2/developer/debugging.html
 %%PORTDOCS%%share/doc/apache2/developer/documenting.html
@@ -239,10 +241,14 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/modules.html.en
 %%PORTDOCS%%share/doc/apache2/developer/modules.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/request.html
-%%PORTDOCS%%share/doc/apache2/dns-caveats.html
+%%PORTDOCS%%share/doc/apache2/developer/thread_safety.html
+%%PORTDOCS%%share/doc/apache2/dns-caveats.html.en
+%%PORTDOCS%%share/doc/apache2/dns-caveats.xml
 %%PORTDOCS%%share/doc/apache2/dso.html.en
 %%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
+%%PORTDOCS%%share/doc/apache2/dso.xml
+%%PORTDOCS%%share/doc/apache2/dso.xml.ja
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
@@ -251,29 +257,41 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/filter.xml
+%%PORTDOCS%%share/doc/apache2/filter.xml.ja
 %%PORTDOCS%%share/doc/apache2/footer.html
-%%PORTDOCS%%share/doc/apache2/glossary.html
+%%PORTDOCS%%share/doc/apache2/glossary.html.en
+%%PORTDOCS%%share/doc/apache2/glossary.xml
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/handler.xml
+%%PORTDOCS%%share/doc/apache2/handler.xml.ja
 %%PORTDOCS%%share/doc/apache2/header.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/cgi.xml
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
-%%PORTDOCS%%share/doc/apache2/howto/htaccess.html
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.html.en
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.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/images/apache_header.gif
 %%PORTDOCS%%share/doc/apache2/images/apache_header.png
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.gif
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache2/images/down.gif
+%%PORTDOCS%%share/doc/apache2/images/favicon.ico
+%%PORTDOCS%%share/doc/apache2/images/feather.gif
 %%PORTDOCS%%share/doc/apache2/images/home.gif
 %%PORTDOCS%%share/doc/apache2/images/home.png
 %%PORTDOCS%%share/doc/apache2/images/index.gif
 %%PORTDOCS%%share/doc/apache2/images/index.png
+%%PORTDOCS%%share/doc/apache2/images/left.gif
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.fig
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.gif
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.png
@@ -282,16 +300,23 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig2.png
 %%PORTDOCS%%share/doc/apache2/images/pixel.gif
 %%PORTDOCS%%share/doc/apache2/images/pixel.png
+%%PORTDOCS%%share/doc/apache2/images/right.gif
 %%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.en
 %%PORTDOCS%%share/doc/apache2/index.html.fr
 %%PORTDOCS%%share/doc/apache2/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/install.html.de
 %%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.xml
+%%PORTDOCS%%share/doc/apache2/install.xml.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.ja
 %%PORTDOCS%%share/doc/apache2/logs.html.en
 %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/logs.xml
@@ -304,7 +329,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html
 %%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
-%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
+%%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/allmodules.xml
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja
@@ -312,6 +338,7 @@ share/apache2/special.mk
 %%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/directives.html.en
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
@@ -327,11 +354,17 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
@@ -342,6 +375,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
@@ -368,6 +403,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
@@ -392,8 +429,12 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.xml
 %%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_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.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
@@ -432,6 +473,7 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
@@ -455,18 +497,27 @@ share/apache2/special.mk
 %%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/mpm.xml
+%%PORTDOCS%%share/doc/apache2/mpm.xml.ja
 %%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/new_features_2_0.xml
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de
 %%PORTDOCS%%share/doc/apache2/platform/footer.html
 %%PORTDOCS%%share/doc/apache2/platform/header.html
-%%PORTDOCS%%share/doc/apache2/platform/netware.html
-%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html
-%%PORTDOCS%%share/doc/apache2/platform/win_compiling.html
-%%PORTDOCS%%share/doc/apache2/platform/win_service.html
-%%PORTDOCS%%share/doc/apache2/platform/windows.html
+%%PORTDOCS%%share/doc/apache2/platform/netware.html.en
+%%PORTDOCS%%share/doc/apache2/platform/netware.xml
+%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html.en
+%%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/apxs.html
@@ -484,10 +535,13 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
 %%PORTDOCS%%share/doc/apache2/sections.html.en
 %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/sections.xml
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/server-wide.xml
 %%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/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
@@ -507,26 +561,66 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
 %%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/style/common.dtd
-%%PORTDOCS%%share/doc/apache2/style/common.xsl
-%%PORTDOCS%%share/doc/apache2/style/de.xml
-%%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/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
+%%PORTDOCS%%share/doc/apache2/style/lang/ja.xml
+%%PORTDOCS%%share/doc/apache2/style/lang/sv.xml
+%%PORTDOCS%%share/doc/apache2/style/manual.de.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.pt-br.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.sv.xsl
 %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
-%%PORTDOCS%%share/doc/apache2/style/sv.xml
+%%PORTDOCS%%share/doc/apache2/style/sitemap.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
+%%PORTDOCS%%share/doc/apache2/style/xsl/moduleindex.xsl
+%%PORTDOCS%%share/doc/apache2/style/xsl/sitemap.xsl
+%%PORTDOCS%%share/doc/apache2/style/xsl/synopsis.xsl
 %%PORTDOCS%%share/doc/apache2/suexec.html.en
 %%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/suexec.xml
+%%PORTDOCS%%share/doc/apache2/upgrading.html.de
 %%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/upgrading.xml
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.de
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.ja
 %%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/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
@@ -838,6 +932,9 @@ www/icons-dist/world2.png
 @dirrm www/cgi-bin-dist
 @dirrm www
 %%PORTDOCS%%@dirrm share/doc/apache2/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache2/style/xsl
+%%PORTDOCS%%@dirrm share/doc/apache2/style/lang
+%%PORTDOCS%%@dirrm share/doc/apache2/style/css
 %%PORTDOCS%%@dirrm share/doc/apache2/style
 %%PORTDOCS%%@dirrm share/doc/apache2/ssl
 %%PORTDOCS%%@dirrm share/doc/apache2/search
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 4b2b89987c3b..2237e9b2ac90 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.40
-PORTREVISION=	1
+PORTVERSION=	2.0.42
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index d8a5b7f6874b..b97977295601 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.40.tar.gz) = fdb35bc3b5b7833e45a455b56a0d0be5
+MD5 (httpd-2.0.42.tar.gz) = 1ea73daf7626ae1e332da7618be81be9
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 7310e6844974..79829ebd3218 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -57,6 +57,7 @@ include/apache2/apr_poll.h
 include/apache2/apr_pools.h
 include/apache2/apr_portable.h
 include/apache2/apr_proc_mutex.h
+include/apache2/apr_queue.h
 include/apache2/apr_reslist.h
 include/apache2/apr_ring.h
 include/apache2/apr_rmm.h
@@ -82,6 +83,7 @@ include/apache2/apr_xlate.h
 include/apache2/apr_xml.h
 include/apache2/apu.h
 include/apache2/apu_compat.h
+include/apache2/apu_version.h
 %%WORKER%%include/apache2/fdqueue.h
 include/apache2/http_config.h
 include/apache2/http_connection.h
@@ -123,19 +125,16 @@ include/apache2/util_md5.h
 include/apache2/util_script.h
 include/apache2/util_time.h
 include/apache2/util_xml.h
-lib/apache2/APRVARS
 lib/apache2/apr.exp
 lib/apache2/aprutil.exp
 lib/apache2/libapr.a
 lib/apache2/libapr.la
-lib/apache2/libapr.so.0
-@unexec rm -f %D/lib/apache2/libapr.so
-@exec ln -fs libapr.so.0 %D/lib/apache2/libapr.so
+lib/apache2/libapr.so
+lib/apache2/libapr.so.9
 lib/apache2/libaprutil.a
 lib/apache2/libaprutil.la
-lib/apache2/libaprutil.so.0
-@unexec rm -f %D/lib/apache2/libaprutil.so
-@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
+lib/apache2/libaprutil.so
+lib/apache2/libaprutil.so.9
 libexec/apache2/httpd.exp
 libexec/apache2/mod_access.so
 libexec/apache2/mod_actions.so
@@ -225,8 +224,11 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/configuring.xml.ja
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html.en
 %%PORTDOCS%%share/doc/apache2/content-negotiation.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/content-negotiation.xml
+%%PORTDOCS%%share/doc/apache2/content-negotiation.xml.ja
 %%PORTDOCS%%share/doc/apache2/custom-error.html.en
 %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/custom-error.xml
 %%PORTDOCS%%share/doc/apache2/developer/API.html
 %%PORTDOCS%%share/doc/apache2/developer/debugging.html
 %%PORTDOCS%%share/doc/apache2/developer/documenting.html
@@ -239,10 +241,14 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/modules.html.en
 %%PORTDOCS%%share/doc/apache2/developer/modules.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/request.html
-%%PORTDOCS%%share/doc/apache2/dns-caveats.html
+%%PORTDOCS%%share/doc/apache2/developer/thread_safety.html
+%%PORTDOCS%%share/doc/apache2/dns-caveats.html.en
+%%PORTDOCS%%share/doc/apache2/dns-caveats.xml
 %%PORTDOCS%%share/doc/apache2/dso.html.en
 %%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
+%%PORTDOCS%%share/doc/apache2/dso.xml
+%%PORTDOCS%%share/doc/apache2/dso.xml.ja
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
@@ -251,29 +257,41 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/filter.xml
+%%PORTDOCS%%share/doc/apache2/filter.xml.ja
 %%PORTDOCS%%share/doc/apache2/footer.html
-%%PORTDOCS%%share/doc/apache2/glossary.html
+%%PORTDOCS%%share/doc/apache2/glossary.html.en
+%%PORTDOCS%%share/doc/apache2/glossary.xml
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/handler.xml
+%%PORTDOCS%%share/doc/apache2/handler.xml.ja
 %%PORTDOCS%%share/doc/apache2/header.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/cgi.xml
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
-%%PORTDOCS%%share/doc/apache2/howto/htaccess.html
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.html.en
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.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/images/apache_header.gif
 %%PORTDOCS%%share/doc/apache2/images/apache_header.png
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.gif
 %%PORTDOCS%%share/doc/apache2/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache2/images/down.gif
+%%PORTDOCS%%share/doc/apache2/images/favicon.ico
+%%PORTDOCS%%share/doc/apache2/images/feather.gif
 %%PORTDOCS%%share/doc/apache2/images/home.gif
 %%PORTDOCS%%share/doc/apache2/images/home.png
 %%PORTDOCS%%share/doc/apache2/images/index.gif
 %%PORTDOCS%%share/doc/apache2/images/index.png
+%%PORTDOCS%%share/doc/apache2/images/left.gif
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.fig
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.gif
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig1.png
@@ -282,16 +300,23 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/images/mod_rewrite_fig2.png
 %%PORTDOCS%%share/doc/apache2/images/pixel.gif
 %%PORTDOCS%%share/doc/apache2/images/pixel.png
+%%PORTDOCS%%share/doc/apache2/images/right.gif
 %%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.en
 %%PORTDOCS%%share/doc/apache2/index.html.fr
 %%PORTDOCS%%share/doc/apache2/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/install.html.de
 %%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.xml
+%%PORTDOCS%%share/doc/apache2/install.xml.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.ja
 %%PORTDOCS%%share/doc/apache2/logs.html.en
 %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/logs.xml
@@ -304,7 +329,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html
 %%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
-%%PORTDOCS%%share/doc/apache2/misc/security_tips.html
+%%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/allmodules.xml
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja
@@ -312,6 +338,7 @@ share/apache2/special.mk
 %%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/directives.html.en
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
@@ -327,11 +354,17 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_alias.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
@@ -342,6 +375,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.xml
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth_ldap.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
@@ -368,6 +403,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_disk_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
@@ -392,8 +429,12 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_info.xml
 %%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.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_ldap.xml
 %%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_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.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_mime_magic.html.en
@@ -432,6 +473,7 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en
 %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
@@ -455,18 +497,27 @@ share/apache2/special.mk
 %%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/mpm.xml
+%%PORTDOCS%%share/doc/apache2/mpm.xml.ja
 %%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/new_features_2_0.xml
+%%PORTDOCS%%share/doc/apache2/new_features_2_0.xml.de
 %%PORTDOCS%%share/doc/apache2/platform/footer.html
 %%PORTDOCS%%share/doc/apache2/platform/header.html
-%%PORTDOCS%%share/doc/apache2/platform/netware.html
-%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html
-%%PORTDOCS%%share/doc/apache2/platform/win_compiling.html
-%%PORTDOCS%%share/doc/apache2/platform/win_service.html
-%%PORTDOCS%%share/doc/apache2/platform/windows.html
+%%PORTDOCS%%share/doc/apache2/platform/netware.html.en
+%%PORTDOCS%%share/doc/apache2/platform/netware.xml
+%%PORTDOCS%%share/doc/apache2/platform/perf-hp.html.en
+%%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/apxs.html
@@ -484,10 +535,13 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/search/manual-index.cgi
 %%PORTDOCS%%share/doc/apache2/sections.html.en
 %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/sections.xml
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/server-wide.xml
 %%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/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
@@ -507,26 +561,66 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
 %%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/style/common.dtd
-%%PORTDOCS%%share/doc/apache2/style/common.xsl
-%%PORTDOCS%%share/doc/apache2/style/de.xml
-%%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/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
+%%PORTDOCS%%share/doc/apache2/style/lang/ja.xml
+%%PORTDOCS%%share/doc/apache2/style/lang/sv.xml
+%%PORTDOCS%%share/doc/apache2/style/manual.de.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.pt-br.xsl
+%%PORTDOCS%%share/doc/apache2/style/manual.sv.xsl
 %%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
-%%PORTDOCS%%share/doc/apache2/style/sv.xml
+%%PORTDOCS%%share/doc/apache2/style/sitemap.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
+%%PORTDOCS%%share/doc/apache2/style/xsl/moduleindex.xsl
+%%PORTDOCS%%share/doc/apache2/style/xsl/sitemap.xsl
+%%PORTDOCS%%share/doc/apache2/style/xsl/synopsis.xsl
 %%PORTDOCS%%share/doc/apache2/suexec.html.en
 %%PORTDOCS%%share/doc/apache2/suexec.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/suexec.xml
+%%PORTDOCS%%share/doc/apache2/upgrading.html.de
 %%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/upgrading.xml
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.de
+%%PORTDOCS%%share/doc/apache2/upgrading.xml.ja
 %%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/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
@@ -838,6 +932,9 @@ www/icons-dist/world2.png
 @dirrm www/cgi-bin-dist
 @dirrm www
 %%PORTDOCS%%@dirrm share/doc/apache2/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache2/style/xsl
+%%PORTDOCS%%@dirrm share/doc/apache2/style/lang
+%%PORTDOCS%%@dirrm share/doc/apache2/style/css
 %%PORTDOCS%%@dirrm share/doc/apache2/style
 %%PORTDOCS%%@dirrm share/doc/apache2/ssl
 %%PORTDOCS%%@dirrm share/doc/apache2/search