Update "apache2" package to version 2.0.55.

Patches supplied by Ben Collver. Addresses PR pkg/31817 by Zafer Aydogan.

8 files changed, 19 insertions, 798 deletions

diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
index 8a91cafc64b..b10d9cbdf7d 100644
--- a/www/apache2/Makefile.common
+++ b/www/apache2/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.18 2005/05/21 03:49:52 reed Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/10/17 10:37:11 tron Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 EXTRACT_SUFX=		.tar.bz2
 # When updating this version be sure to update the checksum and remove
 # any PKGREVISION for devel/apr also.
-APACHE_VERSION=		2.0.54
-APR_VERSION=		0.9.6
+APACHE_VERSION=		2.0.55
+APR_VERSION=		0.9.7
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/} \
 			http://www.NetBSD.org/images/logos/
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index 0dacadd6553..879ccbad040 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2005/05/02 20:34:06 reed Exp $
+@comment $NetBSD: PLIST,v 1.31 2005/10/17 10:37:11 tron Exp $
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -100,7 +100,6 @@ share/httpd/error/HTTP_GONE.html.var
 share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
 share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
 share/httpd/error/HTTP_METHOD_NOT_ALLOWED.html.var
-share/httpd/error/HTTP_NOT_ACCEPTABLE.html.var
 share/httpd/error/HTTP_NOT_FOUND.html.var
 share/httpd/error/HTTP_NOT_IMPLEMENTED.html.var
 share/httpd/error/HTTP_PRECONDITION_FAILED.html.var
@@ -380,142 +379,72 @@ share/httpd/manual/bind.html.es
 share/httpd/manual/bind.html.fr
 share/httpd/manual/bind.html.ja.euc-jp
 share/httpd/manual/bind.html.ko.euc-kr
-share/httpd/manual/bind.xml
-share/httpd/manual/bind.xml.es
-share/httpd/manual/bind.xml.fr
-share/httpd/manual/bind.xml.ja
-share/httpd/manual/bind.xml.ko
-share/httpd/manual/bind.xml.meta
 share/httpd/manual/configuring.html
 share/httpd/manual/configuring.html.de
 share/httpd/manual/configuring.html.en
 share/httpd/manual/configuring.html.fr
 share/httpd/manual/configuring.html.ja.euc-jp
 share/httpd/manual/configuring.html.ko.euc-kr
-share/httpd/manual/configuring.xml
-share/httpd/manual/configuring.xml.de
-share/httpd/manual/configuring.xml.fr
-share/httpd/manual/configuring.xml.ja
-share/httpd/manual/configuring.xml.ko
-share/httpd/manual/configuring.xml.meta
 share/httpd/manual/content-negotiation.html
 share/httpd/manual/content-negotiation.html.en
 share/httpd/manual/content-negotiation.html.fr
 share/httpd/manual/content-negotiation.html.ja.euc-jp
 share/httpd/manual/content-negotiation.html.ko.euc-kr
-share/httpd/manual/content-negotiation.xml
-share/httpd/manual/content-negotiation.xml.fr
-share/httpd/manual/content-negotiation.xml.ja
-share/httpd/manual/content-negotiation.xml.ko
-share/httpd/manual/content-negotiation.xml.meta
 share/httpd/manual/custom-error.html
 share/httpd/manual/custom-error.html.en
 share/httpd/manual/custom-error.html.es
 share/httpd/manual/custom-error.html.fr
 share/httpd/manual/custom-error.html.ja.euc-jp
 share/httpd/manual/custom-error.html.ko.euc-kr
-share/httpd/manual/custom-error.xml
-share/httpd/manual/custom-error.xml.es
-share/httpd/manual/custom-error.xml.fr
-share/httpd/manual/custom-error.xml.ja
-share/httpd/manual/custom-error.xml.ko
-share/httpd/manual/custom-error.xml.meta
 share/httpd/manual/developer/API.html
 share/httpd/manual/developer/API.html.en
-share/httpd/manual/developer/API.xml
-share/httpd/manual/developer/API.xml.meta
 share/httpd/manual/developer/debugging.html
 share/httpd/manual/developer/debugging.html.en
-share/httpd/manual/developer/debugging.xml
-share/httpd/manual/developer/debugging.xml.meta
 share/httpd/manual/developer/documenting.html
 share/httpd/manual/developer/documenting.html.en
-share/httpd/manual/developer/documenting.xml
-share/httpd/manual/developer/documenting.xml.meta
 share/httpd/manual/developer/filters.html
 share/httpd/manual/developer/filters.html.en
-share/httpd/manual/developer/filters.xml
-share/httpd/manual/developer/filters.xml.meta
 share/httpd/manual/developer/hooks.html
 share/httpd/manual/developer/hooks.html.en
-share/httpd/manual/developer/hooks.xml
-share/httpd/manual/developer/hooks.xml.meta
 share/httpd/manual/developer/index.html
 share/httpd/manual/developer/index.html.en
-share/httpd/manual/developer/index.xml
-share/httpd/manual/developer/index.xml.meta
 share/httpd/manual/developer/modules.html
 share/httpd/manual/developer/modules.html.en
 share/httpd/manual/developer/modules.html.ja.euc-jp
-share/httpd/manual/developer/modules.xml
-share/httpd/manual/developer/modules.xml.ja
-share/httpd/manual/developer/modules.xml.meta
 share/httpd/manual/developer/request.html
 share/httpd/manual/developer/request.html.en
-share/httpd/manual/developer/request.xml
-share/httpd/manual/developer/request.xml.meta
 share/httpd/manual/developer/thread_safety.html
 share/httpd/manual/developer/thread_safety.html.en
-share/httpd/manual/developer/thread_safety.xml
-share/httpd/manual/developer/thread_safety.xml.meta
 share/httpd/manual/dns-caveats.html
 share/httpd/manual/dns-caveats.html.en
+share/httpd/manual/dns-caveats.html.es
 share/httpd/manual/dns-caveats.html.fr
 share/httpd/manual/dns-caveats.html.ja.euc-jp
 share/httpd/manual/dns-caveats.html.ko.euc-kr
-share/httpd/manual/dns-caveats.xml
-share/httpd/manual/dns-caveats.xml.fr
-share/httpd/manual/dns-caveats.xml.ja
-share/httpd/manual/dns-caveats.xml.ko
-share/httpd/manual/dns-caveats.xml.meta
 share/httpd/manual/dso.html
 share/httpd/manual/dso.html.en
 share/httpd/manual/dso.html.es
 share/httpd/manual/dso.html.fr
 share/httpd/manual/dso.html.ja.euc-jp
 share/httpd/manual/dso.html.ko.euc-kr
-share/httpd/manual/dso.xml
-share/httpd/manual/dso.xml.es
-share/httpd/manual/dso.xml.fr
-share/httpd/manual/dso.xml.ja
-share/httpd/manual/dso.xml.ko
-share/httpd/manual/dso.xml.meta
 share/httpd/manual/env.html
 share/httpd/manual/env.html.en
+share/httpd/manual/env.html.es
 share/httpd/manual/env.html.fr
 share/httpd/manual/env.html.ja.euc-jp
 share/httpd/manual/env.html.ko.euc-kr
-share/httpd/manual/env.xml
-share/httpd/manual/env.xml.fr
-share/httpd/manual/env.xml.ja
-share/httpd/manual/env.xml.ko
-share/httpd/manual/env.xml.meta
 share/httpd/manual/faq/all_in_one.html
 share/httpd/manual/faq/all_in_one.html.en
 share/httpd/manual/faq/all_in_one.html.ko.euc-kr
-share/httpd/manual/faq/all_in_one.xml
-share/httpd/manual/faq/all_in_one.xml.ko
-share/httpd/manual/faq/all_in_one.xml.meta
-share/httpd/manual/faq/categories.xml
-share/httpd/manual/faq/categories.xml.ko
 share/httpd/manual/faq/error.html
 share/httpd/manual/faq/error.html.en
 share/httpd/manual/faq/error.html.ko.euc-kr
-share/httpd/manual/faq/error.xml
-share/httpd/manual/faq/error.xml.ko
-share/httpd/manual/faq/error.xml.meta
 share/httpd/manual/faq/index.html
 share/httpd/manual/faq/index.html.en
 share/httpd/manual/faq/index.html.ko.euc-kr
-share/httpd/manual/faq/index.xml
-share/httpd/manual/faq/index.xml.ko
-share/httpd/manual/faq/index.xml.meta
 share/httpd/manual/faq/support.html
 share/httpd/manual/faq/support.html.en
 share/httpd/manual/faq/support.html.ko.euc-kr
-share/httpd/manual/faq/support.xml
-share/httpd/manual/faq/support.xml.ko
-share/httpd/manual/faq/support.xml.meta
 share/httpd/manual/filter.html
 share/httpd/manual/filter.html.en
 share/httpd/manual/filter.html.es
@@ -523,23 +452,11 @@ share/httpd/manual/filter.html.fr
 share/httpd/manual/filter.html.ja.euc-jp
 share/httpd/manual/filter.html.ko.euc-kr
 share/httpd/manual/filter.html.ru.koi8-r
-share/httpd/manual/filter.xml
-share/httpd/manual/filter.xml.es
-share/httpd/manual/filter.xml.fr
-share/httpd/manual/filter.xml.ja
-share/httpd/manual/filter.xml.ko
-share/httpd/manual/filter.xml.meta
-share/httpd/manual/filter.xml.ru
 share/httpd/manual/glossary.html
 share/httpd/manual/glossary.html.de
 share/httpd/manual/glossary.html.en
 share/httpd/manual/glossary.html.es
 share/httpd/manual/glossary.html.ko.euc-kr
-share/httpd/manual/glossary.xml
-share/httpd/manual/glossary.xml.de
-share/httpd/manual/glossary.xml.es
-share/httpd/manual/glossary.xml.ko
-share/httpd/manual/glossary.xml.meta
 share/httpd/manual/handler.html
 share/httpd/manual/handler.html.en
 share/httpd/manual/handler.html.es
