Bring in Apache 2.0.16-beta. Just in time for the release...

PR:		26410
Submitted by:	Chang, Hye-Shik <perky@python.or.kr>
Repocopied by:	asami

84 files changed, 3648 insertions, 2524 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 53c05a99e121..8835bc4b7e32 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,68 +1,68 @@
-# New ports collection makefile for:    apache HTTPD
-# Date created:         Fri Aug 25 16:42:36 CDT 1995
-# Whom:                 ache@freebsd.org
+# New ports collection makefile for:	apache2
+# Date created:				7 April 2001
+# Whom:					Hye-Shik Chang <perky@python.or.kr>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	apache
-PORTVERSION=    1.3.19
-PORTREVISION=   1
+PORTVERSION=	2.0.16
 CATEGORIES=	www
-MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
-		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
-		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
-		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
-		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
+MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
+		http://www.cybernic.com/mirror/dist/httpd/ \
+		http://mirrors.partnersforever.net/apache/dist/httpd/ \
+		http://www.technotopia.com/vroom/apache/dist/httpd/ \
+		http://www.tux.org/pub/net/apache/dist/httpd/ \
+		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
 		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
 		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
-		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://www3.service.digital.com/apache/dist/httpd/ \
-		ftp://galileo.galilei.com/pub/apache/httpd/ \
-		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
-		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
-		ftp://apache.nextpath.com/pub/apache/dist/httpd/
-DISTNAME=	apache_${PORTVERSION}
+		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
+DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
 
-#PATCH_SITES=    ${MASTER_SITES}
-#PATCHFILES=     apache_${PORTVERSION}-fix.diff
+MAINTAINER?=	perky@python.or.kr
 
-MAINTAINER=	ache@freebsd.org
+WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
+FIND?=		find
+XARGS?=		xargs
 
-#
-# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
-#
+# apache2 doesn't process '--enable-share=max' option yet.
+# and some modules are very unstable at DSO mode.
+SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
+		auth_anon digest headers cern_meta expires include \
+		cgid status info usertrack dav dav_fs imap proxy \
+		auth_digest file_cache echo optional_fn_import \
+		optional_fn_export
+STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
+		userdir alias asis cgi mime log_config vhost_alias actions
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	\
 		--prefix=${PREFIX} \
-		--server-gid=nogroup \
+		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
-		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
-		--suexec-docroot=${PREFIX}/www/data \
-		--without-confadjust \
-		--enable-module=most \
-		--enable-module=auth_db \
-		--enable-module=mmap_static \
-		--disable-module=auth_dbm \
-		--enable-shared=max
+		--with-suexec-docroot=${PREFIX}/www/data \
+		--enable-shared \
+		--disable-threads \
+		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
 
-OPTIM=		-DHARD_SERVER_LIMIT=512 \
-		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \
-		-DACCEPT_FILTER_NAME=\\"httpready\\"
-
-.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+=		-DBUFFERED_LOGS
-CFLAGS+=	-O6 -fomit-frame-pointer
-.endif
+OPTIM+=		-DHARD_SERVER_LIMIT=512 \
+		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
 CONFIGURE_ENV=	OPTIM='${OPTIM}'
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
+
+.for mod in ${SHARED_MODS}
+CONFIGURE_ARGS+= --enable-${mod}=shared
+.endfor
+.for mod in ${STATIC_MODS}
+CONFIGURE_ARGS+= --enable-${mod}=yes
+.endfor
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 2d2273f86b4e..3802044557de 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
+MD5 (httpd-2_0_16-beta.tar.gz) = 364fc61593185789cb9744bae1ebb655
diff --git a/www/apache2/files/FreeBSD.layout b/www/apache2/files/FreeBSD.layout
deleted file mode 100644
index 5524e186e9c0..000000000000
--- a/www/apache2/files/FreeBSD.layout
+++ /dev/null
@@ -1,19 +0,0 @@
-#   FreeBSD layout...
-<Layout FreeBSD>
-    prefix:        /usr/local
-    exec_prefix:   $prefix
-    bindir:        $exec_prefix/bin
-    sbindir:       $exec_prefix/sbin
-    libexecdir:    $exec_prefix/libexec/apache
-    mandir:        $prefix/man
-    sysconfdir:    $prefix/etc/apache
-    datadir:       $prefix/www
-    iconsdir:      $datadir/icons
-    htdocsdir:     $datadir/data
-    cgidir:        $datadir/cgi-bin
-    includedir:    $prefix/include/apache
-    localstatedir: /var
-    runtimedir:    $localstatedir/run
-    logfiledir:    $localstatedir/log
-    proxycachedir: $datadir/proxy
-</Layout>
diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in
new file mode 100644
index 000000000000..341c8dfd087f
--- /dev/null
+++ b/www/apache2/files/patch-Makefile.in
@@ -0,0 +1,123 @@
+--- Makefile.in.orig	Wed Apr  4 02:03:35 2001
++++ Makefile.in	Sun Apr  8 06:06:58 2001
+@@ -16,7 +16,7 @@
+ targets         = $(PROGRAMS) $(other_targets)
+ phony_targets   = $(srcdir)/buildmark.c
+ install_targets = install-conf install-htdocs install-icons install-other \
+-	install-cgi install-include install-support install-suexec
++	install-cgi install-include install-support install-manpages install-suexec
+ DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
+ 	configure generated_lists include/ap_config_auto.h \
+ 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
+@@ -28,25 +28,32 @@
+ install-conf:
+ 	@echo Installing configuration files
+ 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
++
+ 	@cd docs/conf; \
+ 	for i in mime.types magic; do \
+-		$(INSTALL_DATA) $$i $(sysconfdir); \
++		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
++		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
+ 	done; \
+ 	for i in *-std*; do \
+ 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+ 		    -e 's#@@Port@@#$(PORT)#g' \
+-			< $$i > $(sysconfdir)/$$i; \
+-		chmod 0644 $(sysconfdir)/$$i; \
++			< $$i > $(sysconfdir)/$$i.default; \
++		chmod 0644 $(sysconfdir)/$$i.default; \
++		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
+ 		file=`echo $$i|sed s/-std//`; \
+ 		if [ "$$file" = "httpd.conf" ]; then \
+ 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+ 		fi; \
+ 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
+-			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
++			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
++			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
+ 		fi; \
+ 	done
+ 
+ htdocs-srcdir = docs/docroot
++htman-srcdir = docs/manual
++doc_prefix = $(prefix)/share/doc/apache
++man-srcdir = docs/man
+ 
+ docs::
+ 	mkdir -p ./docs/api
+@@ -57,11 +64,14 @@
+ 
+ install-htdocs:
+ 	@echo Installing HTML documents
+-	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
+-	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+-	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
+-	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
++	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
++	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
++	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
++	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
++	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
++	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-icons:
+ 	@echo Installing icons
+@@ -71,24 +81,27 @@
+ 
+ install-cgi:
+ 	@echo Installing CGIs
+-	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
+-	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
++	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-support:
+ 	@echo Installing Support Binaries
+ 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
+-	@cp -p $(srcdir)/support/httpd.exp $(bindir)
++	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
++	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
++	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
+ 	@cp -p $(builddir)/support/htpasswd $(bindir)
+ 	@cp -p $(builddir)/support/htdigest $(bindir)
+-	@cp -p $(builddir)/support/rotatelogs $(bindir)
+-	@cp -p $(builddir)/support/logresolve $(bindir)
+-	@cp -p $(builddir)/support/ab $(bindir)
+-	@cp -p $(builddir)/support/apachectl $(bindir)
+-	chmod 755 $(bindir)/apachectl
++	@cp -p $(builddir)/support/rotatelogs $(sbindir)
++	@cp -p $(builddir)/support/logresolve $(sbindir)
++	@cp -p $(builddir)/support/ab $(sbindir)
++	@cp -p $(builddir)/support/apachectl $(sbindir)
++	chmod 755 $(sbindir)/apachectl
+ 	@if test -f $(builddir)/support/apxs; then \
+-	    cp -p $(builddir)/support/apxs $(bindir); \
+-	    chmod 755 $(bindir)/apxs; \
++	    cp -p $(builddir)/support/apxs $(sbindir); \
++	    chmod 755 $(sbindir)/apxs; \
+ 	fi
+ 
+ 
+@@ -117,6 +130,15 @@
+ 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
+ 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
+ 	@chmod 644 $(includedir)/*.h
++
++install-manpages:
++	@echo Installing manual pages
++	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
++	@for sect in 1 8; do \
++		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
++		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
++	done;
++	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache2/files/patch-aa b/www/apache2/files/patch-aa
deleted file mode 100644
index 15cd58c27ef2..000000000000
--- a/www/apache2/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig	Tue Jan 18 01:53:17 2000
-+++ configure	Mon Jan 24 19:37:21 2000
-@@ -1232,8 +1232,8 @@
-     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
-     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
-     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
--    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
--    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
-+    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
-     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
-     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1330,8 +1330,8 @@
- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
- echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
- echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
--echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
--echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
- echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
- echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
- echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab
deleted file mode 100644
index e4448f1e47ca..000000000000
--- a/www/apache2/files/patch-ab
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile.tmpl.orig	Tue Jan 11 22:47:41 2000
-+++ Makefile.tmpl	Mon Jan 24 19:50:42 2000
-@@ -123,6 +123,7 @@
- runtimedir      = @runtimedir@
- logfiledir      = @logfiledir@
- proxycachedir   = @proxycachedir@
-+doc_prefix      = $(prefix)/share/doc/apache
- 
- libexecdir_relative   = @libexecdir_relative@
- 
-@@ -266,9 +267,9 @@
- 	$(MKDIR) $(root)$(mandir)/man1
- 	$(MKDIR) $(root)$(mandir)/man8
- 	$(MKDIR) $(root)$(sysconfdir)
--	$(MKDIR) $(root)$(htdocsdir)
-+	$(MKDIR) $(root)$(doc_prefix)
- 	$(MKDIR) $(root)$(iconsdir)
--	$(MKDIR) $(root)$(cgidir)
-+	$(MKDIR) $(root)$(cgidir).default
- 	$(MKDIR) $(root)$(includedir)
- 	$(MKDIR) $(root)$(includedir)/xml
- 	$(MKDIR) $(root)$(runtimedir)
-@@ -452,25 +453,33 @@
- #   icons and distributed CGI scripts.
- install-data:
- 	@echo "===> [data: Installing initial data files]"
--	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
--	else \
--		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+#        -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-+#        else \
-+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
--		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
--		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
--		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
--	fi
--	-@if [ -f $(root)$(cgidir)/printenv ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
--	else \
-+		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
-+		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
-+#        fi
-+	if [ ! -d $(root)$(htdocsdir) ]; then \
-+		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
-+  	fi
-+	$(RM) $(root)$(htdocsdir).default
-+	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
-+#        -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-+#        else \
- 		for script in printenv test-cgi; do \
- 			cat $(TOP)/cgi-bin/$${script} |\
- 			sed -e 's;^#!/.*perl;#!$(PERL);' \
- 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
--			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
-+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
- 		done; \
-+#        fi
-+	if [ ! -d $(root)$(cgidir) ]; then \
-+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
- 	fi
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
- 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
-@@ -509,10 +518,10 @@
- 			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
- 			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
- 			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
--			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
--			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
--			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
--			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
-+			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \
-+			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \
-+			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
-+			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
- 			-e 's;conf/magic;$(sysconfdir)/magic;' \
- 			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
- 			-e 's;User nobody;User $(conf_user);' \
diff --git a/www/apache2/files/patch-ag b/www/apache2/files/patch-ag
deleted file mode 100644
index 80373fbcca63..000000000000
--- a/www/apache2/files/patch-ag
+++ /dev/null
@@ -1,66 +0,0 @@
---- conf/httpd.conf-dist.orig	Mon Feb 21 08:30:46 2000
-+++ conf/httpd.conf-dist	Mon May 29 16:48:49 2000
-@@ -354,7 +354,22 @@
- # directory index.  Separate multiple entries with spaces.
- #
- <IfModule mod_dir.c>
--    DirectoryIndex index.html
-+    <IfModule mod_php3.c>
-+        <IfModule mod_php4.c>
-+            DirectoryIndex index.php index.php3 index.html
-+        </IfModule>
-+        <IfModule !mod_php4.c>
-+            DirectoryIndex index.php3 index.html
-+        </IfModule>
-+    </IfModule>
-+    <IfModule !mod_php3.c>
-+        <IfModule mod_php4.c>
-+            DirectoryIndex index.php index.html
-+        </IfModule>
-+        <IfModule !mod_php4.c>
-+            DirectoryIndex index.html
-+        </IfModule>
-+    </IfModule>
- </IfModule>
- 
- #
-@@ -473,7 +488,7 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+#CustomLog logs/access_log common
- 
- #
- # If you would like to have agent and referer logfiles, uncomment the
-@@ -486,7 +501,7 @@
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+CustomLog logs/access_log combined
- 
- #
- # Optionally add a line containing the server version and virtual host
-@@ -708,13 +723,17 @@
-     # For example, the PHP 3.x module (not part of the Apache distribution - see
-     # http://www.php.net) will typically use:
-     #
--    #AddType application/x-httpd-php3 .php3
--    #AddType application/x-httpd-php3-source .phps
-+    <IfModule mod_php3.c>
-+        AddType application/x-httpd-php3 .php3
-+        AddType application/x-httpd-php3-source .php3s
-+    </IfModule>
-     #
-     # And for PHP 4.x, use:
-     #
--    #AddType application/x-httpd-php .php
--    #AddType application/x-httpd-php-source .phps
-+    <IfModule mod_php4.c>
-+        AddType application/x-httpd-php .php
-+        AddType application/x-httpd-php-source .phps
-+    </IfModule>
- 
-     AddType application/x-tar .tgz
- 
diff --git a/www/apache2/files/patch-ak b/www/apache2/files/patch-ak
deleted file mode 100644
index 486f7ad159cf..000000000000
--- a/www/apache2/files/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/support/apachectl.orig	Wed Apr  7 00:36:33 1999
-+++ src/support/apachectl	Fri Sep  3 15:41:01 1999
-@@ -39,6 +39,8 @@
- # --------------------                              --------------------
- # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
- 
-+eval `limits -e -C daemon` >/dev/null 2>&1
-+
- ERROR=0
- ARGV="$@"
- if [ "x$ARGV" = "x" ] ; then 
-@@ -82,6 +84,7 @@
- 	fi
- 	if kill $PID ; then
- 	    echo "$0 $ARG: httpd stopped"
-+	    rm $PIDFILE
- 	else
- 	    echo "$0 $ARG: httpd could not be stopped"
- 	    ERROR=4
diff --git a/www/apache2/files/patch-build:rules.mk b/www/apache2/files/patch-build:rules.mk
new file mode 100644
index 000000000000..d5058a91d8ca
--- /dev/null
+++ b/www/apache2/files/patch-build:rules.mk
@@ -0,0 +1,14 @@
+--- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
++++ build/rules.mk	Sun Apr  8 01:05:46 2001
+@@ -172,9 +172,9 @@
+ all-p: $(targets)
+ install-p: $(targets) $(install_targets)
+ 	@if test -n '$(PROGRAMS)'; then \
+-		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
++		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
+ 		for i in "$(PROGRAMS)"; do \
+-			$(INSTALL_PROGRAM) $$i $(bindir); \
++			$(INSTALL_PROGRAM) $$i $(sbindir); \
+ 		done; \
+ 	fi
+ 
diff --git a/www/apache2/files/patch-config.layout b/www/apache2/files/patch-config.layout
new file mode 100644
index 000000000000..75a700c6a805
--- /dev/null
+++ b/www/apache2/files/patch-config.layout
@@ -0,0 +1,25 @@
+--- config.layout.orig	Sat Apr  7 04:19:44 2001
++++ config.layout	Sat Apr  7 04:20:28 2001
+@@ -249,3 +249,22 @@
+     logfiledir:    $prefix/logs
+     proxycachedir: $prefix/proxy
+ </Layout>
++
++<Layout FreeBSD>
++    prefix:        /usr/local
++    exec_prefix:   $prefix
++    bindir:        $exec_prefix/bin
++    sbindir:       $exec_prefix/sbin
++    libexecdir:    $exec_prefix/libexec/apache
++    mandir:        $prefix/man
++    sysconfdir:    $prefix/etc/apache
++    datadir:       $prefix/www
++    iconsdir:      $datadir/icons
++    htdocsdir:     $datadir/data
++    cgidir:        $datadir/cgi-bin
++    includedir:    $prefix/include/apache
++    localstatedir: /var
++    runtimedir:    $localstatedir/run
++    logfiledir:    $localstatedir/log
++    proxycachedir: $datadir/proxy
++</Layout>
diff --git a/www/apache2/files/patch-configure b/www/apache2/files/patch-configure
new file mode 100644
index 000000000000..5419d37c531c
--- /dev/null
+++ b/www/apache2/files/patch-configure
@@ -0,0 +1,32 @@
+--- configure.orig	Wed Apr  4 12:45:36 2001
++++ configure	Sun Apr  8 03:25:31 2001
+@@ -3760,7 +3760,9 @@
+       -e "s/[ 	]*$/'/g" \
+       $srcdir/config.layout > $pldconf
+   layout_name=$LAYOUT
++  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
+   . $pldconf
++  prefix=$prefix_backup
+   rm $pldconf
+   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
+              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
+@@ -9678,6 +9680,10 @@
+ 
+   
+   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
+   
+ 
+   
+@@ -9814,7 +9820,7 @@
+ EOF
+ 
+ cat >> confdefs.h <<EOF
+-#define SERVER_CONFIG_FILE "conf/$progname.conf"
++#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
+ EOF
+ 
+ cat >> confdefs.h <<EOF
diff --git a/www/apache2/files/patch-docs:conf:httpd-std.conf b/www/apache2/files/patch-docs:conf:httpd-std.conf
new file mode 100644
index 000000000000..f70a76bf17df
--- /dev/null
+++ b/www/apache2/files/patch-docs:conf:httpd-std.conf
@@ -0,0 +1,203 @@
+--- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
++++ docs/conf/httpd-std.conf	Sun Apr  8 04:26:54 2001
+@@ -64,7 +64,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
+ 
+ #
+ # ScoreBoardFile: File used to store internal server process information.
+@@ -73,7 +73,7 @@
+ # no two invocations of Apache share the same scoreboard file.
+ #
+ <IfModule !perchild.c>
+-ScoreBoardFile logs/apache_runtime_status
++ScoreBoardFile /var/run/apache_runtime_status
+ </IfModule>
+ 
+ #
+@@ -182,6 +182,28 @@
+ #
+ # Example:
+ # LoadModule foo_module modules/mod_foo.so
++#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
++#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
++#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
++#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
++#LoadModule cgid_module			libexec/apache/mod_cgid.so
++#LoadModule dav_module			libexec/apache/mod_dav.so
++#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
++#LoadModule digest_module		libexec/apache/mod_digest.so
++#LoadModule expires_module		libexec/apache/mod_expires.so
++#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
++#LoadModule headers_module		libexec/apache/mod_headers.so
++#LoadModule imap_module			libexec/apache/mod_imap.so
++#LoadModule include_module		libexec/apache/mod_include.so
++#LoadModule info_module			libexec/apache/mod_info.so
++#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
++#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
++#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
++#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
++#LoadModule speling_module		libexec/apache/mod_speling.so
++#LoadModule status_module		libexec/apache/mod_status.so
++#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
++#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
+ 
+ ### Section 2: 'Main' server configuration
+ #
+@@ -221,7 +243,7 @@
+ #  don't use Group #-1 on these systems!
+ #
+ User nobody
+-Group #-1
++Group nogroup
+ 
+ #
+ # ServerAdmin: Your address, where problems with the server should be
+@@ -249,7 +271,7 @@
+ # documents. By default, all requests are taken from this directory, but
+ # symbolic links and aliases may be used to point to other locations.
+ #
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ 
+ #
+ # Each directory to which Apache has access, can be configured with respect
+@@ -274,7 +296,7 @@
+ #
+ # This should be changed to whatever you set DocumentRoot to.
+ #
+-<Directory "@@ServerRoot@@/htdocs">
++<Directory "@@ServerRoot@@/www/data">
+ 
+ #
+ # This may also be "None", "All", or any combination of "Indexes",
+@@ -326,7 +348,22 @@
+ # DirectoryIndex: Name of the file or files to use as a pre-written HTML
+ # directory index.  Separate multiple entries with spaces.
+ #
+-DirectoryIndex index.html
++<IfModule mod_php3.c>
++    <IfModule mod_php4.c>
++        DirectoryIndex index.php index.php3 index.html
++    </IfModule>
++    <IfModule !mod_php4.c>
++        DirectoryIndex index.php3 index.html
++    </IfModule>
++</IfModule>
++<IfModule !mod_php3.c>
++    <IfModule mod_php4.c>
++        DirectoryIndex index.php index.html
++    </IfModule>
++    <IfModule !mod_php4.c>
++        DirectoryIndex index.html
++    </IfModule>
++</IfModule>
+ 
+ #
+ # AccessFileName: The name of the file to look for in each directory
+@@ -372,7 +409,7 @@
+ # TypesConfig describes where the mime.types file (or equivalent) is
+ # to be found.
+ #
+-TypesConfig conf/mime.types
++TypesConfig etc/apache/mime.types
+ 
+ #
+ # DefaultType is the default MIME type the server will use for a document
+@@ -397,7 +434,7 @@
+ # module is part of the server.
+ #
+ <IfModule mod_mime_magic.c>
+-    MIMEMagicFile conf/magic
++    MIMEMagicFile etc/apache/magic
+ </IfModule>
+ 
+ #
+@@ -417,7 +454,7 @@
+ # logged here.  If you *do* define an error logfile for a <VirtualHost>
+ # container, that host's errors will be logged there and not here.
+ #
+-ErrorLog logs/error_log
++ErrorLog /var/log/httpd-error.log
+ 
+ #
+ # LogLevel: Control the number of messages logged to the error_log.
+@@ -442,7 +479,7 @@
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+-CustomLog logs/access_log common
++#CustomLog logs/access_log common
+ 
+ #
+ # If you would like to have agent and referer logfiles, uncomment the
+@@ -455,7 +492,7 @@
+ # If you prefer a single logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can use the following directive.
+ #
+-#CustomLog logs/access_log combined
++CustomLog /var/log/httpd-access.log combined
+ 
+ #
+ # Optionally add a line containing the server version and virtual host
+@@ -474,9 +511,9 @@
+ # require it to be present in the URL.  So "/icons" isn't aliased in this
+ # example, only "/icons/"..
+ #
+-Alias /icons/ "@@ServerRoot@@/icons/"
++Alias /icons/ "@@ServerRoot@@/www/icons/"
+ 
+-<Directory "@@ServerRoot@@/icons">
++<Directory "@@ServerRoot@@/www/icons">
+     Options Indexes MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -491,7 +528,7 @@
+ # The same rules about trailing "/" apply to ScriptAlias directives as to
+ # Alias.
+ #
+-ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
++ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
+ 
+ <IfModule mod_cgid.c>
+ #
+@@ -505,7 +542,7 @@
+ # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
+ # CGI directory exists, if you have that configured.
+ #
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     AllowOverride None
+     Options None
+     Order allow,deny
+@@ -657,6 +694,7 @@
+ AddLanguage ja .ja
+ AddLanguage pl .po
+ AddLanguage kr .kr
++AddLanguage ko .kr
+ AddLanguage pt .pt
+ AddLanguage no .no
+ AddLanguage pt-br .pt-br
+@@ -741,8 +779,17 @@
+ # For example, the PHP3 module (not part of the Apache distribution - see
+ # http://www.php.net) will typically use:
+ #
+-#AddType application/x-httpd-php3 .php3
+-#AddType application/x-httpd-php3-source .phps
++<IfModule mod_php3.c>
++    AddType application/x-httpd-php3 .php3
++    AddType application/x-httpd-php3-source .php3s
++</IfModule>
++#
++# And for PHP 4.x, use:
++#
++<IfModule mod_php4.c>
++    AddType application/x-httpd-php .php
++    AddType application/x-httpd-php-source .phps
++</IfModule>
+ 
+ AddType application/x-tar .tgz
+ 
diff --git a/www/apache2/files/patch-include:httpd.h b/www/apache2/files/patch-include:httpd.h
new file mode 100644
index 000000000000..9f8fdf34997b
--- /dev/null
+++ b/www/apache2/files/patch-include:httpd.h
@@ -0,0 +1,38 @@
+--- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
++++ include/httpd.h	Sat Apr  7 09:08:43 2001
+@@ -127,7 +127,7 @@
+ /* Set default for OS/2 file system */
+ #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
+ #else
+-#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
++#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
+ #endif
+ #endif /* DOCUMENT_LOCATION */
+ 
+@@ -144,7 +144,7 @@
+ #if defined(OS2) || defined(WIN32)
+ #define DEFAULT_ERRORLOG "logs/error.log"
+ #else
+-#define DEFAULT_ERRORLOG "logs/error_log"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
+ #endif
+ #endif /* DEFAULT_ERRORLOG */
+ 
+@@ -160,7 +160,7 @@
+ 
+ /* The name of the server config file */
+ #ifndef SERVER_CONFIG_FILE
+-#define SERVER_CONFIG_FILE "conf/httpd.conf"
++#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
+ #endif
+ 
+ /* Whether we should enable rfc1413 identity checking */
+@@ -247,7 +247,7 @@
+ 
+ /* The name of the MIME types file */
+ #ifndef AP_TYPES_CONFIG_FILE
+-#define AP_TYPES_CONFIG_FILE "conf/mime.types"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
+ #endif
+ 
+ /*
diff --git a/www/apache2/files/patch-srclib:apr-util:Makefile.in b/www/apache2/files/patch-srclib:apr-util:Makefile.in
new file mode 100644
index 000000000000..652901dae28a
--- /dev/null
+++ b/www/apache2/files/patch-srclib:apr-util:Makefile.in
@@ -0,0 +1,22 @@
+--- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
++++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
+@@ -22,8 +22,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=$(prefix)/lib
++includedir=$(prefix)/include/apache
+ 
+ delete-lib:
+ 	@if test -f $(TARGET_LIB); then \
+@@ -43,7 +43,7 @@
+ 	if [ ! -d $(libdir) ]; then \
+ 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
+ 	fi; \
+-	libtool --mode=install cp $(TARGET_LIB) $(libdir)
++	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
+ 
+ $(TARGET_LIB):
+ 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache2/files/patch-srclib:apr:Makefile.in b/www/apache2/files/patch-srclib:apr:Makefile.in
new file mode 100644
index 000000000000..4c0292f73af8
--- /dev/null
+++ b/www/apache2/files/patch-srclib:apr:Makefile.in
@@ -0,0 +1,22 @@
+--- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
++++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
+@@ -37,8 +37,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=$(prefix)/lib
++includedir=$(prefix)/include/apache
+ 
+ delete-lib:
+ 	@if test -f $(TARGET_LIB); then \
+@@ -58,7 +58,7 @@
+ 	if [ ! -d $(libdir) ]; then \
+ 	    ./build/mkdir.sh $(libdir); \
+ 	fi; \
+-	libtool --mode=install cp $(TARGET_LIB) $(libdir)
++	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
+ 
+ $(TARGET_LIB):
+ 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache2/files/patch-support:apachectl.in b/www/apache2/files/patch-support:apachectl.in
new file mode 100644
index 000000000000..739a622d74de
--- /dev/null
+++ b/www/apache2/files/patch-support:apachectl.in
@@ -0,0 +1,24 @@
+--- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
++++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+@@ -25,10 +25,10 @@
+ # --------------------                              --------------------
+ # 
+ # the path to your PID file
+-PIDFILE=@prefix@/logs/httpd.pid
++PIDFILE=/var/run/httpd.pid
+ #
+ # the path to your httpd binary, including options if necessary
+-HTTPD='@prefix@/bin/httpd'
++HTTPD='@prefix@/sbin/httpd'
+ #
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line.  Designed for lynx, however other
+@@ -41,6 +41,8 @@
+ #
+ # --------------------                              --------------------
+ # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
++
++eval `limits -e -C daemon` >/dev/null 2>&1
+ 
+ ERROR=0
+ ARGV="$@"
diff --git a/www/apache2/files/patch-support:apxs.in b/www/apache2/files/patch-support:apxs.in
new file mode 100644
index 000000000000..70ca84075675
--- /dev/null
+++ b/www/apache2/files/patch-support:apxs.in
@@ -0,0 +1,11 @@
+--- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
++++ support/apxs.in	Sat Apr  7 11:55:28 2001
+@@ -73,7 +73,7 @@
+ my $prefix            = "$CFG_PREFIX";
+ my $CFG_EXEC_PREFIX   = "@exec_prefix@";
+ my $exec_prefix       = "$CFG_EXEC_PREFIX";
+-my $CFG_SBINDIR       = "@bindir@";
++my $CFG_SBINDIR       = "@sbindir@";
+ my $CFG_INCLUDEDIR    = "@includedir@";
+ my $CFG_LIBEXECDIR    = "@libexecdir@";
+ my $CFG_SYSCONFDIR    = "@sysconfdir@";
diff --git a/www/apache21/files/patch-al b/www/apache2/files/patch-support:log_server_status.in
index b355a697b4ab..3549aa89f8c5 100644
--- a/www/apache21/files/patch-al
+++ b/www/apache2/files/patch-support:log_server_status.in
@@ -1,6 +1,6 @@
---- src/support/log_server_status.orig	Fri Jun  4 19:54:19 1999
-+++ src/support/log_server_status	Fri Sep  3 15:53:16 1999
-@@ -67,10 +67,10 @@
+--- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
++++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+@@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
@@ -13,7 +13,7 @@
  
  sub tcp_connect
  {
-@@ -100,7 +100,7 @@
+@@ -96,7 +96,7 @@
  	chomp($date);
  	($day,$time)=split(/:/,$date);
  	$res=&tcp_connect($server,$port);
diff --git a/www/apache2/files/patch-util.c b/www/apache2/files/patch-util.c
deleted file mode 100644
index 60f218221799..000000000000
--- a/www/apache2/files/patch-util.c
+++ /dev/null
@@ -1,53 +0,0 @@
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/main/util.c,v
-retrieving revision 1.194
-retrieving revision 1.197
-diff -u -r1.194 -r1.197
---- src/main/util.c	2001/02/01 10:06:37	1.194
-+++ src/main/util.c	2001/03/30 17:37:54	1.197
-@@ -2013,12 +2013,14 @@
-     int x;
- 
-     if (!strchr(p->h_name, '.')) {
--	for (x = 0; p->h_aliases[x]; ++x) {
--	    if (strchr(p->h_aliases[x], '.') &&
--		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
--		return ap_pstrdup(a, p->h_aliases[x]);
--	}
--	return NULL;
-+        if (p->h_aliases) {
-+        	for (x = 0; p->h_aliases[x]; ++x) {
-+                if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') &&
-+            		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
-+		            return ap_pstrdup(a, p->h_aliases[x]);
-+            }
-+	    }
-+	    return NULL;
-     }
-     return ap_pstrdup(a, (void *) p->h_name);
- }
-@@ -2040,7 +2042,6 @@
- 	ap_log_error(APLOG_MARK, APLOG_WARNING, NULL,
- 	             "%s: gethostname() failed to determine ServerName\n",
-                      ap_server_argv0);
--	server_hostname = ap_pstrdup(a, "127.0.0.1");
-     }
-     else 
-     {
-@@ -2048,14 +2049,14 @@
-         if ((!(p = gethostbyname(str))) 
-             || (!(server_hostname = find_fqdn(a, p)))) {
-             /* Recovery - return the default servername by IP: */
--            if (p->h_addr_list[0]) {
-+            if (p && p->h_addr_list && p->h_addr_list[0]) {
-                 ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]);
- 	        server_hostname = ap_pstrdup(a, str);
-                 /* We will drop through to report the IP-named server */
-             }
-         }
- 	else
--            /* Since we found a fdqn, return it with no logged message. */
-+            /* Since we found a fqdn, return it with no logged message. */
-             return server_hostname;
-     }
- 
diff --git a/www/apache2/pkg-comment b/www/apache2/pkg-comment
index 0b2be74481cf..08ad28e1ad55 100644
--- a/www/apache2/pkg-comment
+++ b/www/apache2/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server.  Very fast, very clean
+Version 2 of the extremely popular Apache http server
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 1d0c4d1df94d..95616fc8a1c6 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -1,194 +1,201 @@
-bin/dbmmanage
-bin/htdigest
 bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf.default
