Pull up the following revisions

Makefile 1.12, 1.15-1.16
PLIST 1.7-1.9
distinfo 1.10-1.12
patches/patch-aa 1.7
patches/patch-al 1.2
patches/patch-an 1.4
patches/patch-ao 1.4

of pkgsrc/www/apache2 files to the netbsd-1-6 pkgsrc branch.

Requested by Manuel Bouyer.

They update apache2 to 2.0.43 for security issues.  Tested by Manuel on
1.6/sparc with IPv6 connectivity.

7 files changed, 278 insertions, 86 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 48174c447a3..65843ff89f6 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/07/30 18:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2002/10/12 17:34:24 agc Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 PKGNAME=		apache-${APACHE_VERSION}
-APACHE_VERSION=		2.0.39
-PKGREVISION=		1
+APACHE_VERSION=		2.0.43
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://httpd.apache.org/dist/httpd/old/ \
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index a703fc38546..bfabf5462a4 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/18 23:58:07 itojun Exp $
+@comment $NetBSD: PLIST,v 1.5.6.1 2002/10/12 17:34:24 agc Exp $
 bin/apr-config
 bin/apu-config
 etc/rc.d/apache
@@ -9,6 +9,7 @@ include/httpd/ap_config_layout.h
 include/httpd/ap_listen.h
 include/httpd/ap_mmn.h
 include/httpd/ap_mpm.h
+include/httpd/ap_regkey.h
 include/httpd/ap_release.h
 include/httpd/apr.h
 include/httpd/apr_allocator.h
@@ -38,9 +39,12 @@ include/httpd/apr_mmap.h
 include/httpd/apr_network_io.h
 include/httpd/apr_optional.h
 include/httpd/apr_optional_hooks.h
+include/httpd/apr_poll.h
 include/httpd/apr_pools.h
 include/httpd/apr_portable.h
 include/httpd/apr_proc_mutex.h
+include/httpd/apr_queue.h
+include/httpd/apr_reslist.h
 include/httpd/apr_ring.h
 include/httpd/apr_rmm.h
 include/httpd/apr_sdbm.h
@@ -49,6 +53,7 @@ include/httpd/apr_shm.h
 include/httpd/apr_signal.h
 include/httpd/apr_strings.h
 include/httpd/apr_strmatch.h
+include/httpd/apr_support.h
 include/httpd/apr_tables.h
 include/httpd/apr_thread_cond.h
 include/httpd/apr_thread_mutex.h
@@ -64,6 +69,7 @@ include/httpd/apr_xlate.h
 include/httpd/apr_xml.h
 include/httpd/apu.h
 include/httpd/apu_compat.h
+include/httpd/apu_version.h
 include/httpd/http_config.h
 include/httpd/http_connection.h
 include/httpd/http_core.h
@@ -103,20 +109,29 @@ include/httpd/util_md5.h
 include/httpd/util_script.h
 include/httpd/util_time.h
 include/httpd/util_xml.h
-lib/APRVARS
 lib/apr.exp
 lib/aprutil.exp
 lib/httpd/httpd.exp
 lib/libapr.a
 lib/libapr.la
 lib/libapr.so
-lib/libapr.so.0
-lib/libapr.so.0.0
+lib/libapr.so.9
+lib/libapr.so.9.2
 lib/libaprutil.a
 lib/libaprutil.la
 lib/libaprutil.so
-lib/libaprutil.so.0
-lib/libaprutil.so.0.0
+lib/libaprutil.so.9
+lib/libaprutil.so.9.2
+man/man1/dbmmanage.1
+man/man1/htdigest.1
+man/man1/htpasswd.1
+man/man8/ab.8
+man/man8/apachectl.8
+man/man8/apxs.8
+man/man8/httpd.8
+man/man8/logresolve.8
+man/man8/rotatelogs.8
+man/man8/suexec.8
 sbin/ab
 sbin/apachectl
 sbin/apxs
@@ -424,13 +439,22 @@ share/httpd/icons/world2.png
 share/httpd/manual/LICENSE
 share/httpd/manual/bind.html.en
 share/httpd/manual/bind.html.ja.jis
+share/httpd/manual/bind.xml
+share/httpd/manual/bind.xml.ja
 share/httpd/manual/cgi_path.html.en
 share/httpd/manual/cgi_path.html.ja.jis
 share/httpd/manual/configuring.html.en
 share/httpd/manual/configuring.html.ja.jis
-share/httpd/manual/content-negotiation.html
+share/httpd/manual/configuring.xml
+share/httpd/manual/configuring.xml.ja
+share/httpd/manual/content-negotiation.html.en
+share/httpd/manual/content-negotiation.html.ja.jis
+share/httpd/manual/content-negotiation.xml
+share/httpd/manual/content-negotiation.xml.ja
 share/httpd/manual/custom-error.html.en
 share/httpd/manual/custom-error.html.ja.jis