@@ -547,61 +464,31 @@ share/httpd/manual/handler.html.fr
 share/httpd/manual/handler.html.ja.euc-jp
 share/httpd/manual/handler.html.ko.euc-kr
 share/httpd/manual/handler.html.ru.koi8-r
-share/httpd/manual/handler.xml
-share/httpd/manual/handler.xml.es
-share/httpd/manual/handler.xml.fr
-share/httpd/manual/handler.xml.ja
-share/httpd/manual/handler.xml.ko
-share/httpd/manual/handler.xml.meta
-share/httpd/manual/handler.xml.ru
 share/httpd/manual/howto/auth.html
 share/httpd/manual/howto/auth.html.en
+share/httpd/manual/howto/auth.html.es
 share/httpd/manual/howto/auth.html.ja.euc-jp
 share/httpd/manual/howto/auth.html.ko.euc-kr
-share/httpd/manual/howto/auth.xml
-share/httpd/manual/howto/auth.xml.ja
-share/httpd/manual/howto/auth.xml.ko
-share/httpd/manual/howto/auth.xml.meta
 share/httpd/manual/howto/cgi.html
 share/httpd/manual/howto/cgi.html.en
 share/httpd/manual/howto/cgi.html.ja.euc-jp
 share/httpd/manual/howto/cgi.html.ko.euc-kr
-share/httpd/manual/howto/cgi.xml
-share/httpd/manual/howto/cgi.xml.ja
-share/httpd/manual/howto/cgi.xml.ko
-share/httpd/manual/howto/cgi.xml.meta
 share/httpd/manual/howto/htaccess.html
 share/httpd/manual/howto/htaccess.html.en
 share/httpd/manual/howto/htaccess.html.ja.euc-jp
 share/httpd/manual/howto/htaccess.html.ko.euc-kr
-share/httpd/manual/howto/htaccess.xml
-share/httpd/manual/howto/htaccess.xml.ja
-share/httpd/manual/howto/htaccess.xml.ko
-share/httpd/manual/howto/htaccess.xml.meta
 share/httpd/manual/howto/index.html
 share/httpd/manual/howto/index.html.en
 share/httpd/manual/howto/index.html.ja.euc-jp
 share/httpd/manual/howto/index.html.ko.euc-kr
-share/httpd/manual/howto/index.xml
-share/httpd/manual/howto/index.xml.ja
-share/httpd/manual/howto/index.xml.ko
-share/httpd/manual/howto/index.xml.meta
 share/httpd/manual/howto/public_html.html
 share/httpd/manual/howto/public_html.html.en
 share/httpd/manual/howto/public_html.html.ja.euc-jp
 share/httpd/manual/howto/public_html.html.ko.euc-kr
-share/httpd/manual/howto/public_html.xml
-share/httpd/manual/howto/public_html.xml.ja
-share/httpd/manual/howto/public_html.xml.ko
-share/httpd/manual/howto/public_html.xml.meta
 share/httpd/manual/howto/ssi.html
 share/httpd/manual/howto/ssi.html.en
 share/httpd/manual/howto/ssi.html.ja.euc-jp
 share/httpd/manual/howto/ssi.html.ko.euc-kr
-share/httpd/manual/howto/ssi.xml
-share/httpd/manual/howto/ssi.xml.ja
-share/httpd/manual/howto/ssi.xml.ko
-share/httpd/manual/howto/ssi.xml.meta
 share/httpd/manual/images/apache_header.gif
 share/httpd/manual/images/custom_errordocs.gif
 share/httpd/manual/images/custom_errordocs.png
@@ -634,14 +521,6 @@ share/httpd/manual/index.html.fr
 share/httpd/manual/index.html.ja.euc-jp
 share/httpd/manual/index.html.ko.euc-kr
 share/httpd/manual/index.html.ru.koi8-r
-share/httpd/manual/index.xml
-share/httpd/manual/index.xml.de
-share/httpd/manual/index.xml.es
-share/httpd/manual/index.xml.fr
-share/httpd/manual/index.xml.ja
-share/httpd/manual/index.xml.ko
-share/httpd/manual/index.xml.meta
-share/httpd/manual/index.xml.ru
 share/httpd/manual/install.html
 share/httpd/manual/install.html.de
 share/httpd/manual/install.html.en
@@ -649,13 +528,6 @@ share/httpd/manual/install.html.es
 share/httpd/manual/install.html.ja.euc-jp
 share/httpd/manual/install.html.ko.euc-kr
 share/httpd/manual/install.html.ru.koi8-r
-share/httpd/manual/install.xml
-share/httpd/manual/install.xml.de
-share/httpd/manual/install.xml.es
-share/httpd/manual/install.xml.ja
-share/httpd/manual/install.xml.ko
-share/httpd/manual/install.xml.meta
-share/httpd/manual/install.xml.ru
 share/httpd/manual/invoking.html
 share/httpd/manual/invoking.html.de
 share/httpd/manual/invoking.html.en
@@ -663,109 +535,52 @@ share/httpd/manual/invoking.html.es
 share/httpd/manual/invoking.html.ja.euc-jp
 share/httpd/manual/invoking.html.ko.euc-kr
 share/httpd/manual/invoking.html.ru.koi8-r
-share/httpd/manual/invoking.xml
-share/httpd/manual/invoking.xml.de
-share/httpd/manual/invoking.xml.es
-share/httpd/manual/invoking.xml.ja
-share/httpd/manual/invoking.xml.ko
-share/httpd/manual/invoking.xml.meta
-share/httpd/manual/invoking.xml.ru
 share/httpd/manual/license.html
 share/httpd/manual/license.html.en
-share/httpd/manual/license.xml
-share/httpd/manual/license.xml.meta
 share/httpd/manual/logs.html
 share/httpd/manual/logs.html.en
 share/httpd/manual/logs.html.es
 share/httpd/manual/logs.html.ja.euc-jp
 share/httpd/manual/logs.html.ko.euc-kr
-share/httpd/manual/logs.xml
-share/httpd/manual/logs.xml.es
-share/httpd/manual/logs.xml.ja
-share/httpd/manual/logs.xml.ko
-share/httpd/manual/logs.xml.meta
 share/httpd/manual/misc/custom_errordocs.html
 share/httpd/manual/misc/custom_errordocs.html.en
-share/httpd/manual/misc/custom_errordocs.xml
-share/httpd/manual/misc/custom_errordocs.xml.meta
 share/httpd/manual/misc/descriptors.html
 share/httpd/manual/misc/descriptors.html.en
-share/httpd/manual/misc/descriptors.xml
-share/httpd/manual/misc/descriptors.xml.meta
 share/httpd/manual/misc/fin_wait_2.html
 share/httpd/manual/misc/fin_wait_2.html.en
-share/httpd/manual/misc/fin_wait_2.xml
-share/httpd/manual/misc/fin_wait_2.xml.meta
 share/httpd/manual/misc/index.html
 share/httpd/manual/misc/index.html.en
-share/httpd/manual/misc/index.xml
-share/httpd/manual/misc/index.xml.meta
 share/httpd/manual/misc/known_client_problems.html
 share/httpd/manual/misc/known_client_problems.html.en
-share/httpd/manual/misc/known_client_problems.xml
-share/httpd/manual/misc/known_client_problems.xml.meta
 share/httpd/manual/misc/perf-tuning.html
 share/httpd/manual/misc/perf-tuning.html.en
 share/httpd/manual/misc/perf-tuning.html.ko.euc-kr
-share/httpd/manual/misc/perf-tuning.xml
-share/httpd/manual/misc/perf-tuning.xml.ko
-share/httpd/manual/misc/perf-tuning.xml.meta
 share/httpd/manual/misc/relevant_standards.html
 share/httpd/manual/misc/relevant_standards.html.en
 share/httpd/manual/misc/relevant_standards.html.ko.euc-kr
-share/httpd/manual/misc/relevant_standards.xml
-share/httpd/manual/misc/relevant_standards.xml.ko
-share/httpd/manual/misc/relevant_standards.xml.meta
 share/httpd/manual/misc/rewriteguide.html
 share/httpd/manual/misc/rewriteguide.html.en
 share/httpd/manual/misc/rewriteguide.html.ko.euc-kr
-share/httpd/manual/misc/rewriteguide.xml
-share/httpd/manual/misc/rewriteguide.xml.ko
-share/httpd/manual/misc/rewriteguide.xml.meta
 share/httpd/manual/misc/security_tips.html
 share/httpd/manual/misc/security_tips.html.en
 share/httpd/manual/misc/security_tips.html.ko.euc-kr
-share/httpd/manual/misc/security_tips.xml
-share/httpd/manual/misc/security_tips.xml.ko
-share/httpd/manual/misc/security_tips.xml.meta
 share/httpd/manual/misc/tutorials.html
 share/httpd/manual/misc/tutorials.html.en
-share/httpd/manual/misc/tutorials.xml
-share/httpd/manual/misc/tutorials.xml.meta
-share/httpd/manual/mod/allmodules.xml
-share/httpd/manual/mod/allmodules.xml.de
-share/httpd/manual/mod/allmodules.xml.es
-share/httpd/manual/mod/allmodules.xml.ja
-share/httpd/manual/mod/allmodules.xml.ko
-share/httpd/manual/mod/allmodules.xml.ru
 share/httpd/manual/mod/beos.html
 share/httpd/manual/mod/beos.html.de
 share/httpd/manual/mod/beos.html.en
 share/httpd/manual/mod/beos.html.es
 share/httpd/manual/mod/beos.html.ko.euc-kr
-share/httpd/manual/mod/beos.xml
-share/httpd/manual/mod/beos.xml.de
-share/httpd/manual/mod/beos.xml.es
-share/httpd/manual/mod/beos.xml.ko
-share/httpd/manual/mod/beos.xml.meta
 share/httpd/manual/mod/core.html
 share/httpd/manual/mod/core.html.de
 share/httpd/manual/mod/core.html.en
+share/httpd/manual/mod/core.html.es
 share/httpd/manual/mod/core.html.ja.euc-jp
