10 files changed, 188 insertions, 228 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 329d21363c9..e2d121e5161 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2002/06/01 14:21:47 tron Exp $
+# $NetBSD: Makefile,v 1.9 2002/06/18 23:58:07 itojun Exp $
 
-DISTNAME=		httpd-2.0.36
-PKGNAME=		apache-2.0.36
+DISTNAME=		httpd-2.0.39
+PKGNAME=		apache-2.0.39
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://httpd.apache.org/dist/httpd/old/ \
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-port=80
 
 # Apache Portable Runtime library configure options
-CONFIGURE_ARGS+=	--with-mpm=prefork
+CONFIGURE_ARGS+=	--with-mpm=prefork --with-devrandom=/dev/urandom
 
 # Apache Portable Runtime Utility library configure options
 CONFIGURE_ARGS+=	--with-dbm=sdbm
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index 7663cf6ac7e..a703fc38546 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/01 13:18:01 itojun Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/06/18 23:58:07 itojun Exp $
 bin/apr-config
 bin/apu-config
 etc/rc.d/apache
@@ -48,6 +48,7 @@ include/httpd/apr_sha1.h
 include/httpd/apr_shm.h
 include/httpd/apr_signal.h
 include/httpd/apr_strings.h
+include/httpd/apr_strmatch.h
 include/httpd/apr_tables.h
 include/httpd/apr_thread_cond.h
 include/httpd/apr_thread_mutex.h
@@ -183,9 +184,8 @@ share/httpd/htdocs/index.html.he.iso8859-8
 share/httpd/htdocs/index.html.hr.iso8859-2
 share/httpd/htdocs/index.html.it
 share/httpd/htdocs/index.html.ja.iso2022-jp
-share/httpd/htdocs/index.html.kr.iso2022-kr
-share/httpd/htdocs/index.html.ltz.utf8
-share/httpd/htdocs/index.html.lu.utf8
+share/httpd/htdocs/index.html.ko.euc-kr
+share/httpd/htdocs/index.html.lb.utf8
 share/httpd/htdocs/index.html.nl
 share/httpd/htdocs/index.html.nn
 share/httpd/htdocs/index.html.no
@@ -198,9 +198,8 @@ share/httpd/htdocs/index.html.ru.iso-ru
 share/httpd/htdocs/index.html.ru.koi8-r
 share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.se
-share/httpd/htdocs/index.html.tw
-share/httpd/htdocs/index.html.tw.Big5
 share/httpd/htdocs/index.html.var
+share/httpd/htdocs/index.html.zh
 share/httpd/icons/README
 share/httpd/icons/a.gif
 share/httpd/icons/a.png
@@ -247,6 +246,8 @@ share/httpd/icons/continued.gif
 share/httpd/icons/continued.png
 share/httpd/icons/dir.gif
 share/httpd/icons/dir.png
+share/httpd/icons/diskimg.gif
+share/httpd/icons/diskimg.png
 share/httpd/icons/down.gif
 share/httpd/icons/down.png
 share/httpd/icons/dvi.gif
@@ -421,12 +422,15 @@ share/httpd/icons/world1.png
 share/httpd/icons/world2.gif
 share/httpd/icons/world2.png
 share/httpd/manual/LICENSE
-share/httpd/manual/bind.html
-share/httpd/manual/cgi_path.html
+share/httpd/manual/bind.html.en
+share/httpd/manual/bind.html.ja.jis
+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/custom-error.html
+share/httpd/manual/custom-error.html.en
+share/httpd/manual/custom-error.html.ja.jis
 share/httpd/manual/developer/API.html
 share/httpd/manual/developer/debugging.html
 share/httpd/manual/developer/documenting.html
@@ -440,15 +444,19 @@ share/httpd/manual/developer/modules.html
 share/httpd/manual/developer/request.html
 share/httpd/manual/dns-caveats.html
 share/httpd/manual/dso.html
+share/httpd/manual/dso.html.ko.euc-kr
 share/httpd/manual/ebcdic.html
-share/httpd/manual/env.html
+share/httpd/manual/env.html.en
+share/httpd/manual/env.html.ja.jis
 share/httpd/manual/faq/index.html