+share/httpd/manual/custom-error.xml
+share/httpd/manual/custom-error.xml.ja
 share/httpd/manual/developer/API.html
 share/httpd/manual/developer/debugging.html
 share/httpd/manual/developer/documenting.html
@@ -440,37 +464,59 @@ share/httpd/manual/developer/header.html
 share/httpd/manual/developer/hooks.html
 share/httpd/manual/developer/index.html
 share/httpd/manual/developer/layeredio.html
-share/httpd/manual/developer/modules.html
+share/httpd/manual/developer/modules.html.en
+share/httpd/manual/developer/modules.html.ja.jis
 share/httpd/manual/developer/request.html
-share/httpd/manual/dns-caveats.html
-share/httpd/manual/dso.html
+share/httpd/manual/developer/thread_safety.html
+share/httpd/manual/dns-caveats.html.en
+share/httpd/manual/dns-caveats.xml
+share/httpd/manual/dso.html.en
+share/httpd/manual/dso.html.ja.jis
 share/httpd/manual/dso.html.ko.euc-kr
-share/httpd/manual/ebcdic.html
+share/httpd/manual/dso.xml
+share/httpd/manual/dso.xml.ja
 share/httpd/manual/env.html.en
 share/httpd/manual/env.html.ja.jis
+share/httpd/manual/env.xml
 share/httpd/manual/faq/index.html
 share/httpd/manual/filter.html.en
 share/httpd/manual/filter.html.ja.jis
+share/httpd/manual/filter.xml
+share/httpd/manual/filter.xml.ja
 share/httpd/manual/footer.html
+share/httpd/manual/glossary.html.en
+share/httpd/manual/glossary.xml
 share/httpd/manual/handler.html.en
 share/httpd/manual/handler.html.ja.jis
+share/httpd/manual/handler.xml
+share/httpd/manual/handler.xml.ja
 share/httpd/manual/header.html
 share/httpd/manual/howto/auth.html.en
 share/httpd/manual/howto/auth.html.ja.jis
 share/httpd/manual/howto/cgi.html.en
 share/httpd/manual/howto/cgi.html.ja.jis
+share/httpd/manual/howto/cgi.xml
 share/httpd/manual/howto/footer.html
 share/httpd/manual/howto/header.html
+share/httpd/manual/howto/htaccess.html.en
+share/httpd/manual/howto/htaccess.xml
+share/httpd/manual/howto/public_html.html.en
+share/httpd/manual/howto/public_html.xml
 share/httpd/manual/howto/ssi.html.en
 share/httpd/manual/howto/ssi.html.ja.jis
+share/httpd/manual/howto/ssi.xml
 share/httpd/manual/images/apache_header.gif
 share/httpd/manual/images/apache_header.png
 share/httpd/manual/images/custom_errordocs.gif
 share/httpd/manual/images/custom_errordocs.png
+share/httpd/manual/images/down.gif
+share/httpd/manual/images/favicon.ico
+share/httpd/manual/images/feather.gif
 share/httpd/manual/images/home.gif
 share/httpd/manual/images/home.png
 share/httpd/manual/images/index.gif
 share/httpd/manual/images/index.png
+share/httpd/manual/images/left.gif
 share/httpd/manual/images/mod_rewrite_fig1.fig
 share/httpd/manual/images/mod_rewrite_fig1.gif
 share/httpd/manual/images/mod_rewrite_fig1.png
@@ -479,64 +525,100 @@ share/httpd/manual/images/mod_rewrite_fig2.gif
 share/httpd/manual/images/mod_rewrite_fig2.png
 share/httpd/manual/images/pixel.gif
 share/httpd/manual/images/pixel.png
+share/httpd/manual/images/right.gif
 share/httpd/manual/images/sub.gif
 share/httpd/manual/images/sub.png
+share/httpd/manual/images/up.gif
 share/httpd/manual/index.html.en
 share/httpd/manual/index.html.fr
 share/httpd/manual/index.html.ja.jis
 share/httpd/manual/index.html.ko.euc-kr
+share/httpd/manual/install.html.de
 share/httpd/manual/install.html.en
 share/httpd/manual/install.html.ja.jis
 share/httpd/manual/install.html.ko.euc-kr
+share/httpd/manual/install.xml
+share/httpd/manual/install.xml.de
+share/httpd/manual/install.xml.ja
 share/httpd/manual/invoking.html.en
 share/httpd/manual/invoking.html.ja.jis