-share/httpd/manual/mod/core.xml
-share/httpd/manual/mod/core.xml.de
-share/httpd/manual/mod/core.xml.ja
-share/httpd/manual/mod/core.xml.meta
 share/httpd/manual/mod/directive-dict.html
 share/httpd/manual/mod/directive-dict.html.en
 share/httpd/manual/mod/directive-dict.html.es
 share/httpd/manual/mod/directive-dict.html.ja.euc-jp
 share/httpd/manual/mod/directive-dict.html.ko.euc-kr
-share/httpd/manual/mod/directive-dict.xml
-share/httpd/manual/mod/directive-dict.xml.es
-share/httpd/manual/mod/directive-dict.xml.ja
-share/httpd/manual/mod/directive-dict.xml.ko
-share/httpd/manual/mod/directive-dict.xml.meta
 share/httpd/manual/mod/directives.html
 share/httpd/manual/mod/directives.html.de
 share/httpd/manual/mod/directives.html.en
@@ -773,435 +588,217 @@ share/httpd/manual/mod/directives.html.es
 share/httpd/manual/mod/directives.html.ja.euc-jp
 share/httpd/manual/mod/directives.html.ko.euc-kr
 share/httpd/manual/mod/directives.html.ru.koi8-r
-share/httpd/manual/mod/directives.xml
-share/httpd/manual/mod/directives.xml.de
-share/httpd/manual/mod/directives.xml.es
-share/httpd/manual/mod/directives.xml.ja
-share/httpd/manual/mod/directives.xml.ko
-share/httpd/manual/mod/directives.xml.meta
-share/httpd/manual/mod/directives.xml.ru
 share/httpd/manual/mod/index.html
 share/httpd/manual/mod/index.html.de
 share/httpd/manual/mod/index.html.en
 share/httpd/manual/mod/index.html.es
 share/httpd/manual/mod/index.html.ja.euc-jp
 share/httpd/manual/mod/index.html.ko.euc-kr
-share/httpd/manual/mod/index.xml
-share/httpd/manual/mod/index.xml.de
-share/httpd/manual/mod/index.xml.es
-share/httpd/manual/mod/index.xml.ja
-share/httpd/manual/mod/index.xml.ko
-share/httpd/manual/mod/index.xml.meta
 share/httpd/manual/mod/leader.html
 share/httpd/manual/mod/leader.html.de
 share/httpd/manual/mod/leader.html.en
 share/httpd/manual/mod/leader.html.es
 share/httpd/manual/mod/leader.html.ko.euc-kr
-share/httpd/manual/mod/leader.xml
-share/httpd/manual/mod/leader.xml.de
-share/httpd/manual/mod/leader.xml.es
-share/httpd/manual/mod/leader.xml.ko
-share/httpd/manual/mod/leader.xml.meta
 share/httpd/manual/mod/mod_access.html
 share/httpd/manual/mod/mod_access.html.en
 share/httpd/manual/mod/mod_access.html.ja.euc-jp
-share/httpd/manual/mod/mod_access.xml
-share/httpd/manual/mod/mod_access.xml.ja
-share/httpd/manual/mod/mod_access.xml.meta
 share/httpd/manual/mod/mod_actions.html
 share/httpd/manual/mod/mod_actions.html.en
 share/httpd/manual/mod/mod_actions.html.ja.euc-jp
 share/httpd/manual/mod/mod_actions.html.ko.euc-kr
-share/httpd/manual/mod/mod_actions.xml
-share/httpd/manual/mod/mod_actions.xml.ja
-share/httpd/manual/mod/mod_actions.xml.ko
-share/httpd/manual/mod/mod_actions.xml.meta
 share/httpd/manual/mod/mod_alias.html
 share/httpd/manual/mod/mod_alias.html.en
 share/httpd/manual/mod/mod_alias.html.ja.euc-jp
 share/httpd/manual/mod/mod_alias.html.ko.euc-kr
-share/httpd/manual/mod/mod_alias.xml
-share/httpd/manual/mod/mod_alias.xml.ja
-share/httpd/manual/mod/mod_alias.xml.ko
-share/httpd/manual/mod/mod_alias.xml.meta
 share/httpd/manual/mod/mod_asis.html
 share/httpd/manual/mod/mod_asis.html.en
 share/httpd/manual/mod/mod_asis.html.ja.euc-jp
 share/httpd/manual/mod/mod_asis.html.ko.euc-kr
-share/httpd/manual/mod/mod_asis.xml
-share/httpd/manual/mod/mod_asis.xml.ja
-share/httpd/manual/mod/mod_asis.xml.ko
-share/httpd/manual/mod/mod_asis.xml.meta
 share/httpd/manual/mod/mod_auth.html
 share/httpd/manual/mod/mod_auth.html.en
 share/httpd/manual/mod/mod_auth.html.ja.euc-jp
-share/httpd/manual/mod/mod_auth.xml
-share/httpd/manual/mod/mod_auth.xml.ja
-share/httpd/manual/mod/mod_auth.xml.meta
 share/httpd/manual/mod/mod_auth_anon.html
 share/httpd/manual/mod/mod_auth_anon.html.en
-share/httpd/manual/mod/mod_auth_anon.xml
-share/httpd/manual/mod/mod_auth_anon.xml.meta
 share/httpd/manual/mod/mod_auth_dbm.html
 share/httpd/manual/mod/mod_auth_dbm.html.en
-share/httpd/manual/mod/mod_auth_dbm.xml
-share/httpd/manual/mod/mod_auth_dbm.xml.meta
 share/httpd/manual/mod/mod_auth_digest.html
 share/httpd/manual/mod/mod_auth_digest.html.en
 share/httpd/manual/mod/mod_auth_digest.html.ko.euc-kr
-share/httpd/manual/mod/mod_auth_digest.xml
-share/httpd/manual/mod/mod_auth_digest.xml.ko
-share/httpd/manual/mod/mod_auth_digest.xml.meta
 share/httpd/manual/mod/mod_auth_ldap.html
 share/httpd/manual/mod/mod_auth_ldap.html.en
-share/httpd/manual/mod/mod_auth_ldap.xml
-share/httpd/manual/mod/mod_auth_ldap.xml.meta
 share/httpd/manual/mod/mod_autoindex.html
 share/httpd/manual/mod/mod_autoindex.html.en
 share/httpd/manual/mod/mod_autoindex.html.ja.euc-jp
 share/httpd/manual/mod/mod_autoindex.html.ko.euc-kr
-share/httpd/manual/mod/mod_autoindex.xml
-share/httpd/manual/mod/mod_autoindex.xml.ja
-share/httpd/manual/mod/mod_autoindex.xml.ko
-share/httpd/manual/mod/mod_autoindex.xml.meta
 share/httpd/manual/mod/mod_cache.html
 share/httpd/manual/mod/mod_cache.html.en
 share/httpd/manual/mod/mod_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_cache.xml
-share/httpd/manual/mod/mod_cache.xml.ko
-share/httpd/manual/mod/mod_cache.xml.meta
 share/httpd/manual/mod/mod_cern_meta.html
 share/httpd/manual/mod/mod_cern_meta.html.en
 share/httpd/manual/mod/mod_cern_meta.html.ko.euc-kr
-share/httpd/manual/mod/mod_cern_meta.xml
-share/httpd/manual/mod/mod_cern_meta.xml.ko
-share/httpd/manual/mod/mod_cern_meta.xml.meta
 share/httpd/manual/mod/mod_cgi.html
 share/httpd/manual/mod/mod_cgi.html.en
 share/httpd/manual/mod/mod_cgi.html.ja.euc-jp
 share/httpd/manual/mod/mod_cgi.html.ko.euc-kr
-share/httpd/manual/mod/mod_cgi.xml
-share/httpd/manual/mod/mod_cgi.xml.ja
-share/httpd/manual/mod/mod_cgi.xml.ko
-share/httpd/manual/mod/mod_cgi.xml.meta
 share/httpd/manual/mod/mod_cgid.html
 share/httpd/manual/mod/mod_cgid.html.en
 share/httpd/manual/mod/mod_cgid.html.ja.euc-jp
 share/httpd/manual/mod/mod_cgid.html.ko.euc-kr
-share/httpd/manual/mod/mod_cgid.xml
-share/httpd/manual/mod/mod_cgid.xml.ja
-share/httpd/manual/mod/mod_cgid.xml.ko
-share/httpd/manual/mod/mod_cgid.xml.meta
 share/httpd/manual/mod/mod_charset_lite.html
 share/httpd/manual/mod/mod_charset_lite.html.en
 share/httpd/manual/mod/mod_charset_lite.html.ko.euc-kr
-share/httpd/manual/mod/mod_charset_lite.xml
-share/httpd/manual/mod/mod_charset_lite.xml.ko
-share/httpd/manual/mod/mod_charset_lite.xml.meta
 share/httpd/manual/mod/mod_dav.html
 share/httpd/manual/mod/mod_dav.html.en
 share/httpd/manual/mod/mod_dav.html.ja.euc-jp
 share/httpd/manual/mod/mod_dav.html.ko.euc-kr
-share/httpd/manual/mod/mod_dav.xml
-share/httpd/manual/mod/mod_dav.xml.ja
-share/httpd/manual/mod/mod_dav.xml.ko
-share/httpd/manual/mod/mod_dav.xml.meta
 share/httpd/manual/mod/mod_dav_fs.html
 share/httpd/manual/mod/mod_dav_fs.html.en
 share/httpd/manual/mod/mod_dav_fs.html.ja.euc-jp
 share/httpd/manual/mod/mod_dav_fs.html.ko.euc-kr
-share/httpd/manual/mod/mod_dav_fs.xml
-share/httpd/manual/mod/mod_dav_fs.xml.ja
-share/httpd/manual/mod/mod_dav_fs.xml.ko
-share/httpd/manual/mod/mod_dav_fs.xml.meta
 share/httpd/manual/mod/mod_deflate.html
 share/httpd/manual/mod/mod_deflate.html.en
 share/httpd/manual/mod/mod_deflate.html.ja.euc-jp
 share/httpd/manual/mod/mod_deflate.html.ko.euc-kr