-share/httpd/manual/filter.html
+share/httpd/manual/filter.html.en
+share/httpd/manual/filter.html.ja.jis
 share/httpd/manual/footer.html
 share/httpd/manual/handler.html.en
 share/httpd/manual/handler.html.ja.jis
 share/httpd/manual/header.html
-share/httpd/manual/howto/auth.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/footer.html
@@ -476,8 +484,12 @@ share/httpd/manual/images/sub.png
 share/httpd/manual/index.html.en
 share/httpd/manual/index.html.fr
 share/httpd/manual/index.html.ja.jis
-share/httpd/manual/install.html
-share/httpd/manual/invoking.html
+share/httpd/manual/index.html.ko.euc-kr
+share/httpd/manual/install.html.en
+share/httpd/manual/install.html.ja.jis
+share/httpd/manual/install.html.ko.euc-kr
+share/httpd/manual/invoking.html.en
+share/httpd/manual/invoking.html.ja.jis
 share/httpd/manual/logs.html
 share/httpd/manual/misc/custom_errordocs.html
 share/httpd/manual/misc/descriptors.html
@@ -490,124 +502,136 @@ share/httpd/manual/misc/perf-tuning.html
 share/httpd/manual/misc/rewriteguide.html
 share/httpd/manual/misc/security_tips.html
 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
+share/httpd/manual/mod/core.html.en
 share/httpd/manual/mod/core.xml
 share/httpd/manual/mod/directive-dict.html
-share/httpd/manual/mod/directives.html
+share/httpd/manual/mod/directives.html.en
 share/httpd/manual/mod/directives.xml
 share/httpd/manual/mod/footer.html
 share/httpd/manual/mod/header.html
-share/httpd/manual/mod/index-bytype.html
-share/httpd/manual/mod/index.html
+share/httpd/manual/mod/index.html.en
 share/httpd/manual/mod/index.xml
-share/httpd/manual/mod/mod_TEMPLATE.html
-share/httpd/manual/mod/mod_access.html
+share/httpd/manual/mod/mod_access.html.en
 share/httpd/manual/mod/mod_access.xml
-share/httpd/manual/mod/mod_actions.html
+share/httpd/manual/mod/mod_actions.html.en
 share/httpd/manual/mod/mod_actions.xml
-share/httpd/manual/mod/mod_alias.html
+share/httpd/manual/mod/mod_alias.html.en
 share/httpd/manual/mod/mod_alias.xml
-share/httpd/manual/mod/mod_asis.html
+share/httpd/manual/mod/mod_asis.html.en
 share/httpd/manual/mod/mod_asis.xml
-share/httpd/manual/mod/mod_auth.html
+share/httpd/manual/mod/mod_auth.html.en
 share/httpd/manual/mod/mod_auth.xml
-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_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_digest.html
+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
-share/httpd/manual/mod/mod_autoindex.html
+share/httpd/manual/mod/mod_autoindex.html.en
 share/httpd/manual/mod/mod_autoindex.xml
-share/httpd/manual/mod/mod_cache.html
+share/httpd/manual/mod/mod_cache.html.en
 share/httpd/manual/mod/mod_cache.xml
-share/httpd/manual/mod/mod_cern_meta.html
+share/httpd/manual/mod/mod_cern_meta.html.en
 share/httpd/manual/mod/mod_cern_meta.xml
-share/httpd/manual/mod/mod_cgi.html
+share/httpd/manual/mod/mod_cgi.html.en
 share/httpd/manual/mod/mod_cgi.xml
-share/httpd/manual/mod/mod_cgid.html
+share/httpd/manual/mod/mod_cgid.html.en
 share/httpd/manual/mod/mod_cgid.xml
-share/httpd/manual/mod/mod_charset_lite.html
+share/httpd/manual/mod/mod_charset_lite.html.en
 share/httpd/manual/mod/mod_charset_lite.xml
-share/httpd/manual/mod/mod_dav.html
+share/httpd/manual/mod/mod_dav.html.en
+share/httpd/manual/mod/mod_dav.html.ja.jis
 share/httpd/manual/mod/mod_dav.xml