-share/httpd/manual/logs.html
+share/httpd/manual/invoking.xml
+share/httpd/manual/invoking.xml.ja
+share/httpd/manual/logs.html.en
+share/httpd/manual/logs.html.ja.jis
+share/httpd/manual/logs.xml
+share/httpd/manual/logs.xml.ja
 share/httpd/manual/misc/custom_errordocs.html
 share/httpd/manual/misc/descriptors.html
 share/httpd/manual/misc/fin_wait_2.html
 share/httpd/manual/misc/footer.html
 share/httpd/manual/misc/header.html
-share/httpd/manual/misc/index.html
+share/httpd/manual/misc/index.html.en
+share/httpd/manual/misc/index.xml
 share/httpd/manual/misc/known_client_problems.html
-share/httpd/manual/misc/perf-tuning.html
-share/httpd/manual/misc/rewriteguide.html
-share/httpd/manual/misc/security_tips.html
+share/httpd/manual/misc/perf-tuning.html.en
+share/httpd/manual/misc/perf-tuning.xml
+share/httpd/manual/misc/rewriteguide.html.en
+share/httpd/manual/misc/rewriteguide.xml
+share/httpd/manual/misc/security_tips.html.en
+share/httpd/manual/misc/security_tips.xml
 share/httpd/manual/misc/tutorials.html
-share/httpd/manual/mod/allmodules.html.en
-share/httpd/manual/mod/allmodules.xml
 share/httpd/manual/mod/core.html.en
 share/httpd/manual/mod/core.xml
-share/httpd/manual/mod/directive-dict.html
+share/httpd/manual/mod/directive-dict.html.en
+share/httpd/manual/mod/directive-dict.html.ja.jis
+share/httpd/manual/mod/directive-dict.xml
+share/httpd/manual/mod/directive-dict.xml.ja
 share/httpd/manual/mod/directives.html.en
+share/httpd/manual/mod/directives.html.ja.jis
 share/httpd/manual/mod/directives.xml
+share/httpd/manual/mod/directives.xml.ja
 share/httpd/manual/mod/footer.html
 share/httpd/manual/mod/header.html
 share/httpd/manual/mod/index.html.en
+share/httpd/manual/mod/index.html.ja.jis
 share/httpd/manual/mod/index.xml
+share/httpd/manual/mod/index.xml.ja
 share/httpd/manual/mod/mod_access.html.en
+share/httpd/manual/mod/mod_access.html.ja.jis
 share/httpd/manual/mod/mod_access.xml
+share/httpd/manual/mod/mod_access.xml.ja
 share/httpd/manual/mod/mod_actions.html.en
+share/httpd/manual/mod/mod_actions.html.ja.jis
 share/httpd/manual/mod/mod_actions.xml
+share/httpd/manual/mod/mod_actions.xml.ja
 share/httpd/manual/mod/mod_alias.html.en
+share/httpd/manual/mod/mod_alias.html.ja.jis
 share/httpd/manual/mod/mod_alias.xml
+share/httpd/manual/mod/mod_alias.xml.ja
 share/httpd/manual/mod/mod_asis.html.en
+share/httpd/manual/mod/mod_asis.html.ja.jis
 share/httpd/manual/mod/mod_asis.xml
+share/httpd/manual/mod/mod_asis.xml.ja
 share/httpd/manual/mod/mod_auth.html.en
+share/httpd/manual/mod/mod_auth.html.ja.jis
 share/httpd/manual/mod/mod_auth.xml
+share/httpd/manual/mod/mod_auth.xml.ja
 share/httpd/manual/mod/mod_auth_anon.html.en
 share/httpd/manual/mod/mod_auth_anon.xml
 share/httpd/manual/mod/mod_auth_dbm.html.en
 share/httpd/manual/mod/mod_auth_dbm.xml
 share/httpd/manual/mod/mod_auth_digest.html.en
 share/httpd/manual/mod/mod_auth_digest.xml
+share/httpd/manual/mod/mod_auth_ldap.html.en
+share/httpd/manual/mod/mod_auth_ldap.xml
 share/httpd/manual/mod/mod_autoindex.html.en
+share/httpd/manual/mod/mod_autoindex.html.ja.jis
 share/httpd/manual/mod/mod_autoindex.xml
+share/httpd/manual/mod/mod_autoindex.xml.ja
 share/httpd/manual/mod/mod_cache.html.en
 share/httpd/manual/mod/mod_cache.xml
 share/httpd/manual/mod/mod_cern_meta.html.en
 share/httpd/manual/mod/mod_cern_meta.xml
 share/httpd/manual/mod/mod_cgi.html.en