-share/httpd/manual/mod/mod_deflate.xml
-share/httpd/manual/mod/mod_deflate.xml.ja
-share/httpd/manual/mod/mod_deflate.xml.ko
-share/httpd/manual/mod/mod_deflate.xml.meta
 share/httpd/manual/mod/mod_dir.html
 share/httpd/manual/mod/mod_dir.html.en
 share/httpd/manual/mod/mod_dir.html.ja.euc-jp
 share/httpd/manual/mod/mod_dir.html.ko.euc-kr
-share/httpd/manual/mod/mod_dir.xml
-share/httpd/manual/mod/mod_dir.xml.ja
-share/httpd/manual/mod/mod_dir.xml.ko
-share/httpd/manual/mod/mod_dir.xml.meta
 share/httpd/manual/mod/mod_disk_cache.html
 share/httpd/manual/mod/mod_disk_cache.html.en
 share/httpd/manual/mod/mod_disk_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_disk_cache.xml
-share/httpd/manual/mod/mod_disk_cache.xml.ko
-share/httpd/manual/mod/mod_disk_cache.xml.meta
 share/httpd/manual/mod/mod_dumpio.html
 share/httpd/manual/mod/mod_dumpio.html.en
-share/httpd/manual/mod/mod_dumpio.xml
-share/httpd/manual/mod/mod_dumpio.xml.meta
 share/httpd/manual/mod/mod_echo.html
 share/httpd/manual/mod/mod_echo.html.en
 share/httpd/manual/mod/mod_echo.html.ja.euc-jp
 share/httpd/manual/mod/mod_echo.html.ko.euc-kr
-share/httpd/manual/mod/mod_echo.xml
-share/httpd/manual/mod/mod_echo.xml.ja
-share/httpd/manual/mod/mod_echo.xml.ko
-share/httpd/manual/mod/mod_echo.xml.meta
 share/httpd/manual/mod/mod_env.html
 share/httpd/manual/mod/mod_env.html.en
 share/httpd/manual/mod/mod_env.html.ja.euc-jp
 share/httpd/manual/mod/mod_env.html.ko.euc-kr
-share/httpd/manual/mod/mod_env.xml
-share/httpd/manual/mod/mod_env.xml.ja
-share/httpd/manual/mod/mod_env.xml.ko
-share/httpd/manual/mod/mod_env.xml.meta
 share/httpd/manual/mod/mod_example.html
 share/httpd/manual/mod/mod_example.html.en
 share/httpd/manual/mod/mod_example.html.ko.euc-kr
-share/httpd/manual/mod/mod_example.xml
-share/httpd/manual/mod/mod_example.xml.ko
-share/httpd/manual/mod/mod_example.xml.meta
 share/httpd/manual/mod/mod_expires.html
 share/httpd/manual/mod/mod_expires.html.en
 share/httpd/manual/mod/mod_expires.html.ja.euc-jp
 share/httpd/manual/mod/mod_expires.html.ko.euc-kr
-share/httpd/manual/mod/mod_expires.xml
-share/httpd/manual/mod/mod_expires.xml.ja
-share/httpd/manual/mod/mod_expires.xml.ko
-share/httpd/manual/mod/mod_expires.xml.meta
 share/httpd/manual/mod/mod_ext_filter.html
 share/httpd/manual/mod/mod_ext_filter.html.en
 share/httpd/manual/mod/mod_ext_filter.html.ko.euc-kr
-share/httpd/manual/mod/mod_ext_filter.xml
-share/httpd/manual/mod/mod_ext_filter.xml.ko
-share/httpd/manual/mod/mod_ext_filter.xml.meta
 share/httpd/manual/mod/mod_file_cache.html
 share/httpd/manual/mod/mod_file_cache.html.en
 share/httpd/manual/mod/mod_file_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_file_cache.xml
-share/httpd/manual/mod/mod_file_cache.xml.ko
-share/httpd/manual/mod/mod_file_cache.xml.meta
 share/httpd/manual/mod/mod_headers.html
 share/httpd/manual/mod/mod_headers.html.en
 share/httpd/manual/mod/mod_headers.html.ko.euc-kr
-share/httpd/manual/mod/mod_headers.xml
-share/httpd/manual/mod/mod_headers.xml.ko
-share/httpd/manual/mod/mod_headers.xml.meta
 share/httpd/manual/mod/mod_imap.html
 share/httpd/manual/mod/mod_imap.html.en
 share/httpd/manual/mod/mod_imap.html.ko.euc-kr
-share/httpd/manual/mod/mod_imap.xml
-share/httpd/manual/mod/mod_imap.xml.ko
-share/httpd/manual/mod/mod_imap.xml.meta
 share/httpd/manual/mod/mod_include.html
 share/httpd/manual/mod/mod_include.html.en
 share/httpd/manual/mod/mod_include.html.ja.euc-jp
-share/httpd/manual/mod/mod_include.xml
-share/httpd/manual/mod/mod_include.xml.ja
-share/httpd/manual/mod/mod_include.xml.meta
 share/httpd/manual/mod/mod_info.html
 share/httpd/manual/mod/mod_info.html.en
 share/httpd/manual/mod/mod_info.html.ja.euc-jp
 share/httpd/manual/mod/mod_info.html.ko.euc-kr
-share/httpd/manual/mod/mod_info.xml
-share/httpd/manual/mod/mod_info.xml.ja
-share/httpd/manual/mod/mod_info.xml.ko
-share/httpd/manual/mod/mod_info.xml.meta
 share/httpd/manual/mod/mod_isapi.html
 share/httpd/manual/mod/mod_isapi.html.en
 share/httpd/manual/mod/mod_isapi.html.ko.euc-kr
-share/httpd/manual/mod/mod_isapi.xml
-share/httpd/manual/mod/mod_isapi.xml.ko
-share/httpd/manual/mod/mod_isapi.xml.meta
 share/httpd/manual/mod/mod_ldap.html
 share/httpd/manual/mod/mod_ldap.html.en
-share/httpd/manual/mod/mod_ldap.xml
-share/httpd/manual/mod/mod_ldap.xml.meta
 share/httpd/manual/mod/mod_log_config.html
 share/httpd/manual/mod/mod_log_config.html.en
 share/httpd/manual/mod/mod_log_config.html.ja.euc-jp
 share/httpd/manual/mod/mod_log_config.html.ko.euc-kr
-share/httpd/manual/mod/mod_log_config.xml
-share/httpd/manual/mod/mod_log_config.xml.ja
-share/httpd/manual/mod/mod_log_config.xml.ko
-share/httpd/manual/mod/mod_log_config.xml.meta
 share/httpd/manual/mod/mod_log_forensic.html
 share/httpd/manual/mod/mod_log_forensic.html.en
-share/httpd/manual/mod/mod_log_forensic.xml
-share/httpd/manual/mod/mod_log_forensic.xml.meta
 share/httpd/manual/mod/mod_logio.html
 share/httpd/manual/mod/mod_logio.html.en
 share/httpd/manual/mod/mod_logio.html.ja.euc-jp
 share/httpd/manual/mod/mod_logio.html.ko.euc-kr
-share/httpd/manual/mod/mod_logio.xml
-share/httpd/manual/mod/mod_logio.xml.ja
-share/httpd/manual/mod/mod_logio.xml.ko
-share/httpd/manual/mod/mod_logio.xml.meta
 share/httpd/manual/mod/mod_mem_cache.html
 share/httpd/manual/mod/mod_mem_cache.html.en
 share/httpd/manual/mod/mod_mem_cache.html.ko.euc-kr
-share/httpd/manual/mod/mod_mem_cache.xml
-share/httpd/manual/mod/mod_mem_cache.xml.ko
-share/httpd/manual/mod/mod_mem_cache.xml.meta
 share/httpd/manual/mod/mod_mime.html
 share/httpd/manual/mod/mod_mime.html.en
 share/httpd/manual/mod/mod_mime.html.ja.euc-jp
-share/httpd/manual/mod/mod_mime.xml
-share/httpd/manual/mod/mod_mime.xml.ja
-share/httpd/manual/mod/mod_mime.xml.meta
 share/httpd/manual/mod/mod_mime_magic.html
 share/httpd/manual/mod/mod_mime_magic.html.en
-share/httpd/manual/mod/mod_mime_magic.xml
-share/httpd/manual/mod/mod_mime_magic.xml.meta
 share/httpd/manual/mod/mod_negotiation.html
 share/httpd/manual/mod/mod_negotiation.html.en
 share/httpd/manual/mod/mod_negotiation.html.ja.euc-jp
-share/httpd/manual/mod/mod_negotiation.xml
-share/httpd/manual/mod/mod_negotiation.xml.ja
-share/httpd/manual/mod/mod_negotiation.xml.meta
 share/httpd/manual/mod/mod_nw_ssl.html
 share/httpd/manual/mod/mod_nw_ssl.html.en
-share/httpd/manual/mod/mod_nw_ssl.xml
-share/httpd/manual/mod/mod_nw_ssl.xml.meta
 share/httpd/manual/mod/mod_proxy.html
 share/httpd/manual/mod/mod_proxy.html.en
-share/httpd/manual/mod/mod_proxy.xml
-share/httpd/manual/mod/mod_proxy.xml.meta
 share/httpd/manual/mod/mod_proxy_connect.html
 share/httpd/manual/mod/mod_proxy_connect.html.en
-share/httpd/manual/mod/mod_proxy_connect.xml
-share/httpd/manual/mod/mod_proxy_connect.xml.meta
 share/httpd/manual/mod/mod_proxy_ftp.html
 share/httpd/manual/mod/mod_proxy_ftp.html.en
-share/httpd/manual/mod/mod_proxy_ftp.xml
-share/httpd/manual/mod/mod_proxy_ftp.xml.meta
 share/httpd/manual/mod/mod_proxy_http.html
 share/httpd/manual/mod/mod_proxy_http.html.en