-share/httpd/manual/mod/mod_deflate.html
+share/httpd/manual/mod/mod_dav.xml.ja
+share/httpd/manual/mod/mod_deflate.html.en
 share/httpd/manual/mod/mod_deflate.xml
-share/httpd/manual/mod/mod_dir.html
+share/httpd/manual/mod/mod_dir.html.en
 share/httpd/manual/mod/mod_dir.xml
-share/httpd/manual/mod/mod_env.html
+share/httpd/manual/mod/mod_env.html.en
 share/httpd/manual/mod/mod_env.xml
-share/httpd/manual/mod/mod_example.html
+share/httpd/manual/mod/mod_example.html.en
 share/httpd/manual/mod/mod_example.xml
-share/httpd/manual/mod/mod_expires.html
+share/httpd/manual/mod/mod_expires.html.en
 share/httpd/manual/mod/mod_expires.xml
-share/httpd/manual/mod/mod_ext_filter.html
+share/httpd/manual/mod/mod_ext_filter.html.en
 share/httpd/manual/mod/mod_ext_filter.xml
-share/httpd/manual/mod/mod_file_cache.html
+share/httpd/manual/mod/mod_file_cache.html.en
 share/httpd/manual/mod/mod_file_cache.xml
-share/httpd/manual/mod/mod_headers.html
+share/httpd/manual/mod/mod_headers.html.en
 share/httpd/manual/mod/mod_headers.xml
-share/httpd/manual/mod/mod_imap.html
+share/httpd/manual/mod/mod_imap.html.en
 share/httpd/manual/mod/mod_imap.xml
-share/httpd/manual/mod/mod_include.html
+share/httpd/manual/mod/mod_include.html.en
 share/httpd/manual/mod/mod_include.xml
-share/httpd/manual/mod/mod_info.html
+share/httpd/manual/mod/mod_info.html.en
 share/httpd/manual/mod/mod_info.xml
-share/httpd/manual/mod/mod_isapi.html
+share/httpd/manual/mod/mod_isapi.html.en
 share/httpd/manual/mod/mod_isapi.xml
-share/httpd/manual/mod/mod_ldap.html
-share/httpd/manual/mod/mod_log_config.html
+share/httpd/manual/mod/mod_log_config.html.en
 share/httpd/manual/mod/mod_log_config.xml
-share/httpd/manual/mod/mod_mime.html
+share/httpd/manual/mod/mod_mime.html.en
 share/httpd/manual/mod/mod_mime.xml
-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_mmap_static.html
-share/httpd/manual/mod/mod_negotiation.html
+share/httpd/manual/mod/mod_negotiation.html.en
 share/httpd/manual/mod/mod_negotiation.xml
-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_rewrite.html
+share/httpd/manual/mod/mod_rewrite.html.en
 share/httpd/manual/mod/mod_rewrite.xml
-share/httpd/manual/mod/mod_setenvif.html
+share/httpd/manual/mod/mod_setenvif.html.en
 share/httpd/manual/mod/mod_setenvif.xml
-share/httpd/manual/mod/mod_so.html
+share/httpd/manual/mod/mod_so.html.en
 share/httpd/manual/mod/mod_so.xml
-share/httpd/manual/mod/mod_speling.html
+share/httpd/manual/mod/mod_speling.html.en
 share/httpd/manual/mod/mod_speling.xml
-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_status.html
+share/httpd/manual/mod/mod_status.html.en
 share/httpd/manual/mod/mod_status.xml
-share/httpd/manual/mod/mod_suexec.html
+share/httpd/manual/mod/mod_suexec.html.en
+share/httpd/manual/mod/mod_suexec.html.ja.jis
 share/httpd/manual/mod/mod_suexec.xml
-share/httpd/manual/mod/mod_unique_id.html
+share/httpd/manual/mod/mod_suexec.xml.ja
+share/httpd/manual/mod/mod_unique_id.html.en
 share/httpd/manual/mod/mod_unique_id.xml
-share/httpd/manual/mod/mod_userdir.html
+share/httpd/manual/mod/mod_userdir.html.en
+share/httpd/manual/mod/mod_userdir.html.ja.jis
 share/httpd/manual/mod/mod_userdir.xml