-@exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+bin/htdigest
+etc/rc.d/apache.sh
 @unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
 etc/apache/mime.types.default
 @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf.default
-@exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
-etc/rc.d/apache.sh
-include/apache/ap.h
-include/apache/ap_alloc.h
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
+etc/apache/magic.default
+@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+@unexec if cmp -s %D/etc/apache/highperformance-std.conf %D/etc/apache/highperformance-std.conf.default; then rm -f %D/etc/apache/highperformance-std.conf; fi
+etc/apache/highperformance-std.conf.default
+@exec [ ! -f %B/highperformance-std.conf ] && cp %B/%f %B/highperformance-std.conf
+@unexec if cmp -s %D/etc/apache/highperformance.conf %D/etc/apache/highperformance.conf.default; then rm -f %D/etc/apache/highperformance.conf; fi
+etc/apache/highperformance.conf.default
+@exec [ ! -f %B/highperformance.conf ] && cp %B/%f %B/highperformance.conf
+@unexec if cmp -s %D/etc/apache/httpd-std.conf %D/etc/apache/httpd-std.conf.default; then rm -f %D/etc/apache/httpd-std.conf; fi
+etc/apache/httpd-std.conf.default
+@exec [ ! -f %B/httpd-std.conf ] && cp %B/%f %B/httpd-std.conf
+@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
+etc/apache/httpd.conf.default
+@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+include/apache/apr.h
+include/apache/apr_want.h
+include/apache/apr_uuid.h
+include/apache/apr_user.h
+include/apache/apr_time.h
+include/apache/apr_thread_proc.h
+include/apache/apr_tables.h
+include/apache/apr_strings.h
+include/apache/apr_signal.h
+include/apache/apr_shmem.h
+include/apache/apr_portable.h
+include/apache/apr_pools.h
+include/apache/apr_network_io.h
+include/apache/apr_mmap.h
+include/apache/apr_md5.h
+include/apache/apr_lock.h
+include/apache/apr_lib.h
+include/apache/apr_hash.h
+include/apache/apr_getopt.h
+include/apache/apr_general.h
+include/apache/apr_fnmatch.h
+include/apache/apr_file_io.h
+include/apache/apr_file_info.h
+include/apache/apr_errno.h
+include/apache/apr_dso.h
+include/apache/apr_compat.h
+include/apache/apr_xlate.h
+include/apache/apr_base64.h
+include/apache/apu.h
+include/apache/apr_xml.h
+include/apache/apr_sha1.h
+include/apache/apr_sdbm.h
+include/apache/apr_ring.h
+include/apache/apr_optional.h
+include/apache/apr_hooks.h
+include/apache/apr_generic_hook.h
+include/apache/apr_dbm.h
+include/apache/apr_buckets.h
+include/apache/apu_compat.h
 include/apache/ap_compat.h
-include/apache/ap_config.h
-include/apache/ap_config_auto.h
-include/apache/ap_ctype.h
-include/apache/ap_md5.h
-include/apache/ap_mmn.h
-include/apache/ap_sha1.h
-include/apache/buff.h
-include/apache/compat.h
-include/apache/conf.h
-include/apache/explain.h
-include/apache/fnmatch.h
-include/apache/hsregex.h
-include/apache/http_conf_globals.h
-include/apache/http_config.h
-include/apache/http_core.h
-include/apache/http_log.h
-include/apache/http_main.h
-include/apache/http_protocol.h
-include/apache/http_request.h
-include/apache/http_vhost.h
+include/apache/util_uri.h
+include/apache/util_script.h
+include/apache/util_md5.h
+include/apache/util_filter.h
+include/apache/util_ebcdic.h
+include/apache/util_date.h
+include/apache/util_charset.h
+include/apache/util_cfgtree.h
+include/apache/scoreboard.h
+include/apache/rfc1413.h
+include/apache/pcreposix.h
+include/apache/mpm_common.h
 include/apache/httpd.h
-include/apache/multithread.h
-include/apache/os-inline.c
+include/apache/http_vhost.h
+include/apache/http_request.h
+include/apache/http_protocol.h
+include/apache/http_main.h
+include/apache/http_log.h
+include/apache/http_core.h
+include/apache/http_connection.h
+include/apache/http_config.h
+include/apache/ap_release.h
+include/apache/ap_mpm.h
+include/apache/ap_mmn.h
+include/apache/ap_listen.h
+include/apache/ap_config_auto.h
+include/apache/ap_config.h
+include/apache/util_xml.h
 include/apache/os.h
-include/apache/rfc1413.h
-include/apache/scoreboard.h
-include/apache/util_date.h
-include/apache/util_md5.h
-include/apache/util_script.h
-include/apache/util_uri.h
-include/apache/xml/asciitab.h
-include/apache/xml/hashtable.h
-include/apache/xml/iasciitab.h
-include/apache/xml/latin1tab.h
-include/apache/xml/nametab.h
-include/apache/xml/utf8tab.h
-include/apache/xml/xmldef.h
-include/apache/xml/xmlparse.h
-include/apache/xml/xmlrole.h
-include/apache/xml/xmltok.h
-include/apache/xml/xmltok_impl.h
-libexec/apache/httpd.exp
-libexec/apache/libproxy.so
-libexec/apache/mod_access.so
-libexec/apache/mod_actions.so
-libexec/apache/mod_alias.so
-libexec/apache/mod_asis.so
-libexec/apache/mod_auth.so
+include/apache/os-inline.c
+include/apache/mpm_default.h
+include/apache/mpm.h
+include/apache/mod_dav.h
+include/apache/mod_include.h
+include/apache/pcre.h
+include/apache/internal.h
+include/apache/config.h
+include/apache/unixd.h
+lib/libapr.la
+lib/libapr.a
+lib/libaprutil.la
+lib/libaprutil.a
 libexec/apache/mod_auth_anon.so
+libexec/apache/mod_auth_anon.la
 libexec/apache/mod_auth_db.so
-libexec/apache/mod_autoindex.so
+libexec/apache/mod_auth_db.la
+libexec/apache/mod_auth_digest.so
+libexec/apache/mod_auth_digest.la
+libexec/apache/mod_file_cache.so
+libexec/apache/mod_file_cache.la
+libexec/apache/mod_dav_fs.so
+libexec/apache/mod_dav_fs.la
+libexec/apache/mod_dav.so
+libexec/apache/mod_dav.la
+libexec/apache/mod_echo.so
+libexec/apache/mod_echo.la
+libexec/apache/mod_optional_fn_import.so
+libexec/apache/mod_optional_fn_import.la
+libexec/apache/mod_optional_fn_export.so
+libexec/apache/mod_optional_fn_export.la
+libexec/apache/mod_include.so
+libexec/apache/mod_include.la
+libexec/apache/mod_imap.so
+libexec/apache/mod_imap.la
+libexec/apache/mod_speling.so
+libexec/apache/mod_speling.la
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_rewrite.la
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_mime_magic.la
 libexec/apache/mod_cern_meta.so
-libexec/apache/mod_cgi.so
-libexec/apache/mod_digest.so
-libexec/apache/mod_dir.so
-libexec/apache/mod_env.so
+libexec/apache/mod_cern_meta.la
 libexec/apache/mod_expires.so
+libexec/apache/mod_expires.la
 libexec/apache/mod_headers.so
-libexec/apache/mod_imap.so
-libexec/apache/mod_include.so
-libexec/apache/mod_info.so
-libexec/apache/mod_log_config.so
-libexec/apache/mod_mime.so
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mmap_static.so
-libexec/apache/mod_negotiation.so
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.so
-libexec/apache/mod_speling.so
-libexec/apache/mod_status.so
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_userdir.so
+libexec/apache/mod_headers.la
 libexec/apache/mod_usertrack.so
-libexec/apache/mod_vhost_alias.so
+libexec/apache/mod_usertrack.la
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_unique_id.la
+libexec/apache/mod_status.so
+libexec/apache/mod_status.la
+libexec/apache/mod_info.so
+libexec/apache/mod_info.la
+libexec/apache/mod_cgid.so
+libexec/apache/mod_cgid.la
+libexec/apache/httpd.exp
+sbin/rotatelogs
+sbin/htpasswd
+sbin/logresolve
 sbin/ab
 sbin/apachectl
 sbin/apxs
 sbin/httpd
-sbin/logresolve
-sbin/rotatelogs
 share/doc/apache/README.rus
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/apache_pb.gif
-share/doc/apache/index.html.ca
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.de
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.el
-share/doc/apache/index.html.en
-share/doc/apache/index.html.es
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.it
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.tw
 share/doc/apache/index.html.se
+share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.ru.ucs4
+share/doc/apache/index.html.ru.ucs2
+share/doc/apache/index.html.ru.koi8-r
+share/doc/apache/index.html.ru.iso-ru
+share/doc/apache/index.html.ru.cp866
+share/doc/apache/index.html.ru.cp-1251
+share/doc/apache/index.html.pt-br
+share/doc/apache/index.html.pt
+share/doc/apache/index.html.po.iso-pl
+share/doc/apache/index.html.no
+share/doc/apache/index.html.nl
+share/doc/apache/index.html.lu
+share/doc/apache/index.html.ltz
+share/doc/apache/index.html.kr.iso-kr
+share/doc/apache/index.html.kr.iso2022-kr
+share/doc/apache/index.html.ja.jis
+share/doc/apache/index.html.ja.iso2022-jp
+share/doc/apache/index.html.it
+share/doc/apache/index.html.he.iso8859-8
+share/doc/apache/index.html.fr
+share/doc/apache/index.html.et
+share/doc/apache/index.html.es
+share/doc/apache/index.html.en
+share/doc/apache/index.html.el
+share/doc/apache/index.html.ee
+share/doc/apache/index.html.dk
+share/doc/apache/index.html.de
+share/doc/apache/index.html.cz
+share/doc/apache/index.html.ca
+share/doc/apache/apache_pb.gif
 share/doc/apache/index.html.tw.Big5
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/configuring.html.en
-share/doc/apache/manual/configuring.html.html
-share/doc/apache/manual/configuring.html.ja.jis
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html.en
-share/doc/apache/manual/custom-error.html.html
-share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/handler.html.en
-share/doc/apache/manual/handler.html.html
-share/doc/apache/manual/handler.html.ja.jis
-share/doc/apache/manual/header.html
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.html
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.html
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html.en
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html.html
-share/doc/apache/manual/index.html.ja.jis
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html.en
-share/doc/apache/manual/install.html.fr
-share/doc/apache/manual/install.html.html
-share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/invoking.html.fr
-share/doc/apache/manual/keepalive.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/man-template.html
-share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/misc/tutorials.html
 share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/HTTP_Features.tsv
+share/doc/apache/manual/misc/known_client_problems.html
 share/doc/apache/manual/misc/client_block_api.html
 share/doc/apache/manual/misc/compat_notes.html
 share/doc/apache/manual/misc/custom_errordocs.html
@@ -198,22 +205,32 @@ share/doc/apache/manual/misc/footer.html
 share/doc/apache/manual/misc/header.html
 share/doc/apache/manual/misc/howto.html
 share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/nopgp.html
-share/doc/apache/manual/misc/perf-bsd44.html
-share/doc/apache/manual/misc/perf-dec.html
-share/doc/apache/manual/misc/perf-hp.html
 share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/perf.html
 share/doc/apache/manual/misc/rewriteguide.html
 share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/vif-info.html
-share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/mod/directive-dict.html.en
-share/doc/apache/manual/mod/directive-dict.html.html
-share/doc/apache/manual/mod/directive-dict.html.ja.jis
+share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/developer/modules.html
+share/doc/apache/manual/developer/documenting
+share/doc/apache/manual/developer/footer.html
+share/doc/apache/manual/developer/header.html
+share/doc/apache/manual/developer/hooks.html
+share/doc/apache/manual/developer/index.html
+share/doc/apache/manual/developer/layeredio.html
+share/doc/apache/manual/developer/debugging.html
+share/doc/apache/manual/platform/windows.html
+share/doc/apache/manual/platform/header.html
+share/doc/apache/manual/platform/netware.html
+share/doc/apache/manual/platform/perf-bsd44.html
+share/doc/apache/manual/platform/perf-dec.html
+share/doc/apache/manual/platform/perf-hp.html
+share/doc/apache/manual/platform/perf.html
+share/doc/apache/manual/platform/readme-tpf.html
+share/doc/apache/manual/platform/unixware.html
+share/doc/apache/manual/platform/win_compiling.html
+share/doc/apache/manual/platform/win_service.html
+share/doc/apache/manual/platform/footer.html
+share/doc/apache/manual/mod/threaded.html
+share/doc/apache/manual/mod/directive-dict.html
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
@@ -229,56 +246,44 @@ share/doc/apache/manual/mod/mod_auth_db.html
 share/doc/apache/manual/mod/mod_auth_dbm.html
 share/doc/apache/manual/mod/mod_auth_digest.html
 share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_browser.html
 share/doc/apache/manual/mod/mod_cern_meta.html
+share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_cookies.html
-share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_charset_lite.html
+share/doc/apache/manual/mod/mod_dav.html
 share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_dld.html
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
+share/doc/apache/manual/mod/mod_ext_filter.html
+share/doc/apache/manual/mod/mod_file_cache.html
 share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
 share/doc/apache/manual/mod/mod_info.html
 share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_agent.html
-share/doc/apache/manual/mod/mod_log_common.html
 share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_log_referer.html
 share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html.en
-share/doc/apache/manual/mod/mod_negotiation.html.html
-share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
+share/doc/apache/manual/mod/mod_negotiation.html
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
 share/doc/apache/manual/mod/mod_setenvif.html
-share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_speling.html
 share/doc/apache/manual/mod/mod_status.html
 share/doc/apache/manual/mod/mod_unique_id.html
 share/doc/apache/manual/mod/mod_userdir.html
 share/doc/apache/manual/mod/mod_usertrack.html
 share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html.en
-share/doc/apache/manual/mod/module-dict.html.html
-share/doc/apache/manual/mod/module-dict.html.ja.jis
-share/doc/apache/manual/mpeix.html
-share/doc/apache/manual/multilogs.html
-share/doc/apache/manual/netware.html
-share/doc/apache/manual/new_features_1_0.html
-share/doc/apache/manual/new_features_1_1.html
-share/doc/apache/manual/new_features_1_2.html
-share/doc/apache/manual/new_features_1_3.html.en
-share/doc/apache/manual/new_features_1_3.html.html
-share/doc/apache/manual/new_features_1_3.html.ja.jis
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/process-model.html
-share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/mod/module-dict.html
+share/doc/apache/manual/mod/mpm_common.html
+share/doc/apache/manual/mod/mpm_winnt.html
+share/doc/apache/manual/mod/perchild.html
+share/doc/apache/manual/mod/prefork.html
+share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/search/manual-index.cgi
+share/doc/apache/manual/programs/suexec.html
 share/doc/apache/manual/programs/apachectl.html
 share/doc/apache/manual/programs/apxs.html
 share/doc/apache/manual/programs/dbmmanage.html
@@ -291,104 +296,70 @@ share/doc/apache/manual/programs/index.html
 share/doc/apache/manual/programs/logresolve.html
 share/doc/apache/manual/programs/other.html
 share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/readme-tpf.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/server-wide.html.en
-share/doc/apache/manual/server-wide.html.fr
-share/doc/apache/manual/server-wide.html.html
-share/doc/apache/manual/server-wide.html.ja.jis
-share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/suexec_1_2.html
-share/doc/apache/manual/unixware.html
-share/doc/apache/manual/upgrading_to_1_3.html
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/images/custom_errordocs.gif
+share/doc/apache/manual/images/home.gif
+share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/mod_rewrite_fig1.fig
+share/doc/apache/manual/images/mod_rewrite_fig1.gif
+share/doc/apache/manual/images/mod_rewrite_fig2.fig
+share/doc/apache/manual/images/mod_rewrite_fig2.gif
+share/doc/apache/manual/images/pixel.gif
+share/doc/apache/manual/images/apache_header.gif
+share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.ja.jis
+share/doc/apache/manual/howto/footer.html
+share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.ja.jis
+share/doc/apache/manual/vhosts/virtual-host.html
 share/doc/apache/manual/vhosts/examples.html
 share/doc/apache/manual/vhosts/fd-limits.html
 share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html.en
-share/doc/apache/manual/vhosts/index.html.html
-share/doc/apache/manual/vhosts/index.html.ja.jis
+share/doc/apache/manual/vhosts/index.html
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
 share/doc/apache/manual/vhosts/name-based.html
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/win_compiling.html
-share/doc/apache/manual/win_service.html
-share/doc/apache/manual/windows.html
-www/cgi-bin.default/printenv
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/new_features_2_0.html.fr
+share/doc/apache/manual/new_features_2_0.html
+share/doc/apache/manual/mpm.html
+share/doc/apache/manual/location.html
+share/doc/apache/manual/invoking.html
+share/doc/apache/manual/install.html
+share/doc/apache/manual/install-tpf.html
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html
+share/doc/apache/manual/header.html
+share/doc/apache/manual/handler.html
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/filter.html
+share/doc/apache/manual/env.html
+share/doc/apache/manual/ebcdic.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/configuring.html
+share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/bind.html
+share/doc/apache/manual/STATUS
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/urlmapping.html
+share/doc/apache/manual/upgrading.html.fr
+share/doc/apache/manual/upgrading.html
+share/doc/apache/manual/suexec.html
+share/doc/apache/manual/stopping.html
+share/doc/apache/manual/server-wide.html
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/process-model.html
 www/cgi-bin.default/test-cgi
-www/icons/README
-www/icons/a.gif
-www/icons/alert.black.gif
-www/icons/alert.red.gif
-www/icons/apache_pb.gif
-www/icons/back.gif
-www/icons/ball.gray.gif
-www/icons/ball.red.gif
-www/icons/binary.gif
-www/icons/binhex.gif
-www/icons/blank.gif
-www/icons/bomb.gif
-www/icons/box1.gif
-www/icons/box2.gif
-www/icons/broken.gif
-www/icons/burst.gif
-www/icons/c.gif
-www/icons/comp.blue.gif
-www/icons/comp.gray.gif
-www/icons/compressed.gif
-www/icons/continued.gif
-www/icons/dir.gif
-www/icons/down.gif
-www/icons/dvi.gif
-www/icons/f.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.sec.gif
-www/icons/forward.gif
-www/icons/generic.gif
-www/icons/generic.red.gif
-www/icons/generic.sec.gif
-www/icons/hand.right.gif
-www/icons/hand.up.gif
-www/icons/icon.sheet.gif
-www/icons/image1.gif
-www/icons/image2.gif
-www/icons/image3.gif
-www/icons/index.gif
-www/icons/layout.gif
-www/icons/left.gif
-www/icons/link.gif
-www/icons/movie.gif
-www/icons/p.gif
-www/icons/patch.gif
-www/icons/pdf.gif
-www/icons/pie0.gif
-www/icons/pie1.gif
-www/icons/pie2.gif
-www/icons/pie3.gif
-www/icons/pie4.gif
-www/icons/pie5.gif
-www/icons/pie6.gif
-www/icons/pie7.gif
-www/icons/pie8.gif
-www/icons/portal.gif
-www/icons/ps.gif
-www/icons/quill.gif
-www/icons/right.gif
-www/icons/screw1.gif
-www/icons/screw2.gif
-www/icons/script.gif
-www/icons/small/README.txt
+www/cgi-bin.default/printenv
+www/icons/small/uu.gif
 www/icons/small/back.gif
 www/icons/small/binary.gif
 www/icons/small/binhex.gif
@@ -420,39 +391,100 @@ www/icons/small/tar.gif
 www/icons/small/text.gif
 www/icons/small/transfer.gif
 www/icons/small/unknown.gif
-www/icons/small/uu.gif
-www/icons/sound1.gif
-www/icons/sound2.gif
-www/icons/sphere1.gif
-www/icons/sphere2.gif
-www/icons/tar.gif
-www/icons/tex.gif
-www/icons/text.gif
-www/icons/transfer.gif
-www/icons/unknown.gif
-www/icons/up.gif
-www/icons/uu.gif
-www/icons/uuencoded.gif
+www/icons/small/README.txt
 www/icons/world1.gif
+www/icons/uuencoded.gif
+www/icons/uu.gif
+www/icons/up.gif
+www/icons/unknown.gif
+www/icons/transfer.gif
+www/icons/text.gif
+www/icons/tex.gif
+www/icons/tar.gif
+www/icons/sphere2.gif
+www/icons/sphere1.gif
+www/icons/sound2.gif
+www/icons/sound1.gif
+www/icons/script.gif
+www/icons/screw2.gif
+www/icons/screw1.gif
+www/icons/right.gif
+www/icons/quill.gif
+www/icons/ps.gif
+www/icons/portal.gif
+www/icons/pie8.gif
+www/icons/pie7.gif
+www/icons/pie6.gif
+www/icons/pie5.gif
+www/icons/pie4.gif
+www/icons/pie3.gif
+www/icons/pie2.gif
+www/icons/pie1.gif
+www/icons/pie0.gif
+www/icons/pdf.gif
+www/icons/patch.gif
+www/icons/p.gif
+www/icons/movie.gif
+www/icons/link.gif
+www/icons/left.gif
+www/icons/layout.gif
+www/icons/index.gif
+www/icons/image3.gif
+www/icons/image2.gif
+www/icons/image1.gif
+www/icons/icon.sheet.gif
+www/icons/hand.up.gif
+www/icons/hand.right.gif
+www/icons/generic.sec.gif
+www/icons/generic.red.gif
+www/icons/generic.gif
+www/icons/forward.gif
+www/icons/folder.sec.gif
+www/icons/folder.gif
+www/icons/folder.open.gif
+www/icons/f.gif
+www/icons/dvi.gif
+www/icons/down.gif
+www/icons/dir.gif
+www/icons/continued.gif
+www/icons/compressed.gif
+www/icons/comp.gray.gif
+www/icons/comp.blue.gif
+www/icons/c.gif
+www/icons/burst.gif
+www/icons/broken.gif
+www/icons/box2.gif
+www/icons/box1.gif
+www/icons/bomb.gif
+www/icons/blank.gif
+www/icons/binhex.gif
+www/icons/binary.gif
+www/icons/ball.red.gif
+www/icons/ball.gray.gif
+www/icons/back.gif
+www/icons/apache_pb.gif
+www/icons/alert.red.gif
+www/icons/alert.black.gif
+www/icons/a.gif
 www/icons/world2.gif
-@exec mkdir -p %D/www/proxy
+www/icons/README
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
 @dirrm etc/apache
-@dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/search
 @dirrm share/doc/apache/manual/vhosts
+@dirrm share/doc/apache/manual/search
+@dirrm share/doc/apache/manual/programs
+@dirrm share/doc/apache/manual/platform
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/howto
+@dirrm share/doc/apache/manual/developer
 @dirrm share/doc/apache/manual
 @dirrm share/doc/apache
-@dirrm www/cgi-bin.default
 @dirrm www/icons/small
 @dirrm www/icons