-share/httpd/manual/mod/mod_proxy_http.xml
-share/httpd/manual/mod/mod_proxy_http.xml.meta
 share/httpd/manual/mod/mod_rewrite.html
 share/httpd/manual/mod/mod_rewrite.html.en
-share/httpd/manual/mod/mod_rewrite.xml
-share/httpd/manual/mod/mod_rewrite.xml.meta
 share/httpd/manual/mod/mod_setenvif.html
 share/httpd/manual/mod/mod_setenvif.html.en
 share/httpd/manual/mod/mod_setenvif.html.ja.euc-jp
 share/httpd/manual/mod/mod_setenvif.html.ko.euc-kr
-share/httpd/manual/mod/mod_setenvif.xml
-share/httpd/manual/mod/mod_setenvif.xml.ja
-share/httpd/manual/mod/mod_setenvif.xml.ko
-share/httpd/manual/mod/mod_setenvif.xml.meta
 share/httpd/manual/mod/mod_so.html
 share/httpd/manual/mod/mod_so.html.en
 share/httpd/manual/mod/mod_so.html.ja.euc-jp
 share/httpd/manual/mod/mod_so.html.ko.euc-kr
-share/httpd/manual/mod/mod_so.xml
-share/httpd/manual/mod/mod_so.xml.ja
-share/httpd/manual/mod/mod_so.xml.ko
-share/httpd/manual/mod/mod_so.xml.meta
 share/httpd/manual/mod/mod_speling.html
 share/httpd/manual/mod/mod_speling.html.en
 share/httpd/manual/mod/mod_speling.html.ja.euc-jp
 share/httpd/manual/mod/mod_speling.html.ko.euc-kr
-share/httpd/manual/mod/mod_speling.xml
-share/httpd/manual/mod/mod_speling.xml.ja
-share/httpd/manual/mod/mod_speling.xml.ko
-share/httpd/manual/mod/mod_speling.xml.meta
 share/httpd/manual/mod/mod_ssl.html
 share/httpd/manual/mod/mod_ssl.html.en
-share/httpd/manual/mod/mod_ssl.xml
-share/httpd/manual/mod/mod_ssl.xml.meta
 share/httpd/manual/mod/mod_status.html
 share/httpd/manual/mod/mod_status.html.en
 share/httpd/manual/mod/mod_status.html.ja.euc-jp
 share/httpd/manual/mod/mod_status.html.ko.euc-kr
-share/httpd/manual/mod/mod_status.xml
-share/httpd/manual/mod/mod_status.xml.ja
-share/httpd/manual/mod/mod_status.xml.ko
-share/httpd/manual/mod/mod_status.xml.meta
 share/httpd/manual/mod/mod_suexec.html
 share/httpd/manual/mod/mod_suexec.html.en
 share/httpd/manual/mod/mod_suexec.html.ja.euc-jp
 share/httpd/manual/mod/mod_suexec.html.ko.euc-kr
-share/httpd/manual/mod/mod_suexec.xml
-share/httpd/manual/mod/mod_suexec.xml.ja
-share/httpd/manual/mod/mod_suexec.xml.ko
-share/httpd/manual/mod/mod_suexec.xml.meta
 share/httpd/manual/mod/mod_unique_id.html
 share/httpd/manual/mod/mod_unique_id.html.en
 share/httpd/manual/mod/mod_unique_id.html.ja.euc-jp
 share/httpd/manual/mod/mod_unique_id.html.ko.euc-kr
-share/httpd/manual/mod/mod_unique_id.xml
-share/httpd/manual/mod/mod_unique_id.xml.ja
-share/httpd/manual/mod/mod_unique_id.xml.ko
-share/httpd/manual/mod/mod_unique_id.xml.meta
 share/httpd/manual/mod/mod_userdir.html
 share/httpd/manual/mod/mod_userdir.html.en
 share/httpd/manual/mod/mod_userdir.html.ja.euc-jp
 share/httpd/manual/mod/mod_userdir.html.ko.euc-kr
-share/httpd/manual/mod/mod_userdir.xml
-share/httpd/manual/mod/mod_userdir.xml.ja
-share/httpd/manual/mod/mod_userdir.xml.ko
-share/httpd/manual/mod/mod_userdir.xml.meta
 share/httpd/manual/mod/mod_usertrack.html
 share/httpd/manual/mod/mod_usertrack.html.en
-share/httpd/manual/mod/mod_usertrack.xml
-share/httpd/manual/mod/mod_usertrack.xml.meta
 share/httpd/manual/mod/mod_vhost_alias.html
 share/httpd/manual/mod/mod_vhost_alias.html.en
-share/httpd/manual/mod/mod_vhost_alias.xml
-share/httpd/manual/mod/mod_vhost_alias.xml.meta
 share/httpd/manual/mod/module-dict.html
 share/httpd/manual/mod/module-dict.html.en
 share/httpd/manual/mod/module-dict.html.ja.euc-jp
 share/httpd/manual/mod/module-dict.html.ko.euc-kr
-share/httpd/manual/mod/module-dict.xml
-share/httpd/manual/mod/module-dict.xml.ja
-share/httpd/manual/mod/module-dict.xml.ko
-share/httpd/manual/mod/module-dict.xml.meta
 share/httpd/manual/mod/mpm_common.html
 share/httpd/manual/mod/mpm_common.html.de
 share/httpd/manual/mod/mpm_common.html.en
 share/httpd/manual/mod/mpm_common.html.es
 share/httpd/manual/mod/mpm_common.html.ja.euc-jp
-share/httpd/manual/mod/mpm_common.xml
-share/httpd/manual/mod/mpm_common.xml.de
-share/httpd/manual/mod/mpm_common.xml.es
-share/httpd/manual/mod/mpm_common.xml.ja
-share/httpd/manual/mod/mpm_common.xml.meta
 share/httpd/manual/mod/mpm_netware.html
 share/httpd/manual/mod/mpm_netware.html.en
-share/httpd/manual/mod/mpm_netware.xml
-share/httpd/manual/mod/mpm_netware.xml.meta
 share/httpd/manual/mod/mpm_winnt.html
 share/httpd/manual/mod/mpm_winnt.html.de
 share/httpd/manual/mod/mpm_winnt.html.en
 share/httpd/manual/mod/mpm_winnt.html.es
 share/httpd/manual/mod/mpm_winnt.html.ja.euc-jp
-share/httpd/manual/mod/mpm_winnt.xml
-share/httpd/manual/mod/mpm_winnt.xml.de
-share/httpd/manual/mod/mpm_winnt.xml.es
-share/httpd/manual/mod/mpm_winnt.xml.ja
-share/httpd/manual/mod/mpm_winnt.xml.meta
 share/httpd/manual/mod/mpmt_os2.html
 share/httpd/manual/mod/mpmt_os2.html.en
-share/httpd/manual/mod/mpmt_os2.xml
-share/httpd/manual/mod/mpmt_os2.xml.meta
 share/httpd/manual/mod/perchild.html
 share/httpd/manual/mod/perchild.html.en
-share/httpd/manual/mod/perchild.xml
-share/httpd/manual/mod/perchild.xml.meta
 share/httpd/manual/mod/prefork.html
 share/httpd/manual/mod/prefork.html.de
 share/httpd/manual/mod/prefork.html.en
 share/httpd/manual/mod/prefork.html.es
 share/httpd/manual/mod/prefork.html.ja.euc-jp
-share/httpd/manual/mod/prefork.xml
-share/httpd/manual/mod/prefork.xml.de
-share/httpd/manual/mod/prefork.xml.es
-share/httpd/manual/mod/prefork.xml.ja
-share/httpd/manual/mod/prefork.xml.meta
 share/httpd/manual/mod/quickreference.html
 share/httpd/manual/mod/quickreference.html.de
 share/httpd/manual/mod/quickreference.html.en
@@ -1209,27 +806,13 @@ share/httpd/manual/mod/quickreference.html.es
 share/httpd/manual/mod/quickreference.html.ja.euc-jp
 share/httpd/manual/mod/quickreference.html.ko.euc-kr
 share/httpd/manual/mod/quickreference.html.ru.koi8-r
-share/httpd/manual/mod/quickreference.xml
-share/httpd/manual/mod/quickreference.xml.de
-share/httpd/manual/mod/quickreference.xml.es
-share/httpd/manual/mod/quickreference.xml.ja
-share/httpd/manual/mod/quickreference.xml.ko
-share/httpd/manual/mod/quickreference.xml.meta
-share/httpd/manual/mod/quickreference.xml.ru
 share/httpd/manual/mod/threadpool.html
 share/httpd/manual/mod/threadpool.html.en
-share/httpd/manual/mod/threadpool.xml
-share/httpd/manual/mod/threadpool.xml.meta
 share/httpd/manual/mod/worker.html
 share/httpd/manual/mod/worker.html.de
 share/httpd/manual/mod/worker.html.en
 share/httpd/manual/mod/worker.html.es
 share/httpd/manual/mod/worker.html.ja.euc-jp
-share/httpd/manual/mod/worker.xml
-share/httpd/manual/mod/worker.xml.de
-share/httpd/manual/mod/worker.xml.es
-share/httpd/manual/mod/worker.xml.ja
-share/httpd/manual/mod/worker.xml.meta
 share/httpd/manual/mpm.html
 share/httpd/manual/mpm.html.de
 share/httpd/manual/mpm.html.en
@@ -1237,13 +820,6 @@ share/httpd/manual/mpm.html.es
 share/httpd/manual/mpm.html.ja.euc-jp
 share/httpd/manual/mpm.html.ko.euc-kr
 share/httpd/manual/mpm.html.ru.koi8-r
-share/httpd/manual/mpm.xml
-share/httpd/manual/mpm.xml.de
-share/httpd/manual/mpm.xml.es
-share/httpd/manual/mpm.xml.ja
-share/httpd/manual/mpm.xml.ko
-share/httpd/manual/mpm.xml.meta
-share/httpd/manual/mpm.xml.ru
 share/httpd/manual/new_features_2_0.html
 share/httpd/manual/new_features_2_0.html.de
 share/httpd/manual/new_features_2_0.html.en