-share/httpd/manual/mod/mod_usertrack.html
+share/httpd/manual/mod/mod_userdir.xml.ja
+share/httpd/manual/mod/mod_usertrack.html.en
 share/httpd/manual/mod/mod_usertrack.xml
-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/module-dict.html
-share/httpd/manual/mod/mpm_common.html
+share/httpd/manual/mod/mpm_common.html.en
 share/httpd/manual/mod/mpm_common.xml
-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_winnt.html
+share/httpd/manual/mod/mpm_winnt.html.en
+share/httpd/manual/mod/mpm_winnt.html.ja.jis
 share/httpd/manual/mod/mpm_winnt.xml
-share/httpd/manual/mod/perchild.html
+share/httpd/manual/mod/mpm_winnt.xml.ja
+share/httpd/manual/mod/perchild.html.en
 share/httpd/manual/mod/perchild.xml
-share/httpd/manual/mod/prefork.html
+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/worker.html
+share/httpd/manual/mod/prefork.xml.ja
+share/httpd/manual/mod/worker.html.en
+share/httpd/manual/mod/worker.html.ja.jis
 share/httpd/manual/mod/worker.xml
-share/httpd/manual/mpm.html
+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/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/platform/footer.html
 share/httpd/manual/platform/header.html
 share/httpd/manual/platform/netware.html
@@ -630,13 +654,15 @@ share/httpd/manual/programs/other.html
 share/httpd/manual/programs/rotatelogs.html
 share/httpd/manual/programs/suexec.html
 share/httpd/manual/search/manual-index.cgi
-share/httpd/manual/sections.html
+share/httpd/manual/sections.html.en
+share/httpd/manual/sections.html.ja.jis
 share/httpd/manual/server-wide.html.en
 share/httpd/manual/server-wide.html.ja.jis
 share/httpd/manual/sitemap.html
 share/httpd/manual/ssl/footer.html
 share/httpd/manual/ssl/header.html
-share/httpd/manual/ssl/index.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/ssl_cover_logo.jpg
 share/httpd/manual/ssl/ssl_cover_title.jpg
@@ -651,27 +677,36 @@ 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/style/manual.xsl
+share/httpd/manual/style/manual.en.xsl
+share/httpd/manual/style/manual.ja.xsl
 share/httpd/manual/style/modulesynopsis.dtd
-share/httpd/manual/style/settings.xsl
 share/httpd/manual/style/sv.xml
-share/httpd/manual/suexec.html
+share/httpd/manual/suexec.html.en
+share/httpd/manual/suexec.html.ja.jis
 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/vhosts/details.html
 share/httpd/manual/vhosts/examples.html
-share/httpd/manual/vhosts/fd-limits.html
+share/httpd/manual/vhosts/fd-limits.html.en
+share/httpd/manual/vhosts/fd-limits.html.ja.jis
 share/httpd/manual/vhosts/footer.html
 share/httpd/manual/vhosts/header.html
-share/httpd/manual/vhosts/index.html
+share/httpd/manual/vhosts/index.html.en
+share/httpd/manual/vhosts/index.html.ja.jis
 share/httpd/manual/vhosts/ip-based.html
 share/httpd/manual/vhosts/mass.html
-share/httpd/manual/vhosts/name-based.html
+share/httpd/manual/vhosts/name-based.html.en
+share/httpd/manual/vhosts/name-based.html.ja.jis
 @dirrm share/httpd/manual/developer
 @dirrm share/httpd/manual/faq
 @dirrm share/httpd/manual/howto
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 75ba18f4fd9..eb04878cd1d 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.7 2002/06/18 02:17:17 itojun Exp $
+$NetBSD: distinfo,v 1.8 2002/06/18 23:58:07 itojun Exp $
 