+share/httpd/manual/mod/mod_cgi.html.ja.jis
 share/httpd/manual/mod/mod_cgi.xml
+share/httpd/manual/mod/mod_cgi.xml.ja
 share/httpd/manual/mod/mod_cgid.html.en
 share/httpd/manual/mod/mod_cgid.xml
 share/httpd/manual/mod/mod_charset_lite.html.en
@@ -546,11 +628,23 @@ share/httpd/manual/mod/mod_dav.html.ja.jis
 share/httpd/manual/mod/mod_dav.xml
 share/httpd/manual/mod/mod_dav.xml.ja
 share/httpd/manual/mod/mod_deflate.html.en
+share/httpd/manual/mod/mod_deflate.html.ja.jis
 share/httpd/manual/mod/mod_deflate.xml
+share/httpd/manual/mod/mod_deflate.xml.ja
 share/httpd/manual/mod/mod_dir.html.en
+share/httpd/manual/mod/mod_dir.html.ja.jis
 share/httpd/manual/mod/mod_dir.xml
+share/httpd/manual/mod/mod_dir.xml.ja
+share/httpd/manual/mod/mod_disk_cache.html.en
+share/httpd/manual/mod/mod_disk_cache.xml
+share/httpd/manual/mod/mod_echo.html.en
+share/httpd/manual/mod/mod_echo.html.ja.jis
+share/httpd/manual/mod/mod_echo.xml
+share/httpd/manual/mod/mod_echo.xml.ja
 share/httpd/manual/mod/mod_env.html.en
+share/httpd/manual/mod/mod_env.html.ja.jis
 share/httpd/manual/mod/mod_env.xml
+share/httpd/manual/mod/mod_env.xml.ja
 share/httpd/manual/mod/mod_example.html.en
 share/httpd/manual/mod/mod_example.xml
 share/httpd/manual/mod/mod_expires.html.en
@@ -566,27 +660,43 @@ share/httpd/manual/mod/mod_imap.xml
 share/httpd/manual/mod/mod_include.html.en
 share/httpd/manual/mod/mod_include.xml
 share/httpd/manual/mod/mod_info.html.en
+share/httpd/manual/mod/mod_info.html.ja.jis
 share/httpd/manual/mod/mod_info.xml
+share/httpd/manual/mod/mod_info.xml.ja
 share/httpd/manual/mod/mod_isapi.html.en
 share/httpd/manual/mod/mod_isapi.xml
+share/httpd/manual/mod/mod_ldap.html.en
+share/httpd/manual/mod/mod_ldap.xml
 share/httpd/manual/mod/mod_log_config.html.en
 share/httpd/manual/mod/mod_log_config.xml
+share/httpd/manual/mod/mod_logio.html.en
+share/httpd/manual/mod/mod_logio.xml
+share/httpd/manual/mod/mod_mem_cache.html.en
+share/httpd/manual/mod/mod_mem_cache.xml
 share/httpd/manual/mod/mod_mime.html.en
 share/httpd/manual/mod/mod_mime.xml
 share/httpd/manual/mod/mod_mime_magic.html.en
 share/httpd/manual/mod/mod_mime_magic.xml
 share/httpd/manual/mod/mod_negotiation.html.en
+share/httpd/manual/mod/mod_negotiation.html.ja.jis
 share/httpd/manual/mod/mod_negotiation.xml
+share/httpd/manual/mod/mod_negotiation.xml.ja
 share/httpd/manual/mod/mod_proxy.html.en
 share/httpd/manual/mod/mod_proxy.xml
 share/httpd/manual/mod/mod_rewrite.html.en
 share/httpd/manual/mod/mod_rewrite.xml
 share/httpd/manual/mod/mod_setenvif.html.en
+share/httpd/manual/mod/mod_setenvif.html.ja.jis
 share/httpd/manual/mod/mod_setenvif.xml
+share/httpd/manual/mod/mod_setenvif.xml.ja
 share/httpd/manual/mod/mod_so.html.en
+share/httpd/manual/mod/mod_so.html.ja.jis
 share/httpd/manual/mod/mod_so.xml
+share/httpd/manual/mod/mod_so.xml.ja
 share/httpd/manual/mod/mod_speling.html.en
+share/httpd/manual/mod/mod_speling.html.ja.jis
 share/httpd/manual/mod/mod_speling.xml
+share/httpd/manual/mod/mod_speling.xml.ja
 share/httpd/manual/mod/mod_ssl.html.en
 share/httpd/manual/mod/mod_ssl.xml
 share/httpd/manual/mod/mod_status.html.en