@@ -1252,205 +828,105 @@ share/httpd/manual/new_features_2_0.html.fr
 share/httpd/manual/new_features_2_0.html.ja.euc-jp
 share/httpd/manual/new_features_2_0.html.ko.euc-kr
 share/httpd/manual/new_features_2_0.html.ru.koi8-r
-share/httpd/manual/new_features_2_0.xml
-share/httpd/manual/new_features_2_0.xml.de
-share/httpd/manual/new_features_2_0.xml.es
-share/httpd/manual/new_features_2_0.xml.ja
-share/httpd/manual/new_features_2_0.xml.ko
-share/httpd/manual/new_features_2_0.xml.meta
-share/httpd/manual/new_features_2_0.xml.ru
 share/httpd/manual/platform/ebcdic.html
 share/httpd/manual/platform/ebcdic.html.en
 share/httpd/manual/platform/ebcdic.html.ko.euc-kr
-share/httpd/manual/platform/ebcdic.xml
-share/httpd/manual/platform/ebcdic.xml.ko
-share/httpd/manual/platform/ebcdic.xml.meta
 share/httpd/manual/platform/index.html
 share/httpd/manual/platform/index.html.en
 share/httpd/manual/platform/index.html.ko.euc-kr
-share/httpd/manual/platform/index.xml
-share/httpd/manual/platform/index.xml.ko
-share/httpd/manual/platform/index.xml.meta
 share/httpd/manual/platform/netware.html
 share/httpd/manual/platform/netware.html.en
 share/httpd/manual/platform/netware.html.ko.euc-kr
-share/httpd/manual/platform/netware.xml
-share/httpd/manual/platform/netware.xml.ko
-share/httpd/manual/platform/netware.xml.meta
 share/httpd/manual/platform/perf-hp.html
 share/httpd/manual/platform/perf-hp.html.en
 share/httpd/manual/platform/perf-hp.html.ko.euc-kr
-share/httpd/manual/platform/perf-hp.xml
-share/httpd/manual/platform/perf-hp.xml.ko
-share/httpd/manual/platform/perf-hp.xml.meta
 share/httpd/manual/platform/win_compiling.html
 share/httpd/manual/platform/win_compiling.html.en
 share/httpd/manual/platform/win_compiling.html.ko.euc-kr
-share/httpd/manual/platform/win_compiling.xml
-share/httpd/manual/platform/win_compiling.xml.ko
-share/httpd/manual/platform/win_compiling.xml.meta
 share/httpd/manual/platform/windows.html
 share/httpd/manual/platform/windows.html.en
 share/httpd/manual/platform/windows.html.ko.euc-kr
-share/httpd/manual/platform/windows.xml
-share/httpd/manual/platform/windows.xml.ko
-share/httpd/manual/platform/windows.xml.meta
 share/httpd/manual/programs/ab.html
 share/httpd/manual/programs/ab.html.en
 share/httpd/manual/programs/ab.html.ko.euc-kr
-share/httpd/manual/programs/ab.xml
-share/httpd/manual/programs/ab.xml.ko
-share/httpd/manual/programs/ab.xml.meta
 share/httpd/manual/programs/apachectl.html
 share/httpd/manual/programs/apachectl.html.en
 share/httpd/manual/programs/apachectl.html.ko.euc-kr
-share/httpd/manual/programs/apachectl.xml
-share/httpd/manual/programs/apachectl.xml.ko
-share/httpd/manual/programs/apachectl.xml.meta
 share/httpd/manual/programs/apxs.html
 share/httpd/manual/programs/apxs.html.en
 share/httpd/manual/programs/apxs.html.ko.euc-kr
-share/httpd/manual/programs/apxs.xml
-share/httpd/manual/programs/apxs.xml.ko
-share/httpd/manual/programs/apxs.xml.meta
 share/httpd/manual/programs/configure.html
 share/httpd/manual/programs/configure.html.en
 share/httpd/manual/programs/configure.html.ko.euc-kr
-share/httpd/manual/programs/configure.xml
-share/httpd/manual/programs/configure.xml.ko
-share/httpd/manual/programs/configure.xml.meta
 share/httpd/manual/programs/dbmmanage.html
 share/httpd/manual/programs/dbmmanage.html.en
 share/httpd/manual/programs/dbmmanage.html.ko.euc-kr
-share/httpd/manual/programs/dbmmanage.xml
-share/httpd/manual/programs/dbmmanage.xml.ko
-share/httpd/manual/programs/dbmmanage.xml.meta
+share/httpd/manual/programs/htdbm.html
+share/httpd/manual/programs/htdbm.html.en
 share/httpd/manual/programs/htdigest.html
 share/httpd/manual/programs/htdigest.html.en
 share/httpd/manual/programs/htdigest.html.ko.euc-kr
-share/httpd/manual/programs/htdigest.xml
-share/httpd/manual/programs/htdigest.xml.ko
-share/httpd/manual/programs/htdigest.xml.meta
 share/httpd/manual/programs/htpasswd.html
 share/httpd/manual/programs/htpasswd.html.en
 share/httpd/manual/programs/htpasswd.html.ko.euc-kr
-share/httpd/manual/programs/htpasswd.xml
-share/httpd/manual/programs/htpasswd.xml.ko
-share/httpd/manual/programs/htpasswd.xml.meta
 share/httpd/manual/programs/httpd.html
 share/httpd/manual/programs/httpd.html.en
 share/httpd/manual/programs/httpd.html.ko.euc-kr
-share/httpd/manual/programs/httpd.xml
-share/httpd/manual/programs/httpd.xml.ko
-share/httpd/manual/programs/httpd.xml.meta
 share/httpd/manual/programs/index.html
 share/httpd/manual/programs/index.html.en
 share/httpd/manual/programs/index.html.es
 share/httpd/manual/programs/index.html.ko.euc-kr
 share/httpd/manual/programs/index.html.ru.koi8-r
-share/httpd/manual/programs/index.xml
-share/httpd/manual/programs/index.xml.es
-share/httpd/manual/programs/index.xml.ko
-share/httpd/manual/programs/index.xml.meta
-share/httpd/manual/programs/index.xml.ru
 share/httpd/manual/programs/logresolve.html
 share/httpd/manual/programs/logresolve.html.en
 share/httpd/manual/programs/logresolve.html.ko.euc-kr
-share/httpd/manual/programs/logresolve.xml
-share/httpd/manual/programs/logresolve.xml.ko
-share/httpd/manual/programs/logresolve.xml.meta
 share/httpd/manual/programs/other.html
 share/httpd/manual/programs/other.html.en
 share/httpd/manual/programs/other.html.ko.euc-kr
-share/httpd/manual/programs/other.xml
-share/httpd/manual/programs/other.xml.ko
-share/httpd/manual/programs/other.xml.meta
 share/httpd/manual/programs/rotatelogs.html
 share/httpd/manual/programs/rotatelogs.html.en
 share/httpd/manual/programs/rotatelogs.html.ko.euc-kr
-share/httpd/manual/programs/rotatelogs.xml
-share/httpd/manual/programs/rotatelogs.xml.ko
-share/httpd/manual/programs/rotatelogs.xml.meta
 share/httpd/manual/programs/suexec.html
 share/httpd/manual/programs/suexec.html.en
 share/httpd/manual/programs/suexec.html.ko.euc-kr
-share/httpd/manual/programs/suexec.xml
-share/httpd/manual/programs/suexec.xml.ko
-share/httpd/manual/programs/suexec.xml.meta
 share/httpd/manual/rewrite/index.html
 share/httpd/manual/rewrite/index.html.en
-share/httpd/manual/rewrite/index.xml
-share/httpd/manual/rewrite/index.xml.meta
 share/httpd/manual/rewrite/rewrite_guide.html
 share/httpd/manual/rewrite/rewrite_guide.html.en
-share/httpd/manual/rewrite/rewrite_guide.xml
-share/httpd/manual/rewrite/rewrite_guide.xml.meta
 share/httpd/manual/rewrite/rewrite_guide_advanced.html
 share/httpd/manual/rewrite/rewrite_guide_advanced.html.en
-share/httpd/manual/rewrite/rewrite_guide_advanced.xml
-share/httpd/manual/rewrite/rewrite_guide_advanced.xml.meta
 share/httpd/manual/rewrite/rewrite_intro.html
 share/httpd/manual/rewrite/rewrite_intro.html.en
-share/httpd/manual/rewrite/rewrite_intro.xml
-share/httpd/manual/rewrite/rewrite_intro.xml.meta
 share/httpd/manual/rewrite/rewrite_tech.html
 share/httpd/manual/rewrite/rewrite_tech.html.en
-share/httpd/manual/rewrite/rewrite_tech.xml
-share/httpd/manual/rewrite/rewrite_tech.xml.meta
 share/httpd/manual/sections.html
 share/httpd/manual/sections.html.en
+share/httpd/manual/sections.html.es
 share/httpd/manual/sections.html.ja.euc-jp
 share/httpd/manual/sections.html.ko.euc-kr
-share/httpd/manual/sections.xml
-share/httpd/manual/sections.xml.ja
-share/httpd/manual/sections.xml.ko
-share/httpd/manual/sections.xml.meta
 share/httpd/manual/server-wide.html
 share/httpd/manual/server-wide.html.en
 share/httpd/manual/server-wide.html.es
 share/httpd/manual/server-wide.html.ja.euc-jp
 share/httpd/manual/server-wide.html.ko.euc-kr
-share/httpd/manual/server-wide.xml
-share/httpd/manual/server-wide.xml.es
-share/httpd/manual/server-wide.xml.ja
-share/httpd/manual/server-wide.xml.ko
-share/httpd/manual/server-wide.xml.meta
 share/httpd/manual/sitemap.html
 share/httpd/manual/sitemap.html.de
 share/httpd/manual/sitemap.html.en
 share/httpd/manual/sitemap.html.es
 share/httpd/manual/sitemap.html.ja.euc-jp
 share/httpd/manual/sitemap.html.ko.euc-kr