-SHA1 (httpd-2.0.36.tar.gz) = 7080a7ab9cb1289b4b0f934e81439f9d21076784
-Size (httpd-2.0.36.tar.gz) = 4558484 bytes
-SHA1 (patch-aa) = ac42d212a1a9a103952ddc28e7c427a64f1a84d6
-SHA1 (patch-ad) = 139c2eed9b0b74323cb7ad88324ca968defff6d6
-SHA1 (patch-ag) = d3fe2a5f066353c64649c3efa76855ffd3d75111
-SHA1 (patch-ah) = 437152bd67b4045370f8f11c21f9f8d7a9c29d60
-SHA1 (patch-ai) = d04ed1f2999be97e1e764e9e4f0decbff202d76b
+SHA1 (httpd-2.0.39.tar.gz) = 3f04dbffc081a34dbfc9aeab6738f320285db292
+Size (httpd-2.0.39.tar.gz) = 4413542 bytes
+SHA1 (patch-aa) = 6f39606469ced7555f0ce3e927da0a4dec5f80bd
+SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1
+SHA1 (patch-ag) = 3d68e475caef0555097a9756533034686e81d474
+SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 0dcba1455b4fa3fc40fbd488813608b7e2350309
 SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
-SHA1 (patch-an) = 2a5b54b7e63410756f8ff7b1b8da0a9f8e4c9fa5
-SHA1 (patch-ao) = fd8211a4b9e2b58ab418168d27cbbd96a61f0537
+SHA1 (patch-an) = 0ec78dc92d743db7fbbdb0f60d6f12f6d0dc3e90
+SHA1 (patch-ao) = 551922e4ebc89144c4f6c39bef8ad6657ce695f8
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index 0051876d2db..afb9d0159c6 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/06/01 13:18:02 itojun Exp $
+$NetBSD: patch-aa,v 1.5 2002/06/18 23:58:07 itojun Exp $
 
---- Makefile.in.orig	Mon Apr 29 01:41:25 2002
-+++ Makefile.in
-@@ -16,7 +16,7 @@
+--- Makefile.in.orig	Sat Jun 15 18:41:03 2002
++++ Makefile.in	Wed Jun 19 07:39:04 2002
+@@ -14,7 +14,7 @@
  PROGRAMS        = $(PROGRAM_NAME)
  TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
  PHONY_TARGETS   = $(srcdir)/buildmark.c
@@ -11,26 +11,26 @@ $NetBSD: patch-aa,v 1.4 2002/06/01 13:18:02 itojun Exp $
  	install-other install-cgi install-include install-suexec install-man \
  	install-build
  
-@@ -70,6 +70,7 @@
+@@ -68,6 +68,7 @@
  					< $$i; \
  			fi \
- 		) > $(sysconfdir)/$$i; \
+ 		) > $(DESTDIR)$(sysconfdir)/$$i; \
 +		if false; then \
- 		chmod 0644 $(sysconfdir)/$$i; \
+ 		chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
  		file=`echo $$i|sed s/-std//`; \
  		if [ "$$file" = "httpd.conf" ]; then \
-@@ -78,12 +79,15 @@
- 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
- 			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
+@@ -76,12 +77,15 @@
+ 		if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
+ 			$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  		fi; \
 +		fi; \
  	done ; \
  	done
  	@if test -f "$(builddir)/envvars-std"; then \
- 	    cp -p envvars-std $(sbindir); \
+ 	    cp -p envvars-std $(DESTDIR)$(sbindir); \
 +	    if false; then \
- 	    if test ! -f $(sbindir)/envvars; then \
- 	        cp -p envvars-std $(sbindir)/envvars ; \
+ 	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+ 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
 +	    fi ; \
  	    fi ; \
  	fi
diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad
index 28b5801a1f6..46c70bbfd95 100644
--- a/www/apache2/patches/patch-ad
+++ b/www/apache2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2002/04/13 21:35:52 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2002/06/18 23:58:07 itojun Exp $
 
---- config.layout.orig	Thu Mar 28 14:04:47 2002
-+++ config.layout
-@@ -309,3 +309,26 @@
+--- config.layout.orig	Fri May 17 23:49:30 2002
++++ config.layout	Wed Jun 19 07:39:33 2002
+@@ -298,3 +298,26 @@
      installbuilddir: ${prefix}/etc/apache2/build
      errordir:      ${datadir}/error
  </Layout>
diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag
index 954b2d3adf7..1daea42bd56 100644
--- a/www/apache2/patches/patch-ag
+++ b/www/apache2/patches/patch-ag
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.4 2002/04/13 21:35:53 jlam Exp $
+$NetBSD: patch-ag,v 1.5 2002/06/18 23:58:07 itojun Exp $
 
---- support/Makefile.in.orig	Mon Mar 25 04:50:41 2002
-+++ support/Makefile.in
-@@ -24,8 +24,10 @@
+--- support/Makefile.in.orig	Sat Jun 15 13:41:52 2002
++++ support/Makefile.in	Wed Jun 19 07:39:51 2002
+@@ -22,8 +22,10 @@
  	done
  	@if test -f "$(builddir)/envvars-std"; then \
- 	    cp -p envvars-std $(sbindir); \
+ 	    cp -p envvars-std $(DESTDIR)$(sbindir); \
 +	    if false; then \
- 	    if test ! -f $(sbindir)/envvars; then \
- 	        cp -p envvars-std $(sbindir)/envvars ; \
+ 	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+ 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
 +	    fi ; \
  	    fi ; \
  	fi
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
index e1fa3fb1f3e..213e51de12c 100644
--- a/www/apache2/patches/patch-ah
+++ b/www/apache2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2002/06/01 13:18:02 itojun Exp $
+$NetBSD: patch-ah,v 1.5 2002/06/18 23:58:07 itojun Exp $
 
---- support/apachectl.in.orig	Mon Apr 15 02:41:25 2002
-+++ support/apachectl.in
-@@ -32,8 +32,8 @@
+--- support/apachectl.in.orig	Mon May 27 20:46:01 2002
++++ support/apachectl.in	Wed Jun 19 07:40:07 2002
+@@ -31,8 +31,8 @@
  HTTPD='@exp_sbindir@/@progname@'
  #
  # pick up any necessary environment variables
diff --git a/www/apache2/patches/patch-ai b/www/apache2/patches/patch-ai
deleted file mode 100644
index c19c2826387..00000000000
--- a/www/apache2/patches/patch-ai
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2002/06/01 13:18:02 itojun Exp $
-
---- support/apxs.in.orig	Mon Apr 29 20:09:02 2002
-+++ support/apxs.in
-@@ -63,10 +63,11 @@
- 
- my $prefix         = "@prefix@";
- my $CFG_PREFIX     = $prefix;
-+my $installbuilddir = "@exp_installbuilddir@";
- 
- # read the configuration variables once
- my %config_vars = ();
--get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
-+get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
- 
- my $exec_prefix    = get_vars("exec_prefix");
- my $CFG_TARGET     = get_vars("progname");
-@@ -223,7 +224,7 @@
- my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
- $httpd = eval qq("$httpd");
- $httpd = eval qq("$httpd");
--my $envvars = get_vars("bindir") . "/envvars";
-+my $envvars = get_vars("sbindir") . "/envvars";
- $envvars = eval qq("$envvars");
- $envvars = eval qq("$envvars");
- 
-@@ -418,7 +419,7 @@
-         $la =~ s|\.c$|.la|;
-         my $o = $s;
-         $o =~ s|\.c$|.o|;
--        push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
-+        push(@cmds, "$installbuilddir/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
-         unshift(@objs, $lo);
-     }
- 
-@@ -443,7 +444,7 @@
-         $opt .= " -l$opt_l";
-     }
- 
--    push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
-+    push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
- 
-     #   execute the commands
-     &execute_cmds(@cmds);
-@@ -474,8 +475,8 @@
-         $t =~ s|^.+/([^/]+)$|$1|;
-         $t =~ s|\.la$|\.so|;
-         if ($opt_i) {
--	    push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
--                 "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
-+	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
-+                 "$installbuilddir/libtool' $f $CFG_LIBEXECDIR");
- 	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-         }
- 
diff --git a/www/apache2/patches/patch-an b/www/apache2/patches/patch-an
index 8cd8cab6bfa..a3556ccde6f 100644
--- a/www/apache2/patches/patch-an
+++ b/www/apache2/patches/patch-an
@@ -1,23 +1,17 @@
-$NetBSD: patch-an,v 1.1 2002/06/18 02:17:18 itojun Exp $
+$NetBSD: patch-an,v 1.2 2002/06/18 23:58:07 itojun Exp $
 