-@dirrm www/proxy
+@dirrm www/cgi-bin.default
 @dirrm www
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 53c05a99e121..8835bc4b7e32 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -1,68 +1,68 @@
-# New ports collection makefile for:    apache HTTPD
-# Date created:         Fri Aug 25 16:42:36 CDT 1995
-# Whom:                 ache@freebsd.org
+# New ports collection makefile for:	apache2
+# Date created:				7 April 2001
+# Whom:					Hye-Shik Chang <perky@python.or.kr>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	apache
-PORTVERSION=    1.3.19
-PORTREVISION=   1
+PORTVERSION=	2.0.16
 CATEGORIES=	www
-MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
-		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
-		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
-		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
-		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
+MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
+		http://www.cybernic.com/mirror/dist/httpd/ \
+		http://mirrors.partnersforever.net/apache/dist/httpd/ \
+		http://www.technotopia.com/vroom/apache/dist/httpd/ \
+		http://www.tux.org/pub/net/apache/dist/httpd/ \
+		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
 		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
 		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
-		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://www3.service.digital.com/apache/dist/httpd/ \
-		ftp://galileo.galilei.com/pub/apache/httpd/ \
-		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
-		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
-		ftp://apache.nextpath.com/pub/apache/dist/httpd/
-DISTNAME=	apache_${PORTVERSION}
+		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
+DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
 
-#PATCH_SITES=    ${MASTER_SITES}
-#PATCHFILES=     apache_${PORTVERSION}-fix.diff
+MAINTAINER?=	perky@python.or.kr
 
-MAINTAINER=	ache@freebsd.org
+WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
+FIND?=		find
+XARGS?=		xargs
 
-#
-# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
-#
+# apache2 doesn't process '--enable-share=max' option yet.
+# and some modules are very unstable at DSO mode.
+SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
+		auth_anon digest headers cern_meta expires include \
+		cgid status info usertrack dav dav_fs imap proxy \
+		auth_digest file_cache echo optional_fn_import \
+		optional_fn_export
+STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
+		userdir alias asis cgi mime log_config vhost_alias actions
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	\
 		--prefix=${PREFIX} \
-		--server-gid=nogroup \
+		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
-		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
-		--suexec-docroot=${PREFIX}/www/data \
-		--without-confadjust \
-		--enable-module=most \
-		--enable-module=auth_db \
-		--enable-module=mmap_static \
-		--disable-module=auth_dbm \
-		--enable-shared=max
+		--with-suexec-docroot=${PREFIX}/www/data \
+		--enable-shared \
+		--disable-threads \
+		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
 
-OPTIM=		-DHARD_SERVER_LIMIT=512 \
-		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \
-		-DACCEPT_FILTER_NAME=\\"httpready\\"
-
-.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+=		-DBUFFERED_LOGS
-CFLAGS+=	-O6 -fomit-frame-pointer
-.endif
+OPTIM+=		-DHARD_SERVER_LIMIT=512 \
+		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
 CONFIGURE_ENV=	OPTIM='${OPTIM}'
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
+
+.for mod in ${SHARED_MODS}
+CONFIGURE_ARGS+= --enable-${mod}=shared
+.endfor
+.for mod in ${STATIC_MODS}
+CONFIGURE_ARGS+= --enable-${mod}=yes
+.endfor
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index 2d2273f86b4e..3802044557de 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
+MD5 (httpd-2_0_16-beta.tar.gz) = 364fc61593185789cb9744bae1ebb655
diff --git a/www/apache20/files/FreeBSD.layout b/www/apache20/files/FreeBSD.layout
deleted file mode 100644
index 5524e186e9c0..000000000000
--- a/www/apache20/files/FreeBSD.layout
+++ /dev/null
@@ -1,19 +0,0 @@
-#   FreeBSD layout...
-<Layout FreeBSD>
-    prefix:        /usr/local
-    exec_prefix:   $prefix
-    bindir:        $exec_prefix/bin
-    sbindir:       $exec_prefix/sbin
-    libexecdir:    $exec_prefix/libexec/apache
-    mandir:        $prefix/man
-    sysconfdir:    $prefix/etc/apache
-    datadir:       $prefix/www
-    iconsdir:      $datadir/icons
-    htdocsdir:     $datadir/data
-    cgidir:        $datadir/cgi-bin
-    includedir:    $prefix/include/apache
-    localstatedir: /var
-    runtimedir:    $localstatedir/run
-    logfiledir:    $localstatedir/log
-    proxycachedir: $datadir/proxy
-</Layout>
diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in
new file mode 100644
index 000000000000..341c8dfd087f
--- /dev/null
+++ b/www/apache20/files/patch-Makefile.in
@@ -0,0 +1,123 @@
+--- Makefile.in.orig	Wed Apr  4 02:03:35 2001
++++ Makefile.in	Sun Apr  8 06:06:58 2001
+@@ -16,7 +16,7 @@
+ targets         = $(PROGRAMS) $(other_targets)
+ phony_targets   = $(srcdir)/buildmark.c
+ install_targets = install-conf install-htdocs install-icons install-other \
+-	install-cgi install-include install-support install-suexec
++	install-cgi install-include install-support install-manpages install-suexec
+ DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
+ 	configure generated_lists include/ap_config_auto.h \
+ 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
+@@ -28,25 +28,32 @@
+ install-conf:
+ 	@echo Installing configuration files
+ 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
++
+ 	@cd docs/conf; \
+ 	for i in mime.types magic; do \
+-		$(INSTALL_DATA) $$i $(sysconfdir); \
++		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
++		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
+ 	done; \
+ 	for i in *-std*; do \
+ 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+ 		    -e 's#@@Port@@#$(PORT)#g' \
+-			< $$i > $(sysconfdir)/$$i; \
+-		chmod 0644 $(sysconfdir)/$$i; \
++			< $$i > $(sysconfdir)/$$i.default; \
++		chmod 0644 $(sysconfdir)/$$i.default; \
++		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
+ 		file=`echo $$i|sed s/-std//`; \
+ 		if [ "$$file" = "httpd.conf" ]; then \
+ 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+ 		fi; \
+ 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
+-			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
++			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
++			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
+ 		fi; \
+ 	done
+ 
+ htdocs-srcdir = docs/docroot
++htman-srcdir = docs/manual
++doc_prefix = $(prefix)/share/doc/apache
++man-srcdir = docs/man
+ 
+ docs::
+ 	mkdir -p ./docs/api
+@@ -57,11 +64,14 @@
+ 
+ install-htdocs:
+ 	@echo Installing HTML documents
+-	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
+-	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+-	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
+-	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
++	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
++	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
++	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
++	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
++	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
++	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-icons:
+ 	@echo Installing icons
+@@ -71,24 +81,27 @@
+ 
+ install-cgi:
+ 	@echo Installing CGIs
+-	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
+-	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
++	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-support:
+ 	@echo Installing Support Binaries
+ 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
+-	@cp -p $(srcdir)/support/httpd.exp $(bindir)
++	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
++	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
++	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
+ 	@cp -p $(builddir)/support/htpasswd $(bindir)
+ 	@cp -p $(builddir)/support/htdigest $(bindir)
+-	@cp -p $(builddir)/support/rotatelogs $(bindir)
+-	@cp -p $(builddir)/support/logresolve $(bindir)
+-	@cp -p $(builddir)/support/ab $(bindir)
+-	@cp -p $(builddir)/support/apachectl $(bindir)
+-	chmod 755 $(bindir)/apachectl
++	@cp -p $(builddir)/support/rotatelogs $(sbindir)
++	@cp -p $(builddir)/support/logresolve $(sbindir)
++	@cp -p $(builddir)/support/ab $(sbindir)
++	@cp -p $(builddir)/support/apachectl $(sbindir)
++	chmod 755 $(sbindir)/apachectl
+ 	@if test -f $(builddir)/support/apxs; then \
+-	    cp -p $(builddir)/support/apxs $(bindir); \
+-	    chmod 755 $(bindir)/apxs; \
++	    cp -p $(builddir)/support/apxs $(sbindir); \
++	    chmod 755 $(sbindir)/apxs; \
+ 	fi
+ 
+ 
+@@ -117,6 +130,15 @@
+ 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
+ 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
+ 	@chmod 644 $(includedir)/*.h
++
++install-manpages:
++	@echo Installing manual pages
++	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
++	@for sect in 1 8; do \
++		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
++		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
++	done;
++	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache20/files/patch-aa b/www/apache20/files/patch-aa
deleted file mode 100644
index 15cd58c27ef2..000000000000
--- a/www/apache20/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig	Tue Jan 18 01:53:17 2000
-+++ configure	Mon Jan 24 19:37:21 2000
-@@ -1232,8 +1232,8 @@
-     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
-     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
-     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
--    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
--    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
-+    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
-     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
-     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1330,8 +1330,8 @@
- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
- echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
- echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
--echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
--echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
- echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
- echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
- echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab
deleted file mode 100644
index e4448f1e47ca..000000000000
--- a/www/apache20/files/patch-ab
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile.tmpl.orig	Tue Jan 11 22:47:41 2000
-+++ Makefile.tmpl	Mon Jan 24 19:50:42 2000
-@@ -123,6 +123,7 @@
- runtimedir      = @runtimedir@
- logfiledir      = @logfiledir@
- proxycachedir   = @proxycachedir@
-+doc_prefix      = $(prefix)/share/doc/apache
- 
- libexecdir_relative   = @libexecdir_relative@
- 
-@@ -266,9 +267,9 @@
- 	$(MKDIR) $(root)$(mandir)/man1
- 	$(MKDIR) $(root)$(mandir)/man8
- 	$(MKDIR) $(root)$(sysconfdir)
--	$(MKDIR) $(root)$(htdocsdir)
-+	$(MKDIR) $(root)$(doc_prefix)
- 	$(MKDIR) $(root)$(iconsdir)
--	$(MKDIR) $(root)$(cgidir)
-+	$(MKDIR) $(root)$(cgidir).default
- 	$(MKDIR) $(root)$(includedir)
- 	$(MKDIR) $(root)$(includedir)/xml
- 	$(MKDIR) $(root)$(runtimedir)
-@@ -452,25 +453,33 @@
- #   icons and distributed CGI scripts.
- install-data:
- 	@echo "===> [data: Installing initial data files]"
--	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
--	else \
--		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+#        -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-+#        else \
-+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
--		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
--		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
--		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
--	fi
--	-@if [ -f $(root)$(cgidir)/printenv ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
--	else \
-+		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
-+		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
-+#        fi
-+	if [ ! -d $(root)$(htdocsdir) ]; then \
-+		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
-+  	fi
-+	$(RM) $(root)$(htdocsdir).default
-+	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
-+#        -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-+#        else \
- 		for script in printenv test-cgi; do \
- 			cat $(TOP)/cgi-bin/$${script} |\
- 			sed -e 's;^#!/.*perl;#!$(PERL);' \
- 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
--			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
-+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
- 		done; \
-+#        fi
-+	if [ ! -d $(root)$(cgidir) ]; then \
-+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
- 	fi
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
- 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
-@@ -509,10 +518,10 @@
- 			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
- 			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
- 			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
--			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
--			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
--			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
--			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
-+			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \
-+			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \
-+			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
-+			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
- 			-e 's;conf/magic;$(sysconfdir)/magic;' \
- 			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
- 			-e 's;User nobody;User $(conf_user);' \
diff --git a/www/apache20/files/patch-ag b/www/apache20/files/patch-ag
deleted file mode 100644
index 80373fbcca63..000000000000
--- a/www/apache20/files/patch-ag
+++ /dev/null
@@ -1,66 +0,0 @@
---- conf/httpd.conf-dist.orig	Mon Feb 21 08:30:46 2000
-+++ conf/httpd.conf-dist	Mon May 29 16:48:49 2000
-@@ -354,7 +354,22 @@
- # directory index.  Separate multiple entries with spaces.
- #
- <IfModule mod_dir.c>
--    DirectoryIndex index.html
-+    <IfModule mod_php3.c>
-+        <IfModule mod_php4.c>
-+            DirectoryIndex index.php index.php3 index.html
-+        </IfModule>
-+        <IfModule !mod_php4.c>
-+            DirectoryIndex index.php3 index.html
-+        </IfModule>
-+    </IfModule>
-+    <IfModule !mod_php3.c>
-+        <IfModule mod_php4.c>
-+            DirectoryIndex index.php index.html
-+        </IfModule>
-+        <IfModule !mod_php4.c>
-+            DirectoryIndex index.html
-+        </IfModule>
-+    </IfModule>
- </IfModule>
- 
- #
-@@ -473,7 +488,7 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+#CustomLog logs/access_log common
- 
- #
- # If you would like to have agent and referer logfiles, uncomment the
-@@ -486,7 +501,7 @@
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+CustomLog logs/access_log combined
- 
- #
- # Optionally add a line containing the server version and virtual host
-@@ -708,13 +723,17 @@
-     # For example, the PHP 3.x module (not part of the Apache distribution - see
-     # http://www.php.net) will typically use:
-     #
--    #AddType application/x-httpd-php3 .php3
--    #AddType application/x-httpd-php3-source .phps
-+    <IfModule mod_php3.c>
-+        AddType application/x-httpd-php3 .php3
-+        AddType application/x-httpd-php3-source .php3s
-+    </IfModule>
-     #
-     # And for PHP 4.x, use:
-     #
--    #AddType application/x-httpd-php .php
--    #AddType application/x-httpd-php-source .phps
-+    <IfModule mod_php4.c>
-+        AddType application/x-httpd-php .php
-+        AddType application/x-httpd-php-source .phps
-+    </IfModule>
- 
-     AddType application/x-tar .tgz
- 
diff --git a/www/apache20/files/patch-ak b/www/apache20/files/patch-ak
deleted file mode 100644
index 486f7ad159cf..000000000000
--- a/www/apache20/files/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/support/apachectl.orig	Wed Apr  7 00:36:33 1999
-+++ src/support/apachectl	Fri Sep  3 15:41:01 1999
-@@ -39,6 +39,8 @@
- # --------------------                              --------------------
- # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
- 
-+eval `limits -e -C daemon` >/dev/null 2>&1
-+
- ERROR=0
- ARGV="$@"
- if [ "x$ARGV" = "x" ] ; then 
-@@ -82,6 +84,7 @@
- 	fi
- 	if kill $PID ; then
- 	    echo "$0 $ARG: httpd stopped"
-+	    rm $PIDFILE
- 	else
- 	    echo "$0 $ARG: httpd could not be stopped"
- 	    ERROR=4
diff --git a/www/apache20/files/patch-build:rules.mk b/www/apache20/files/patch-build:rules.mk
new file mode 100644
index 000000000000..d5058a91d8ca
--- /dev/null
+++ b/www/apache20/files/patch-build:rules.mk
@@ -0,0 +1,14 @@
+--- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
++++ build/rules.mk	Sun Apr  8 01:05:46 2001
+@@ -172,9 +172,9 @@
+ all-p: $(targets)
+ install-p: $(targets) $(install_targets)
+ 	@if test -n '$(PROGRAMS)'; then \
+-		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
++		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
+ 		for i in "$(PROGRAMS)"; do \
+-			$(INSTALL_PROGRAM) $$i $(bindir); \
++			$(INSTALL_PROGRAM) $$i $(sbindir); \
+ 		done; \
+ 	fi
+ 
diff --git a/www/apache20/files/patch-config.layout b/www/apache20/files/patch-config.layout
new file mode 100644
index 000000000000..75a700c6a805
--- /dev/null
+++ b/www/apache20/files/patch-config.layout
@@ -0,0 +1,25 @@
+--- config.layout.orig	Sat Apr  7 04:19:44 2001
++++ config.layout	Sat Apr  7 04:20:28 2001
+@@ -249,3 +249,22 @@
+     logfiledir:    $prefix/logs
+     proxycachedir: $prefix/proxy
+ </Layout>
++
++<Layout FreeBSD>
++    prefix:        /usr/local
++    exec_prefix:   $prefix
++    bindir:        $exec_prefix/bin
++    sbindir:       $exec_prefix/sbin
++    libexecdir:    $exec_prefix/libexec/apache
++    mandir:        $prefix/man
++    sysconfdir:    $prefix/etc/apache
++    datadir:       $prefix/www
++    iconsdir:      $datadir/icons
++    htdocsdir:     $datadir/data
++    cgidir:        $datadir/cgi-bin
++    includedir:    $prefix/include/apache
++    localstatedir: /var
++    runtimedir:    $localstatedir/run
++    logfiledir:    $localstatedir/log
++    proxycachedir: $datadir/proxy
++</Layout>
diff --git a/www/apache20/files/patch-configure b/www/apache20/files/patch-configure
new file mode 100644
index 000000000000..5419d37c531c
--- /dev/null
+++ b/www/apache20/files/patch-configure
@@ -0,0 +1,32 @@
+--- configure.orig	Wed Apr  4 12:45:36 2001
++++ configure	Sun Apr  8 03:25:31 2001
+@@ -3760,7 +3760,9 @@
+       -e "s/[ 	]*$/'/g" \
+       $srcdir/config.layout > $pldconf
+   layout_name=$LAYOUT
++  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
+   . $pldconf
++  prefix=$prefix_backup
+   rm $pldconf
+   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
+              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
+@@ -9678,6 +9680,10 @@
+ 
+   
+   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
+   
+ 
+   
+@@ -9814,7 +9820,7 @@
+ EOF
+ 
+ cat >> confdefs.h <<EOF
+-#define SERVER_CONFIG_FILE "conf/$progname.conf"
++#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
+ EOF
+ 
+ cat >> confdefs.h <<EOF
diff --git a/www/apache20/files/patch-docs:conf:httpd-std.conf b/www/apache20/files/patch-docs:conf:httpd-std.conf
new file mode 100644
index 000000000000..f70a76bf17df
--- /dev/null
+++ b/www/apache20/files/patch-docs:conf:httpd-std.conf
@@ -0,0 +1,203 @@
+--- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
++++ docs/conf/httpd-std.conf	Sun Apr  8 04:26:54 2001
+@@ -64,7 +64,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
+ 
+ #
+ # ScoreBoardFile: File used to store internal server process information.
+@@ -73,7 +73,7 @@
+ # no two invocations of Apache share the same scoreboard file.
+ #
+ <IfModule !perchild.c>
+-ScoreBoardFile logs/apache_runtime_status
++ScoreBoardFile /var/run/apache_runtime_status
+ </IfModule>
+ 
+ #
+@@ -182,6 +182,28 @@
+ #
+ # Example:
+ # LoadModule foo_module modules/mod_foo.so
++#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
++#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
++#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
++#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
++#LoadModule cgid_module			libexec/apache/mod_cgid.so
++#LoadModule dav_module			libexec/apache/mod_dav.so
++#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
++#LoadModule digest_module		libexec/apache/mod_digest.so
++#LoadModule expires_module		libexec/apache/mod_expires.so
++#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
++#LoadModule headers_module		libexec/apache/mod_headers.so
++#LoadModule imap_module			libexec/apache/mod_imap.so
++#LoadModule include_module		libexec/apache/mod_include.so
++#LoadModule info_module			libexec/apache/mod_info.so
++#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
++#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
++#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
++#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
++#LoadModule speling_module		libexec/apache/mod_speling.so
++#LoadModule status_module		libexec/apache/mod_status.so
++#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
++#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
+ 
+ ### Section 2: 'Main' server configuration
+ #
+@@ -221,7 +243,7 @@
+ #  don't use Group #-1 on these systems!
+ #
+ User nobody
+-Group #-1
++Group nogroup
+ 
+ #
+ # ServerAdmin: Your address, where problems with the server should be
+@@ -249,7 +271,7 @@
+ # documents. By default, all requests are taken from this directory, but
+ # symbolic links and aliases may be used to point to other locations.
+ #
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ 
+ #
+ # Each directory to which Apache has access, can be configured with respect
+@@ -274,7 +296,7 @@
+ #
+ # This should be changed to whatever you set DocumentRoot to.
+ #
+-<Directory "@@ServerRoot@@/htdocs">
++<Directory "@@ServerRoot@@/www/data">
+ 
+ #
+ # This may also be "None", "All", or any combination of "Indexes",
+@@ -326,7 +348,22 @@
+ # DirectoryIndex: Name of the file or files to use as a pre-written HTML
+ # directory index.  Separate multiple entries with spaces.
+ #
+-DirectoryIndex index.html
++<IfModule mod_php3.c>
++    <IfModule mod_php4.c>
++        DirectoryIndex index.php index.php3 index.html
++    </IfModule>
++    <IfModule !mod_php4.c>
++        DirectoryIndex index.php3 index.html
++    </IfModule>
++</IfModule>
++<IfModule !mod_php3.c>
++    <IfModule mod_php4.c>
++        DirectoryIndex index.php index.html
++    </IfModule>
++    <IfModule !mod_php4.c>
++        DirectoryIndex index.html
++    </IfModule>
++</IfModule>
+ 
+ #
+ # AccessFileName: The name of the file to look for in each directory
+@@ -372,7 +409,7 @@
+ # TypesConfig describes where the mime.types file (or equivalent) is
+ # to be found.
+ #
+-TypesConfig conf/mime.types
++TypesConfig etc/apache/mime.types
+ 
+ #
+ # DefaultType is the default MIME type the server will use for a document
+@@ -397,7 +434,7 @@
+ # module is part of the server.
+ #
+ <IfModule mod_mime_magic.c>
+-    MIMEMagicFile conf/magic
++    MIMEMagicFile etc/apache/magic
+ </IfModule>
+ 
+ #
+@@ -417,7 +454,7 @@
+ # logged here.  If you *do* define an error logfile for a <VirtualHost>
+ # container, that host's errors will be logged there and not here.
+ #
+-ErrorLog logs/error_log
++ErrorLog /var/log/httpd-error.log
+ 
+ #
+ # LogLevel: Control the number of messages logged to the error_log.
+@@ -442,7 +479,7 @@
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+-CustomLog logs/access_log common
++#CustomLog logs/access_log common
+ 
+ #
+ # If you would like to have agent and referer logfiles, uncomment the
+@@ -455,7 +492,7 @@
+ # If you prefer a single logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can use the following directive.
+ #
+-#CustomLog logs/access_log combined
++CustomLog /var/log/httpd-access.log combined
+ 
+ #
+ # Optionally add a line containing the server version and virtual host
+@@ -474,9 +511,9 @@
+ # require it to be present in the URL.  So "/icons" isn't aliased in this
+ # example, only "/icons/"..
+ #
+-Alias /icons/ "@@ServerRoot@@/icons/"
++Alias /icons/ "@@ServerRoot@@/www/icons/"
+ 
+-<Directory "@@ServerRoot@@/icons">
++<Directory "@@ServerRoot@@/www/icons">
+     Options Indexes MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -491,7 +528,7 @@
+ # The same rules about trailing "/" apply to ScriptAlias directives as to
+ # Alias.
+ #
+-ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
++ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
+ 
+ <IfModule mod_cgid.c>
+ #
+@@ -505,7 +542,7 @@
+ # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
+ # CGI directory exists, if you have that configured.
+ #
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     AllowOverride None
+     Options None
+     Order allow,deny
+@@ -657,6 +694,7 @@
+ AddLanguage ja .ja
+ AddLanguage pl .po
+ AddLanguage kr .kr
++AddLanguage ko .kr
+ AddLanguage pt .pt
+ AddLanguage no .no
+ AddLanguage pt-br .pt-br
+@@ -741,8 +779,17 @@
+ # For example, the PHP3 module (not part of the Apache distribution - see
+ # http://www.php.net) will typically use:
+ #
+-#AddType application/x-httpd-php3 .php3
+-#AddType application/x-httpd-php3-source .phps
++<IfModule mod_php3.c>
++    AddType application/x-httpd-php3 .php3
++    AddType application/x-httpd-php3-source .php3s
++</IfModule>
++#
++# And for PHP 4.x, use:
++#
++<IfModule mod_php4.c>
++    AddType application/x-httpd-php .php
++    AddType application/x-httpd-php-source .phps
++</IfModule>
+ 
+ AddType application/x-tar .tgz
+ 
diff --git a/www/apache20/files/patch-include:httpd.h b/www/apache20/files/patch-include:httpd.h
new file mode 100644
index 000000000000..9f8fdf34997b
--- /dev/null
+++ b/www/apache20/files/patch-include:httpd.h
@@ -0,0 +1,38 @@
+--- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
++++ include/httpd.h	Sat Apr  7 09:08:43 2001
+@@ -127,7 +127,7 @@
+ /* Set default for OS/2 file system */
+ #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
+ #else
+-#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
++#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
+ #endif
+ #endif /* DOCUMENT_LOCATION */
+ 
+@@ -144,7 +144,7 @@
+ #if defined(OS2) || defined(WIN32)
+ #define DEFAULT_ERRORLOG "logs/error.log"
+ #else
+-#define DEFAULT_ERRORLOG "logs/error_log"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
+ #endif
+ #endif /* DEFAULT_ERRORLOG */
+ 
+@@ -160,7 +160,7 @@
+ 
+ /* The name of the server config file */
+ #ifndef SERVER_CONFIG_FILE
+-#define SERVER_CONFIG_FILE "conf/httpd.conf"
++#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
+ #endif
+ 
+ /* Whether we should enable rfc1413 identity checking */
+@@ -247,7 +247,7 @@
+ 
+ /* The name of the MIME types file */
+ #ifndef AP_TYPES_CONFIG_FILE
+-#define AP_TYPES_CONFIG_FILE "conf/mime.types"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
+ #endif
+ 
+ /*
diff --git a/www/apache20/files/patch-srclib:apr-util:Makefile.in b/www/apache20/files/patch-srclib:apr-util:Makefile.in
new file mode 100644
index 000000000000..652901dae28a
--- /dev/null
+++ b/www/apache20/files/patch-srclib:apr-util:Makefile.in
@@ -0,0 +1,22 @@
+--- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
++++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
+@@ -22,8 +22,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=$(prefix)/lib
++includedir=$(prefix)/include/apache
+ 
+ delete-lib:
+ 	@if test -f $(TARGET_LIB); then \
+@@ -43,7 +43,7 @@
+ 	if [ ! -d $(libdir) ]; then \
+ 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
+ 	fi; \
+-	libtool --mode=install cp $(TARGET_LIB) $(libdir)
++	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
+ 
+ $(TARGET_LIB):
+ 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache20/files/patch-srclib:apr:Makefile.in b/www/apache20/files/patch-srclib:apr:Makefile.in
new file mode 100644
index 000000000000..4c0292f73af8
--- /dev/null
+++ b/www/apache20/files/patch-srclib:apr:Makefile.in
@@ -0,0 +1,22 @@
+--- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
++++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
+@@ -37,8 +37,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=$(prefix)/lib
++includedir=$(prefix)/include/apache
+ 
+ delete-lib:
+ 	@if test -f $(TARGET_LIB); then \
+@@ -58,7 +58,7 @@
+ 	if [ ! -d $(libdir) ]; then \
+ 	    ./build/mkdir.sh $(libdir); \
+ 	fi; \
+-	libtool --mode=install cp $(TARGET_LIB) $(libdir)
++	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
+ 
+ $(TARGET_LIB):
+ 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache20/files/patch-support:apachectl.in b/www/apache20/files/patch-support:apachectl.in
new file mode 100644
index 000000000000..739a622d74de
--- /dev/null
+++ b/www/apache20/files/patch-support:apachectl.in
@@ -0,0 +1,24 @@
+--- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
++++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+@@ -25,10 +25,10 @@
+ # --------------------                              --------------------
+ # 
+ # the path to your PID file
+-PIDFILE=@prefix@/logs/httpd.pid
++PIDFILE=/var/run/httpd.pid
+ #
+ # the path to your httpd binary, including options if necessary
+-HTTPD='@prefix@/bin/httpd'
++HTTPD='@prefix@/sbin/httpd'
+ #
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line.  Designed for lynx, however other
+@@ -41,6 +41,8 @@
+ #
+ # --------------------                              --------------------
+ # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
++
++eval `limits -e -C daemon` >/dev/null 2>&1
+ 
+ ERROR=0
+ ARGV="$@"
diff --git a/www/apache20/files/patch-support:apxs.in b/www/apache20/files/patch-support:apxs.in
new file mode 100644
index 000000000000..70ca84075675
--- /dev/null
+++ b/www/apache20/files/patch-support:apxs.in
@@ -0,0 +1,11 @@
+--- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
++++ support/apxs.in	Sat Apr  7 11:55:28 2001
+@@ -73,7 +73,7 @@
+ my $prefix            = "$CFG_PREFIX";
+ my $CFG_EXEC_PREFIX   = "@exec_prefix@";
+ my $exec_prefix       = "$CFG_EXEC_PREFIX";
+-my $CFG_SBINDIR       = "@bindir@";
++my $CFG_SBINDIR       = "@sbindir@";
+ my $CFG_INCLUDEDIR    = "@includedir@";
+ my $CFG_LIBEXECDIR    = "@libexecdir@";
+ my $CFG_SYSCONFDIR    = "@sysconfdir@";
diff --git a/www/apache2/files/patch-al b/www/apache20/files/patch-support:log_server_status.in
index b355a697b4ab..3549aa89f8c5 100644
--- a/www/apache2/files/patch-al
+++ b/www/apache20/files/patch-support:log_server_status.in
@@ -1,6 +1,6 @@
---- src/support/log_server_status.orig	Fri Jun  4 19:54:19 1999
-+++ src/support/log_server_status	Fri Sep  3 15:53:16 1999
-@@ -67,10 +67,10 @@
+--- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
++++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+@@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
@@ -13,7 +13,7 @@
  
  sub tcp_connect
  {
-@@ -100,7 +100,7 @@
+@@ -96,7 +96,7 @@
  	chomp($date);
  	($day,$time)=split(/:/,$date);
  	$res=&tcp_connect($server,$port);
diff --git a/www/apache20/files/patch-util.c b/www/apache20/files/patch-util.c
deleted file mode 100644
index 60f218221799..000000000000
--- a/www/apache20/files/patch-util.c
+++ /dev/null
@@ -1,53 +0,0 @@
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/main/util.c,v
-retrieving revision 1.194
-retrieving revision 1.197
-diff -u -r1.194 -r1.197
---- src/main/util.c	2001/02/01 10:06:37	1.194
-+++ src/main/util.c	2001/03/30 17:37:54	1.197
-@@ -2013,12 +2013,14 @@
-     int x;
- 
-     if (!strchr(p->h_name, '.')) {
--	for (x = 0; p->h_aliases[x]; ++x) {
--	    if (strchr(p->h_aliases[x], '.') &&
--		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
--		return ap_pstrdup(a, p->h_aliases[x]);
--	}
--	return NULL;
-+        if (p->h_aliases) {
-+        	for (x = 0; p->h_aliases[x]; ++x) {
-+                if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') &&
-+            		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
-+		            return ap_pstrdup(a, p->h_aliases[x]);
-+            }
-+	    }
-+	    return NULL;
-     }
-     return ap_pstrdup(a, (void *) p->h_name);
- }
-@@ -2040,7 +2042,6 @@
- 	ap_log_error(APLOG_MARK, APLOG_WARNING, NULL,
- 	             "%s: gethostname() failed to determine ServerName\n",
-                      ap_server_argv0);
--	server_hostname = ap_pstrdup(a, "127.0.0.1");
-     }
-     else 
-     {
-@@ -2048,14 +2049,14 @@
-         if ((!(p = gethostbyname(str))) 
-             || (!(server_hostname = find_fqdn(a, p)))) {
-             /* Recovery - return the default servername by IP: */
--            if (p->h_addr_list[0]) {
-+            if (p && p->h_addr_list && p->h_addr_list[0]) {
-                 ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]);
- 	        server_hostname = ap_pstrdup(a, str);
-                 /* We will drop through to report the IP-named server */
-             }
-         }
- 	else
--            /* Since we found a fdqn, return it with no logged message. */
-+            /* Since we found a fqdn, return it with no logged message. */
-             return server_hostname;
-     }
- 
diff --git a/www/apache20/pkg-comment b/www/apache20/pkg-comment
index 0b2be74481cf..08ad28e1ad55 100644
--- a/www/apache20/pkg-comment
+++ b/www/apache20/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server.  Very fast, very clean
+Version 2 of the extremely popular Apache http server
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 1d0c4d1df94d..95616fc8a1c6 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -1,194 +1,201 @@
-bin/dbmmanage
-bin/htdigest
 bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf.default