-share/httpd/manual/sitemap.xml
-share/httpd/manual/sitemap.xml.de
-share/httpd/manual/sitemap.xml.es
-share/httpd/manual/sitemap.xml.ja
-share/httpd/manual/sitemap.xml.ko
-share/httpd/manual/sitemap.xml.meta
 share/httpd/manual/ssl/index.html
 share/httpd/manual/ssl/index.html.en
 share/httpd/manual/ssl/index.html.ja.euc-jp
-share/httpd/manual/ssl/index.xml
-share/httpd/manual/ssl/index.xml.ja
-share/httpd/manual/ssl/index.xml.meta
 share/httpd/manual/ssl/ssl_compat.html
 share/httpd/manual/ssl/ssl_compat.html.en
-share/httpd/manual/ssl/ssl_compat.xml
-share/httpd/manual/ssl/ssl_compat.xml.meta
 share/httpd/manual/ssl/ssl_faq.html
 share/httpd/manual/ssl/ssl_faq.html.en
-share/httpd/manual/ssl/ssl_faq.xml
-share/httpd/manual/ssl/ssl_faq.xml.meta
 share/httpd/manual/ssl/ssl_howto.html
 share/httpd/manual/ssl/ssl_howto.html.en
-share/httpd/manual/ssl/ssl_howto.xml
-share/httpd/manual/ssl/ssl_howto.xml.meta
 share/httpd/manual/ssl/ssl_intro.html
 share/httpd/manual/ssl/ssl_intro.html.en
 share/httpd/manual/ssl/ssl_intro.html.ja.euc-jp
-share/httpd/manual/ssl/ssl_intro.xml
-share/httpd/manual/ssl/ssl_intro.xml.ja
-share/httpd/manual/ssl/ssl_intro.xml.meta
 share/httpd/manual/stopping.html
 share/httpd/manual/stopping.html.de
 share/httpd/manual/stopping.html.en
@@ -1458,13 +934,6 @@ share/httpd/manual/stopping.html.es
 share/httpd/manual/stopping.html.ja.euc-jp
 share/httpd/manual/stopping.html.ko.euc-kr
 share/httpd/manual/stopping.html.ru.koi8-r
-share/httpd/manual/stopping.xml
-share/httpd/manual/stopping.xml.de
-share/httpd/manual/stopping.xml.es
-share/httpd/manual/stopping.xml.ja
-share/httpd/manual/stopping.xml.ko
-share/httpd/manual/stopping.xml.meta
-share/httpd/manual/stopping.xml.ru
 share/httpd/manual/style/build.properties
 share/httpd/manual/style/common.dtd
 share/httpd/manual/style/css/manual-chm.css
@@ -1473,16 +942,7 @@ share/httpd/manual/style/css/manual-print.css
 share/httpd/manual/style/css/manual-zip-100pc.css
 share/httpd/manual/style/css/manual-zip.css
 share/httpd/manual/style/css/manual.css
-share/httpd/manual/style/description.xml
 share/httpd/manual/style/faq.dtd
-share/httpd/manual/style/lang-targets.xml
-share/httpd/manual/style/lang/de.xml
-share/httpd/manual/style/lang/en.xml
-share/httpd/manual/style/lang/es.xml
-share/httpd/manual/style/lang/fr.xml
-share/httpd/manual/style/lang/ja.xml
-share/httpd/manual/style/lang/ko.xml
-share/httpd/manual/style/lang/ru.xml
 share/httpd/manual/style/latex/atbeginend.sty
 share/httpd/manual/style/latex/common.xsl
 share/httpd/manual/style/latex/directiveindex.xsl
@@ -1518,24 +978,11 @@ share/httpd/manual/style/xsl/quickreference.xsl
 share/httpd/manual/style/xsl/sitemap.xsl
 share/httpd/manual/style/xsl/synopsis.xsl
 share/httpd/manual/style/xsl/typemap.xsl
-share/httpd/manual/style/xsl/util/allmodules.xml
-share/httpd/manual/style/xsl/util/designations.xml
-share/httpd/manual/style/xsl/util/lf.xml
-share/httpd/manual/style/xsl/util/li-end.xml
-share/httpd/manual/style/xsl/util/li-start.xml
 share/httpd/manual/style/xsl/util/modtrans.xsl
-share/httpd/manual/style/xsl/util/nbsp.xml
-share/httpd/manual/style/xsl/util/tab.xml
-share/httpd/manual/style/xsl/util/ul-end.xml
-share/httpd/manual/style/xsl/util/ul-start.xml
 share/httpd/manual/suexec.html
 share/httpd/manual/suexec.html.en
 share/httpd/manual/suexec.html.ja.euc-jp
 share/httpd/manual/suexec.html.ko.euc-kr
-share/httpd/manual/suexec.xml
-share/httpd/manual/suexec.xml.ja
-share/httpd/manual/suexec.xml.ko
-share/httpd/manual/suexec.xml.meta
 share/httpd/manual/upgrading.html
 share/httpd/manual/upgrading.html.de
 share/httpd/manual/upgrading.html.en
@@ -1544,41 +991,20 @@ share/httpd/manual/upgrading.html.fr
 share/httpd/manual/upgrading.html.ja.euc-jp
 share/httpd/manual/upgrading.html.ko.euc-kr
 share/httpd/manual/upgrading.html.ru.koi8-r
-share/httpd/manual/upgrading.xml
-share/httpd/manual/upgrading.xml.de
-share/httpd/manual/upgrading.xml.es
-share/httpd/manual/upgrading.xml.ja
-share/httpd/manual/upgrading.xml.ko
-share/httpd/manual/upgrading.xml.meta
-share/httpd/manual/upgrading.xml.ru
 share/httpd/manual/urlmapping.html
 share/httpd/manual/urlmapping.html.en
 share/httpd/manual/urlmapping.html.ja.euc-jp
 share/httpd/manual/urlmapping.html.ko.euc-kr
-share/httpd/manual/urlmapping.xml
-share/httpd/manual/urlmapping.xml.ja
-share/httpd/manual/urlmapping.xml.ko
-share/httpd/manual/urlmapping.xml.meta
 share/httpd/manual/vhosts/details.html
 share/httpd/manual/vhosts/details.html.en
 share/httpd/manual/vhosts/details.html.ko.euc-kr
-share/httpd/manual/vhosts/details.xml
-share/httpd/manual/vhosts/details.xml.ko
-share/httpd/manual/vhosts/details.xml.meta
 share/httpd/manual/vhosts/examples.html
 share/httpd/manual/vhosts/examples.html.en
 share/httpd/manual/vhosts/examples.html.ko.euc-kr
-share/httpd/manual/vhosts/examples.xml
-share/httpd/manual/vhosts/examples.xml.ko
-share/httpd/manual/vhosts/examples.xml.meta
 share/httpd/manual/vhosts/fd-limits.html
 share/httpd/manual/vhosts/fd-limits.html.en
 share/httpd/manual/vhosts/fd-limits.html.ja.euc-jp
 share/httpd/manual/vhosts/fd-limits.html.ko.euc-kr
-share/httpd/manual/vhosts/fd-limits.xml
-share/httpd/manual/vhosts/fd-limits.xml.ja
-share/httpd/manual/vhosts/fd-limits.xml.ko
-share/httpd/manual/vhosts/fd-limits.xml.meta
 share/httpd/manual/vhosts/index.html
 share/httpd/manual/vhosts/index.html.de
 share/httpd/manual/vhosts/index.html.en
@@ -1586,37 +1012,18 @@ share/httpd/manual/vhosts/index.html.es
 share/httpd/manual/vhosts/index.html.ja.euc-jp
 share/httpd/manual/vhosts/index.html.ko.euc-kr
 share/httpd/manual/vhosts/index.html.ru.koi8-r
-share/httpd/manual/vhosts/index.xml
-share/httpd/manual/vhosts/index.xml.de
-share/httpd/manual/vhosts/index.xml.es
-share/httpd/manual/vhosts/index.xml.ja
-share/httpd/manual/vhosts/index.xml.ko
-share/httpd/manual/vhosts/index.xml.meta
-share/httpd/manual/vhosts/index.xml.ru
 share/httpd/manual/vhosts/ip-based.html
 share/httpd/manual/vhosts/ip-based.html.en
 share/httpd/manual/vhosts/ip-based.html.ko.euc-kr
-share/httpd/manual/vhosts/ip-based.xml
-share/httpd/manual/vhosts/ip-based.xml.ko
-share/httpd/manual/vhosts/ip-based.xml.meta
 share/httpd/manual/vhosts/mass.html
 share/httpd/manual/vhosts/mass.html.en
 share/httpd/manual/vhosts/mass.html.ko.euc-kr
-share/httpd/manual/vhosts/mass.xml
-share/httpd/manual/vhosts/mass.xml.ko
-share/httpd/manual/vhosts/mass.xml.meta
 share/httpd/manual/vhosts/name-based.html
 share/httpd/manual/vhosts/name-based.html.de
 share/httpd/manual/vhosts/name-based.html.en
 share/httpd/manual/vhosts/name-based.html.es
 share/httpd/manual/vhosts/name-based.html.ja.euc-jp
 share/httpd/manual/vhosts/name-based.html.ko.euc-kr
-share/httpd/manual/vhosts/name-based.xml
-share/httpd/manual/vhosts/name-based.xml.de
-share/httpd/manual/vhosts/name-based.xml.es
-share/httpd/manual/vhosts/name-based.xml.ja
-share/httpd/manual/vhosts/name-based.xml.ko
-share/httpd/manual/vhosts/name-based.xml.meta
 @unexec ${RMDIR} %D/libexec/cgi-bin 2>/dev/null || ${TRUE}
 @dirrm share/httpd/manual/vhosts
 @dirrm share/httpd/manual/style/xsl/util
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 4a8b5421f16..7a4e6473bc4 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.43 2005/10/11 20:10:35 joerg Exp $
+$NetBSD: distinfo,v 1.44 2005/10/17 10:37:11 tron Exp $
 