---- srclib/apr/configure.in-	Tue Jun 18 11:12:46 2002
-+++ srclib/apr/configure.in	Tue Jun 18 11:13:38 2002
-@@ -1450,13 +1450,13 @@
- dnl #----------------------------- Checking for /dev/random 
- AC_MSG_CHECKING(for /dev/random)
- 
--if test -r "/dev/random"; then
--    AC_DEFINE(DEV_RANDOM, [/dev/random])
--    AC_MSG_RESULT(/dev/random)
--    rand="1"
--elif test -r "/dev/urandom"; then
-+if test -r "/dev/urandom"; then
-     AC_DEFINE(DEV_RANDOM, [/dev/urandom])
-     AC_MSG_RESULT(/dev/urandom)
-+    rand="1"
-+elif test -r "/dev/random"; then
-+    AC_DEFINE(DEV_RANDOM, [/dev/random])
-+    AC_MSG_RESULT(/dev/random)
-     rand="1"
- else
-     case $host in
+--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 @@
+     fi
+   elif test "$apr_devrandom" != "no"; then
+     if test -r "$apr_devrandom"; then
+-      AC_DEFINE(DEV_RANDOM, [$apr_devrandom])
+-      AC_MSG_RESULT($apr_devrandom)
++      AC_DEFINE(DEV_RANDOM, [/dev/urandom])
++      AC_MSG_RESULT([/dev/urandom])
+       rand="1"
+     else
+       AC_ERROR([$apr_devrandom not found or unreadable.])
diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao
index db30e1ed3ab..1968e2f8621 100644
--- a/www/apache2/patches/patch-ao
+++ b/www/apache2/patches/patch-ao
@@ -1,34 +1,21 @@
-$NetBSD: patch-ao,v 1.1 2002/06/18 02:17:18 itojun Exp $
+$NetBSD: patch-ao,v 1.2 2002/06/18 23:58:08 itojun Exp $
 
---- srclib/apr/configure-	Tue Jun 18 11:12:43 2002
-+++ srclib/apr/configure	Tue Jun 18 11:13:27 2002
-@@ -24882,21 +24882,21 @@
- echo "$as_me:$LINENO: checking for /dev/random" >&5
- echo $ECHO_N "checking for /dev/random... $ECHO_C" >&6
- 
--if test -r "/dev/random"; then
-+if test -r "/dev/urandom"; then
-     cat >>confdefs.h <<\_ACEOF
--#define DEV_RANDOM /dev/random
+--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 @@
+   elif test "$apr_devrandom" != "no"; then
+     if test -r "$apr_devrandom"; then
+       cat >>confdefs.h <<\_ACEOF
+-#define DEV_RANDOM $apr_devrandom
 +#define DEV_RANDOM /dev/urandom
  _ACEOF
  
--    echo "$as_me:$LINENO: result: /dev/random" >&5
--echo "${ECHO_T}/dev/random" >&6
-+    echo "$as_me:$LINENO: result: /dev/urandom" >&5
+-      echo "$as_me:$LINENO: result: $apr_devrandom" >&5
+-echo "${ECHO_T}$apr_devrandom" >&6
++      echo "$as_me:$LINENO: result: /dev/urandom" >&5
 +echo "${ECHO_T}/dev/urandom" >&6
-     rand="1"
--elif test -r "/dev/urandom"; then
-+elif test -r "/dev/random"; then
-     cat >>confdefs.h <<\_ACEOF
--#define DEV_RANDOM /dev/urandom
-+#define DEV_RANDOM /dev/random
- _ACEOF
- 
--    echo "$as_me:$LINENO: result: /dev/urandom" >&5
--echo "${ECHO_T}/dev/urandom" >&6
-+    echo "$as_me:$LINENO: result: /dev/random" >&5
-+echo "${ECHO_T}/dev/random" >&6
-     rand="1"
- else
-     case $host in
+       rand="1"
+     else
+       { { echo "$as_me:$LINENO: error: $apr_devrandom not found or unreadable." >&5