@@ -596,7 +706,9 @@ share/httpd/manual/mod/mod_suexec.html.ja.jis
 share/httpd/manual/mod/mod_suexec.xml
 share/httpd/manual/mod/mod_suexec.xml.ja
 share/httpd/manual/mod/mod_unique_id.html.en
+share/httpd/manual/mod/mod_unique_id.html.ja.jis
 share/httpd/manual/mod/mod_unique_id.xml
+share/httpd/manual/mod/mod_unique_id.xml.ja
 share/httpd/manual/mod/mod_userdir.html.en
 share/httpd/manual/mod/mod_userdir.html.ja.jis
 share/httpd/manual/mod/mod_userdir.xml
@@ -605,9 +717,14 @@ share/httpd/manual/mod/mod_usertrack.html.en
 share/httpd/manual/mod/mod_usertrack.xml
 share/httpd/manual/mod/mod_vhost_alias.html.en
 share/httpd/manual/mod/mod_vhost_alias.xml
-share/httpd/manual/mod/module-dict.html
+share/httpd/manual/mod/module-dict.html.en
+share/httpd/manual/mod/module-dict.html.ja.jis
+share/httpd/manual/mod/module-dict.xml
+share/httpd/manual/mod/module-dict.xml.ja
 share/httpd/manual/mod/mpm_common.html.en
+share/httpd/manual/mod/mpm_common.html.ja.jis
 share/httpd/manual/mod/mpm_common.xml
+share/httpd/manual/mod/mpm_common.xml.ja
 share/httpd/manual/mod/mpm_netware.html.en
 share/httpd/manual/mod/mpm_netware.xml
 share/httpd/manual/mod/mpm_winnt.html.en
@@ -620,6 +737,10 @@ share/httpd/manual/mod/prefork.html.en
 share/httpd/manual/mod/prefork.html.ja.jis
 share/httpd/manual/mod/prefork.xml
 share/httpd/manual/mod/prefork.xml.ja
+share/httpd/manual/mod/quickreference.html.en
+share/httpd/manual/mod/quickreference.html.ja.jis
+share/httpd/manual/mod/quickreference.xml
+share/httpd/manual/mod/quickreference.xml.ja
 share/httpd/manual/mod/worker.html.en
 share/httpd/manual/mod/worker.html.ja.jis
 share/httpd/manual/mod/worker.xml
@@ -627,18 +748,32 @@ share/httpd/manual/mod/worker.xml.ja
 share/httpd/manual/mpm.html.en
 share/httpd/manual/mpm.html.ja.jis
 share/httpd/manual/mpm.html.ko.euc-kr
+share/httpd/manual/mpm.xml
+share/httpd/manual/mpm.xml.ja
 share/httpd/manual/new_features_2_0.html.de
 share/httpd/manual/new_features_2_0.html.en
 share/httpd/manual/new_features_2_0.html.fr
 share/httpd/manual/new_features_2_0.html.ja.jis
 share/httpd/manual/new_features_2_0.html.ko.euc-kr
+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.ja
+share/httpd/manual/platform/ebcdic.html.en
+share/httpd/manual/platform/ebcdic.xml
 share/httpd/manual/platform/footer.html
 share/httpd/manual/platform/header.html
-share/httpd/manual/platform/netware.html
-share/httpd/manual/platform/perf-hp.html
-share/httpd/manual/platform/win_compiling.html
-share/httpd/manual/platform/win_service.html
-share/httpd/manual/platform/windows.html
+share/httpd/manual/platform/index.html.en
+share/httpd/manual/platform/index.xml
+share/httpd/manual/platform/netware.html.en
+share/httpd/manual/platform/netware.xml
+share/httpd/manual/platform/perf-hp.html.en
+share/httpd/manual/platform/perf-hp.xml
+share/httpd/manual/platform/win_compiling.html.en
+share/httpd/manual/platform/win_compiling.xml
+share/httpd/manual/platform/win_service.html.en
+share/httpd/manual/platform/win_service.xml
+share/httpd/manual/platform/windows.html.en
+share/httpd/manual/platform/windows.xml
 share/httpd/manual/programs/ab.html
 share/httpd/manual/programs/apachectl.html
 share/httpd/manual/programs/apxs.html
@@ -656,45 +791,104 @@ share/httpd/manual/programs/suexec.html
 share/httpd/manual/search/manual-index.cgi
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.ja.jis
+share/httpd/manual/sections.xml
 share/httpd/manual/server-wide.html.en
 share/httpd/manual/server-wide.html.ja.jis