-SHA1 (httpd-2.0.54.tar.bz2) = 15b4fc3024cceea6562fb03383fd624e84e5e35a
-RMD160 (httpd-2.0.54.tar.bz2) = c511cb2fa396ba04caf77bfc6ca03413df48ea08
-Size (httpd-2.0.54.tar.bz2) = 5566979 bytes
+SHA1 (httpd-2.0.55.tar.bz2) = ab016aace57f34cb3eae5c9d48f2bcc5759d6c84
+RMD160 (httpd-2.0.55.tar.bz2) = 04749dcf9ea369152eddf9422e49bc0a77a443eb
+Size (httpd-2.0.55.tar.bz2) = 4745220 bytes
 SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
 SHA1 (patch-ab) = 387892276efd49fd081a187c1123de26fb6486ba
-SHA1 (patch-ac) = 02e0ff6a6b3308ca86c96857b8159ebd6a405537
+SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
 SHA1 (patch-ad) = 8c6f62346ffb5069de89a50516a3da2c6104e09b
-SHA1 (patch-ae) = 15be65257d60e5a8340ace40af903b8aa488c1a4
-SHA1 (patch-af) = 9e9a8bae118140cc8a49bd30c4753cab5741bdf3
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
-SHA1 (patch-ah) = 39109cb9d58f900627ea190e4ce24731735538ea
 SHA1 (patch-ai) = 4dc88c15b0525a5aabc80d5c2a0720cd260629de
-SHA1 (patch-aj) = 32ac362e0d67bfb208a8814b9baf70e20c22ae4b
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 9af7b6c56177d971e135f0a00b3ab9ded5d1b6dd
 SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
diff --git a/www/apache2/patches/patch-ac b/www/apache2/patches/patch-ac
index ba853c5e47e..9ae4e70c69e 100644
--- a/www/apache2/patches/patch-ac
+++ b/www/apache2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2005/04/25 09:13:14 adam Exp $
+$NetBSD: patch-ac,v 1.6 2005/10/17 10:37:11 tron Exp $
 
---- configure.orig	2005-04-11 21:04:54.000000000 +0000
+--- configure.orig	2005-10-09 18:34:38.000000000 -0700
 +++ configure
-@@ -17035,7 +17035,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -17086,7 +17086,6 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
diff --git a/www/apache2/patches/patch-ae b/www/apache2/patches/patch-ae
deleted file mode 100644
index 92b9c5bed09..00000000000
--- a/www/apache2/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/09/02 11:40:56 tron Exp $
-
---- modules/ssl/ssl_engine_kernel.c.orig	2005-03-29 09:44:31.000000000 +0100
-+++ modules/ssl/ssl_engine_kernel.c	2005-09-02 12:28:45.000000000 +0100
-@@ -406,8 +406,8 @@
-                 (!(verify_old & SSL_VERIFY_PEER) &&
-                   (verify     & SSL_VERIFY_PEER)) ||
- 
--                (!(verify_old & SSL_VERIFY_PEER_STRICT) &&
--                  (verify     & SSL_VERIFY_PEER_STRICT)))
-+                (!(verify_old & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) &&
-+                  (verify     & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)))
-             {
-                 renegotiate = TRUE;
-                 /* optimization */
-@@ -1398,7 +1398,7 @@
-             BIO_printf(bio, ", nextUpdate: ");
-             ASN1_UTCTIME_print(bio, X509_CRL_get_nextUpdate(crl));
- 
--            n = BIO_read(bio, buff, sizeof(buff));
-+            n = BIO_read(bio, buff, sizeof(buff) - 1);
-             buff[n] = '\0';
- 
-             BIO_free(bio);
diff --git a/www/apache2/patches/patch-af b/www/apache2/patches/patch-af
deleted file mode 100644
index fef7cf4b529..00000000000
--- a/www/apache2/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.4 2005/08/08 18:30:26 tron Exp $
-
---- server/protocol.c.orig	2005/07/14 16:49:17	219060
-+++ server/protocol.c	2005/07/14 16:51:55	219061
-@@ -885,6 +885,15 @@
-             apr_brigade_destroy(tmp_bb);
-             return r;
-         }
-+
-+        if (apr_table_get(r->headers_in, "Transfer-Encoding")
-+            && apr_table_get(r->headers_in, "Content-Length")) {
-+            /* 2616 section 4.4, point 3: "if both Transfer-Encoding
-+             * and Content-Length are received, the latter MUST be
-+             * ignored"; so unset it here to prevent any confusion
-+             * later. */
-+            apr_table_unset(r->headers_in, "Content-Length");
-+        }
-     }
-     else {
-         if (r->header_only) {
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
deleted file mode 100644
index ce22c3c0e0d..00000000000
--- a/www/apache2/patches/patch-ah
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ah,v 1.8 2005/08/28 08:36:55 tron Exp $
-
---- srclib/pcre/pcre.c.orig	Wed Nov 24 20:31:09 2004
-+++ srclib/pcre/pcre.c	Thu Aug 25 22:14:56 2005
-@@ -714,7 +714,18 @@
- int min = 0;
- int max = -1;
- 
-+/* Read the minimum value and do a paranoid check: a negative value indicates
-+an integer overflow. */
-+
- while ((cd->ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
-+if (min < 0 || min > 65535)
-+  {
-+  *errorptr = ERR5;
-+  return p;
-+  }
-+ 
-+/* Read the maximum value if there is one, and again do a paranoid on its size.
-+Also, max must not be less than min. */
- 
- if (*p == '}') max = min; else
-   {
-@@ -722,6 +733,11 @@
-     {
-     max = 0;
-     while((cd->ctypes[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
-+    if (max < 0 || max > 65535)
-+      {
-+      *errorptr = ERR5;
-+      return p;
-+      }
-     if (max < min)
-       {
-       *errorptr = ERR4;
-@@ -730,16 +746,11 @@
-     }
-   }
- 
--/* Do paranoid checks, then fill in the required variables, and pass back the
--pointer to the terminating '}'. */
-+/* Fill in the required variables, and pass back the pointer to the terminating
-+'}'. */
- 
--if (min > 65535 || max > 65535)
--  *errorptr = ERR5;
--else
--  {
--  *minp = min;
--  *maxp = max;
--  }
-+*minp = min;
-+*maxp = max;
- return p;
- }
- 
diff --git a/www/apache2/patches/patch-aj b/www/apache2/patches/patch-aj
deleted file mode 100644
index e0867ac2047..00000000000
--- a/www/apache2/patches/patch-aj
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2005/08/28 08:36:55 tron Exp $
-
---- modules/http/http_protocol.c.orig
-+++ modules/http/http_protocol.c Tue Aug 23 01:36:16 2005
-@@ -2856,18 +2856,35 @@
- #define MIN_LENGTH(len1, len2) ((len1 > len2) ? len2 : len1)
-     request_rec *r = f->r;
-     conn_rec *c = r->connection;
--    byterange_ctx *ctx = f->ctx;
-+    byterange_ctx *ctx;
-     apr_bucket *e;
-     apr_bucket_brigade *bsend;
-     apr_off_t range_start;
-     apr_off_t range_end;
-     char *current;
--    apr_off_t bb_length;
-     apr_off_t clength = 0;
-     apr_status_t rv;
-     int found = 0;
- 
--    if (!ctx) {
-+    /* Iterate through the brigade until reaching EOS or a bucket with
-+     * unknown length. */
-+    for (e = APR_BRIGADE_FIRST(bb);
-+         (e != APR_BRIGADE_SENTINEL(bb) && !APR_BUCKET_IS_EOS(e)
-+          && e->length != (apr_size_t)-1);
-+         e = APR_BUCKET_NEXT(e)) {
-+        clength += e->length;
-+    }
-+
-+    /* Don't attempt to do byte range work if this brigade doesn't
-+     * contain an EOS, or if any of the buckets has an unknown length;
-+     * this avoids the cases where it is expensive to perform
-+     * byteranging (i.e. may require arbitrary amounts of memory). */
-+    if (!APR_BUCKET_IS_EOS(e) || clength <= 0) {
-+        ap_remove_output_filter(f);
-+        return ap_pass_brigade(f->next, bb);
-+    }
-+
-+    {
-         int num_ranges = ap_set_byterange(r);
- 
-         /* We have nothing to do, get out of the way. */
-@@ -2876,7 +2893,7 @@
-             return ap_pass_brigade(f->next, bb);
-         }
- 
--        ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx));
-+        ctx = apr_pcalloc(r->pool, sizeof(*ctx));
-         ctx->num_ranges = num_ranges;
-         /* create a brigade in case we never call ap_save_brigade() */
-         ctx->bb = apr_brigade_create(r->pool, c->bucket_alloc);
-@@ -2902,29 +2919,6 @@
-             ap_xlate_proto_to_ascii(ctx->bound_head, strlen(ctx->bound_head));
-         }
-     }
--
--    /* We can't actually deal with byte-ranges until we have the whole brigade
--     * because the byte-ranges can be in any order, and according to the RFC,
--     * we SHOULD return the data in the same order it was requested.
--     *
--     * XXX: We really need to dump all bytes prior to the start of the earliest
--     * range, and only slurp up to the end of the latest range.  By this we
--     * mean that we should peek-ahead at the lowest first byte of any range,
--     * and the highest last byte of any range.
--     */
--    if (!APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
--        ap_save_brigade(f, &ctx->bb, &bb, r->pool);
--        return APR_SUCCESS;
--    }
--
--    /* Prepend any earlier saved brigades. */
--    APR_BRIGADE_PREPEND(bb, ctx->bb);
--
--    /* It is possible that we won't have a content length yet, so we have to
--     * compute the length before we can actually do the byterange work.
--     */
--    apr_brigade_length(bb, 1, &bb_length);
--    clength = (apr_off_t)bb_length;
- 
-     /* this brigade holds what we will be sending */
-     bsend = apr_brigade_create(r->pool, c->bucket_alloc);