-@exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+bin/htdigest
+etc/rc.d/apache.sh
 @unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
 etc/apache/mime.types.default
 @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf.default
-@exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
-etc/rc.d/apache.sh
-include/apache/ap.h
-include/apache/ap_alloc.h
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
+etc/apache/magic.default
+@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+@unexec if cmp -s %D/etc/apache/highperformance-std.conf %D/etc/apache/highperformance-std.conf.default; then rm -f %D/etc/apache/highperformance-std.conf; fi
+etc/apache/highperformance-std.conf.default
+@exec [ ! -f %B/highperformance-std.conf ] && cp %B/%f %B/highperformance-std.conf
+@unexec if cmp -s %D/etc/apache/highperformance.conf %D/etc/apache/highperformance.conf.default; then rm -f %D/etc/apache/highperformance.conf; fi
+etc/apache/highperformance.conf.default
+@exec [ ! -f %B/highperformance.conf ] && cp %B/%f %B/highperformance.conf
+@unexec if cmp -s %D/etc/apache/httpd-std.conf %D/etc/apache/httpd-std.conf.default; then rm -f %D/etc/apache/httpd-std.conf; fi
+etc/apache/httpd-std.conf.default
+@exec [ ! -f %B/httpd-std.conf ] && cp %B/%f %B/httpd-std.conf
+@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
+etc/apache/httpd.conf.default
+@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+include/apache/apr.h
+include/apache/apr_want.h
+include/apache/apr_uuid.h
+include/apache/apr_user.h
+include/apache/apr_time.h
+include/apache/apr_thread_proc.h
+include/apache/apr_tables.h
+include/apache/apr_strings.h
+include/apache/apr_signal.h
+include/apache/apr_shmem.h
+include/apache/apr_portable.h
+include/apache/apr_pools.h
+include/apache/apr_network_io.h
+include/apache/apr_mmap.h
+include/apache/apr_md5.h
+include/apache/apr_lock.h
+include/apache/apr_lib.h
+include/apache/apr_hash.h
+include/apache/apr_getopt.h
+include/apache/apr_general.h
+include/apache/apr_fnmatch.h
+include/apache/apr_file_io.h
+include/apache/apr_file_info.h
+include/apache/apr_errno.h
+include/apache/apr_dso.h
+include/apache/apr_compat.h
+include/apache/apr_xlate.h
+include/apache/apr_base64.h
+include/apache/apu.h
+include/apache/apr_xml.h
+include/apache/apr_sha1.h
+include/apache/apr_sdbm.h
+include/apache/apr_ring.h
+include/apache/apr_optional.h
+include/apache/apr_hooks.h
+include/apache/apr_generic_hook.h
+include/apache/apr_dbm.h
+include/apache/apr_buckets.h
+include/apache/apu_compat.h
 include/apache/ap_compat.h
-include/apache/ap_config.h
-include/apache/ap_config_auto.h
-include/apache/ap_ctype.h
-include/apache/ap_md5.h
-include/apache/ap_mmn.h
-include/apache/ap_sha1.h
-include/apache/buff.h
-include/apache/compat.h
-include/apache/conf.h
-include/apache/explain.h
-include/apache/fnmatch.h
-include/apache/hsregex.h
-include/apache/http_conf_globals.h
-include/apache/http_config.h
-include/apache/http_core.h
-include/apache/http_log.h
-include/apache/http_main.h
-include/apache/http_protocol.h
-include/apache/http_request.h
-include/apache/http_vhost.h
+include/apache/util_uri.h
+include/apache/util_script.h
+include/apache/util_md5.h
+include/apache/util_filter.h
+include/apache/util_ebcdic.h
+include/apache/util_date.h
+include/apache/util_charset.h
+include/apache/util_cfgtree.h
+include/apache/scoreboard.h
+include/apache/rfc1413.h
+include/apache/pcreposix.h
+include/apache/mpm_common.h
 include/apache/httpd.h
-include/apache/multithread.h
-include/apache/os-inline.c
+include/apache/http_vhost.h
+include/apache/http_request.h
+include/apache/http_protocol.h
+include/apache/http_main.h
+include/apache/http_log.h
+include/apache/http_core.h
+include/apache/http_connection.h
+include/apache/http_config.h
+include/apache/ap_release.h
+include/apache/ap_mpm.h
+include/apache/ap_mmn.h
+include/apache/ap_listen.h
+include/apache/ap_config_auto.h
+include/apache/ap_config.h
+include/apache/util_xml.h
 include/apache/os.h
-include/apache/rfc1413.h
-include/apache/scoreboard.h
-include/apache/util_date.h
-include/apache/util_md5.h
-include/apache/util_script.h
-include/apache/util_uri.h
-include/apache/xml/asciitab.h
-include/apache/xml/hashtable.h
-include/apache/xml/iasciitab.h
-include/apache/xml/latin1tab.h
-include/apache/xml/nametab.h
-include/apache/xml/utf8tab.h
-include/apache/xml/xmldef.h
-include/apache/xml/xmlparse.h
-include/apache/xml/xmlrole.h
-include/apache/xml/xmltok.h
-include/apache/xml/xmltok_impl.h
-libexec/apache/httpd.exp
-libexec/apache/libproxy.so
-libexec/apache/mod_access.so
-libexec/apache/mod_actions.so
-libexec/apache/mod_alias.so
-libexec/apache/mod_asis.so
-libexec/apache/mod_auth.so
+include/apache/os-inline.c
+include/apache/mpm_default.h
+include/apache/mpm.h
+include/apache/mod_dav.h
+include/apache/mod_include.h
+include/apache/pcre.h
+include/apache/internal.h
+include/apache/config.h
+include/apache/unixd.h
+lib/libapr.la
+lib/libapr.a
+lib/libaprutil.la
+lib/libaprutil.a
 libexec/apache/mod_auth_anon.so
+libexec/apache/mod_auth_anon.la
 libexec/apache/mod_auth_db.so
-libexec/apache/mod_autoindex.so
+libexec/apache/mod_auth_db.la
+libexec/apache/mod_auth_digest.so
+libexec/apache/mod_auth_digest.la
+libexec/apache/mod_file_cache.so
+libexec/apache/mod_file_cache.la
+libexec/apache/mod_dav_fs.so
+libexec/apache/mod_dav_fs.la
+libexec/apache/mod_dav.so
+libexec/apache/mod_dav.la
+libexec/apache/mod_echo.so
+libexec/apache/mod_echo.la
+libexec/apache/mod_optional_fn_import.so
+libexec/apache/mod_optional_fn_import.la
+libexec/apache/mod_optional_fn_export.so
+libexec/apache/mod_optional_fn_export.la
+libexec/apache/mod_include.so
+libexec/apache/mod_include.la
+libexec/apache/mod_imap.so
+libexec/apache/mod_imap.la
+libexec/apache/mod_speling.so
+libexec/apache/mod_speling.la
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_rewrite.la
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_mime_magic.la
 libexec/apache/mod_cern_meta.so
-libexec/apache/mod_cgi.so
-libexec/apache/mod_digest.so
-libexec/apache/mod_dir.so
-libexec/apache/mod_env.so
+libexec/apache/mod_cern_meta.la
 libexec/apache/mod_expires.so
+libexec/apache/mod_expires.la
 libexec/apache/mod_headers.so
-libexec/apache/mod_imap.so
-libexec/apache/mod_include.so
-libexec/apache/mod_info.so
-libexec/apache/mod_log_config.so
-libexec/apache/mod_mime.so
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mmap_static.so
-libexec/apache/mod_negotiation.so
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.so
-libexec/apache/mod_speling.so
-libexec/apache/mod_status.so
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_userdir.so
+libexec/apache/mod_headers.la
 libexec/apache/mod_usertrack.so
-libexec/apache/mod_vhost_alias.so
+libexec/apache/mod_usertrack.la
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_unique_id.la
+libexec/apache/mod_status.so
+libexec/apache/mod_status.la
+libexec/apache/mod_info.so
+libexec/apache/mod_info.la
+libexec/apache/mod_cgid.so
+libexec/apache/mod_cgid.la
+libexec/apache/httpd.exp
+sbin/rotatelogs
+sbin/htpasswd
+sbin/logresolve
 sbin/ab
 sbin/apachectl
 sbin/apxs
 sbin/httpd
-sbin/logresolve
-sbin/rotatelogs
 share/doc/apache/README.rus
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/apache_pb.gif
-share/doc/apache/index.html.ca
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.de
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.el
-share/doc/apache/index.html.en
-share/doc/apache/index.html.es
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.it
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.tw
 share/doc/apache/index.html.se
+share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.ru.ucs4
+share/doc/apache/index.html.ru.ucs2
+share/doc/apache/index.html.ru.koi8-r
+share/doc/apache/index.html.ru.iso-ru
+share/doc/apache/index.html.ru.cp866
+share/doc/apache/index.html.ru.cp-1251
+share/doc/apache/index.html.pt-br
+share/doc/apache/index.html.pt
+share/doc/apache/index.html.po.iso-pl
+share/doc/apache/index.html.no
+share/doc/apache/index.html.nl
+share/doc/apache/index.html.lu
+share/doc/apache/index.html.ltz
+share/doc/apache/index.html.kr.iso-kr
+share/doc/apache/index.html.kr.iso2022-kr
+share/doc/apache/index.html.ja.jis
+share/doc/apache/index.html.ja.iso2022-jp
+share/doc/apache/index.html.it
+share/doc/apache/index.html.he.iso8859-8
+share/doc/apache/index.html.fr
+share/doc/apache/index.html.et
+share/doc/apache/index.html.es
+share/doc/apache/index.html.en
+share/doc/apache/index.html.el
+share/doc/apache/index.html.ee
+share/doc/apache/index.html.dk
+share/doc/apache/index.html.de
+share/doc/apache/index.html.cz
+share/doc/apache/index.html.ca
+share/doc/apache/apache_pb.gif
 share/doc/apache/index.html.tw.Big5
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/configuring.html.en
-share/doc/apache/manual/configuring.html.html
-share/doc/apache/manual/configuring.html.ja.jis
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html.en
-share/doc/apache/manual/custom-error.html.html
-share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/handler.html.en
-share/doc/apache/manual/handler.html.html
-share/doc/apache/manual/handler.html.ja.jis
-share/doc/apache/manual/header.html
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.html
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.html
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html.en
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html.html
-share/doc/apache/manual/index.html.ja.jis
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html.en
-share/doc/apache/manual/install.html.fr
-share/doc/apache/manual/install.html.html
-share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/invoking.html.fr
-share/doc/apache/manual/keepalive.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/man-template.html
-share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/misc/tutorials.html
 share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/HTTP_Features.tsv
+share/doc/apache/manual/misc/known_client_problems.html
 share/doc/apache/manual/misc/client_block_api.html
 share/doc/apache/manual/misc/compat_notes.html
 share/doc/apache/manual/misc/custom_errordocs.html
@@ -198,22 +205,32 @@ share/doc/apache/manual/misc/footer.html
 share/doc/apache/manual/misc/header.html
 share/doc/apache/manual/misc/howto.html
 share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/nopgp.html
-share/doc/apache/manual/misc/perf-bsd44.html
-share/doc/apache/manual/misc/perf-dec.html
-share/doc/apache/manual/misc/perf-hp.html
 share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/perf.html
 share/doc/apache/manual/misc/rewriteguide.html
 share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/vif-info.html
-share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/mod/directive-dict.html.en
-share/doc/apache/manual/mod/directive-dict.html.html
-share/doc/apache/manual/mod/directive-dict.html.ja.jis
+share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/developer/modules.html
+share/doc/apache/manual/developer/documenting
+share/doc/apache/manual/developer/footer.html
+share/doc/apache/manual/developer/header.html
+share/doc/apache/manual/developer/hooks.html
+share/doc/apache/manual/developer/index.html
+share/doc/apache/manual/developer/layeredio.html
+share/doc/apache/manual/developer/debugging.html
+share/doc/apache/manual/platform/windows.html
+share/doc/apache/manual/platform/header.html
+share/doc/apache/manual/platform/netware.html
+share/doc/apache/manual/platform/perf-bsd44.html
+share/doc/apache/manual/platform/perf-dec.html
+share/doc/apache/manual/platform/perf-hp.html
+share/doc/apache/manual/platform/perf.html
+share/doc/apache/manual/platform/readme-tpf.html
+share/doc/apache/manual/platform/unixware.html
+share/doc/apache/manual/platform/win_compiling.html
+share/doc/apache/manual/platform/win_service.html
+share/doc/apache/manual/platform/footer.html
+share/doc/apache/manual/mod/threaded.html
+share/doc/apache/manual/mod/directive-dict.html
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
@@ -229,56 +246,44 @@ share/doc/apache/manual/mod/mod_auth_db.html
 share/doc/apache/manual/mod/mod_auth_dbm.html
 share/doc/apache/manual/mod/mod_auth_digest.html
 share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_browser.html
 share/doc/apache/manual/mod/mod_cern_meta.html
+share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_cookies.html
-share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_charset_lite.html
+share/doc/apache/manual/mod/mod_dav.html
 share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_dld.html
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
+share/doc/apache/manual/mod/mod_ext_filter.html
+share/doc/apache/manual/mod/mod_file_cache.html
 share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
 share/doc/apache/manual/mod/mod_info.html
 share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_agent.html
-share/doc/apache/manual/mod/mod_log_common.html
 share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_log_referer.html
 share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html.en
-share/doc/apache/manual/mod/mod_negotiation.html.html
-share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
+share/doc/apache/manual/mod/mod_negotiation.html
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
 share/doc/apache/manual/mod/mod_setenvif.html
-share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_speling.html
 share/doc/apache/manual/mod/mod_status.html
 share/doc/apache/manual/mod/mod_unique_id.html
 share/doc/apache/manual/mod/mod_userdir.html
 share/doc/apache/manual/mod/mod_usertrack.html
 share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html.en
-share/doc/apache/manual/mod/module-dict.html.html
-share/doc/apache/manual/mod/module-dict.html.ja.jis
-share/doc/apache/manual/mpeix.html
-share/doc/apache/manual/multilogs.html
-share/doc/apache/manual/netware.html
-share/doc/apache/manual/new_features_1_0.html
-share/doc/apache/manual/new_features_1_1.html
-share/doc/apache/manual/new_features_1_2.html
-share/doc/apache/manual/new_features_1_3.html.en
-share/doc/apache/manual/new_features_1_3.html.html
-share/doc/apache/manual/new_features_1_3.html.ja.jis
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/process-model.html
-share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/mod/module-dict.html
+share/doc/apache/manual/mod/mpm_common.html
+share/doc/apache/manual/mod/mpm_winnt.html
+share/doc/apache/manual/mod/perchild.html
+share/doc/apache/manual/mod/prefork.html
+share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/search/manual-index.cgi
+share/doc/apache/manual/programs/suexec.html
 share/doc/apache/manual/programs/apachectl.html
 share/doc/apache/manual/programs/apxs.html
 share/doc/apache/manual/programs/dbmmanage.html
@@ -291,104 +296,70 @@ share/doc/apache/manual/programs/index.html
 share/doc/apache/manual/programs/logresolve.html
 share/doc/apache/manual/programs/other.html
 share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/readme-tpf.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/server-wide.html.en
-share/doc/apache/manual/server-wide.html.fr
-share/doc/apache/manual/server-wide.html.html
-share/doc/apache/manual/server-wide.html.ja.jis
-share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/suexec_1_2.html
-share/doc/apache/manual/unixware.html
-share/doc/apache/manual/upgrading_to_1_3.html
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/images/custom_errordocs.gif
+share/doc/apache/manual/images/home.gif
+share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/mod_rewrite_fig1.fig
+share/doc/apache/manual/images/mod_rewrite_fig1.gif
+share/doc/apache/manual/images/mod_rewrite_fig2.fig
+share/doc/apache/manual/images/mod_rewrite_fig2.gif
+share/doc/apache/manual/images/pixel.gif
+share/doc/apache/manual/images/apache_header.gif
+share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.ja.jis
+share/doc/apache/manual/howto/footer.html
+share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.ja.jis
+share/doc/apache/manual/vhosts/virtual-host.html
 share/doc/apache/manual/vhosts/examples.html
 share/doc/apache/manual/vhosts/fd-limits.html
 share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html.en
-share/doc/apache/manual/vhosts/index.html.html
-share/doc/apache/manual/vhosts/index.html.ja.jis
+share/doc/apache/manual/vhosts/index.html
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
 share/doc/apache/manual/vhosts/name-based.html
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/win_compiling.html
-share/doc/apache/manual/win_service.html
-share/doc/apache/manual/windows.html
-www/cgi-bin.default/printenv
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/new_features_2_0.html.fr
+share/doc/apache/manual/new_features_2_0.html
+share/doc/apache/manual/mpm.html
+share/doc/apache/manual/location.html
+share/doc/apache/manual/invoking.html
+share/doc/apache/manual/install.html
+share/doc/apache/manual/install-tpf.html
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html
+share/doc/apache/manual/header.html
+share/doc/apache/manual/handler.html
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/filter.html
+share/doc/apache/manual/env.html
+share/doc/apache/manual/ebcdic.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/configuring.html
+share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/bind.html
+share/doc/apache/manual/STATUS
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/urlmapping.html
+share/doc/apache/manual/upgrading.html.fr
+share/doc/apache/manual/upgrading.html
+share/doc/apache/manual/suexec.html
+share/doc/apache/manual/stopping.html
+share/doc/apache/manual/server-wide.html
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/process-model.html
 www/cgi-bin.default/test-cgi
-www/icons/README
-www/icons/a.gif
-www/icons/alert.black.gif
-www/icons/alert.red.gif
-www/icons/apache_pb.gif
-www/icons/back.gif
-www/icons/ball.gray.gif
-www/icons/ball.red.gif
-www/icons/binary.gif
-www/icons/binhex.gif
-www/icons/blank.gif
-www/icons/bomb.gif
-www/icons/box1.gif
-www/icons/box2.gif
-www/icons/broken.gif
-www/icons/burst.gif
-www/icons/c.gif
-www/icons/comp.blue.gif
-www/icons/comp.gray.gif
-www/icons/compressed.gif
-www/icons/continued.gif
-www/icons/dir.gif
-www/icons/down.gif
-www/icons/dvi.gif
-www/icons/f.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.sec.gif
-www/icons/forward.gif
-www/icons/generic.gif
-www/icons/generic.red.gif
-www/icons/generic.sec.gif
-www/icons/hand.right.gif
-www/icons/hand.up.gif
-www/icons/icon.sheet.gif
-www/icons/image1.gif
-www/icons/image2.gif
-www/icons/image3.gif
-www/icons/index.gif
-www/icons/layout.gif
-www/icons/left.gif
-www/icons/link.gif
-www/icons/movie.gif
-www/icons/p.gif
-www/icons/patch.gif
-www/icons/pdf.gif
-www/icons/pie0.gif
-www/icons/pie1.gif
-www/icons/pie2.gif
-www/icons/pie3.gif
-www/icons/pie4.gif
-www/icons/pie5.gif
-www/icons/pie6.gif
-www/icons/pie7.gif
-www/icons/pie8.gif
-www/icons/portal.gif
-www/icons/ps.gif
-www/icons/quill.gif
-www/icons/right.gif
-www/icons/screw1.gif
-www/icons/screw2.gif
-www/icons/script.gif
-www/icons/small/README.txt
+www/cgi-bin.default/printenv
+www/icons/small/uu.gif
 www/icons/small/back.gif
 www/icons/small/binary.gif
 www/icons/small/binhex.gif
@@ -420,39 +391,100 @@ www/icons/small/tar.gif
 www/icons/small/text.gif
 www/icons/small/transfer.gif
 www/icons/small/unknown.gif
-www/icons/small/uu.gif
-www/icons/sound1.gif
-www/icons/sound2.gif
-www/icons/sphere1.gif
-www/icons/sphere2.gif
-www/icons/tar.gif
-www/icons/tex.gif
-www/icons/text.gif
-www/icons/transfer.gif
-www/icons/unknown.gif
-www/icons/up.gif
-www/icons/uu.gif
-www/icons/uuencoded.gif
+www/icons/small/README.txt
 www/icons/world1.gif
+www/icons/uuencoded.gif
+www/icons/uu.gif
+www/icons/up.gif
+www/icons/unknown.gif
+www/icons/transfer.gif
+www/icons/text.gif
+www/icons/tex.gif
+www/icons/tar.gif
+www/icons/sphere2.gif
+www/icons/sphere1.gif
+www/icons/sound2.gif
+www/icons/sound1.gif
+www/icons/script.gif
+www/icons/screw2.gif
+www/icons/screw1.gif
+www/icons/right.gif
+www/icons/quill.gif
+www/icons/ps.gif
+www/icons/portal.gif
+www/icons/pie8.gif
+www/icons/pie7.gif
+www/icons/pie6.gif
+www/icons/pie5.gif
+www/icons/pie4.gif
+www/icons/pie3.gif
+www/icons/pie2.gif
+www/icons/pie1.gif
+www/icons/pie0.gif
+www/icons/pdf.gif
+www/icons/patch.gif
+www/icons/p.gif
+www/icons/movie.gif
+www/icons/link.gif
+www/icons/left.gif
+www/icons/layout.gif
+www/icons/index.gif
+www/icons/image3.gif
+www/icons/image2.gif
+www/icons/image1.gif
+www/icons/icon.sheet.gif
+www/icons/hand.up.gif
+www/icons/hand.right.gif
+www/icons/generic.sec.gif
+www/icons/generic.red.gif
+www/icons/generic.gif
+www/icons/forward.gif
+www/icons/folder.sec.gif
+www/icons/folder.gif
+www/icons/folder.open.gif
+www/icons/f.gif
+www/icons/dvi.gif
+www/icons/down.gif
+www/icons/dir.gif
+www/icons/continued.gif
+www/icons/compressed.gif
+www/icons/comp.gray.gif
+www/icons/comp.blue.gif
+www/icons/c.gif
+www/icons/burst.gif
+www/icons/broken.gif
+www/icons/box2.gif
+www/icons/box1.gif
+www/icons/bomb.gif
+www/icons/blank.gif
+www/icons/binhex.gif
+www/icons/binary.gif
+www/icons/ball.red.gif
+www/icons/ball.gray.gif
+www/icons/back.gif
+www/icons/apache_pb.gif
+www/icons/alert.red.gif
+www/icons/alert.black.gif
+www/icons/a.gif
 www/icons/world2.gif
-@exec mkdir -p %D/www/proxy
+www/icons/README
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
 @dirrm etc/apache
-@dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/search
 @dirrm share/doc/apache/manual/vhosts
+@dirrm share/doc/apache/manual/search
+@dirrm share/doc/apache/manual/programs
+@dirrm share/doc/apache/manual/platform
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/howto
+@dirrm share/doc/apache/manual/developer
 @dirrm share/doc/apache/manual
 @dirrm share/doc/apache
-@dirrm www/cgi-bin.default
 @dirrm www/icons/small
 @dirrm www/icons
-@dirrm www/proxy
+@dirrm www/cgi-bin.default
 @dirrm www
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 53c05a99e121..8835bc4b7e32 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -1,68 +1,68 @@
-# New ports collection makefile for:    apache HTTPD
-# Date created:         Fri Aug 25 16:42:36 CDT 1995
-# Whom:                 ache@freebsd.org
+# New ports collection makefile for:	apache2
+# Date created:				7 April 2001
+# Whom:					Hye-Shik Chang <perky@python.or.kr>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	apache
-PORTVERSION=    1.3.19
-PORTREVISION=   1
+PORTVERSION=	2.0.16
 CATEGORIES=	www
-MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
-		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
-		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
-		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
-		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
+MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
+		http://www.cybernic.com/mirror/dist/httpd/ \
+		http://mirrors.partnersforever.net/apache/dist/httpd/ \
+		http://www.technotopia.com/vroom/apache/dist/httpd/ \
+		http://www.tux.org/pub/net/apache/dist/httpd/ \
+		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
 		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
 		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
-		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://www3.service.digital.com/apache/dist/httpd/ \
-		ftp://galileo.galilei.com/pub/apache/httpd/ \
-		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
-		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
-		ftp://apache.nextpath.com/pub/apache/dist/httpd/
-DISTNAME=	apache_${PORTVERSION}
+		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
+DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
 
-#PATCH_SITES=    ${MASTER_SITES}
-#PATCHFILES=     apache_${PORTVERSION}-fix.diff
+MAINTAINER?=	perky@python.or.kr
 
-MAINTAINER=	ache@freebsd.org
+WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
+FIND?=		find
+XARGS?=		xargs
 
-#
-# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
-#
+# apache2 doesn't process '--enable-share=max' option yet.
+# and some modules are very unstable at DSO mode.
+SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
+		auth_anon digest headers cern_meta expires include \
+		cgid status info usertrack dav dav_fs imap proxy \
+		auth_digest file_cache echo optional_fn_import \
+		optional_fn_export
+STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
+		userdir alias asis cgi mime log_config vhost_alias actions
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	\
 		--prefix=${PREFIX} \
-		--server-gid=nogroup \
+		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
-		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
-		--suexec-docroot=${PREFIX}/www/data \
-		--without-confadjust \
-		--enable-module=most \
-		--enable-module=auth_db \
-		--enable-module=mmap_static \
-		--disable-module=auth_dbm \
-		--enable-shared=max
+		--with-suexec-docroot=${PREFIX}/www/data \
+		--enable-shared \
+		--disable-threads \
+		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
 
-OPTIM=		-DHARD_SERVER_LIMIT=512 \
-		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \
-		-DACCEPT_FILTER_NAME=\\"httpready\\"
-
-.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+=		-DBUFFERED_LOGS
-CFLAGS+=	-O6 -fomit-frame-pointer
-.endif
+OPTIM+=		-DHARD_SERVER_LIMIT=512 \
+		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
 CONFIGURE_ENV=	OPTIM='${OPTIM}'
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
+
+.for mod in ${SHARED_MODS}
+CONFIGURE_ARGS+= --enable-${mod}=shared
+.endfor
+.for mod in ${STATIC_MODS}
+CONFIGURE_ARGS+= --enable-${mod}=yes
+.endfor
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index 2d2273f86b4e..3802044557de 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
+MD5 (httpd-2_0_16-beta.tar.gz) = 364fc61593185789cb9744bae1ebb655
diff --git a/www/apache21/files/FreeBSD.layout b/www/apache21/files/FreeBSD.layout
deleted file mode 100644
index 5524e186e9c0..000000000000
--- a/www/apache21/files/FreeBSD.layout
+++ /dev/null
@@ -1,19 +0,0 @@
-#   FreeBSD layout...
-<Layout FreeBSD>
-    prefix:        /usr/local
-    exec_prefix:   $prefix
-    bindir:        $exec_prefix/bin
-    sbindir:       $exec_prefix/sbin
-    libexecdir:    $exec_prefix/libexec/apache
-    mandir:        $prefix/man
-    sysconfdir:    $prefix/etc/apache
-    datadir:       $prefix/www
-    iconsdir:      $datadir/icons
-    htdocsdir:     $datadir/data
-    cgidir:        $datadir/cgi-bin
-    includedir:    $prefix/include/apache
-    localstatedir: /var
-    runtimedir:    $localstatedir/run
-    logfiledir:    $localstatedir/log
-    proxycachedir: $datadir/proxy
-</Layout>
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
new file mode 100644
index 000000000000..341c8dfd087f
--- /dev/null
+++ b/www/apache21/files/patch-Makefile.in
@@ -0,0 +1,123 @@
+--- Makefile.in.orig	Wed Apr  4 02:03:35 2001
++++ Makefile.in	Sun Apr  8 06:06:58 2001
+@@ -16,7 +16,7 @@
+ targets         = $(PROGRAMS) $(other_targets)
+ phony_targets   = $(srcdir)/buildmark.c
+ install_targets = install-conf install-htdocs install-icons install-other \
+-	install-cgi install-include install-support install-suexec
++	install-cgi install-include install-support install-manpages install-suexec
+ DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
+ 	configure generated_lists include/ap_config_auto.h \
+ 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
+@@ -28,25 +28,32 @@
+ install-conf:
+ 	@echo Installing configuration files
+ 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
++
+ 	@cd docs/conf; \
+ 	for i in mime.types magic; do \
+-		$(INSTALL_DATA) $$i $(sysconfdir); \
++		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
++		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
+ 	done; \
+ 	for i in *-std*; do \
+ 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+ 		    -e 's#@@Port@@#$(PORT)#g' \
+-			< $$i > $(sysconfdir)/$$i; \
+-		chmod 0644 $(sysconfdir)/$$i; \
++			< $$i > $(sysconfdir)/$$i.default; \
++		chmod 0644 $(sysconfdir)/$$i.default; \
++		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
+ 		file=`echo $$i|sed s/-std//`; \
+ 		if [ "$$file" = "httpd.conf" ]; then \
+ 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+ 		fi; \
+ 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
+-			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
++			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
++			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
+ 		fi; \
+ 	done
+ 
+ htdocs-srcdir = docs/docroot
++htman-srcdir = docs/manual
++doc_prefix = $(prefix)/share/doc/apache
++man-srcdir = docs/man
+ 
+ docs::
+ 	mkdir -p ./docs/api
+@@ -57,11 +64,14 @@
+ 
+ install-htdocs:
+ 	@echo Installing HTML documents
+-	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
+-	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+-	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
+-	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
++	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
++	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
++	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
++	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
++	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
++	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-icons:
+ 	@echo Installing icons
+@@ -71,24 +81,27 @@
+ 
+ install-cgi:
+ 	@echo Installing CGIs
+-	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
+-	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
++	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-support:
+ 	@echo Installing Support Binaries
+ 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
+-	@cp -p $(srcdir)/support/httpd.exp $(bindir)
++	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
++	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
++	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
+ 	@cp -p $(builddir)/support/htpasswd $(bindir)
+ 	@cp -p $(builddir)/support/htdigest $(bindir)
+-	@cp -p $(builddir)/support/rotatelogs $(bindir)
+-	@cp -p $(builddir)/support/logresolve $(bindir)
+-	@cp -p $(builddir)/support/ab $(bindir)
+-	@cp -p $(builddir)/support/apachectl $(bindir)
+-	chmod 755 $(bindir)/apachectl
++	@cp -p $(builddir)/support/rotatelogs $(sbindir)
++	@cp -p $(builddir)/support/logresolve $(sbindir)
++	@cp -p $(builddir)/support/ab $(sbindir)
++	@cp -p $(builddir)/support/apachectl $(sbindir)
++	chmod 755 $(sbindir)/apachectl
+ 	@if test -f $(builddir)/support/apxs; then \
+-	    cp -p $(builddir)/support/apxs $(bindir); \
+-	    chmod 755 $(bindir)/apxs; \
++	    cp -p $(builddir)/support/apxs $(sbindir); \
++	    chmod 755 $(sbindir)/apxs; \
+ 	fi
+ 
+ 
+@@ -117,6 +130,15 @@
+ 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
+ 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
+ 	@chmod 644 $(includedir)/*.h
++
++install-manpages:
++	@echo Installing manual pages
++	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
++	@for sect in 1 8; do \
++		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
++		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
++	done;
++	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache21/files/patch-aa b/www/apache21/files/patch-aa
deleted file mode 100644
index 15cd58c27ef2..000000000000
--- a/www/apache21/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig	Tue Jan 18 01:53:17 2000
-+++ configure	Mon Jan 24 19:37:21 2000
-@@ -1232,8 +1232,8 @@
-     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
-     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
-     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
--    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
--    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
-+    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
-     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
-     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1330,8 +1330,8 @@
- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
- echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
- echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
--echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
--echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
- echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
- echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
- echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab
deleted file mode 100644
index e4448f1e47ca..000000000000
--- a/www/apache21/files/patch-ab
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile.tmpl.orig	Tue Jan 11 22:47:41 2000
-+++ Makefile.tmpl	Mon Jan 24 19:50:42 2000
-@@ -123,6 +123,7 @@
- runtimedir      = @runtimedir@
- logfiledir      = @logfiledir@
- proxycachedir   = @proxycachedir@
-+doc_prefix      = $(prefix)/share/doc/apache
- 
- libexecdir_relative   = @libexecdir_relative@
- 
-@@ -266,9 +267,9 @@
- 	$(MKDIR) $(root)$(mandir)/man1
- 	$(MKDIR) $(root)$(mandir)/man8
- 	$(MKDIR) $(root)$(sysconfdir)
--	$(MKDIR) $(root)$(htdocsdir)
-+	$(MKDIR) $(root)$(doc_prefix)
- 	$(MKDIR) $(root)$(iconsdir)
--	$(MKDIR) $(root)$(cgidir)
-+	$(MKDIR) $(root)$(cgidir).default
- 	$(MKDIR) $(root)$(includedir)
- 	$(MKDIR) $(root)$(includedir)/xml
- 	$(MKDIR) $(root)$(runtimedir)
-@@ -452,25 +453,33 @@
- #   icons and distributed CGI scripts.
- install-data:
- 	@echo "===> [data: Installing initial data files]"
--	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
--	else \
--		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+#        -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-+#        else \
-+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
--		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
--		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
--		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
--	fi
--	-@if [ -f $(root)$(cgidir)/printenv ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
--	else \
-+		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
-+		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
-+#        fi
-+	if [ ! -d $(root)$(htdocsdir) ]; then \
-+		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
-+  	fi
-+	$(RM) $(root)$(htdocsdir).default
-+	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
-+#        -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-+#        else \
- 		for script in printenv test-cgi; do \
- 			cat $(TOP)/cgi-bin/$${script} |\
- 			sed -e 's;^#!/.*perl;#!$(PERL);' \
- 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
--			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
-+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
- 		done; \
-+#        fi
-+	if [ ! -d $(root)$(cgidir) ]; then \
-+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
- 	fi
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
- 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
-@@ -509,10 +518,10 @@
- 			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
- 			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
- 			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
--			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
--			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
--			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
--			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
-+			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \
-+			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \
-+			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
-+			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
- 			-e 's;conf/magic;$(sysconfdir)/magic;' \
- 			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
- 			-e 's;User nobody;User $(conf_user);' \
diff --git a/www/apache21/files/patch-ag b/www/apache21/files/patch-ag
deleted file mode 100644
index 80373fbcca63..000000000000
--- a/www/apache21/files/patch-ag
+++ /dev/null
@@ -1,66 +0,0 @@
---- conf/httpd.conf-dist.orig	Mon Feb 21 08:30:46 2000
-+++ conf/httpd.conf-dist	Mon May 29 16:48:49 2000
-@@ -354,7 +354,22 @@
- # directory index.  Separate multiple entries with spaces.
- #
- <IfModule mod_dir.c>
--    DirectoryIndex index.html
-+    <IfModule mod_php3.c>
-+        <IfModule mod_php4.c>
-+            DirectoryIndex index.php index.php3 index.html
-+        </IfModule>
-+        <IfModule !mod_php4.c>
-+            DirectoryIndex index.php3 index.html
-+        </IfModule>
-+    </IfModule>
-+    <IfModule !mod_php3.c>
-+        <IfModule mod_php4.c>
-+            DirectoryIndex index.php index.html
-+        </IfModule>
-+        <IfModule !mod_php4.c>
-+            DirectoryIndex index.html
-+        </IfModule>
-+    </IfModule>
- </IfModule>
- 
- #
-@@ -473,7 +488,7 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+#CustomLog logs/access_log common
- 
- #
- # If you would like to have agent and referer logfiles, uncomment the
-@@ -486,7 +501,7 @@
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+CustomLog logs/access_log combined
- 
- #
- # Optionally add a line containing the server version and virtual host
-@@ -708,13 +723,17 @@
-     # For example, the PHP 3.x module (not part of the Apache distribution - see
-     # http://www.php.net) will typically use:
-     #
--    #AddType application/x-httpd-php3 .php3
--    #AddType application/x-httpd-php3-source .phps
-+    <IfModule mod_php3.c>
-+        AddType application/x-httpd-php3 .php3
-+        AddType application/x-httpd-php3-source .php3s
-+    </IfModule>
-     #
-     # And for PHP 4.x, use:
-     #
--    #AddType application/x-httpd-php .php
--    #AddType application/x-httpd-php-source .phps
-+    <IfModule mod_php4.c>
-+        AddType application/x-httpd-php .php
-+        AddType application/x-httpd-php-source .phps
-+    </IfModule>
- 
-     AddType application/x-tar .tgz
- 
diff --git a/www/apache21/files/patch-ak b/www/apache21/files/patch-ak
deleted file mode 100644
index 486f7ad159cf..000000000000
--- a/www/apache21/files/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/support/apachectl.orig	Wed Apr  7 00:36:33 1999
-+++ src/support/apachectl	Fri Sep  3 15:41:01 1999
-@@ -39,6 +39,8 @@
- # --------------------                              --------------------
- # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
- 
-+eval `limits -e -C daemon` >/dev/null 2>&1
-+
- ERROR=0
- ARGV="$@"
- if [ "x$ARGV" = "x" ] ; then 
-@@ -82,6 +84,7 @@
- 	fi
- 	if kill $PID ; then
- 	    echo "$0 $ARG: httpd stopped"
-+	    rm $PIDFILE
- 	else
- 	    echo "$0 $ARG: httpd could not be stopped"
- 	    ERROR=4
diff --git a/www/apache21/files/patch-build:rules.mk b/www/apache21/files/patch-build:rules.mk
new file mode 100644
index 000000000000..d5058a91d8ca
--- /dev/null
+++ b/www/apache21/files/patch-build:rules.mk
@@ -0,0 +1,14 @@
+--- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
++++ build/rules.mk	Sun Apr  8 01:05:46 2001
+@@ -172,9 +172,9 @@
+ all-p: $(targets)
+ install-p: $(targets) $(install_targets)
+ 	@if test -n '$(PROGRAMS)'; then \
+-		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
++		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
+ 		for i in "$(PROGRAMS)"; do \
+-			$(INSTALL_PROGRAM) $$i $(bindir); \
++			$(INSTALL_PROGRAM) $$i $(sbindir); \
+ 		done; \
+ 	fi
+ 
diff --git a/www/apache21/files/patch-config.layout b/www/apache21/files/patch-config.layout
new file mode 100644
index 000000000000..75a700c6a805
--- /dev/null
+++ b/www/apache21/files/patch-config.layout
@@ -0,0 +1,25 @@
+--- config.layout.orig	Sat Apr  7 04:19:44 2001
++++ config.layout	Sat Apr  7 04:20:28 2001
+@@ -249,3 +249,22 @@
+     logfiledir:    $prefix/logs
+     proxycachedir: $prefix/proxy
+ </Layout>
++
++<Layout FreeBSD>
++    prefix:        /usr/local
++    exec_prefix:   $prefix
++    bindir:        $exec_prefix/bin
++    sbindir:       $exec_prefix/sbin
++    libexecdir:    $exec_prefix/libexec/apache
++    mandir:        $prefix/man
++    sysconfdir:    $prefix/etc/apache
++    datadir:       $prefix/www
++    iconsdir:      $datadir/icons
++    htdocsdir:     $datadir/data
++    cgidir:        $datadir/cgi-bin
++    includedir:    $prefix/include/apache
++    localstatedir: /var
++    runtimedir:    $localstatedir/run
++    logfiledir:    $localstatedir/log
++    proxycachedir: $datadir/proxy
++</Layout>
diff --git a/www/apache21/files/patch-configure b/www/apache21/files/patch-configure
new file mode 100644
index 000000000000..5419d37c531c
--- /dev/null
+++ b/www/apache21/files/patch-configure
@@ -0,0 +1,32 @@
+--- configure.orig	Wed Apr  4 12:45:36 2001
++++ configure	Sun Apr  8 03:25:31 2001
+@@ -3760,7 +3760,9 @@
+       -e "s/[ 	]*$/'/g" \
+       $srcdir/config.layout > $pldconf
+   layout_name=$LAYOUT
++  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
+   . $pldconf
++  prefix=$prefix_backup
+   rm $pldconf
+   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
+              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
+@@ -9678,6 +9680,10 @@
+ 
+   
+   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
+   
+ 
+   
+@@ -9814,7 +9820,7 @@
+ EOF
+ 
+ cat >> confdefs.h <<EOF
+-#define SERVER_CONFIG_FILE "conf/$progname.conf"
++#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
+ EOF
+ 
+ cat >> confdefs.h <<EOF
diff --git a/www/apache21/files/patch-docs:conf:httpd-std.conf b/www/apache21/files/patch-docs:conf:httpd-std.conf
new file mode 100644
index 000000000000..f70a76bf17df
--- /dev/null
+++ b/www/apache21/files/patch-docs:conf:httpd-std.conf
@@ -0,0 +1,203 @@
+--- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
++++ docs/conf/httpd-std.conf	Sun Apr  8 04:26:54 2001
+@@ -64,7 +64,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
+ 
+ #
+ # ScoreBoardFile: File used to store internal server process information.
+@@ -73,7 +73,7 @@
+ # no two invocations of Apache share the same scoreboard file.
+ #
+ <IfModule !perchild.c>
+-ScoreBoardFile logs/apache_runtime_status
++ScoreBoardFile /var/run/apache_runtime_status
+ </IfModule>
+ 
+ #
+@@ -182,6 +182,28 @@
+ #
+ # Example:
+ # LoadModule foo_module modules/mod_foo.so
++#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
++#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
++#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
++#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
++#LoadModule cgid_module			libexec/apache/mod_cgid.so
++#LoadModule dav_module			libexec/apache/mod_dav.so
++#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
++#LoadModule digest_module		libexec/apache/mod_digest.so
++#LoadModule expires_module		libexec/apache/mod_expires.so
++#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
++#LoadModule headers_module		libexec/apache/mod_headers.so
++#LoadModule imap_module			libexec/apache/mod_imap.so
++#LoadModule include_module		libexec/apache/mod_include.so
++#LoadModule info_module			libexec/apache/mod_info.so
++#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
++#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
++#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
++#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
++#LoadModule speling_module		libexec/apache/mod_speling.so
++#LoadModule status_module		libexec/apache/mod_status.so
++#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
++#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
+ 
+ ### Section 2: 'Main' server configuration
+ #
+@@ -221,7 +243,7 @@
+ #  don't use Group #-1 on these systems!
+ #
+ User nobody
+-Group #-1
++Group nogroup
+ 
+ #
+ # ServerAdmin: Your address, where problems with the server should be
+@@ -249,7 +271,7 @@
+ # documents. By default, all requests are taken from this directory, but
+ # symbolic links and aliases may be used to point to other locations.
+ #
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ 
+ #
+ # Each directory to which Apache has access, can be configured with respect
+@@ -274,7 +296,7 @@
+ #
+ # This should be changed to whatever you set DocumentRoot to.
+ #
+-<Directory "@@ServerRoot@@/htdocs">
++<Directory "@@ServerRoot@@/www/data">
+ 
+ #
+ # This may also be "None", "All", or any combination of "Indexes",
+@@ -326,7 +348,22 @@
+ # DirectoryIndex: Name of the file or files to use as a pre-written HTML
+ # directory index.  Separate multiple entries with spaces.
+ #
+-DirectoryIndex index.html
++<IfModule mod_php3.c>
++    <IfModule mod_php4.c>
++        DirectoryIndex index.php index.php3 index.html
++    </IfModule>
++    <IfModule !mod_php4.c>
++        DirectoryIndex index.php3 index.html
++    </IfModule>
++</IfModule>
++<IfModule !mod_php3.c>
++    <IfModule mod_php4.c>
++        DirectoryIndex index.php index.html
++    </IfModule>
++    <IfModule !mod_php4.c>
++        DirectoryIndex index.html
++    </IfModule>
++</IfModule>
+ 
+ #
+ # AccessFileName: The name of the file to look for in each directory
+@@ -372,7 +409,7 @@
+ # TypesConfig describes where the mime.types file (or equivalent) is
+ # to be found.
+ #
+-TypesConfig conf/mime.types
++TypesConfig etc/apache/mime.types
+ 
+ #
+ # DefaultType is the default MIME type the server will use for a document
+@@ -397,7 +434,7 @@
+ # module is part of the server.
+ #
+ <IfModule mod_mime_magic.c>
+-    MIMEMagicFile conf/magic
++    MIMEMagicFile etc/apache/magic
+ </IfModule>
+ 
+ #
+@@ -417,7 +454,7 @@
+ # logged here.  If you *do* define an error logfile for a <VirtualHost>
+ # container, that host's errors will be logged there and not here.
+ #
+-ErrorLog logs/error_log
++ErrorLog /var/log/httpd-error.log
+ 
+ #
+ # LogLevel: Control the number of messages logged to the error_log.
+@@ -442,7 +479,7 @@
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+-CustomLog logs/access_log common
++#CustomLog logs/access_log common
+ 
+ #
+ # If you would like to have agent and referer logfiles, uncomment the
+@@ -455,7 +492,7 @@
+ # If you prefer a single logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can use the following directive.
+ #
+-#CustomLog logs/access_log combined
++CustomLog /var/log/httpd-access.log combined
+ 
+ #
+ # Optionally add a line containing the server version and virtual host
+@@ -474,9 +511,9 @@
+ # require it to be present in the URL.  So "/icons" isn't aliased in this
+ # example, only "/icons/"..
+ #
+-Alias /icons/ "@@ServerRoot@@/icons/"
++Alias /icons/ "@@ServerRoot@@/www/icons/"
+ 
+-<Directory "@@ServerRoot@@/icons">
++<Directory "@@ServerRoot@@/www/icons">
+     Options Indexes MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -491,7 +528,7 @@
+ # The same rules about trailing "/" apply to ScriptAlias directives as to
+ # Alias.
+ #
+-ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
++ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
+ 
+ <IfModule mod_cgid.c>
+ #
+@@ -505,7 +542,7 @@
+ # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
+ # CGI directory exists, if you have that configured.
+ #
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     AllowOverride None
+     Options None
+     Order allow,deny
+@@ -657,6 +694,7 @@
+ AddLanguage ja .ja
+ AddLanguage pl .po
+ AddLanguage kr .kr
++AddLanguage ko .kr
+ AddLanguage pt .pt
+ AddLanguage no .no
+ AddLanguage pt-br .pt-br
+@@ -741,8 +779,17 @@
+ # For example, the PHP3 module (not part of the Apache distribution - see
+ # http://www.php.net) will typically use:
+ #
+-#AddType application/x-httpd-php3 .php3
+-#AddType application/x-httpd-php3-source .phps
++<IfModule mod_php3.c>
++    AddType application/x-httpd-php3 .php3
++    AddType application/x-httpd-php3-source .php3s
++</IfModule>
++#
++# And for PHP 4.x, use:
++#
++<IfModule mod_php4.c>
++    AddType application/x-httpd-php .php
++    AddType application/x-httpd-php-source .phps
++</IfModule>
+ 
+ AddType application/x-tar .tgz
+ 
diff --git a/www/apache21/files/patch-include:httpd.h b/www/apache21/files/patch-include:httpd.h
new file mode 100644
index 000000000000..9f8fdf34997b
--- /dev/null
+++ b/www/apache21/files/patch-include:httpd.h
@@ -0,0 +1,38 @@
+--- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
++++ include/httpd.h	Sat Apr  7 09:08:43 2001
+@@ -127,7 +127,7 @@
+ /* Set default for OS/2 file system */
+ #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
+ #else
+-#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
++#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
+ #endif
+ #endif /* DOCUMENT_LOCATION */
+ 
+@@ -144,7 +144,7 @@
+ #if defined(OS2) || defined(WIN32)
+ #define DEFAULT_ERRORLOG "logs/error.log"
+ #else
+-#define DEFAULT_ERRORLOG "logs/error_log"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
+ #endif
+ #endif /* DEFAULT_ERRORLOG */
+ 
+@@ -160,7 +160,7 @@
+ 
+ /* The name of the server config file */
+ #ifndef SERVER_CONFIG_FILE
+-#define SERVER_CONFIG_FILE "conf/httpd.conf"
++#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
+ #endif
+ 
+ /* Whether we should enable rfc1413 identity checking */
+@@ -247,7 +247,7 @@
+ 
+ /* The name of the MIME types file */
+ #ifndef AP_TYPES_CONFIG_FILE
+-#define AP_TYPES_CONFIG_FILE "conf/mime.types"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
+ #endif
+ 
+ /*
diff --git a/www/apache21/files/patch-srclib:apr-util:Makefile.in b/www/apache21/files/patch-srclib:apr-util:Makefile.in
new file mode 100644
index 000000000000..652901dae28a
--- /dev/null
+++ b/www/apache21/files/patch-srclib:apr-util:Makefile.in
@@ -0,0 +1,22 @@
+--- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
++++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
+@@ -22,8 +22,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=$(prefix)/lib
++includedir=$(prefix)/include/apache
+ 
+ delete-lib:
+ 	@if test -f $(TARGET_LIB); then \
+@@ -43,7 +43,7 @@
+ 	if [ ! -d $(libdir) ]; then \
+ 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
+ 	fi; \
+-	libtool --mode=install cp $(TARGET_LIB) $(libdir)
++	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
+ 
+ $(TARGET_LIB):
+ 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache21/files/patch-srclib:apr:Makefile.in b/www/apache21/files/patch-srclib:apr:Makefile.in
new file mode 100644
index 000000000000..4c0292f73af8
--- /dev/null
+++ b/www/apache21/files/patch-srclib:apr:Makefile.in
@@ -0,0 +1,22 @@
+--- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
++++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
+@@ -37,8 +37,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=$(prefix)/lib
++includedir=$(prefix)/include/apache
+ 
+ delete-lib:
+ 	@if test -f $(TARGET_LIB); then \
+@@ -58,7 +58,7 @@
+ 	if [ ! -d $(libdir) ]; then \
+ 	    ./build/mkdir.sh $(libdir); \
+ 	fi; \
+-	libtool --mode=install cp $(TARGET_LIB) $(libdir)
++	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
+ 
+ $(TARGET_LIB):
+ 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache21/files/patch-support:apachectl.in b/www/apache21/files/patch-support:apachectl.in
new file mode 100644
index 000000000000..739a622d74de
--- /dev/null
+++ b/www/apache21/files/patch-support:apachectl.in
@@ -0,0 +1,24 @@
+--- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
++++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+@@ -25,10 +25,10 @@
+ # --------------------                              --------------------
+ # 
+ # the path to your PID file
+-PIDFILE=@prefix@/logs/httpd.pid
++PIDFILE=/var/run/httpd.pid
+ #
+ # the path to your httpd binary, including options if necessary
+-HTTPD='@prefix@/bin/httpd'
++HTTPD='@prefix@/sbin/httpd'
+ #
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line.  Designed for lynx, however other
+@@ -41,6 +41,8 @@
+ #
+ # --------------------                              --------------------
+ # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
++
++eval `limits -e -C daemon` >/dev/null 2>&1
+ 
+ ERROR=0
+ ARGV="$@"
diff --git a/www/apache21/files/patch-support:apxs.in b/www/apache21/files/patch-support:apxs.in
new file mode 100644
index 000000000000..70ca84075675
--- /dev/null
+++ b/www/apache21/files/patch-support:apxs.in
@@ -0,0 +1,11 @@
+--- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
++++ support/apxs.in	Sat Apr  7 11:55:28 2001
+@@ -73,7 +73,7 @@
+ my $prefix            = "$CFG_PREFIX";
+ my $CFG_EXEC_PREFIX   = "@exec_prefix@";
+ my $exec_prefix       = "$CFG_EXEC_PREFIX";
+-my $CFG_SBINDIR       = "@bindir@";
++my $CFG_SBINDIR       = "@sbindir@";
+ my $CFG_INCLUDEDIR    = "@includedir@";
+ my $CFG_LIBEXECDIR    = "@libexecdir@";
+ my $CFG_SYSCONFDIR    = "@sysconfdir@";
diff --git a/www/apache22/files/patch-al b/www/apache21/files/patch-support:log_server_status.in
index b355a697b4ab..3549aa89f8c5 100644
--- a/www/apache22/files/patch-al
+++ b/www/apache21/files/patch-support:log_server_status.in
@@ -1,6 +1,6 @@
---- src/support/log_server_status.orig	Fri Jun  4 19:54:19 1999
-+++ src/support/log_server_status	Fri Sep  3 15:53:16 1999
-@@ -67,10 +67,10 @@
+--- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
++++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+@@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
@@ -13,7 +13,7 @@
  
  sub tcp_connect
  {
-@@ -100,7 +100,7 @@
+@@ -96,7 +96,7 @@
  	chomp($date);
  	($day,$time)=split(/:/,$date);
  	$res=&tcp_connect($server,$port);
diff --git a/www/apache21/files/patch-util.c b/www/apache21/files/patch-util.c
deleted file mode 100644
index 60f218221799..000000000000
--- a/www/apache21/files/patch-util.c
+++ /dev/null
@@ -1,53 +0,0 @@
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/main/util.c,v
-retrieving revision 1.194
-retrieving revision 1.197
-diff -u -r1.194 -r1.197
---- src/main/util.c	2001/02/01 10:06:37	1.194
-+++ src/main/util.c	2001/03/30 17:37:54	1.197
-@@ -2013,12 +2013,14 @@
-     int x;
- 
-     if (!strchr(p->h_name, '.')) {
--	for (x = 0; p->h_aliases[x]; ++x) {
--	    if (strchr(p->h_aliases[x], '.') &&
--		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
--		return ap_pstrdup(a, p->h_aliases[x]);
--	}
--	return NULL;
-+        if (p->h_aliases) {
-+        	for (x = 0; p->h_aliases[x]; ++x) {
-+                if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') &&
-+            		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
-+		            return ap_pstrdup(a, p->h_aliases[x]);
-+            }
-+	    }
-+	    return NULL;
-     }
-     return ap_pstrdup(a, (void *) p->h_name);
- }
-@@ -2040,7 +2042,6 @@
- 	ap_log_error(APLOG_MARK, APLOG_WARNING, NULL,
- 	             "%s: gethostname() failed to determine ServerName\n",
-                      ap_server_argv0);
--	server_hostname = ap_pstrdup(a, "127.0.0.1");
-     }
-     else 
-     {
-@@ -2048,14 +2049,14 @@
-         if ((!(p = gethostbyname(str))) 
-             || (!(server_hostname = find_fqdn(a, p)))) {
-             /* Recovery - return the default servername by IP: */
--            if (p->h_addr_list[0]) {
-+            if (p && p->h_addr_list && p->h_addr_list[0]) {
-                 ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]);
- 	        server_hostname = ap_pstrdup(a, str);
-                 /* We will drop through to report the IP-named server */
-             }
-         }
- 	else
--            /* Since we found a fdqn, return it with no logged message. */
-+            /* Since we found a fqdn, return it with no logged message. */
-             return server_hostname;
-     }
- 
diff --git a/www/apache21/pkg-comment b/www/apache21/pkg-comment
index 0b2be74481cf..08ad28e1ad55 100644
--- a/www/apache21/pkg-comment
+++ b/www/apache21/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server.  Very fast, very clean
+Version 2 of the extremely popular Apache http server
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 1d0c4d1df94d..95616fc8a1c6 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -1,194 +1,201 @@
-bin/dbmmanage
-bin/htdigest
 bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf.default