-share/httpd/manual/sitemap.html
+share/httpd/manual/server-wide.xml
+share/httpd/manual/server-wide.xml.ja
+share/httpd/manual/sitemap.html.en
+share/httpd/manual/sitemap.html.ja.jis
+share/httpd/manual/sitemap.xml
+share/httpd/manual/sitemap.xml.ja
 share/httpd/manual/ssl/footer.html
 share/httpd/manual/ssl/header.html
 share/httpd/manual/ssl/index.html.en
 share/httpd/manual/ssl/index.html.ja.jis
-share/httpd/manual/ssl/ssl_compat.html
+share/httpd/manual/ssl/index.xml
+share/httpd/manual/ssl/ssl_compat.html.en
+share/httpd/manual/ssl/ssl_compat.xml
 share/httpd/manual/ssl/ssl_cover_logo.jpg
 share/httpd/manual/ssl/ssl_cover_title.jpg
-share/httpd/manual/ssl/ssl_faq.html
-share/httpd/manual/ssl/ssl_glossary.html
-share/httpd/manual/ssl/ssl_howto.html
-share/httpd/manual/ssl/ssl_intro.html
+share/httpd/manual/ssl/ssl_faq.html.en
+share/httpd/manual/ssl/ssl_faq.xml
+share/httpd/manual/ssl/ssl_howto.html.en
+share/httpd/manual/ssl/ssl_howto.xml
+share/httpd/manual/ssl/ssl_intro.html.en
+share/httpd/manual/ssl/ssl_intro.xml
 share/httpd/manual/ssl/ssl_intro_fig1.gif
 share/httpd/manual/ssl/ssl_intro_fig2.gif
 share/httpd/manual/ssl/ssl_intro_fig3.gif
 share/httpd/manual/ssl/ssl_overview_fig1.gif
 share/httpd/manual/ssl/ssl_template.imgdot-1x1-000000.gif
 share/httpd/manual/ssl/ssl_template.imgdot-1x1-transp.gif
-share/httpd/manual/stopping.html
-share/httpd/manual/style/Makefile
-share/httpd/manual/style/build.sh
-share/httpd/manual/style/build.xml
-share/httpd/manual/style/common.xsl
-share/httpd/manual/style/en.xml
-share/httpd/manual/style/ja.xml
-share/httpd/manual/style/manual.css
+share/httpd/manual/stopping.html.en
+share/httpd/manual/stopping.html.ja.jis
+share/httpd/manual/stopping.xml
+share/httpd/manual/stopping.xml.ja
+share/httpd/manual/style/common.dtd
+share/httpd/manual/style/css/manual-loose-100pc-b.css
+share/httpd/manual/style/css/manual-loose-100pc.css
+share/httpd/manual/style/css/manual-loose-90pc-b.css
+share/httpd/manual/style/css/manual-loose-90pc.css
+share/httpd/manual/style/css/manual-loose-fix13-b.css
+share/httpd/manual/style/css/manual-loose-fix13.css
+share/httpd/manual/style/css/manual-loose-fix15-b.css
+share/httpd/manual/style/css/manual-loose-fix15.css
+share/httpd/manual/style/css/manual-print.css
+share/httpd/manual/style/css/manual-sbar-left-100pc-b.css
+share/httpd/manual/style/css/manual-sbar-left-100pc.css
+share/httpd/manual/style/css/manual-sbar-left-90pc-b.css
+share/httpd/manual/style/css/manual-sbar-left-90pc.css
+share/httpd/manual/style/css/manual-sbar-left-fix13-b.css
+share/httpd/manual/style/css/manual-sbar-left-fix13.css
+share/httpd/manual/style/css/manual-sbar-left-fix15-b.css
+share/httpd/manual/style/css/manual-sbar-left-fix15.css
+share/httpd/manual/style/css/manual-sbar-right-100pc-b.css
+share/httpd/manual/style/css/manual-sbar-right-100pc.css
+share/httpd/manual/style/css/manual-sbar-right-90pc-b.css
+share/httpd/manual/style/css/manual-sbar-right-90pc.css
+share/httpd/manual/style/css/manual-sbar-right-fix13-b.css
+share/httpd/manual/style/css/manual-sbar-right-fix13.css
+share/httpd/manual/style/css/manual-sbar-right-fix15-b.css
+share/httpd/manual/style/css/manual-sbar-right-fix15.css
+share/httpd/manual/style/css/manual.css
+share/httpd/manual/style/lang/de.xml
+share/httpd/manual/style/lang/en.xml
+share/httpd/manual/style/lang/ja.xml
+share/httpd/manual/style/lang/ru.xml
+share/httpd/manual/style/lang/sv.xml
+share/httpd/manual/style/manual.de.xsl
 share/httpd/manual/style/manual.en.xsl
 share/httpd/manual/style/manual.ja.xsl