-@exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+bin/htdigest
+etc/rc.d/apache.sh
 @unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
 etc/apache/mime.types.default
 @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf.default
-@exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
-etc/rc.d/apache.sh
-include/apache/ap.h
-include/apache/ap_alloc.h
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
+etc/apache/magic.default
+@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+@unexec if cmp -s %D/etc/apache/highperformance-std.conf %D/etc/apache/highperformance-std.conf.default; then rm -f %D/etc/apache/highperformance-std.conf; fi
+etc/apache/highperformance-std.conf.default
+@exec [ ! -f %B/highperformance-std.conf ] && cp %B/%f %B/highperformance-std.conf
+@unexec if cmp -s %D/etc/apache/highperformance.conf %D/etc/apache/highperformance.conf.default; then rm -f %D/etc/apache/highperformance.conf; fi
+etc/apache/highperformance.conf.default
+@exec [ ! -f %B/highperformance.conf ] && cp %B/%f %B/highperformance.conf
+@unexec if cmp -s %D/etc/apache/httpd-std.conf %D/etc/apache/httpd-std.conf.default; then rm -f %D/etc/apache/httpd-std.conf; fi
+etc/apache/httpd-std.conf.default
+@exec [ ! -f %B/httpd-std.conf ] && cp %B/%f %B/httpd-std.conf
+@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
+etc/apache/httpd.conf.default
+@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+include/apache/apr.h
+include/apache/apr_want.h
+include/apache/apr_uuid.h
+include/apache/apr_user.h
+include/apache/apr_time.h
+include/apache/apr_thread_proc.h
+include/apache/apr_tables.h
+include/apache/apr_strings.h
+include/apache/apr_signal.h
+include/apache/apr_shmem.h
+include/apache/apr_portable.h
+include/apache/apr_pools.h
+include/apache/apr_network_io.h
+include/apache/apr_mmap.h
+include/apache/apr_md5.h
+include/apache/apr_lock.h
+include/apache/apr_lib.h
+include/apache/apr_hash.h
+include/apache/apr_getopt.h
+include/apache/apr_general.h
+include/apache/apr_fnmatch.h
+include/apache/apr_file_io.h
+include/apache/apr_file_info.h
+include/apache/apr_errno.h
+include/apache/apr_dso.h
+include/apache/apr_compat.h
+include/apache/apr_xlate.h
+include/apache/apr_base64.h
+include/apache/apu.h
+include/apache/apr_xml.h
+include/apache/apr_sha1.h
+include/apache/apr_sdbm.h
+include/apache/apr_ring.h
+include/apache/apr_optional.h
+include/apache/apr_hooks.h
+include/apache/apr_generic_hook.h
+include/apache/apr_dbm.h
+include/apache/apr_buckets.h
+include/apache/apu_compat.h
 include/apache/ap_compat.h
-include/apache/ap_config.h
-include/apache/ap_config_auto.h
-include/apache/ap_ctype.h
-include/apache/ap_md5.h
-include/apache/ap_mmn.h
-include/apache/ap_sha1.h
-include/apache/buff.h
-include/apache/compat.h
-include/apache/conf.h
-include/apache/explain.h
-include/apache/fnmatch.h
-include/apache/hsregex.h
-include/apache/http_conf_globals.h
-include/apache/http_config.h
-include/apache/http_core.h
-include/apache/http_log.h
-include/apache/http_main.h
-include/apache/http_protocol.h
-include/apache/http_request.h
-include/apache/http_vhost.h
+include/apache/util_uri.h
+include/apache/util_script.h
+include/apache/util_md5.h
+include/apache/util_filter.h
+include/apache/util_ebcdic.h
+include/apache/util_date.h
+include/apache/util_charset.h
+include/apache/util_cfgtree.h
+include/apache/scoreboard.h
+include/apache/rfc1413.h
+include/apache/pcreposix.h
+include/apache/mpm_common.h
 include/apache/httpd.h
-include/apache/multithread.h
-include/apache/os-inline.c
+include/apache/http_vhost.h
+include/apache/http_request.h
+include/apache/http_protocol.h
+include/apache/http_main.h
+include/apache/http_log.h
+include/apache/http_core.h
+include/apache/http_connection.h
+include/apache/http_config.h
+include/apache/ap_release.h
+include/apache/ap_mpm.h
+include/apache/ap_mmn.h
+include/apache/ap_listen.h
+include/apache/ap_config_auto.h
+include/apache/ap_config.h
+include/apache/util_xml.h
 include/apache/os.h
-include/apache/rfc1413.h
-include/apache/scoreboard.h
-include/apache/util_date.h
-include/apache/util_md5.h
-include/apache/util_script.h
-include/apache/util_uri.h
-include/apache/xml/asciitab.h
-include/apache/xml/hashtable.h
-include/apache/xml/iasciitab.h
-include/apache/xml/latin1tab.h
-include/apache/xml/nametab.h
-include/apache/xml/utf8tab.h
-include/apache/xml/xmldef.h
-include/apache/xml/xmlparse.h
-include/apache/xml/xmlrole.h
-include/apache/xml/xmltok.h
-include/apache/xml/xmltok_impl.h
-libexec/apache/httpd.exp
-libexec/apache/libproxy.so
-libexec/apache/mod_access.so
-libexec/apache/mod_actions.so
-libexec/apache/mod_alias.so
-libexec/apache/mod_asis.so
-libexec/apache/mod_auth.so
+include/apache/os-inline.c
+include/apache/mpm_default.h
+include/apache/mpm.h
+include/apache/mod_dav.h
+include/apache/mod_include.h
+include/apache/pcre.h
+include/apache/internal.h
+include/apache/config.h
+include/apache/unixd.h
+lib/libapr.la
+lib/libapr.a
+lib/libaprutil.la
+lib/libaprutil.a
 libexec/apache/mod_auth_anon.so
+libexec/apache/mod_auth_anon.la
 libexec/apache/mod_auth_db.so
-libexec/apache/mod_autoindex.so
+libexec/apache/mod_auth_db.la
+libexec/apache/mod_auth_digest.so
+libexec/apache/mod_auth_digest.la
+libexec/apache/mod_file_cache.so
+libexec/apache/mod_file_cache.la
+libexec/apache/mod_dav_fs.so
+libexec/apache/mod_dav_fs.la
+libexec/apache/mod_dav.so
+libexec/apache/mod_dav.la
+libexec/apache/mod_echo.so
+libexec/apache/mod_echo.la
+libexec/apache/mod_optional_fn_import.so
+libexec/apache/mod_optional_fn_import.la
+libexec/apache/mod_optional_fn_export.so
+libexec/apache/mod_optional_fn_export.la
+libexec/apache/mod_include.so
+libexec/apache/mod_include.la
+libexec/apache/mod_imap.so
+libexec/apache/mod_imap.la
+libexec/apache/mod_speling.so
+libexec/apache/mod_speling.la
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_rewrite.la
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_mime_magic.la
 libexec/apache/mod_cern_meta.so
-libexec/apache/mod_cgi.so
-libexec/apache/mod_digest.so
-libexec/apache/mod_dir.so
-libexec/apache/mod_env.so
+libexec/apache/mod_cern_meta.la
 libexec/apache/mod_expires.so
+libexec/apache/mod_expires.la
 libexec/apache/mod_headers.so
-libexec/apache/mod_imap.so
-libexec/apache/mod_include.so
-libexec/apache/mod_info.so
-libexec/apache/mod_log_config.so
-libexec/apache/mod_mime.so
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mmap_static.so
-libexec/apache/mod_negotiation.so
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.so
-libexec/apache/mod_speling.so
-libexec/apache/mod_status.so
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_userdir.so
+libexec/apache/mod_headers.la
 libexec/apache/mod_usertrack.so
-libexec/apache/mod_vhost_alias.so
+libexec/apache/mod_usertrack.la
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_unique_id.la
+libexec/apache/mod_status.so
+libexec/apache/mod_status.la
+libexec/apache/mod_info.so
+libexec/apache/mod_info.la
+libexec/apache/mod_cgid.so
+libexec/apache/mod_cgid.la
+libexec/apache/httpd.exp
+sbin/rotatelogs
+sbin/htpasswd
+sbin/logresolve
 sbin/ab
 sbin/apachectl
 sbin/apxs
 sbin/httpd
-sbin/logresolve
-sbin/rotatelogs
 share/doc/apache/README.rus
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/apache_pb.gif
-share/doc/apache/index.html.ca
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.de
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.el
-share/doc/apache/index.html.en
-share/doc/apache/index.html.es
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.it
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.tw
 share/doc/apache/index.html.se
+share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.ru.ucs4
+share/doc/apache/index.html.ru.ucs2
+share/doc/apache/index.html.ru.koi8-r
+share/doc/apache/index.html.ru.iso-ru
+share/doc/apache/index.html.ru.cp866
+share/doc/apache/index.html.ru.cp-1251
+share/doc/apache/index.html.pt-br
+share/doc/apache/index.html.pt
+share/doc/apache/index.html.po.iso-pl
+share/doc/apache/index.html.no
+share/doc/apache/index.html.nl
+share/doc/apache/index.html.lu
+share/doc/apache/index.html.ltz
+share/doc/apache/index.html.kr.iso-kr
+share/doc/apache/index.html.kr.iso2022-kr
+share/doc/apache/index.html.ja.jis
+share/doc/apache/index.html.ja.iso2022-jp
+share/doc/apache/index.html.it
+share/doc/apache/index.html.he.iso8859-8
+share/doc/apache/index.html.fr
+share/doc/apache/index.html.et
+share/doc/apache/index.html.es
+share/doc/apache/index.html.en
+share/doc/apache/index.html.el
+share/doc/apache/index.html.ee
+share/doc/apache/index.html.dk
+share/doc/apache/index.html.de
+share/doc/apache/index.html.cz
+share/doc/apache/index.html.ca
+share/doc/apache/apache_pb.gif
 share/doc/apache/index.html.tw.Big5
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/configuring.html.en
-share/doc/apache/manual/configuring.html.html
-share/doc/apache/manual/configuring.html.ja.jis
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html.en
-share/doc/apache/manual/custom-error.html.html
-share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/handler.html.en
-share/doc/apache/manual/handler.html.html
-share/doc/apache/manual/handler.html.ja.jis
-share/doc/apache/manual/header.html
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.html
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.html
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html.en
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html.html
-share/doc/apache/manual/index.html.ja.jis
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html.en
-share/doc/apache/manual/install.html.fr
-share/doc/apache/manual/install.html.html
-share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/invoking.html.fr
-share/doc/apache/manual/keepalive.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/man-template.html
-share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/misc/tutorials.html
 share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/HTTP_Features.tsv
+share/doc/apache/manual/misc/known_client_problems.html
 share/doc/apache/manual/misc/client_block_api.html
 share/doc/apache/manual/misc/compat_notes.html
 share/doc/apache/manual/misc/custom_errordocs.html
@@ -198,22 +205,32 @@ share/doc/apache/manual/misc/footer.html
 share/doc/apache/manual/misc/header.html
 share/doc/apache/manual/misc/howto.html
 share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/nopgp.html
-share/doc/apache/manual/misc/perf-bsd44.html
-share/doc/apache/manual/misc/perf-dec.html
-share/doc/apache/manual/misc/perf-hp.html
 share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/perf.html
 share/doc/apache/manual/misc/rewriteguide.html
 share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/vif-info.html
-share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/mod/directive-dict.html.en
-share/doc/apache/manual/mod/directive-dict.html.html
-share/doc/apache/manual/mod/directive-dict.html.ja.jis
+share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/developer/modules.html
+share/doc/apache/manual/developer/documenting
+share/doc/apache/manual/developer/footer.html
+share/doc/apache/manual/developer/header.html
+share/doc/apache/manual/developer/hooks.html
+share/doc/apache/manual/developer/index.html
+share/doc/apache/manual/developer/layeredio.html
+share/doc/apache/manual/developer/debugging.html
+share/doc/apache/manual/platform/windows.html
+share/doc/apache/manual/platform/header.html
+share/doc/apache/manual/platform/netware.html
+share/doc/apache/manual/platform/perf-bsd44.html
+share/doc/apache/manual/platform/perf-dec.html
+share/doc/apache/manual/platform/perf-hp.html
+share/doc/apache/manual/platform/perf.html
+share/doc/apache/manual/platform/readme-tpf.html
+share/doc/apache/manual/platform/unixware.html
+share/doc/apache/manual/platform/win_compiling.html
+share/doc/apache/manual/platform/win_service.html
+share/doc/apache/manual/platform/footer.html
+share/doc/apache/manual/mod/threaded.html
+share/doc/apache/manual/mod/directive-dict.html
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
@@ -229,56 +246,44 @@ share/doc/apache/manual/mod/mod_auth_db.html
 share/doc/apache/manual/mod/mod_auth_dbm.html
 share/doc/apache/manual/mod/mod_auth_digest.html
 share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_browser.html
 share/doc/apache/manual/mod/mod_cern_meta.html
+share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_cookies.html
-share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_charset_lite.html
+share/doc/apache/manual/mod/mod_dav.html
 share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_dld.html
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
+share/doc/apache/manual/mod/mod_ext_filter.html
+share/doc/apache/manual/mod/mod_file_cache.html
 share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
 share/doc/apache/manual/mod/mod_info.html
 share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_agent.html
-share/doc/apache/manual/mod/mod_log_common.html
 share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_log_referer.html
 share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html.en
-share/doc/apache/manual/mod/mod_negotiation.html.html
-share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
+share/doc/apache/manual/mod/mod_negotiation.html
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
 share/doc/apache/manual/mod/mod_setenvif.html
-share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_speling.html
 share/doc/apache/manual/mod/mod_status.html
 share/doc/apache/manual/mod/mod_unique_id.html
 share/doc/apache/manual/mod/mod_userdir.html
 share/doc/apache/manual/mod/mod_usertrack.html
 share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html.en
-share/doc/apache/manual/mod/module-dict.html.html
-share/doc/apache/manual/mod/module-dict.html.ja.jis
-share/doc/apache/manual/mpeix.html
-share/doc/apache/manual/multilogs.html
-share/doc/apache/manual/netware.html
-share/doc/apache/manual/new_features_1_0.html
-share/doc/apache/manual/new_features_1_1.html
-share/doc/apache/manual/new_features_1_2.html
-share/doc/apache/manual/new_features_1_3.html.en
-share/doc/apache/manual/new_features_1_3.html.html
-share/doc/apache/manual/new_features_1_3.html.ja.jis
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/process-model.html
-share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/mod/module-dict.html
+share/doc/apache/manual/mod/mpm_common.html
+share/doc/apache/manual/mod/mpm_winnt.html
+share/doc/apache/manual/mod/perchild.html
+share/doc/apache/manual/mod/prefork.html
+share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/search/manual-index.cgi
+share/doc/apache/manual/programs/suexec.html
 share/doc/apache/manual/programs/apachectl.html
 share/doc/apache/manual/programs/apxs.html
 share/doc/apache/manual/programs/dbmmanage.html
@@ -291,104 +296,70 @@ share/doc/apache/manual/programs/index.html
 share/doc/apache/manual/programs/logresolve.html
 share/doc/apache/manual/programs/other.html
 share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/readme-tpf.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/server-wide.html.en
-share/doc/apache/manual/server-wide.html.fr
-share/doc/apache/manual/server-wide.html.html
-share/doc/apache/manual/server-wide.html.ja.jis
-share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/suexec_1_2.html
-share/doc/apache/manual/unixware.html
-share/doc/apache/manual/upgrading_to_1_3.html
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/images/custom_errordocs.gif
+share/doc/apache/manual/images/home.gif
+share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/mod_rewrite_fig1.fig
+share/doc/apache/manual/images/mod_rewrite_fig1.gif
+share/doc/apache/manual/images/mod_rewrite_fig2.fig
+share/doc/apache/manual/images/mod_rewrite_fig2.gif
+share/doc/apache/manual/images/pixel.gif
+share/doc/apache/manual/images/apache_header.gif
+share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.ja.jis
+share/doc/apache/manual/howto/footer.html
+share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.ja.jis
+share/doc/apache/manual/vhosts/virtual-host.html
 share/doc/apache/manual/vhosts/examples.html
 share/doc/apache/manual/vhosts/fd-limits.html
 share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html.en
-share/doc/apache/manual/vhosts/index.html.html
-share/doc/apache/manual/vhosts/index.html.ja.jis
+share/doc/apache/manual/vhosts/index.html
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
 share/doc/apache/manual/vhosts/name-based.html
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/win_compiling.html
-share/doc/apache/manual/win_service.html
-share/doc/apache/manual/windows.html
-www/cgi-bin.default/printenv
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/new_features_2_0.html.fr
+share/doc/apache/manual/new_features_2_0.html
+share/doc/apache/manual/mpm.html
+share/doc/apache/manual/location.html
+share/doc/apache/manual/invoking.html
+share/doc/apache/manual/install.html
+share/doc/apache/manual/install-tpf.html
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html
+share/doc/apache/manual/header.html
+share/doc/apache/manual/handler.html
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/filter.html
+share/doc/apache/manual/env.html
+share/doc/apache/manual/ebcdic.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/configuring.html
+share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/bind.html
+share/doc/apache/manual/STATUS
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/urlmapping.html
+share/doc/apache/manual/upgrading.html.fr
+share/doc/apache/manual/upgrading.html
+share/doc/apache/manual/suexec.html
+share/doc/apache/manual/stopping.html
+share/doc/apache/manual/server-wide.html
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/process-model.html
 www/cgi-bin.default/test-cgi
-www/icons/README
-www/icons/a.gif
-www/icons/alert.black.gif
-www/icons/alert.red.gif
-www/icons/apache_pb.gif
-www/icons/back.gif
-www/icons/ball.gray.gif
-www/icons/ball.red.gif
-www/icons/binary.gif
-www/icons/binhex.gif
-www/icons/blank.gif
-www/icons/bomb.gif
-www/icons/box1.gif
-www/icons/box2.gif
-www/icons/broken.gif
-www/icons/burst.gif
-www/icons/c.gif
-www/icons/comp.blue.gif
-www/icons/comp.gray.gif
-www/icons/compressed.gif
-www/icons/continued.gif
-www/icons/dir.gif
-www/icons/down.gif
-www/icons/dvi.gif
-www/icons/f.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.sec.gif
-www/icons/forward.gif
-www/icons/generic.gif
-www/icons/generic.red.gif
-www/icons/generic.sec.gif
-www/icons/hand.right.gif
-www/icons/hand.up.gif
-www/icons/icon.sheet.gif
-www/icons/image1.gif
-www/icons/image2.gif
-www/icons/image3.gif
-www/icons/index.gif
-www/icons/layout.gif
-www/icons/left.gif
-www/icons/link.gif
-www/icons/movie.gif
-www/icons/p.gif
-www/icons/patch.gif
-www/icons/pdf.gif
-www/icons/pie0.gif
-www/icons/pie1.gif
-www/icons/pie2.gif
-www/icons/pie3.gif
-www/icons/pie4.gif
-www/icons/pie5.gif
-www/icons/pie6.gif
-www/icons/pie7.gif
-www/icons/pie8.gif
-www/icons/portal.gif
-www/icons/ps.gif
-www/icons/quill.gif
-www/icons/right.gif
-www/icons/screw1.gif
-www/icons/screw2.gif
-www/icons/script.gif
-www/icons/small/README.txt
+www/cgi-bin.default/printenv
+www/icons/small/uu.gif
 www/icons/small/back.gif
 www/icons/small/binary.gif
 www/icons/small/binhex.gif
@@ -420,39 +391,100 @@ www/icons/small/tar.gif
 www/icons/small/text.gif
 www/icons/small/transfer.gif
 www/icons/small/unknown.gif
-www/icons/small/uu.gif
-www/icons/sound1.gif
-www/icons/sound2.gif
-www/icons/sphere1.gif
-www/icons/sphere2.gif
-www/icons/tar.gif
-www/icons/tex.gif
-www/icons/text.gif
-www/icons/transfer.gif
-www/icons/unknown.gif
-www/icons/up.gif
-www/icons/uu.gif
-www/icons/uuencoded.gif
+www/icons/small/README.txt
 www/icons/world1.gif
+www/icons/uuencoded.gif
+www/icons/uu.gif
+www/icons/up.gif
+www/icons/unknown.gif
+www/icons/transfer.gif
+www/icons/text.gif
+www/icons/tex.gif
+www/icons/tar.gif
+www/icons/sphere2.gif
+www/icons/sphere1.gif
+www/icons/sound2.gif
+www/icons/sound1.gif
+www/icons/script.gif
+www/icons/screw2.gif
+www/icons/screw1.gif
+www/icons/right.gif
+www/icons/quill.gif
+www/icons/ps.gif
+www/icons/portal.gif
+www/icons/pie8.gif
+www/icons/pie7.gif
+www/icons/pie6.gif
+www/icons/pie5.gif
+www/icons/pie4.gif
+www/icons/pie3.gif
+www/icons/pie2.gif
+www/icons/pie1.gif
+www/icons/pie0.gif
+www/icons/pdf.gif
+www/icons/patch.gif
+www/icons/p.gif
+www/icons/movie.gif
+www/icons/link.gif
+www/icons/left.gif
+www/icons/layout.gif
+www/icons/index.gif
+www/icons/image3.gif
+www/icons/image2.gif
+www/icons/image1.gif
+www/icons/icon.sheet.gif
+www/icons/hand.up.gif
+www/icons/hand.right.gif
+www/icons/generic.sec.gif
+www/icons/generic.red.gif
+www/icons/generic.gif
+www/icons/forward.gif
+www/icons/folder.sec.gif
+www/icons/folder.gif
+www/icons/folder.open.gif
+www/icons/f.gif
+www/icons/dvi.gif
+www/icons/down.gif
+www/icons/dir.gif
+www/icons/continued.gif
+www/icons/compressed.gif
+www/icons/comp.gray.gif
+www/icons/comp.blue.gif
+www/icons/c.gif
+www/icons/burst.gif
+www/icons/broken.gif
+www/icons/box2.gif
+www/icons/box1.gif
+www/icons/bomb.gif
+www/icons/blank.gif
+www/icons/binhex.gif
+www/icons/binary.gif
+www/icons/ball.red.gif
+www/icons/ball.gray.gif
+www/icons/back.gif
+www/icons/apache_pb.gif
+www/icons/alert.red.gif
+www/icons/alert.black.gif
+www/icons/a.gif
 www/icons/world2.gif
-@exec mkdir -p %D/www/proxy
+www/icons/README
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
 @dirrm etc/apache
-@dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/search
 @dirrm share/doc/apache/manual/vhosts
+@dirrm share/doc/apache/manual/search
+@dirrm share/doc/apache/manual/programs
+@dirrm share/doc/apache/manual/platform
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/howto
+@dirrm share/doc/apache/manual/developer
 @dirrm share/doc/apache/manual
 @dirrm share/doc/apache
-@dirrm www/cgi-bin.default
 @dirrm www/icons/small
 @dirrm www/icons
-@dirrm www/proxy
+@dirrm www/cgi-bin.default
 @dirrm www
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 53c05a99e121..8835bc4b7e32 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,68 +1,68 @@
-# New ports collection makefile for:    apache HTTPD
-# Date created:         Fri Aug 25 16:42:36 CDT 1995
-# Whom:                 ache@freebsd.org
+# New ports collection makefile for:	apache2
+# Date created:				7 April 2001
+# Whom:					Hye-Shik Chang <perky@python.or.kr>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	apache
-PORTVERSION=    1.3.19
-PORTREVISION=   1
+PORTVERSION=	2.0.16
 CATEGORIES=	www
-MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
-		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
-		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
-		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
-		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
+MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
+		http://www.cybernic.com/mirror/dist/httpd/ \
+		http://mirrors.partnersforever.net/apache/dist/httpd/ \
+		http://www.technotopia.com/vroom/apache/dist/httpd/ \
+		http://www.tux.org/pub/net/apache/dist/httpd/ \
+		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
 		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
 		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
-		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://www3.service.digital.com/apache/dist/httpd/ \
-		ftp://galileo.galilei.com/pub/apache/httpd/ \
-		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
-		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
-		ftp://apache.nextpath.com/pub/apache/dist/httpd/
-DISTNAME=	apache_${PORTVERSION}
+		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
+DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
 
-#PATCH_SITES=    ${MASTER_SITES}
-#PATCHFILES=     apache_${PORTVERSION}-fix.diff
+MAINTAINER?=	perky@python.or.kr
 
-MAINTAINER=	ache@freebsd.org
+WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
+FIND?=		find
+XARGS?=		xargs
 
-#
-# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
-#
+# apache2 doesn't process '--enable-share=max' option yet.
+# and some modules are very unstable at DSO mode.
+SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
+		auth_anon digest headers cern_meta expires include \
+		cgid status info usertrack dav dav_fs imap proxy \
+		auth_digest file_cache echo optional_fn_import \
+		optional_fn_export
+STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
+		userdir alias asis cgi mime log_config vhost_alias actions
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	\
 		--prefix=${PREFIX} \
-		--server-gid=nogroup \
+		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
-		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
-		--suexec-docroot=${PREFIX}/www/data \
-		--without-confadjust \
-		--enable-module=most \
-		--enable-module=auth_db \
-		--enable-module=mmap_static \
-		--disable-module=auth_dbm \
-		--enable-shared=max
+		--with-suexec-docroot=${PREFIX}/www/data \
+		--enable-shared \
+		--disable-threads \
+		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
 
-OPTIM=		-DHARD_SERVER_LIMIT=512 \
-		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" \
-		-DACCEPT_FILTER_NAME=\\"httpready\\"
-
-.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+=		-DBUFFERED_LOGS
-CFLAGS+=	-O6 -fomit-frame-pointer
-.endif
+OPTIM+=		-DHARD_SERVER_LIMIT=512 \
+		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
 
 CONFIGURE_ENV=	OPTIM='${OPTIM}'
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
+
+.for mod in ${SHARED_MODS}
+CONFIGURE_ARGS+= --enable-${mod}=shared
+.endfor
+.for mod in ${STATIC_MODS}
+CONFIGURE_ARGS+= --enable-${mod}=yes
+.endfor
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 2d2273f86b4e..3802044557de 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
+MD5 (httpd-2_0_16-beta.tar.gz) = 364fc61593185789cb9744bae1ebb655
diff --git a/www/apache22/files/FreeBSD.layout b/www/apache22/files/FreeBSD.layout
deleted file mode 100644
index 5524e186e9c0..000000000000
--- a/www/apache22/files/FreeBSD.layout
+++ /dev/null
@@ -1,19 +0,0 @@
-#   FreeBSD layout...
-<Layout FreeBSD>
-    prefix:        /usr/local
-    exec_prefix:   $prefix
-    bindir:        $exec_prefix/bin
-    sbindir:       $exec_prefix/sbin
-    libexecdir:    $exec_prefix/libexec/apache
-    mandir:        $prefix/man
-    sysconfdir:    $prefix/etc/apache
-    datadir:       $prefix/www
-    iconsdir:      $datadir/icons
-    htdocsdir:     $datadir/data
-    cgidir:        $datadir/cgi-bin
-    includedir:    $prefix/include/apache
-    localstatedir: /var
-    runtimedir:    $localstatedir/run
-    logfiledir:    $localstatedir/log
-    proxycachedir: $datadir/proxy
-</Layout>
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
new file mode 100644
index 000000000000..341c8dfd087f
--- /dev/null
+++ b/www/apache22/files/patch-Makefile.in
@@ -0,0 +1,123 @@
+--- Makefile.in.orig	Wed Apr  4 02:03:35 2001
++++ Makefile.in	Sun Apr  8 06:06:58 2001
+@@ -16,7 +16,7 @@
+ targets         = $(PROGRAMS) $(other_targets)
+ phony_targets   = $(srcdir)/buildmark.c
+ install_targets = install-conf install-htdocs install-icons install-other \
+-	install-cgi install-include install-support install-suexec
++	install-cgi install-include install-support install-manpages install-suexec
+ DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
+ 	configure generated_lists include/ap_config_auto.h \
+ 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
+@@ -28,25 +28,32 @@
+ install-conf:
+ 	@echo Installing configuration files
+ 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
++
+ 	@cd docs/conf; \
+ 	for i in mime.types magic; do \
+-		$(INSTALL_DATA) $$i $(sysconfdir); \
++		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
++		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
+ 	done; \
+ 	for i in *-std*; do \
+ 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+ 		    -e 's#@@Port@@#$(PORT)#g' \
+-			< $$i > $(sysconfdir)/$$i; \
+-		chmod 0644 $(sysconfdir)/$$i; \
++			< $$i > $(sysconfdir)/$$i.default; \
++		chmod 0644 $(sysconfdir)/$$i.default; \
++		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
+ 		file=`echo $$i|sed s/-std//`; \
+ 		if [ "$$file" = "httpd.conf" ]; then \
+ 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+ 		fi; \
+ 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
+-			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
++			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
++			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
+ 		fi; \
+ 	done
+ 
+ htdocs-srcdir = docs/docroot
++htman-srcdir = docs/manual
++doc_prefix = $(prefix)/share/doc/apache
++man-srcdir = docs/man
+ 
+ docs::
+ 	mkdir -p ./docs/api
+@@ -57,11 +64,14 @@
+ 
+ install-htdocs:
+ 	@echo Installing HTML documents
+-	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
+-	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+-	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
+-	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
++	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
++	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
++	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
++	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
++	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
++	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-icons:
+ 	@echo Installing icons
+@@ -71,24 +81,27 @@
+ 
+ install-cgi:
+ 	@echo Installing CGIs
+-	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
+-	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
++	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
++	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-support:
+ 	@echo Installing Support Binaries
+ 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
+-	@cp -p $(srcdir)/support/httpd.exp $(bindir)
++	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
++	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
++	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
+ 	@cp -p $(builddir)/support/htpasswd $(bindir)
+ 	@cp -p $(builddir)/support/htdigest $(bindir)
+-	@cp -p $(builddir)/support/rotatelogs $(bindir)
+-	@cp -p $(builddir)/support/logresolve $(bindir)
+-	@cp -p $(builddir)/support/ab $(bindir)
+-	@cp -p $(builddir)/support/apachectl $(bindir)
+-	chmod 755 $(bindir)/apachectl
++	@cp -p $(builddir)/support/rotatelogs $(sbindir)
++	@cp -p $(builddir)/support/logresolve $(sbindir)
++	@cp -p $(builddir)/support/ab $(sbindir)
++	@cp -p $(builddir)/support/apachectl $(sbindir)
++	chmod 755 $(sbindir)/apachectl
+ 	@if test -f $(builddir)/support/apxs; then \
+-	    cp -p $(builddir)/support/apxs $(bindir); \
+-	    chmod 755 $(bindir)/apxs; \
++	    cp -p $(builddir)/support/apxs $(sbindir); \
++	    chmod 755 $(sbindir)/apxs; \
+ 	fi
+ 
+ 
+@@ -117,6 +130,15 @@
+ 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
+ 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
+ 	@chmod 644 $(includedir)/*.h
++
++install-manpages:
++	@echo Installing manual pages
++	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
++	@for sect in 1 8; do \
++		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
++		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
++	done;
++	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache22/files/patch-aa b/www/apache22/files/patch-aa
deleted file mode 100644
index 15cd58c27ef2..000000000000
--- a/www/apache22/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig	Tue Jan 18 01:53:17 2000
-+++ configure	Mon Jan 24 19:37:21 2000
-@@ -1232,8 +1232,8 @@
-     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
-     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
-     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
--    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
--    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
-+    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
-     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
-     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-@@ -1330,8 +1330,8 @@
- echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
- echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
- echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
--echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
--echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
-+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
- echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
- echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
- echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab
deleted file mode 100644
index e4448f1e47ca..000000000000
--- a/www/apache22/files/patch-ab
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile.tmpl.orig	Tue Jan 11 22:47:41 2000
-+++ Makefile.tmpl	Mon Jan 24 19:50:42 2000
-@@ -123,6 +123,7 @@
- runtimedir      = @runtimedir@
- logfiledir      = @logfiledir@
- proxycachedir   = @proxycachedir@
-+doc_prefix      = $(prefix)/share/doc/apache
- 
- libexecdir_relative   = @libexecdir_relative@
- 
-@@ -266,9 +267,9 @@
- 	$(MKDIR) $(root)$(mandir)/man1
- 	$(MKDIR) $(root)$(mandir)/man8
- 	$(MKDIR) $(root)$(sysconfdir)
--	$(MKDIR) $(root)$(htdocsdir)
-+	$(MKDIR) $(root)$(doc_prefix)
- 	$(MKDIR) $(root)$(iconsdir)
--	$(MKDIR) $(root)$(cgidir)
-+	$(MKDIR) $(root)$(cgidir).default
- 	$(MKDIR) $(root)$(includedir)
- 	$(MKDIR) $(root)$(includedir)/xml
- 	$(MKDIR) $(root)$(runtimedir)
-@@ -452,25 +453,33 @@
- #   icons and distributed CGI scripts.
- install-data:
- 	@echo "===> [data: Installing initial data files]"
--	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
--	else \
--		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+#        -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-+#        else \
-+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
- 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
--		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
--		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
--		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
--	fi
--	-@if [ -f $(root)$(cgidir)/printenv ]; then \
--		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
--	else \
-+		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
-+		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
-+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
-+#        fi
-+	if [ ! -d $(root)$(htdocsdir) ]; then \
-+		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
-+  	fi
-+	$(RM) $(root)$(htdocsdir).default
-+	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
-+#        -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
-+#        else \
- 		for script in printenv test-cgi; do \
- 			cat $(TOP)/cgi-bin/$${script} |\
- 			sed -e 's;^#!/.*perl;#!$(PERL);' \
- 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
--			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
-+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
- 		done; \
-+#        fi
-+	if [ ! -d $(root)$(cgidir) ]; then \
-+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
- 	fi
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
- 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
-@@ -509,10 +518,10 @@
- 			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
- 			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
- 			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
--			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
--			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
--			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
--			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
-+			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \
-+			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \
-+			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
-+			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
- 			-e 's;conf/magic;$(sysconfdir)/magic;' \
- 			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
- 			-e 's;User nobody;User $(conf_user);' \
diff --git a/www/apache22/files/patch-ag b/www/apache22/files/patch-ag
deleted file mode 100644
index 80373fbcca63..000000000000
--- a/www/apache22/files/patch-ag
+++ /dev/null
@@ -1,66 +0,0 @@
---- conf/httpd.conf-dist.orig	Mon Feb 21 08:30:46 2000
-+++ conf/httpd.conf-dist	Mon May 29 16:48:49 2000
-@@ -354,7 +354,22 @@
- # directory index.  Separate multiple entries with spaces.
- #
- <IfModule mod_dir.c>
--    DirectoryIndex index.html
-+    <IfModule mod_php3.c>
-+        <IfModule mod_php4.c>
-+            DirectoryIndex index.php index.php3 index.html
-+        </IfModule>
-+        <IfModule !mod_php4.c>
-+            DirectoryIndex index.php3 index.html
-+        </IfModule>
-+    </IfModule>
-+    <IfModule !mod_php3.c>
-+        <IfModule mod_php4.c>
-+            DirectoryIndex index.php index.html
-+        </IfModule>
-+        <IfModule !mod_php4.c>
-+            DirectoryIndex index.html
-+        </IfModule>
-+    </IfModule>
- </IfModule>
- 
- #
-@@ -473,7 +488,7 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+#CustomLog logs/access_log common
- 
- #
- # If you would like to have agent and referer logfiles, uncomment the
-@@ -486,7 +501,7 @@
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+CustomLog logs/access_log combined
- 
- #
- # Optionally add a line containing the server version and virtual host
-@@ -708,13 +723,17 @@
-     # For example, the PHP 3.x module (not part of the Apache distribution - see
-     # http://www.php.net) will typically use:
-     #
--    #AddType application/x-httpd-php3 .php3
--    #AddType application/x-httpd-php3-source .phps
-+    <IfModule mod_php3.c>
-+        AddType application/x-httpd-php3 .php3
-+        AddType application/x-httpd-php3-source .php3s
-+    </IfModule>
-     #
-     # And for PHP 4.x, use:
-     #
--    #AddType application/x-httpd-php .php
--    #AddType application/x-httpd-php-source .phps
-+    <IfModule mod_php4.c>
-+        AddType application/x-httpd-php .php
-+        AddType application/x-httpd-php-source .phps
-+    </IfModule>
- 
-     AddType application/x-tar .tgz
- 
diff --git a/www/apache22/files/patch-ak b/www/apache22/files/patch-ak
deleted file mode 100644
index 486f7ad159cf..000000000000
--- a/www/apache22/files/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/support/apachectl.orig	Wed Apr  7 00:36:33 1999
-+++ src/support/apachectl	Fri Sep  3 15:41:01 1999
-@@ -39,6 +39,8 @@
- # --------------------                              --------------------
- # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
- 
-+eval `limits -e -C daemon` >/dev/null 2>&1
-+
- ERROR=0
- ARGV="$@"
- if [ "x$ARGV" = "x" ] ; then 
-@@ -82,6 +84,7 @@
- 	fi
- 	if kill $PID ; then
- 	    echo "$0 $ARG: httpd stopped"
-+	    rm $PIDFILE
- 	else
- 	    echo "$0 $ARG: httpd could not be stopped"
- 	    ERROR=4
diff --git a/www/apache22/files/patch-build:rules.mk b/www/apache22/files/patch-build:rules.mk
new file mode 100644
index 000000000000..d5058a91d8ca
--- /dev/null
+++ b/www/apache22/files/patch-build:rules.mk
@@ -0,0 +1,14 @@
+--- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
++++ build/rules.mk	Sun Apr  8 01:05:46 2001
+@@ -172,9 +172,9 @@
+ all-p: $(targets)
+ install-p: $(targets) $(install_targets)
+ 	@if test -n '$(PROGRAMS)'; then \
+-		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
++		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
+ 		for i in "$(PROGRAMS)"; do \
+-			$(INSTALL_PROGRAM) $$i $(bindir); \
++			$(INSTALL_PROGRAM) $$i $(sbindir); \
+ 		done; \
+ 	fi
+ 
diff --git a/www/apache22/files/patch-config.layout b/www/apache22/files/patch-config.layout
new file mode 100644
index 000000000000..75a700c6a805
--- /dev/null
+++ b/www/apache22/files/patch-config.layout
@@ -0,0 +1,25 @@
+--- config.layout.orig	Sat Apr  7 04:19:44 2001
++++ config.layout	Sat Apr  7 04:20:28 2001
+@@ -249,3 +249,22 @@
+     logfiledir:    $prefix/logs
+     proxycachedir: $prefix/proxy
+ </Layout>
++
++<Layout FreeBSD>
++    prefix:        /usr/local
++    exec_prefix:   $prefix
++    bindir:        $exec_prefix/bin
++    sbindir:       $exec_prefix/sbin
++    libexecdir:    $exec_prefix/libexec/apache
++    mandir:        $prefix/man
++    sysconfdir:    $prefix/etc/apache
++    datadir:       $prefix/www
++    iconsdir:      $datadir/icons
++    htdocsdir:     $datadir/data
++    cgidir:        $datadir/cgi-bin
++    includedir:    $prefix/include/apache
++    localstatedir: /var
++    runtimedir:    $localstatedir/run
++    logfiledir:    $localstatedir/log
++    proxycachedir: $datadir/proxy
++</Layout>
diff --git a/www/apache22/files/patch-configure b/www/apache22/files/patch-configure
new file mode 100644
index 000000000000..5419d37c531c
--- /dev/null
+++ b/www/apache22/files/patch-configure
@@ -0,0 +1,32 @@
+--- configure.orig	Wed Apr  4 12:45:36 2001
++++ configure	Sun Apr  8 03:25:31 2001
+@@ -3760,7 +3760,9 @@
+       -e "s/[ 	]*$/'/g" \
+       $srcdir/config.layout > $pldconf
+   layout_name=$LAYOUT
++  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
+   . $pldconf
++  prefix=$prefix_backup
+   rm $pldconf
+   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
+              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
+@@ -9678,6 +9680,10 @@
+ 
+   
+   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
++  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
+   
+ 
+   
+@@ -9814,7 +9820,7 @@
+ EOF
+ 
+ cat >> confdefs.h <<EOF
+-#define SERVER_CONFIG_FILE "conf/$progname.conf"
++#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
+ EOF
+ 
+ cat >> confdefs.h <<EOF
diff --git a/www/apache22/files/patch-docs:conf:httpd-std.conf b/www/apache22/files/patch-docs:conf:httpd-std.conf
new file mode 100644
index 000000000000..f70a76bf17df
--- /dev/null
+++ b/www/apache22/files/patch-docs:conf:httpd-std.conf
@@ -0,0 +1,203 @@
+--- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
++++ docs/conf/httpd-std.conf	Sun Apr  8 04:26:54 2001
+@@ -64,7 +64,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
+ 
+ #
+ # ScoreBoardFile: File used to store internal server process information.
+@@ -73,7 +73,7 @@
+ # no two invocations of Apache share the same scoreboard file.
+ #
+ <IfModule !perchild.c>
+-ScoreBoardFile logs/apache_runtime_status
++ScoreBoardFile /var/run/apache_runtime_status
+ </IfModule>
+ 
+ #
+@@ -182,6 +182,28 @@
+ #
+ # Example:
+ # LoadModule foo_module modules/mod_foo.so
++#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
++#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
++#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
++#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
++#LoadModule cgid_module			libexec/apache/mod_cgid.so
++#LoadModule dav_module			libexec/apache/mod_dav.so
++#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
++#LoadModule digest_module		libexec/apache/mod_digest.so
++#LoadModule expires_module		libexec/apache/mod_expires.so
++#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
++#LoadModule headers_module		libexec/apache/mod_headers.so
++#LoadModule imap_module			libexec/apache/mod_imap.so
++#LoadModule include_module		libexec/apache/mod_include.so
++#LoadModule info_module			libexec/apache/mod_info.so
++#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
++#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
++#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
++#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
++#LoadModule speling_module		libexec/apache/mod_speling.so
++#LoadModule status_module		libexec/apache/mod_status.so
++#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
++#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
+ 
+ ### Section 2: 'Main' server configuration
+ #
+@@ -221,7 +243,7 @@
+ #  don't use Group #-1 on these systems!
+ #
+ User nobody
+-Group #-1
++Group nogroup
+ 
+ #
+ # ServerAdmin: Your address, where problems with the server should be
+@@ -249,7 +271,7 @@
+ # documents. By default, all requests are taken from this directory, but
+ # symbolic links and aliases may be used to point to other locations.
+ #
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ 
+ #
+ # Each directory to which Apache has access, can be configured with respect
+@@ -274,7 +296,7 @@
+ #
+ # This should be changed to whatever you set DocumentRoot to.
+ #
+-<Directory "@@ServerRoot@@/htdocs">
++<Directory "@@ServerRoot@@/www/data">
+ 
+ #
+ # This may also be "None", "All", or any combination of "Indexes",
+@@ -326,7 +348,22 @@
+ # DirectoryIndex: Name of the file or files to use as a pre-written HTML
+ # directory index.  Separate multiple entries with spaces.
+ #
+-DirectoryIndex index.html
++<IfModule mod_php3.c>
++    <IfModule mod_php4.c>
++        DirectoryIndex index.php index.php3 index.html
++    </IfModule>
++    <IfModule !mod_php4.c>
++        DirectoryIndex index.php3 index.html
++    </IfModule>
++</IfModule>
++<IfModule !mod_php3.c>
++    <IfModule mod_php4.c>
++        DirectoryIndex index.php index.html
++    </IfModule>
++    <IfModule !mod_php4.c>
++        DirectoryIndex index.html
++    </IfModule>
++</IfModule>
+ 
+ #
+ # AccessFileName: The name of the file to look for in each directory
+@@ -372,7 +409,7 @@
+ # TypesConfig describes where the mime.types file (or equivalent) is
+ # to be found.
+ #
+-TypesConfig conf/mime.types
++TypesConfig etc/apache/mime.types
+ 
+ #
+ # DefaultType is the default MIME type the server will use for a document
+@@ -397,7 +434,7 @@
+ # module is part of the server.
+ #
+ <IfModule mod_mime_magic.c>
+-    MIMEMagicFile conf/magic
++    MIMEMagicFile etc/apache/magic
+ </IfModule>
+ 
+ #
+@@ -417,7 +454,7 @@
+ # logged here.  If you *do* define an error logfile for a <VirtualHost>
+ # container, that host's errors will be logged there and not here.
+ #
+-ErrorLog logs/error_log
++ErrorLog /var/log/httpd-error.log
+ 
+ #
+ # LogLevel: Control the number of messages logged to the error_log.
+@@ -442,7 +479,7 @@
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+-CustomLog logs/access_log common
++#CustomLog logs/access_log common
+ 
+ #
+ # If you would like to have agent and referer logfiles, uncomment the
+@@ -455,7 +492,7 @@
+ # If you prefer a single logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can use the following directive.
+ #
+-#CustomLog logs/access_log combined
++CustomLog /var/log/httpd-access.log combined
+ 
+ #
+ # Optionally add a line containing the server version and virtual host
+@@ -474,9 +511,9 @@
+ # require it to be present in the URL.  So "/icons" isn't aliased in this
+ # example, only "/icons/"..
+ #
+-Alias /icons/ "@@ServerRoot@@/icons/"
++Alias /icons/ "@@ServerRoot@@/www/icons/"
+ 
+-<Directory "@@ServerRoot@@/icons">
++<Directory "@@ServerRoot@@/www/icons">
+     Options Indexes MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -491,7 +528,7 @@
+ # The same rules about trailing "/" apply to ScriptAlias directives as to
+ # Alias.
+ #
+-ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
++ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
+ 
+ <IfModule mod_cgid.c>
+ #
+@@ -505,7 +542,7 @@
+ # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
+ # CGI directory exists, if you have that configured.
+ #
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     AllowOverride None
+     Options None
+     Order allow,deny
+@@ -657,6 +694,7 @@
+ AddLanguage ja .ja
+ AddLanguage pl .po
+ AddLanguage kr .kr
++AddLanguage ko .kr
+ AddLanguage pt .pt
+ AddLanguage no .no
+ AddLanguage pt-br .pt-br
+@@ -741,8 +779,17 @@
+ # For example, the PHP3 module (not part of the Apache distribution - see
+ # http://www.php.net) will typically use:
+ #
+-#AddType application/x-httpd-php3 .php3
+-#AddType application/x-httpd-php3-source .phps
++<IfModule mod_php3.c>
++    AddType application/x-httpd-php3 .php3
++    AddType application/x-httpd-php3-source .php3s
++</IfModule>
++#
++# And for PHP 4.x, use:
++#
++<IfModule mod_php4.c>
++    AddType application/x-httpd-php .php
++    AddType application/x-httpd-php-source .phps
++</IfModule>
+ 
+ AddType application/x-tar .tgz
+ 
diff --git a/www/apache22/files/patch-include:httpd.h b/www/apache22/files/patch-include:httpd.h
new file mode 100644
index 000000000000..9f8fdf34997b
--- /dev/null
+++ b/www/apache22/files/patch-include:httpd.h
@@ -0,0 +1,38 @@
+--- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
++++ include/httpd.h	Sat Apr  7 09:08:43 2001
+@@ -127,7 +127,7 @@
+ /* Set default for OS/2 file system */
+ #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
+ #else
+-#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
++#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
+ #endif
+ #endif /* DOCUMENT_LOCATION */
+ 
+@@ -144,7 +144,7 @@
+ #if defined(OS2) || defined(WIN32)
+ #define DEFAULT_ERRORLOG "logs/error.log"
+ #else
+-#define DEFAULT_ERRORLOG "logs/error_log"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
+ #endif
+ #endif /* DEFAULT_ERRORLOG */
+ 
+@@ -160,7 +160,7 @@
+ 
+ /* The name of the server config file */
+ #ifndef SERVER_CONFIG_FILE
+-#define SERVER_CONFIG_FILE "conf/httpd.conf"
++#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
+ #endif
+ 
+ /* Whether we should enable rfc1413 identity checking */
+@@ -247,7 +247,7 @@
+ 
+ /* The name of the MIME types file */
+ #ifndef AP_TYPES_CONFIG_FILE
+-#define AP_TYPES_CONFIG_FILE "conf/mime.types"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
+ #endif
+ 
+ /*
diff --git a/www/apache22/files/patch-srclib:apr-util:Makefile.in b/www/apache22/files/patch-srclib:apr-util:Makefile.in
new file mode 100644
index 000000000000..652901dae28a
--- /dev/null
+++ b/www/apache22/files/patch-srclib:apr-util:Makefile.in
@@ -0,0 +1,22 @@
+--- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
++++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
+@@ -22,8 +22,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=$(prefix)/lib
++includedir=$(prefix)/include/apache
+ 
+ delete-lib:
+ 	@if test -f $(TARGET_LIB); then \
+@@ -43,7 +43,7 @@
+ 	if [ ! -d $(libdir) ]; then \
+ 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
+ 	fi; \
+-	libtool --mode=install cp $(TARGET_LIB) $(libdir)
++	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
+ 
+ $(TARGET_LIB):
+ 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache22/files/patch-srclib:apr:Makefile.in b/www/apache22/files/patch-srclib:apr:Makefile.in
new file mode 100644
index 000000000000..4c0292f73af8
--- /dev/null
+++ b/www/apache22/files/patch-srclib:apr:Makefile.in
@@ -0,0 +1,22 @@
+--- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
++++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
+@@ -37,8 +37,8 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=$(prefix)/lib
++includedir=$(prefix)/include/apache
+ 
+ delete-lib:
+ 	@if test -f $(TARGET_LIB); then \
+@@ -58,7 +58,7 @@
+ 	if [ ! -d $(libdir) ]; then \
+ 	    ./build/mkdir.sh $(libdir); \
+ 	fi; \
+-	libtool --mode=install cp $(TARGET_LIB) $(libdir)
++	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
+ 
+ $(TARGET_LIB):
+ 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache22/files/patch-support:apachectl.in b/www/apache22/files/patch-support:apachectl.in
new file mode 100644
index 000000000000..739a622d74de
--- /dev/null
+++ b/www/apache22/files/patch-support:apachectl.in
@@ -0,0 +1,24 @@
+--- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
++++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+@@ -25,10 +25,10 @@
+ # --------------------                              --------------------
+ # 
+ # the path to your PID file
+-PIDFILE=@prefix@/logs/httpd.pid
++PIDFILE=/var/run/httpd.pid
+ #
+ # the path to your httpd binary, including options if necessary
+-HTTPD='@prefix@/bin/httpd'
++HTTPD='@prefix@/sbin/httpd'
+ #
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line.  Designed for lynx, however other
+@@ -41,6 +41,8 @@
+ #
+ # --------------------                              --------------------
+ # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
++
++eval `limits -e -C daemon` >/dev/null 2>&1
+ 
+ ERROR=0
+ ARGV="$@"
diff --git a/www/apache22/files/patch-support:apxs.in b/www/apache22/files/patch-support:apxs.in
new file mode 100644
index 000000000000..70ca84075675
--- /dev/null
+++ b/www/apache22/files/patch-support:apxs.in
@@ -0,0 +1,11 @@
+--- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
++++ support/apxs.in	Sat Apr  7 11:55:28 2001
+@@ -73,7 +73,7 @@
+ my $prefix            = "$CFG_PREFIX";
+ my $CFG_EXEC_PREFIX   = "@exec_prefix@";
+ my $exec_prefix       = "$CFG_EXEC_PREFIX";
+-my $CFG_SBINDIR       = "@bindir@";
++my $CFG_SBINDIR       = "@sbindir@";
+ my $CFG_INCLUDEDIR    = "@includedir@";
+ my $CFG_LIBEXECDIR    = "@libexecdir@";
+ my $CFG_SYSCONFDIR    = "@sysconfdir@";
diff --git a/www/apache20/files/patch-al b/www/apache22/files/patch-support:log_server_status.in
index b355a697b4ab..3549aa89f8c5 100644
--- a/www/apache20/files/patch-al
+++ b/www/apache22/files/patch-support:log_server_status.in
@@ -1,6 +1,6 @@
---- src/support/log_server_status.orig	Fri Jun  4 19:54:19 1999
-+++ src/support/log_server_status	Fri Sep  3 15:53:16 1999
-@@ -67,10 +67,10 @@
+--- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
++++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+@@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
@@ -13,7 +13,7 @@
  
  sub tcp_connect
  {
-@@ -100,7 +100,7 @@
+@@ -96,7 +96,7 @@
  	chomp($date);
  	($day,$time)=split(/:/,$date);
  	$res=&tcp_connect($server,$port);
diff --git a/www/apache22/files/patch-util.c b/www/apache22/files/patch-util.c
deleted file mode 100644
index 60f218221799..000000000000
--- a/www/apache22/files/patch-util.c
+++ /dev/null
@@ -1,53 +0,0 @@
-===================================================================
-RCS file: /home/cvs/apache-1.3/src/main/util.c,v
-retrieving revision 1.194
-retrieving revision 1.197
-diff -u -r1.194 -r1.197
---- src/main/util.c	2001/02/01 10:06:37	1.194
-+++ src/main/util.c	2001/03/30 17:37:54	1.197
-@@ -2013,12 +2013,14 @@
-     int x;
- 
-     if (!strchr(p->h_name, '.')) {
--	for (x = 0; p->h_aliases[x]; ++x) {
--	    if (strchr(p->h_aliases[x], '.') &&
--		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
--		return ap_pstrdup(a, p->h_aliases[x]);
--	}
--	return NULL;
-+        if (p->h_aliases) {
-+        	for (x = 0; p->h_aliases[x]; ++x) {
-+                if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') &&
-+            		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
-+		            return ap_pstrdup(a, p->h_aliases[x]);
-+            }
-+	    }
-+	    return NULL;
-     }
-     return ap_pstrdup(a, (void *) p->h_name);
- }
-@@ -2040,7 +2042,6 @@
- 	ap_log_error(APLOG_MARK, APLOG_WARNING, NULL,
- 	             "%s: gethostname() failed to determine ServerName\n",
-                      ap_server_argv0);
--	server_hostname = ap_pstrdup(a, "127.0.0.1");
-     }
-     else 
-     {
-@@ -2048,14 +2049,14 @@
-         if ((!(p = gethostbyname(str))) 
-             || (!(server_hostname = find_fqdn(a, p)))) {
-             /* Recovery - return the default servername by IP: */
--            if (p->h_addr_list[0]) {
-+            if (p && p->h_addr_list && p->h_addr_list[0]) {
-                 ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]);
- 	        server_hostname = ap_pstrdup(a, str);
-                 /* We will drop through to report the IP-named server */
-             }
-         }
- 	else
--            /* Since we found a fdqn, return it with no logged message. */
-+            /* Since we found a fqdn, return it with no logged message. */
-             return server_hostname;
-     }
- 
diff --git a/www/apache22/pkg-comment b/www/apache22/pkg-comment
index 0b2be74481cf..08ad28e1ad55 100644
--- a/www/apache22/pkg-comment
+++ b/www/apache22/pkg-comment
@@ -1 +1 @@
-The extremely popular Apache http server.  Very fast, very clean
+Version 2 of the extremely popular Apache http server
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 1d0c4d1df94d..95616fc8a1c6 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -1,194 +1,201 @@
-bin/dbmmanage
-bin/htdigest
 bin/htpasswd