+share/httpd/manual/style/manual.pt-br.xsl
+share/httpd/manual/style/manual.ru.xsl
+share/httpd/manual/style/manual.sv.xsl
+share/httpd/manual/style/manualpage.dtd
 share/httpd/manual/style/modulesynopsis.dtd
-share/httpd/manual/style/sv.xml
+share/httpd/manual/style/sitemap.dtd
+share/httpd/manual/style/xsl/common.xsl
+share/httpd/manual/style/xsl/directiveindex.xsl
+share/httpd/manual/style/xsl/manualpage.xsl
+share/httpd/manual/style/xsl/moduleindex.xsl
+share/httpd/manual/style/xsl/quickreference.xsl
+share/httpd/manual/style/xsl/sitemap.xsl
+share/httpd/manual/style/xsl/synopsis.xsl
 share/httpd/manual/suexec.html.en
 share/httpd/manual/suexec.html.ja.jis
+share/httpd/manual/suexec.xml
+share/httpd/manual/suexec.xml.ja
+share/httpd/manual/upgrading.html.de
 share/httpd/manual/upgrading.html.en
 share/httpd/manual/upgrading.html.fr
 share/httpd/manual/upgrading.html.ja.jis
 share/httpd/manual/upgrading.html.ko.euc-kr
-share/httpd/manual/urlmapping.html
+share/httpd/manual/upgrading.xml
+share/httpd/manual/upgrading.xml.de
+share/httpd/manual/upgrading.xml.ja
+share/httpd/manual/urlmapping.html.en
+share/httpd/manual/urlmapping.html.ja.jis
+share/httpd/manual/urlmapping.xml
+share/httpd/manual/urlmapping.xml.ja
 share/httpd/manual/vhosts/details.html
 share/httpd/manual/vhosts/examples.html
 share/httpd/manual/vhosts/fd-limits.html.en
@@ -717,6 +911,9 @@ share/httpd/manual/vhosts/name-based.html.ja.jis
 @dirrm share/httpd/manual/programs
 @dirrm share/httpd/manual/search
 @dirrm share/httpd/manual/ssl
+@dirrm share/httpd/manual/style/xsl
+@dirrm share/httpd/manual/style/lang
+@dirrm share/httpd/manual/style/css
 @dirrm share/httpd/manual/style
 @dirrm share/httpd/manual/vhosts
 @dirrm share/httpd/manual
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index eb04878cd1d..d6f9b6c9e0f 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.8 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: distinfo,v 1.8.6.1 2002/10/12 17:34:24 agc Exp $
 
-SHA1 (httpd-2.0.39.tar.gz) = 3f04dbffc081a34dbfc9aeab6738f320285db292
-Size (httpd-2.0.39.tar.gz) = 4413542 bytes
-SHA1 (patch-aa) = 6f39606469ced7555f0ce3e927da0a4dec5f80bd
+SHA1 (httpd-2.0.43.tar.gz) = 92f1feac1232919f5c6eaac5de0cc7d7eb44e237
+Size (httpd-2.0.43.tar.gz) = 4835188 bytes
+SHA1 (patch-aa) = 9d74b4ddeab96761f1bb3a7d39a5ab9001e3ea84
 SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1
 SHA1 (patch-ag) = 3d68e475caef0555097a9756533034686e81d474
 SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
-SHA1 (patch-al) = 0dcba1455b4fa3fc40fbd488813608b7e2350309
+SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc
 SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
-SHA1 (patch-an) = 0ec78dc92d743db7fbbdb0f60d6f12f6d0dc3e90
-SHA1 (patch-ao) = 551922e4ebc89144c4f6c39bef8ad6657ce695f8
+SHA1 (patch-an) = c596758ee0c9327be8d748c95921903dba4dc971
+SHA1 (patch-ao) = 8e26a8d43f578071e4ec1b2c2f442e9753667f02
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index afb9d0159c6..f2e85af23fb 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: patch-aa,v 1.5.6.1 2002/10/12 17:34:25 agc Exp $
 
---- Makefile.in.orig	Sat Jun 15 18:41:03 2002
-+++ Makefile.in	Wed Jun 19 07:39:04 2002
+--- Makefile.in.orig	Thu Jul 25 17:47:12 2002
++++ Makefile.in	Mon Aug 12 15:01:27 2002
 @@ -14,7 +14,7 @@
  PROGRAMS        = $(PROGRAM_NAME)
  TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
@@ -11,22 +11,22 @@ $NetBSD: patch-aa,v 1.5 2002/06/18 23:58:07 itojun Exp $
  	install-other install-cgi install-include install-suexec install-man \
  	install-build
  