-@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf.default
-@exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+bin/htdigest
+etc/rc.d/apache.sh
 @unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
 etc/apache/mime.types.default
 @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf.default
-@exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
-etc/rc.d/apache.sh
-include/apache/ap.h
-include/apache/ap_alloc.h
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
+etc/apache/magic.default
+@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+@unexec if cmp -s %D/etc/apache/highperformance-std.conf %D/etc/apache/highperformance-std.conf.default; then rm -f %D/etc/apache/highperformance-std.conf; fi
+etc/apache/highperformance-std.conf.default
+@exec [ ! -f %B/highperformance-std.conf ] && cp %B/%f %B/highperformance-std.conf
+@unexec if cmp -s %D/etc/apache/highperformance.conf %D/etc/apache/highperformance.conf.default; then rm -f %D/etc/apache/highperformance.conf; fi
+etc/apache/highperformance.conf.default
+@exec [ ! -f %B/highperformance.conf ] && cp %B/%f %B/highperformance.conf
+@unexec if cmp -s %D/etc/apache/httpd-std.conf %D/etc/apache/httpd-std.conf.default; then rm -f %D/etc/apache/httpd-std.conf; fi
+etc/apache/httpd-std.conf.default
+@exec [ ! -f %B/httpd-std.conf ] && cp %B/%f %B/httpd-std.conf
+@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
+etc/apache/httpd.conf.default
+@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+include/apache/apr.h
+include/apache/apr_want.h
+include/apache/apr_uuid.h
+include/apache/apr_user.h
+include/apache/apr_time.h
+include/apache/apr_thread_proc.h
+include/apache/apr_tables.h
+include/apache/apr_strings.h
+include/apache/apr_signal.h
+include/apache/apr_shmem.h
+include/apache/apr_portable.h
+include/apache/apr_pools.h
+include/apache/apr_network_io.h
+include/apache/apr_mmap.h
+include/apache/apr_md5.h
+include/apache/apr_lock.h
+include/apache/apr_lib.h
+include/apache/apr_hash.h
+include/apache/apr_getopt.h
+include/apache/apr_general.h
+include/apache/apr_fnmatch.h
+include/apache/apr_file_io.h
+include/apache/apr_file_info.h
+include/apache/apr_errno.h
+include/apache/apr_dso.h
+include/apache/apr_compat.h
+include/apache/apr_xlate.h
+include/apache/apr_base64.h
+include/apache/apu.h
+include/apache/apr_xml.h
+include/apache/apr_sha1.h
+include/apache/apr_sdbm.h
+include/apache/apr_ring.h
+include/apache/apr_optional.h
+include/apache/apr_hooks.h
+include/apache/apr_generic_hook.h
+include/apache/apr_dbm.h
+include/apache/apr_buckets.h
+include/apache/apu_compat.h
 include/apache/ap_compat.h
-include/apache/ap_config.h
-include/apache/ap_config_auto.h
-include/apache/ap_ctype.h
-include/apache/ap_md5.h
-include/apache/ap_mmn.h
-include/apache/ap_sha1.h
-include/apache/buff.h
-include/apache/compat.h
-include/apache/conf.h
-include/apache/explain.h
-include/apache/fnmatch.h
-include/apache/hsregex.h
-include/apache/http_conf_globals.h
-include/apache/http_config.h
-include/apache/http_core.h
-include/apache/http_log.h
-include/apache/http_main.h
-include/apache/http_protocol.h
-include/apache/http_request.h
-include/apache/http_vhost.h
+include/apache/util_uri.h
+include/apache/util_script.h
+include/apache/util_md5.h
+include/apache/util_filter.h
+include/apache/util_ebcdic.h
+include/apache/util_date.h
+include/apache/util_charset.h
+include/apache/util_cfgtree.h
+include/apache/scoreboard.h
+include/apache/rfc1413.h
+include/apache/pcreposix.h
+include/apache/mpm_common.h
 include/apache/httpd.h
-include/apache/multithread.h
-include/apache/os-inline.c
+include/apache/http_vhost.h
+include/apache/http_request.h
+include/apache/http_protocol.h
+include/apache/http_main.h
+include/apache/http_log.h
+include/apache/http_core.h
+include/apache/http_connection.h
+include/apache/http_config.h
+include/apache/ap_release.h
+include/apache/ap_mpm.h
+include/apache/ap_mmn.h
+include/apache/ap_listen.h
+include/apache/ap_config_auto.h
+include/apache/ap_config.h
+include/apache/util_xml.h
 include/apache/os.h
-include/apache/rfc1413.h
-include/apache/scoreboard.h
-include/apache/util_date.h
-include/apache/util_md5.h
-include/apache/util_script.h
-include/apache/util_uri.h
-include/apache/xml/asciitab.h
-include/apache/xml/hashtable.h
-include/apache/xml/iasciitab.h
-include/apache/xml/latin1tab.h
-include/apache/xml/nametab.h
-include/apache/xml/utf8tab.h
-include/apache/xml/xmldef.h
-include/apache/xml/xmlparse.h
-include/apache/xml/xmlrole.h
-include/apache/xml/xmltok.h
-include/apache/xml/xmltok_impl.h
-libexec/apache/httpd.exp
-libexec/apache/libproxy.so
-libexec/apache/mod_access.so
-libexec/apache/mod_actions.so
-libexec/apache/mod_alias.so
-libexec/apache/mod_asis.so
-libexec/apache/mod_auth.so
+include/apache/os-inline.c
+include/apache/mpm_default.h
+include/apache/mpm.h
+include/apache/mod_dav.h
+include/apache/mod_include.h
+include/apache/pcre.h
+include/apache/internal.h
+include/apache/config.h
+include/apache/unixd.h
+lib/libapr.la
+lib/libapr.a
+lib/libaprutil.la
+lib/libaprutil.a
 libexec/apache/mod_auth_anon.so
+libexec/apache/mod_auth_anon.la
 libexec/apache/mod_auth_db.so
-libexec/apache/mod_autoindex.so
+libexec/apache/mod_auth_db.la
+libexec/apache/mod_auth_digest.so
+libexec/apache/mod_auth_digest.la
+libexec/apache/mod_file_cache.so
+libexec/apache/mod_file_cache.la
+libexec/apache/mod_dav_fs.so
+libexec/apache/mod_dav_fs.la
+libexec/apache/mod_dav.so
+libexec/apache/mod_dav.la
+libexec/apache/mod_echo.so
+libexec/apache/mod_echo.la
+libexec/apache/mod_optional_fn_import.so
+libexec/apache/mod_optional_fn_import.la
+libexec/apache/mod_optional_fn_export.so
+libexec/apache/mod_optional_fn_export.la
+libexec/apache/mod_include.so
+libexec/apache/mod_include.la
+libexec/apache/mod_imap.so
+libexec/apache/mod_imap.la
+libexec/apache/mod_speling.so
+libexec/apache/mod_speling.la
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_rewrite.la
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_mime_magic.la
 libexec/apache/mod_cern_meta.so
-libexec/apache/mod_cgi.so
-libexec/apache/mod_digest.so
-libexec/apache/mod_dir.so
-libexec/apache/mod_env.so
+libexec/apache/mod_cern_meta.la
 libexec/apache/mod_expires.so
+libexec/apache/mod_expires.la
 libexec/apache/mod_headers.so
-libexec/apache/mod_imap.so
-libexec/apache/mod_include.so
-libexec/apache/mod_info.so
-libexec/apache/mod_log_config.so
-libexec/apache/mod_mime.so
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mmap_static.so
-libexec/apache/mod_negotiation.so
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.so
-libexec/apache/mod_speling.so
-libexec/apache/mod_status.so
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_userdir.so
+libexec/apache/mod_headers.la
 libexec/apache/mod_usertrack.so
-libexec/apache/mod_vhost_alias.so
+libexec/apache/mod_usertrack.la
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_unique_id.la
+libexec/apache/mod_status.so
+libexec/apache/mod_status.la
+libexec/apache/mod_info.so
+libexec/apache/mod_info.la
+libexec/apache/mod_cgid.so
+libexec/apache/mod_cgid.la
+libexec/apache/httpd.exp
+sbin/rotatelogs
+sbin/htpasswd
+sbin/logresolve
 sbin/ab
 sbin/apachectl
 sbin/apxs
 sbin/httpd
-sbin/logresolve
-sbin/rotatelogs
 share/doc/apache/README.rus
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/apache_pb.gif
-share/doc/apache/index.html.ca
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.de
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.el
-share/doc/apache/index.html.en
-share/doc/apache/index.html.es
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.it
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.tw
 share/doc/apache/index.html.se
+share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.ru.ucs4
+share/doc/apache/index.html.ru.ucs2
+share/doc/apache/index.html.ru.koi8-r
+share/doc/apache/index.html.ru.iso-ru
+share/doc/apache/index.html.ru.cp866
+share/doc/apache/index.html.ru.cp-1251
+share/doc/apache/index.html.pt-br
+share/doc/apache/index.html.pt
+share/doc/apache/index.html.po.iso-pl
+share/doc/apache/index.html.no
+share/doc/apache/index.html.nl
+share/doc/apache/index.html.lu
+share/doc/apache/index.html.ltz
+share/doc/apache/index.html.kr.iso-kr
+share/doc/apache/index.html.kr.iso2022-kr
+share/doc/apache/index.html.ja.jis
+share/doc/apache/index.html.ja.iso2022-jp
+share/doc/apache/index.html.it
+share/doc/apache/index.html.he.iso8859-8
+share/doc/apache/index.html.fr
+share/doc/apache/index.html.et
+share/doc/apache/index.html.es
+share/doc/apache/index.html.en
+share/doc/apache/index.html.el
+share/doc/apache/index.html.ee
+share/doc/apache/index.html.dk
+share/doc/apache/index.html.de
+share/doc/apache/index.html.cz
+share/doc/apache/index.html.ca
+share/doc/apache/apache_pb.gif
 share/doc/apache/index.html.tw.Big5
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/configuring.html.en
-share/doc/apache/manual/configuring.html.html
-share/doc/apache/manual/configuring.html.ja.jis
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html.en
-share/doc/apache/manual/custom-error.html.html
-share/doc/apache/manual/custom-error.html.ja.jis
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/handler.html.en
-share/doc/apache/manual/handler.html.html
-share/doc/apache/manual/handler.html.ja.jis
-share/doc/apache/manual/header.html
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.html
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.html
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html.en
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html.html
-share/doc/apache/manual/index.html.ja.jis
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html.en
-share/doc/apache/manual/install.html.fr
-share/doc/apache/manual/install.html.html
-share/doc/apache/manual/install.html.ja.jis
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/invoking.html.fr
-share/doc/apache/manual/keepalive.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/man-template.html
-share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/misc/tutorials.html
 share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/HTTP_Features.tsv
+share/doc/apache/manual/misc/known_client_problems.html
 share/doc/apache/manual/misc/client_block_api.html
 share/doc/apache/manual/misc/compat_notes.html
 share/doc/apache/manual/misc/custom_errordocs.html
@@ -198,22 +205,32 @@ share/doc/apache/manual/misc/footer.html
 share/doc/apache/manual/misc/header.html
 share/doc/apache/manual/misc/howto.html
 share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/nopgp.html
-share/doc/apache/manual/misc/perf-bsd44.html
-share/doc/apache/manual/misc/perf-dec.html
-share/doc/apache/manual/misc/perf-hp.html
 share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/perf.html
 share/doc/apache/manual/misc/rewriteguide.html
 share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/vif-info.html
-share/doc/apache/manual/misc/windoz_keepalive.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/mod/directive-dict.html.en
-share/doc/apache/manual/mod/directive-dict.html.html
-share/doc/apache/manual/mod/directive-dict.html.ja.jis
+share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/developer/modules.html
+share/doc/apache/manual/developer/documenting
+share/doc/apache/manual/developer/footer.html
+share/doc/apache/manual/developer/header.html
+share/doc/apache/manual/developer/hooks.html
+share/doc/apache/manual/developer/index.html
+share/doc/apache/manual/developer/layeredio.html
+share/doc/apache/manual/developer/debugging.html
+share/doc/apache/manual/platform/windows.html
+share/doc/apache/manual/platform/header.html
+share/doc/apache/manual/platform/netware.html
+share/doc/apache/manual/platform/perf-bsd44.html
+share/doc/apache/manual/platform/perf-dec.html
+share/doc/apache/manual/platform/perf-hp.html
+share/doc/apache/manual/platform/perf.html
+share/doc/apache/manual/platform/readme-tpf.html
+share/doc/apache/manual/platform/unixware.html
+share/doc/apache/manual/platform/win_compiling.html
+share/doc/apache/manual/platform/win_service.html
+share/doc/apache/manual/platform/footer.html
+share/doc/apache/manual/mod/threaded.html
+share/doc/apache/manual/mod/directive-dict.html
 share/doc/apache/manual/mod/directives.html
 share/doc/apache/manual/mod/footer.html
 share/doc/apache/manual/mod/header.html
@@ -229,56 +246,44 @@ share/doc/apache/manual/mod/mod_auth_db.html
 share/doc/apache/manual/mod/mod_auth_dbm.html
 share/doc/apache/manual/mod/mod_auth_digest.html
 share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_browser.html
 share/doc/apache/manual/mod/mod_cern_meta.html
+share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_cookies.html
-share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_charset_lite.html
+share/doc/apache/manual/mod/mod_dav.html
 share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_dld.html
 share/doc/apache/manual/mod/mod_env.html
 share/doc/apache/manual/mod/mod_example.html
 share/doc/apache/manual/mod/mod_expires.html
+share/doc/apache/manual/mod/mod_ext_filter.html
+share/doc/apache/manual/mod/mod_file_cache.html
 share/doc/apache/manual/mod/mod_headers.html
 share/doc/apache/manual/mod/mod_imap.html
 share/doc/apache/manual/mod/mod_include.html
 share/doc/apache/manual/mod/mod_info.html
 share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_agent.html
-share/doc/apache/manual/mod/mod_log_common.html
 share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_log_referer.html
 share/doc/apache/manual/mod/mod_mime.html
 share/doc/apache/manual/mod/mod_mime_magic.html
 share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html.en
-share/doc/apache/manual/mod/mod_negotiation.html.html
-share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
+share/doc/apache/manual/mod/mod_negotiation.html
 share/doc/apache/manual/mod/mod_proxy.html
 share/doc/apache/manual/mod/mod_rewrite.html
 share/doc/apache/manual/mod/mod_setenvif.html
-share/doc/apache/manual/mod/mod_so.html
 share/doc/apache/manual/mod/mod_speling.html
 share/doc/apache/manual/mod/mod_status.html
 share/doc/apache/manual/mod/mod_unique_id.html
 share/doc/apache/manual/mod/mod_userdir.html
 share/doc/apache/manual/mod/mod_usertrack.html
 share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html.en
-share/doc/apache/manual/mod/module-dict.html.html
-share/doc/apache/manual/mod/module-dict.html.ja.jis
-share/doc/apache/manual/mpeix.html
-share/doc/apache/manual/multilogs.html
-share/doc/apache/manual/netware.html
-share/doc/apache/manual/new_features_1_0.html
-share/doc/apache/manual/new_features_1_1.html
-share/doc/apache/manual/new_features_1_2.html
-share/doc/apache/manual/new_features_1_3.html.en
-share/doc/apache/manual/new_features_1_3.html.html
-share/doc/apache/manual/new_features_1_3.html.ja.jis
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/process-model.html
-share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/mod/module-dict.html
+share/doc/apache/manual/mod/mpm_common.html
+share/doc/apache/manual/mod/mpm_winnt.html
+share/doc/apache/manual/mod/perchild.html
+share/doc/apache/manual/mod/prefork.html
+share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/search/manual-index.cgi
+share/doc/apache/manual/programs/suexec.html
 share/doc/apache/manual/programs/apachectl.html
 share/doc/apache/manual/programs/apxs.html
 share/doc/apache/manual/programs/dbmmanage.html
@@ -291,104 +296,70 @@ share/doc/apache/manual/programs/index.html
 share/doc/apache/manual/programs/logresolve.html
 share/doc/apache/manual/programs/other.html
 share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/readme-tpf.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/server-wide.html.en
-share/doc/apache/manual/server-wide.html.fr
-share/doc/apache/manual/server-wide.html.html
-share/doc/apache/manual/server-wide.html.ja.jis
-share/doc/apache/manual/sourcereorg.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/suexec_1_2.html
-share/doc/apache/manual/unixware.html
-share/doc/apache/manual/upgrading_to_1_3.html
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/images/custom_errordocs.gif
+share/doc/apache/manual/images/home.gif
+share/doc/apache/manual/images/index.gif
+share/doc/apache/manual/images/mod_rewrite_fig1.fig
+share/doc/apache/manual/images/mod_rewrite_fig1.gif
+share/doc/apache/manual/images/mod_rewrite_fig2.fig
+share/doc/apache/manual/images/mod_rewrite_fig2.gif
+share/doc/apache/manual/images/pixel.gif
+share/doc/apache/manual/images/apache_header.gif
+share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.ja.jis
+share/doc/apache/manual/howto/footer.html
+share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.ja.jis
+share/doc/apache/manual/vhosts/virtual-host.html
 share/doc/apache/manual/vhosts/examples.html
 share/doc/apache/manual/vhosts/fd-limits.html
 share/doc/apache/manual/vhosts/footer.html
 share/doc/apache/manual/vhosts/header.html
 share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html.en
-share/doc/apache/manual/vhosts/index.html.html
-share/doc/apache/manual/vhosts/index.html.ja.jis
+share/doc/apache/manual/vhosts/index.html
 share/doc/apache/manual/vhosts/ip-based.html
 share/doc/apache/manual/vhosts/mass.html
 share/doc/apache/manual/vhosts/name-based.html
 share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/win_compiling.html
-share/doc/apache/manual/win_service.html
-share/doc/apache/manual/windows.html
-www/cgi-bin.default/printenv
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/new_features_2_0.html.fr
+share/doc/apache/manual/new_features_2_0.html
+share/doc/apache/manual/mpm.html
+share/doc/apache/manual/location.html
+share/doc/apache/manual/invoking.html
+share/doc/apache/manual/install.html
+share/doc/apache/manual/install-tpf.html
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html
+share/doc/apache/manual/header.html
+share/doc/apache/manual/handler.html
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/filter.html
+share/doc/apache/manual/env.html
+share/doc/apache/manual/ebcdic.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/configuring.html
+share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/bind.html
+share/doc/apache/manual/STATUS
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/urlmapping.html
+share/doc/apache/manual/upgrading.html.fr
+share/doc/apache/manual/upgrading.html
+share/doc/apache/manual/suexec.html
+share/doc/apache/manual/stopping.html
+share/doc/apache/manual/server-wide.html
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/process-model.html
 www/cgi-bin.default/test-cgi
-www/icons/README
-www/icons/a.gif
-www/icons/alert.black.gif
-www/icons/alert.red.gif
-www/icons/apache_pb.gif
-www/icons/back.gif
-www/icons/ball.gray.gif
-www/icons/ball.red.gif
-www/icons/binary.gif
-www/icons/binhex.gif
-www/icons/blank.gif
-www/icons/bomb.gif
-www/icons/box1.gif
-www/icons/box2.gif
-www/icons/broken.gif
-www/icons/burst.gif
-www/icons/c.gif
-www/icons/comp.blue.gif
-www/icons/comp.gray.gif
-www/icons/compressed.gif
-www/icons/continued.gif
-www/icons/dir.gif
-www/icons/down.gif
-www/icons/dvi.gif
-www/icons/f.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.sec.gif
-www/icons/forward.gif
-www/icons/generic.gif
-www/icons/generic.red.gif
-www/icons/generic.sec.gif
-www/icons/hand.right.gif
-www/icons/hand.up.gif
-www/icons/icon.sheet.gif
-www/icons/image1.gif
-www/icons/image2.gif
-www/icons/image3.gif
-www/icons/index.gif
-www/icons/layout.gif
-www/icons/left.gif
-www/icons/link.gif
-www/icons/movie.gif
-www/icons/p.gif
-www/icons/patch.gif
-www/icons/pdf.gif
-www/icons/pie0.gif
-www/icons/pie1.gif
-www/icons/pie2.gif
-www/icons/pie3.gif
-www/icons/pie4.gif
-www/icons/pie5.gif
-www/icons/pie6.gif
-www/icons/pie7.gif
-www/icons/pie8.gif
-www/icons/portal.gif
-www/icons/ps.gif
-www/icons/quill.gif
-www/icons/right.gif
-www/icons/screw1.gif
-www/icons/screw2.gif
-www/icons/script.gif
-www/icons/small/README.txt
+www/cgi-bin.default/printenv
+www/icons/small/uu.gif
 www/icons/small/back.gif
 www/icons/small/binary.gif
 www/icons/small/binhex.gif
@@ -420,39 +391,100 @@ www/icons/small/tar.gif
 www/icons/small/text.gif
 www/icons/small/transfer.gif
 www/icons/small/unknown.gif
-www/icons/small/uu.gif
-www/icons/sound1.gif
-www/icons/sound2.gif
-www/icons/sphere1.gif
-www/icons/sphere2.gif
-www/icons/tar.gif
-www/icons/tex.gif
-www/icons/text.gif
-www/icons/transfer.gif
-www/icons/unknown.gif
-www/icons/up.gif
-www/icons/uu.gif
-www/icons/uuencoded.gif
+www/icons/small/README.txt
 www/icons/world1.gif
+www/icons/uuencoded.gif
+www/icons/uu.gif
+www/icons/up.gif
+www/icons/unknown.gif
+www/icons/transfer.gif
+www/icons/text.gif
+www/icons/tex.gif
+www/icons/tar.gif
+www/icons/sphere2.gif
+www/icons/sphere1.gif
+www/icons/sound2.gif
+www/icons/sound1.gif
+www/icons/script.gif
+www/icons/screw2.gif
+www/icons/screw1.gif
+www/icons/right.gif
+www/icons/quill.gif
+www/icons/ps.gif
+www/icons/portal.gif
+www/icons/pie8.gif
+www/icons/pie7.gif
+www/icons/pie6.gif
+www/icons/pie5.gif
+www/icons/pie4.gif
+www/icons/pie3.gif
+www/icons/pie2.gif
+www/icons/pie1.gif
+www/icons/pie0.gif
+www/icons/pdf.gif
+www/icons/patch.gif
+www/icons/p.gif
+www/icons/movie.gif
+www/icons/link.gif
+www/icons/left.gif
+www/icons/layout.gif
+www/icons/index.gif
+www/icons/image3.gif
+www/icons/image2.gif
+www/icons/image1.gif
+www/icons/icon.sheet.gif
+www/icons/hand.up.gif
+www/icons/hand.right.gif
+www/icons/generic.sec.gif
+www/icons/generic.red.gif
+www/icons/generic.gif
+www/icons/forward.gif
+www/icons/folder.sec.gif
+www/icons/folder.gif
+www/icons/folder.open.gif
+www/icons/f.gif
+www/icons/dvi.gif
+www/icons/down.gif
+www/icons/dir.gif
+www/icons/continued.gif
+www/icons/compressed.gif
+www/icons/comp.gray.gif
+www/icons/comp.blue.gif
+www/icons/c.gif
+www/icons/burst.gif
+www/icons/broken.gif
+www/icons/box2.gif
+www/icons/box1.gif
+www/icons/bomb.gif
+www/icons/blank.gif
+www/icons/binhex.gif
+www/icons/binary.gif
+www/icons/ball.red.gif
+www/icons/ball.gray.gif
+www/icons/back.gif
+www/icons/apache_pb.gif
+www/icons/alert.red.gif
+www/icons/alert.black.gif
+www/icons/a.gif
 www/icons/world2.gif
-@exec mkdir -p %D/www/proxy
+www/icons/README
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
 @dirrm etc/apache
-@dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/search
 @dirrm share/doc/apache/manual/vhosts
+@dirrm share/doc/apache/manual/search
+@dirrm share/doc/apache/manual/programs
+@dirrm share/doc/apache/manual/platform
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/howto
+@dirrm share/doc/apache/manual/developer
 @dirrm share/doc/apache/manual
 @dirrm share/doc/apache
-@dirrm www/cgi-bin.default
 @dirrm www/icons/small
 @dirrm www/icons
-@dirrm www/proxy
+@dirrm www/cgi-bin.default
 @dirrm www