-@@ -68,6 +68,7 @@
- 					< $$i; \
- 			fi \
- 		) > $(DESTDIR)$(sysconfdir)/$$i; \
+@@ -71,6 +71,7 @@
+ 	    				< $$i; \
+ 	    		fi \
+ 	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
 +		if false; then \
- 		chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
- 		file=`echo $$i|sed s/-std//`; \
- 		if [ "$$file" = "httpd.conf" ]; then \
-@@ -76,12 +77,15 @@
- 		if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
- 			$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
- 		fi; \
-+		fi; \
+ 	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
+ 	    	file=`echo $$i|sed s/-std//`; \
+ 	    	if [ "$$file" = "httpd.conf" ]; then \
+@@ -79,12 +80,15 @@
+ 	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
+ 	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
+ 	    	fi; \
++	    	fi; \
+ 	    done ; \
  	done ; \
- 	done
- 	@if test -f "$(builddir)/envvars-std"; then \
+ 	if test -f "$(builddir)/envvars-std"; then \
  	    cp -p envvars-std $(DESTDIR)$(sbindir); \
 +	    if false; then \
  	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
diff --git a/www/apache2/patches/patch-al b/www/apache2/patches/patch-al
index 3e16dd083af..d2f6e096f19 100644
--- a/www/apache2/patches/patch-al
+++ b/www/apache2/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2002/04/13 21:35:54 jlam Exp $
+$NetBSD: patch-al,v 1.1.8.1 2002/10/12 17:34:25 agc Exp $
 
---- include/httpd.h.orig	Fri Mar 29 03:17:19 2002
-+++ include/httpd.h
-@@ -146,9 +146,9 @@
+--- include/httpd.h.orig	Mon Jul  1 19:49:53 2002
++++ include/httpd.h	Mon Aug 12 15:02:08 2002
+@@ -147,9 +147,9 @@
  /* The name of the log files */
  #ifndef DEFAULT_ERRORLOG
  #if defined(OS2) || defined(WIN32)
@@ -14,7 +14,7 @@ $NetBSD: patch-al,v 1.1 2002/04/13 21:35:54 jlam Exp $
  #endif
  #endif /* DEFAULT_ERRORLOG */
  
-@@ -164,7 +164,7 @@
+@@ -165,7 +165,7 @@
  
  /* The name of the server config file */
  #ifndef SERVER_CONFIG_FILE
@@ -23,7 +23,7 @@ $NetBSD: patch-al,v 1.1 2002/04/13 21:35:54 jlam Exp $
  #endif
  
  /* Whether we should enable rfc1413 identity checking */
-@@ -255,7 +255,7 @@
+@@ -256,7 +256,7 @@
  
  /** The name of the MIME types file */
  #ifndef AP_TYPES_CONFIG_FILE
diff --git a/www/apache2/patches/patch-an b/www/apache2/patches/patch-an
index a3556ccde6f..5f15d29fe0d 100644
--- a/www/apache2/patches/patch-an
+++ b/www/apache2/patches/patch-an
@@ -1,10 +1,8 @@
-$NetBSD: patch-an,v 1.2 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: patch-an,v 1.2.8.1 2002/10/12 17:34:25 agc Exp $
 
---with-randomdev=foo does not work.
-
---- srclib/apr/configure.in-	Wed Jun 19 08:23:52 2002
-+++ srclib/apr/configure.in	Wed Jun 19 08:32:09 2002
-@@ -1561,8 +1561,8 @@
+--- srclib/apr/configure.in.orig	Mon Aug  5 11:28:24 2002
++++ srclib/apr/configure.in	Mon Aug 12 15:02:37 2002
+@@ -1590,8 +1590,8 @@
      fi
    elif test "$apr_devrandom" != "no"; then
      if test -r "$apr_devrandom"; then
diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao
index 1968e2f8621..298d6f43897 100644
--- a/www/apache2/patches/patch-ao
+++ b/www/apache2/patches/patch-ao
@@ -1,10 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2002/06/18 23:58:08 itojun Exp $
+$NetBSD: patch-ao,v 1.2.8.1 2002/10/12 17:34:25 agc Exp $
 
---with-randomdev=foo does not work.
-
---- srclib/apr/configure-	Wed Jun 19 08:23:54 2002
-+++ srclib/apr/configure	Wed Jun 19 08:34:18 2002
-@@ -25347,11 +25347,11 @@
+--- srclib/apr/configure.orig	Fri Aug  9 19:47:46 2002
++++ srclib/apr/configure	Mon Aug 12 15:02:57 2002
+@@ -25353,11 +25353,11 @@
    elif test "$apr_devrandom" != "no"; then
      if test -r "$apr_devrandom"; then
        cat >>confdefs.h <<\_ACEOF