Update to 2.0.40

24 files changed, 1716 insertions, 1492 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 6fd5dc4b47ba..383b746775d4 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.39
-PORTREVISION=	7
+PORTVERSION=	2.0.40
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
@@ -44,7 +43,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
-SHARED_MODULES= all cgid deflate ext_filter
+SHARED_MODULES= all cgid deflate ext_filter proxy proxy-connect proxy-ftp \
+		proxy-http
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
@@ -53,6 +53,12 @@ MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SUEXEC)
 SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
 SUEXEC_USERDIR?= public_html
@@ -72,11 +78,6 @@ PLIST_SUB+=	SUEXEC="@comment "
 .if ${WITH_MPM} != "prefork"
 PKGNAMESUFFIX=	-${WITH_MPM}
 WITH_THREADS=	yes
-.if !defined(FORCE_THREADING_MPM)
-FORBIDDEN=	"doesn't support threads on FreeBSD, officially. If you are\
-		prepared to risk unintended problems, make again with\
-		-DFORCE_THREADING_MPM"
-.endif
 .if ${WITH_MPM} == "worker"
 PLIST_SUB+=	PREFORK="@comment " WORKER=""
 .else
@@ -89,31 +90,28 @@ PLIST_SUB+=	PREFORK="" WORKER="@comment "
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+= --enable-threads
 CFLAGS+=	-DFREEBSD_THREAD_HACK
+SHARED_MODULES+= cache file-cache disk-cache mem_cache
+PLIST_SUB+=	THREADS=""
+.else
+PLIST_SUB+=	THREADS="@comment "
 .endif
 
-.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+.if !defined(WITHOUT_SSL)
 SHARED_MODULES+= ssl
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
 PLIST_SUB+=	MODSSL=""
+_SSLBUGGY!=	${OPENSSLBASE}/bin/openssl version | \
+		${EGREP} "OpenSSL ([1-9]+)|([0\.9\.[6-9][e-z])|(0\.[1-9][0-9]+)" \
+		|| ${TRUE}
+.if empty(_SSLBUGGY)
+IGNORE=		"requires OpenSSL 0.9.6e or higher. Upgrade your base system"
+.endif
 RC_SUB+=	-e 's,@@SSL@@,ssl,g'
 .else
 PLIST_SUB+=	MODSSL="@comment "
 RC_SUB+=	-e 's,@@SSL@@,,g'
 .endif
 
-.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS)
-SHARED_MODULES+= cache file-cache disk-cache mem_cache
-PLIST_SUB+=	MODCACHE=""
-.else
-PLIST_SUB+=	MODCACHE="@comment "
-.endif
-
-.if !defined(WITHOUT_PROXY)
-SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
-PLIST_SUB+=	MODPROXY=""
-.else
-PLIST_SUB+=	MODPROXY="@comment "
-.endif
-
 .if defined(WITH_EXPERIMENTAL)
 SHARED_MODULES+= bucketeer case_filter case_filter_in ext_filter charset_lite \
 		optional_hook_export optional_hook_import \
@@ -137,7 +135,7 @@ post-patch:
 	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
 		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
 	 ); done
-	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
+	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
 	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
@@ -151,4 +149,4 @@ post-install:
 		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index c91856e7d4c5..d8a5b7f6874b 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.39.tar.gz) = b821c6babca68b4859b9ba38d1b345af
+MD5 (httpd-2.0.40.tar.gz) = fdb35bc3b5b7833e45a455b56a0d0be5
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in
index 398b43f9a899..c0e84224e034 100644
--- a/www/apache2/files/patch-Makefile.in
+++ b/www/apache2/files/patch-Makefile.in
@@ -1,61 +1,106 @@
---- Makefile.in.orig	Sat Jun 15 18:41:03 2002
-+++ Makefile.in	Sun Jul 21 03:15:18 2002
-@@ -31,12 +31,14 @@
- 	@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
- 	@cd $(top_srcdir)/docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		cp -f $$i $$i-dist; \
-+		$(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
+--- Makefile.in.orig	Fri Jul 26 00:47:12 2002
++++ Makefile.in	Sat Aug 10 09:38:48 2002
+@@ -36,10 +36,13 @@
+ 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+ 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ 	    fi; \
++	    cp -f $$i $$i-dist; \
++	    $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
  	done; \
  	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- 		cd $$j ; \
- 	for i in *-std*.conf ssl.conf; do \
--		[ -f $$i ] || continue; \
+ 	    cd $$j ; \
+ 	    for i in *-std*.conf; do \
 +		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
- 		( \
- 			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
- 			if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
-@@ -54,6 +56,9 @@
- 					if test "x$$j" = "xssl"; then \
- 						echo "<IfDefine SSL>"; \
- 					fi; \
+ 	    	( \
+ 	    		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+ 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
+@@ -57,6 +60,9 @@
+ 	    				if test "x$$j" = "xssl"; then \
+ 	    					echo "<IfDefine SSL>"; \
+ 	    				fi; \
 +					if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
 +					        echo -n "#"; \
 +					fi; \
- 					if test $$j != "^EOL^"; then \
- 						echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
- 					fi; \
-@@ -104,11 +109,14 @@
+ 	    				if test $$j != "^EOL^"; then \
+ 	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+ 	    				fi; \
+@@ -106,44 +112,32 @@
+ 	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
- 	@echo Installing HTML documents
--	@test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
--	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
+-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
+-           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
+-        else \
+-	    echo Installing HTML documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
+-	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+-	    cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing HTML documents
 +	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
 +	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
 +	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
-+.if !defined(NOPORTDOCS)
- 	@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
--	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
-+.endif
 +	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-error:
- 	@echo Installing error documents
-@@ -124,9 +132,10 @@
+-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
+-           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
+-        else \
+-	    echo Installing error documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
+-	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
+-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing error documents
++	@test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
++	cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
++	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	@test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
+ 
+ install-icons:
+-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
+-           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
+-        else \
+-	    echo Installing icons ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
+-	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
+-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing icons
++	@test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
++	cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
++	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	@test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
  
  install-cgi:
- 	@echo Installing CGIs
--	@test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
--	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
--	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
+-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
+-	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
+-	else \
+-	   echo Installing CGIs ; \
+-	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
+-	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
+-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing CGIs
 +	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
-+	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
-+	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
+@@ -185,11 +179,13 @@
+ 	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
+ 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ 	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
+-	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+ 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
+ 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
++.if !defined(NOPORTDOCS)
++	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+ 	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
+ 	@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf)
++.endif
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache2/files/patch-modules:http:http_request.c b/www/apache2/files/patch-modules:http:http_request.c
deleted file mode 100644
index e44aa29391f7..000000000000
--- a/www/apache2/files/patch-modules:http:http_request.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/http/http_request.c.orig	26 Jun 2002 19:45:06 -0000	1.150
-+++ modules/http/http_request.c	27 Jun 2002 04:40:47 -0000	1.151
-@@ -383,8 +383,6 @@
-         f = f->next;
-     }
- 
--    ap_add_input_filter("HTTP_IN", NULL, new, new->connection);
--
-     apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
-                    apr_itoa(r->pool, r->status));
diff --git a/www/apache2/files/patch-support:htpasswd.c b/www/apache2/files/patch-support:htpasswd.c
deleted file mode 100644
index f836f157fa1b..000000000000
--- a/www/apache2/files/patch-support:htpasswd.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- support/htpasswd.c.orig	Tue Jun 18 11:58:36 2002
-+++ support/htpasswd.c	Mon Jul  8 16:30:14 2002
-@@ -236,6 +236,7 @@
-     strcpy(record, user);
-     strcat(record, ":");
-     strcat(record, cpw);
-+    strcat(record, "\n");
-     return 0;
- }
- 
-@@ -375,7 +376,7 @@
-         }
-     }
- 
--    if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
-+    if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
-         apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
-         exit(ERR_SYNTAX);
-     }
-@@ -592,6 +593,7 @@
-                  */
-                 apr_file_printf(errfile, "Updating ");
-                 putline(ftemp, record);
-+                found++;
-             }
-         }
-     }
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 8371eabc37f2..7310e6844974 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -23,6 +23,7 @@ include/apache2/ap_config_layout.h
 include/apache2/ap_listen.h
 include/apache2/ap_mmn.h
 include/apache2/ap_mpm.h
+include/apache2/ap_regkey.h
 include/apache2/ap_release.h
 include/apache2/apr.h
 include/apache2/apr_allocator.h
@@ -52,9 +53,11 @@ include/apache2/apr_mmap.h
 include/apache2/apr_network_io.h
 include/apache2/apr_optional.h
 include/apache2/apr_optional_hooks.h
+include/apache2/apr_poll.h
 include/apache2/apr_pools.h
 include/apache2/apr_portable.h
 include/apache2/apr_proc_mutex.h
+include/apache2/apr_reslist.h
 include/apache2/apr_ring.h
 include/apache2/apr_rmm.h
 include/apache2/apr_sdbm.h
@@ -63,6 +66,7 @@ include/apache2/apr_shm.h
 include/apache2/apr_signal.h
 include/apache2/apr_strings.h
 include/apache2/apr_strmatch.h
+include/apache2/apr_support.h
 include/apache2/apr_tables.h
 include/apache2/apr_thread_cond.h
 include/apache2/apr_thread_mutex.h
@@ -143,7 +147,7 @@ libexec/apache2/mod_auth_dbm.so
 libexec/apache2/mod_auth_digest.so
 libexec/apache2/mod_autoindex.so
 %%EXPERIMENTAL%%libexec/apache2/mod_bucketeer.so
-%%MODCACHE%%libexec/apache2/mod_cache.so
+%%THREADS%%libexec/apache2/mod_cache.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter_in.so
 libexec/apache2/mod_cern_meta.so
@@ -154,17 +158,17 @@ libexec/apache2/mod_dav.so
 libexec/apache2/mod_dav_fs.so
 libexec/apache2/mod_deflate.so
 libexec/apache2/mod_dir.so
-%%MODCACHE%%libexec/apache2/mod_disk_cache.so
+%%THREADS%%libexec/apache2/mod_disk_cache.so
 libexec/apache2/mod_env.so
 libexec/apache2/mod_expires.so
 libexec/apache2/mod_ext_filter.so
-%%MODCACHE%%libexec/apache2/mod_file_cache.so
+%%THREADS%%libexec/apache2/mod_file_cache.so
 libexec/apache2/mod_headers.so
 libexec/apache2/mod_imap.so
 libexec/apache2/mod_include.so
 libexec/apache2/mod_info.so
 libexec/apache2/mod_log_config.so
-%%MODCACHE%%libexec/apache2/mod_mem_cache.so
+%%THREADS%%libexec/apache2/mod_mem_cache.so
 libexec/apache2/mod_mime.so
 libexec/apache2/mod_mime_magic.so
 libexec/apache2/mod_negotiation.so
@@ -172,10 +176,10 @@ libexec/apache2/mod_negotiation.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_hook_import.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_import.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_export.so
-%%MODPROXY%%libexec/apache2/mod_proxy.so
-%%MODPROXY%%libexec/apache2/mod_proxy_connect.so
-%%MODPROXY%%libexec/apache2/mod_proxy_ftp.so
-%%MODPROXY%%libexec/apache2/mod_proxy_http.so
+libexec/apache2/mod_proxy.so
+libexec/apache2/mod_proxy_connect.so
+libexec/apache2/mod_proxy_ftp.so
+libexec/apache2/mod_proxy_http.so
 libexec/apache2/mod_rewrite.so
 libexec/apache2/mod_setenvif.so
 libexec/apache2/mod_speling.so
@@ -211,11 +215,16 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/LICENSE
 %%PORTDOCS%%share/doc/apache2/bind.html.en
 %%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/bind.xml
+%%PORTDOCS%%share/doc/apache2/bind.xml.ja
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.en
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/configuring.html.en
 %%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/content-negotiation.html
+%%PORTDOCS%%share/doc/apache2/configuring.xml
+%%PORTDOCS%%share/doc/apache2/configuring.xml.ja
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html.en
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/custom-error.html.en
 %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/API.html
@@ -227,20 +236,26 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/hooks.html
 %%PORTDOCS%%share/doc/apache2/developer/index.html
 %%PORTDOCS%%share/doc/apache2/developer/layeredio.html
-%%PORTDOCS%%share/doc/apache2/developer/modules.html
+%%PORTDOCS%%share/doc/apache2/developer/modules.html.en
+%%PORTDOCS%%share/doc/apache2/developer/modules.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/request.html
 %%PORTDOCS%%share/doc/apache2/dns-caveats.html
-%%PORTDOCS%%share/doc/apache2/dso.html
+%%PORTDOCS%%share/doc/apache2/dso.html.en
+%%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/env.xml
 %%PORTDOCS%%share/doc/apache2/faq/index.html
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/filter.xml
 %%PORTDOCS%%share/doc/apache2/footer.html
+%%PORTDOCS%%share/doc/apache2/glossary.html
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/handler.xml
 %%PORTDOCS%%share/doc/apache2/header.html
 %%PORTDOCS%%share/doc/apache2/howto/auth.html.en
 %%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
@@ -248,6 +263,7 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.html
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.en
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/images/apache_header.gif
@@ -276,7 +292,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/invoking.html.en
 %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/logs.html
+%%PORTDOCS%%share/doc/apache2/logs.html.en
+%%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/logs.xml
 %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
 %%PORTDOCS%%share/doc/apache2/misc/descriptors.html
 %%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html
@@ -288,19 +306,26 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
 %%PORTDOCS%%share/doc/apache2/misc/security_tips.html
 %%PORTDOCS%%share/doc/apache2/misc/tutorials.html
-%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
+%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/core.html.en
 %%PORTDOCS%%share/doc/apache2/mod/core.xml
-%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.en
+%%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
+%%PORTDOCS%%share/doc/apache2/mod/directives.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/footer.html
 %%PORTDOCS%%share/doc/apache2/mod/header.html
 %%PORTDOCS%%share/doc/apache2/mod/index.html.en
+%%PORTDOCS%%share/doc/apache2/mod/index.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/index.xml
+%%PORTDOCS%%share/doc/apache2/mod/index.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
@@ -308,7 +333,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
@@ -316,7 +343,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
@@ -332,11 +361,19 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
@@ -370,7 +407,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
@@ -391,9 +430,12 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
-%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
@@ -444,7 +486,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/sitemap.html
+%%PORTDOCS%%share/doc/apache2/sitemap.html.en
+%%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
@@ -462,16 +505,17 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_overview_fig1.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
-%%PORTDOCS%%share/doc/apache2/stopping.html
-%%PORTDOCS%%share/doc/apache2/style/Makefile
-%%PORTDOCS%%share/doc/apache2/style/build.sh
-%%PORTDOCS%%share/doc/apache2/style/build.xml
+%%PORTDOCS%%share/doc/apache2/stopping.html.en
+%%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/style/common.dtd
 %%PORTDOCS%%share/doc/apache2/style/common.xsl
+%%PORTDOCS%%share/doc/apache2/style/de.xml
 %%PORTDOCS%%share/doc/apache2/style/en.xml
 %%PORTDOCS%%share/doc/apache2/style/ja.xml
 %%PORTDOCS%%share/doc/apache2/style/manual.css
 %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
+%%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
 %%PORTDOCS%%share/doc/apache2/style/sv.xml
 %%PORTDOCS%%share/doc/apache2/suexec.html.en
@@ -480,7 +524,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/upgrading.html.fr
 %%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
-%%PORTDOCS%%share/doc/apache2/urlmapping.html
+%%PORTDOCS%%share/doc/apache2/upgrading.xml
+%%PORTDOCS%%share/doc/apache2/urlmapping.html.en
+%%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
@@ -535,255 +581,259 @@ www/data-dist/index.html.ru.utf8
 www/data-dist/index.html.se
 www/data-dist/index.html.var
 www/data-dist/index.html.zh
-www/error/HTTP_BAD_GATEWAY.html.var
-www/error/HTTP_BAD_REQUEST.html.var
-www/error/HTTP_FORBIDDEN.html.var
-www/error/HTTP_GONE.html.var
-www/error/HTTP_INTERNAL_SERVER_ERROR.html.var
-www/error/HTTP_LENGTH_REQUIRED.html.var
-www/error/HTTP_METHOD_NOT_ALLOWED.html.var
-www/error/HTTP_NOT_ACCEPTABLE.html.var
-www/error/HTTP_NOT_FOUND.html.var
-www/error/HTTP_NOT_IMPLEMENTED.html.var
-www/error/HTTP_PRECONDITION_FAILED.html.var
-www/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-www/error/HTTP_REQUEST_TIME_OUT.html.var
-www/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-www/error/HTTP_SERVICE_UNAVAILABLE.html.var
-www/error/HTTP_UNAUTHORIZED.html.var
-www/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-www/error/HTTP_VARIANT_ALSO_VARIES.html.var
-www/error/README
-www/error/contact.html.var
-www/error/include/bottom.html
-www/error/include/spacer.html
-www/error/include/top.html
-www/icons/README
-www/icons/a.gif
-www/icons/a.png
-www/icons/alert.black.gif
-www/icons/alert.black.png
-www/icons/alert.red.gif
-www/icons/alert.red.png
-www/icons/apache_pb.gif
-www/icons/apache_pb.png
-www/icons/apache_pb2.gif
-www/icons/apache_pb2.png
-www/icons/apache_pb2_ani.gif
-www/icons/back.gif
-www/icons/back.png
-www/icons/ball.gray.gif
-www/icons/ball.gray.png
-www/icons/ball.red.gif
-www/icons/ball.red.png
-www/icons/binary.gif
-www/icons/binary.png
-www/icons/binhex.gif
-www/icons/binhex.png
-www/icons/blank.gif
-www/icons/blank.png
-www/icons/bomb.gif
-www/icons/bomb.png
-www/icons/box1.gif
-www/icons/box1.png
-www/icons/box2.gif
-www/icons/box2.png
-www/icons/broken.gif
-www/icons/broken.png
-www/icons/burst.gif
-www/icons/burst.png
-www/icons/c.gif
-www/icons/c.png
-www/icons/comp.blue.gif
-www/icons/comp.blue.png
-www/icons/comp.gray.gif
-www/icons/comp.gray.png
-www/icons/compressed.gif
-www/icons/compressed.png
-www/icons/continued.gif
-www/icons/continued.png
-www/icons/dir.gif
-www/icons/dir.png
-www/icons/diskimg.gif
-www/icons/diskimg.png
-www/icons/down.gif
-www/icons/down.png
-www/icons/dvi.gif
-www/icons/dvi.png
-www/icons/f.gif
-www/icons/f.png
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.open.png
-www/icons/folder.png
-www/icons/folder.sec.gif
-www/icons/folder.sec.png
-www/icons/forward.gif
-www/icons/forward.png
-www/icons/freebsd.gif
-www/icons/generic.gif
-www/icons/generic.png
-www/icons/generic.red.gif
-www/icons/generic.red.png
-www/icons/generic.sec.gif
-www/icons/generic.sec.png
-www/icons/hand.right.gif
-www/icons/hand.right.png
-www/icons/hand.up.gif
-www/icons/hand.up.png
-www/icons/icon.sheet.gif
-www/icons/icon.sheet.png
-www/icons/image1.gif
-www/icons/image1.png
-www/icons/image2.gif
-www/icons/image2.png
-www/icons/image3.gif
-www/icons/image3.png
-www/icons/index.gif
-www/icons/index.png
-www/icons/layout.gif
-www/icons/layout.png
-www/icons/left.gif
-www/icons/left.png
-www/icons/link.gif
-www/icons/link.png
-www/icons/movie.gif
-www/icons/movie.png
-www/icons/p.gif
-www/icons/p.png
-www/icons/patch.gif
-www/icons/patch.png
-www/icons/pdf.gif
-www/icons/pdf.png
-www/icons/pie0.gif
-www/icons/pie0.png
-www/icons/pie1.gif
-www/icons/pie1.png
-www/icons/pie2.gif
-www/icons/pie2.png
-www/icons/pie3.gif
-www/icons/pie3.png
-www/icons/pie4.gif
-www/icons/pie4.png
-www/icons/pie5.gif
-www/icons/pie5.png
-www/icons/pie6.gif
-www/icons/pie6.png
-www/icons/pie7.gif
-www/icons/pie7.png
-www/icons/pie8.gif
-www/icons/pie8.png
-www/icons/portal.gif
-www/icons/portal.png
-www/icons/ps.gif
-www/icons/ps.png
-www/icons/quill.gif
-www/icons/quill.png
-www/icons/right.gif
-www/icons/right.png
-www/icons/screw1.gif
-www/icons/screw1.png
-www/icons/screw2.gif
-www/icons/screw2.png
-www/icons/script.gif
-www/icons/script.png
-www/icons/small/README.txt
-www/icons/small/back.gif
-www/icons/small/back.png
-www/icons/small/binary.gif
-www/icons/small/binary.png
-www/icons/small/binhex.gif
-www/icons/small/binhex.png
-www/icons/small/blank.gif
-www/icons/small/blank.png
-www/icons/small/broken.gif
-www/icons/small/broken.png
-www/icons/small/burst.gif
-www/icons/small/burst.png
-www/icons/small/comp1.gif
-www/icons/small/comp1.png
-www/icons/small/comp2.gif
-www/icons/small/comp2.png
-www/icons/small/compressed.gif
-www/icons/small/compressed.png
-www/icons/small/continued.gif
-www/icons/small/continued.png
-www/icons/small/dir.gif
-www/icons/small/dir.png
-www/icons/small/dir2.gif
-www/icons/small/dir2.png
-www/icons/small/doc.gif
-www/icons/small/doc.png
-www/icons/small/forward.gif
-www/icons/small/forward.png
-www/icons/small/generic.gif
-www/icons/small/generic.png
-www/icons/small/generic2.gif
-www/icons/small/generic2.png
-www/icons/small/generic3.gif
-www/icons/small/generic3.png
-www/icons/small/image.gif
-www/icons/small/image.png
-www/icons/small/image2.gif
-www/icons/small/image2.png
-www/icons/small/index.gif
-www/icons/small/index.png
-www/icons/small/key.gif
-www/icons/small/key.png
-www/icons/small/movie.gif
-www/icons/small/movie.png
-www/icons/small/patch.gif
-www/icons/small/patch.png
-www/icons/small/ps.gif
-www/icons/small/ps.png
-www/icons/small/rainbow.gif
-www/icons/small/rainbow.png
-www/icons/small/sound.gif
-www/icons/small/sound.png
-www/icons/small/sound2.gif
-www/icons/small/sound2.png
-www/icons/small/tar.gif
-www/icons/small/tar.png
-www/icons/small/text.gif
-www/icons/small/text.png
-www/icons/small/transfer.gif
-www/icons/small/transfer.png
-www/icons/small/unknown.gif
-www/icons/small/unknown.png
-www/icons/small/uu.gif
-www/icons/small/uu.png
-www/icons/sound1.gif
-www/icons/sound1.png
-www/icons/sound2.gif
-www/icons/sound2.png
-www/icons/sphere1.gif
-www/icons/sphere1.png
-www/icons/sphere2.gif
-www/icons/sphere2.png
-www/icons/tar.gif
-www/icons/tar.png
-www/icons/tex.gif
-www/icons/tex.png
-www/icons/text.gif
-www/icons/text.png
-www/icons/transfer.gif
-www/icons/transfer.png
-www/icons/unknown.gif
-www/icons/unknown.png
-www/icons/up.gif
-www/icons/up.png
-www/icons/uu.gif
-www/icons/uu.png
-www/icons/uuencoded.gif
-www/icons/uuencoded.png
-www/icons/world1.gif
-www/icons/world1.png
-www/icons/world2.gif
-www/icons/world2.png
-@dirrm www/icons/small
-@dirrm www/icons
-@dirrm www/error/include
-@dirrm www/error
+@unexec if [ -L %D/www/error ]; then rm -f %D/www/error; fi
+@exec [ ! -d %D/www/error ] && ln -fs %D/www/error-dist %D/www/error
+www/error-dist/HTTP_BAD_GATEWAY.html.var
+www/error-dist/HTTP_BAD_REQUEST.html.var
+www/error-dist/HTTP_FORBIDDEN.html.var
+www/error-dist/HTTP_GONE.html.var
+www/error-dist/HTTP_INTERNAL_SERVER_ERROR.html.var
+www/error-dist/HTTP_LENGTH_REQUIRED.html.var
+www/error-dist/HTTP_METHOD_NOT_ALLOWED.html.var
+www/error-dist/HTTP_NOT_ACCEPTABLE.html.var
+www/error-dist/HTTP_NOT_FOUND.html.var
+www/error-dist/HTTP_NOT_IMPLEMENTED.html.var
+www/error-dist/HTTP_PRECONDITION_FAILED.html.var
+www/error-dist/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+www/error-dist/HTTP_REQUEST_TIME_OUT.html.var
+www/error-dist/HTTP_REQUEST_URI_TOO_LARGE.html.var
+www/error-dist/HTTP_SERVICE_UNAVAILABLE.html.var
+www/error-dist/HTTP_UNAUTHORIZED.html.var
+www/error-dist/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+www/error-dist/HTTP_VARIANT_ALSO_VARIES.html.var
+www/error-dist/README
+www/error-dist/contact.html.var
+www/error-dist/include/bottom.html
+www/error-dist/include/spacer.html
+www/error-dist/include/top.html
+@unexec if [ -L %D/www/icons ]; then rm -f %D/www/icons; fi
+@exec [ ! -d %D/www/icons ] && ln -fs %D/www/icons-dist %D/www/icons
+www/icons-dist/README
+www/icons-dist/a.gif
+www/icons-dist/a.png
+www/icons-dist/alert.black.gif
+www/icons-dist/alert.black.png
+www/icons-dist/alert.red.gif
+www/icons-dist/alert.red.png
+www/icons-dist/apache_pb.gif
+www/icons-dist/apache_pb.png
+www/icons-dist/apache_pb2.gif
+www/icons-dist/apache_pb2.png
+www/icons-dist/apache_pb2_ani.gif
+www/icons-dist/back.gif
+www/icons-dist/back.png
+www/icons-dist/ball.gray.gif
+www/icons-dist/ball.gray.png
+www/icons-dist/ball.red.gif
+www/icons-dist/ball.red.png
+www/icons-dist/binary.gif
+www/icons-dist/binary.png
+www/icons-dist/binhex.gif
+www/icons-dist/binhex.png
+www/icons-dist/blank.gif
+www/icons-dist/blank.png
+www/icons-dist/bomb.gif
+www/icons-dist/bomb.png
+www/icons-dist/box1.gif
+www/icons-dist/box1.png
+www/icons-dist/box2.gif
+www/icons-dist/box2.png
+www/icons-dist/broken.gif
+www/icons-dist/broken.png
+www/icons-dist/burst.gif
+www/icons-dist/burst.png
+www/icons-dist/c.gif
+www/icons-dist/c.png
+www/icons-dist/comp.blue.gif
+www/icons-dist/comp.blue.png
+www/icons-dist/comp.gray.gif
+www/icons-dist/comp.gray.png
+www/icons-dist/compressed.gif
+www/icons-dist/compressed.png
+www/icons-dist/continued.gif
+www/icons-dist/continued.png
+www/icons-dist/dir.gif
+www/icons-dist/dir.png
+www/icons-dist/diskimg.gif
+www/icons-dist/diskimg.png
+www/icons-dist/down.gif
+www/icons-dist/down.png
+www/icons-dist/dvi.gif
+www/icons-dist/dvi.png
+www/icons-dist/f.gif
+www/icons-dist/f.png
+www/icons-dist/folder.gif
+www/icons-dist/folder.open.gif
+www/icons-dist/folder.open.png
+www/icons-dist/folder.png
+www/icons-dist/folder.sec.gif
+www/icons-dist/folder.sec.png
+www/icons-dist/forward.gif
+www/icons-dist/forward.png
+www/icons-dist/freebsd.gif
+www/icons-dist/generic.gif
+www/icons-dist/generic.png
+www/icons-dist/generic.red.gif
+www/icons-dist/generic.red.png
+www/icons-dist/generic.sec.gif
+www/icons-dist/generic.sec.png
+www/icons-dist/hand.right.gif
+www/icons-dist/hand.right.png
+www/icons-dist/hand.up.gif
+www/icons-dist/hand.up.png
+www/icons-dist/icon.sheet.gif
+www/icons-dist/icon.sheet.png
+www/icons-dist/image1.gif
+www/icons-dist/image1.png
+www/icons-dist/image2.gif
+www/icons-dist/image2.png
+www/icons-dist/image3.gif
+www/icons-dist/image3.png
+www/icons-dist/index.gif
+www/icons-dist/index.png
+www/icons-dist/layout.gif
+www/icons-dist/layout.png
+www/icons-dist/left.gif
+www/icons-dist/left.png
+www/icons-dist/link.gif
+www/icons-dist/link.png
+www/icons-dist/movie.gif
+www/icons-dist/movie.png
+www/icons-dist/p.gif
+www/icons-dist/p.png
+www/icons-dist/patch.gif
+www/icons-dist/patch.png
+www/icons-dist/pdf.gif
+www/icons-dist/pdf.png
+www/icons-dist/pie0.gif
+www/icons-dist/pie0.png
+www/icons-dist/pie1.gif
+www/icons-dist/pie1.png
+www/icons-dist/pie2.gif
+www/icons-dist/pie2.png
+www/icons-dist/pie3.gif
+www/icons-dist/pie3.png
+www/icons-dist/pie4.gif
+www/icons-dist/pie4.png
+www/icons-dist/pie5.gif
+www/icons-dist/pie5.png
+www/icons-dist/pie6.gif
+www/icons-dist/pie6.png
+www/icons-dist/pie7.gif
+www/icons-dist/pie7.png
+www/icons-dist/pie8.gif
+www/icons-dist/pie8.png
+www/icons-dist/portal.gif
+www/icons-dist/portal.png
+www/icons-dist/ps.gif
+www/icons-dist/ps.png
+www/icons-dist/quill.gif
+www/icons-dist/quill.png
+www/icons-dist/right.gif
+www/icons-dist/right.png
+www/icons-dist/screw1.gif
+www/icons-dist/screw1.png
+www/icons-dist/screw2.gif
+www/icons-dist/screw2.png
+www/icons-dist/script.gif
+www/icons-dist/script.png
+www/icons-dist/small/README.txt
+www/icons-dist/small/back.gif
+www/icons-dist/small/back.png
+www/icons-dist/small/binary.gif
+www/icons-dist/small/binary.png
+www/icons-dist/small/binhex.gif
+www/icons-dist/small/binhex.png
+www/icons-dist/small/blank.gif
+www/icons-dist/small/blank.png
+www/icons-dist/small/broken.gif
+www/icons-dist/small/broken.png
+www/icons-dist/small/burst.gif
+www/icons-dist/small/burst.png
+www/icons-dist/small/comp1.gif
+www/icons-dist/small/comp1.png
+www/icons-dist/small/comp2.gif
+www/icons-dist/small/comp2.png
+www/icons-dist/small/compressed.gif
+www/icons-dist/small/compressed.png
+www/icons-dist/small/continued.gif
+www/icons-dist/small/continued.png
+www/icons-dist/small/dir.gif
+www/icons-dist/small/dir.png
+www/icons-dist/small/dir2.gif
+www/icons-dist/small/dir2.png
+www/icons-dist/small/doc.gif
+www/icons-dist/small/doc.png
+www/icons-dist/small/forward.gif
+www/icons-dist/small/forward.png
+www/icons-dist/small/generic.gif
+www/icons-dist/small/generic.png
+www/icons-dist/small/generic2.gif
+www/icons-dist/small/generic2.png
+www/icons-dist/small/generic3.gif
+www/icons-dist/small/generic3.png
+www/icons-dist/small/image.gif
+www/icons-dist/small/image.png
+www/icons-dist/small/image2.gif
+www/icons-dist/small/image2.png
+www/icons-dist/small/index.gif
+www/icons-dist/small/index.png
+www/icons-dist/small/key.gif
+www/icons-dist/small/key.png
+www/icons-dist/small/movie.gif
+www/icons-dist/small/movie.png
+www/icons-dist/small/patch.gif
+www/icons-dist/small/patch.png
+www/icons-dist/small/ps.gif
+www/icons-dist/small/ps.png
+www/icons-dist/small/rainbow.gif
+www/icons-dist/small/rainbow.png
+www/icons-dist/small/sound.gif
+www/icons-dist/small/sound.png
+www/icons-dist/small/sound2.gif
+www/icons-dist/small/sound2.png
+www/icons-dist/small/tar.gif
+www/icons-dist/small/tar.png
+www/icons-dist/small/text.gif
+www/icons-dist/small/text.png
+www/icons-dist/small/transfer.gif
+www/icons-dist/small/transfer.png
+www/icons-dist/small/unknown.gif
+www/icons-dist/small/unknown.png
+www/icons-dist/small/uu.gif
+www/icons-dist/small/uu.png
+www/icons-dist/sound1.gif
+www/icons-dist/sound1.png
+www/icons-dist/sound2.gif
+www/icons-dist/sound2.png
+www/icons-dist/sphere1.gif
+www/icons-dist/sphere1.png
+www/icons-dist/sphere2.gif
+www/icons-dist/sphere2.png
+www/icons-dist/tar.gif
+www/icons-dist/tar.png
+www/icons-dist/tex.gif
+www/icons-dist/tex.png
+www/icons-dist/text.gif
+www/icons-dist/text.png
+www/icons-dist/transfer.gif
+www/icons-dist/transfer.png
+www/icons-dist/unknown.gif
+www/icons-dist/unknown.png
+www/icons-dist/up.gif
+www/icons-dist/up.png
+www/icons-dist/uu.gif
+www/icons-dist/uu.png
+www/icons-dist/uuencoded.gif
+www/icons-dist/uuencoded.png
+www/icons-dist/world1.gif
+www/icons-dist/world1.png
+www/icons-dist/world2.gif
+www/icons-dist/world2.png
+@dirrm www/icons-dist/small
+@dirrm www/icons-dist
+@dirrm www/error-dist/include
+@dirrm www/error-dist
 @dirrm www/data-dist
 @dirrm www/cgi-bin-dist
 @dirrm www
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 6fd5dc4b47ba..383b746775d4 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.39
-PORTREVISION=	7
+PORTVERSION=	2.0.40
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
@@ -44,7 +43,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
-SHARED_MODULES= all cgid deflate ext_filter
+SHARED_MODULES= all cgid deflate ext_filter proxy proxy-connect proxy-ftp \
+		proxy-http
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
@@ -53,6 +53,12 @@ MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SUEXEC)
 SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
 SUEXEC_USERDIR?= public_html
@@ -72,11 +78,6 @@ PLIST_SUB+=	SUEXEC="@comment "
 .if ${WITH_MPM} != "prefork"
 PKGNAMESUFFIX=	-${WITH_MPM}
 WITH_THREADS=	yes
-.if !defined(FORCE_THREADING_MPM)
-FORBIDDEN=	"doesn't support threads on FreeBSD, officially. If you are\
-		prepared to risk unintended problems, make again with\
-		-DFORCE_THREADING_MPM"
-.endif
 .if ${WITH_MPM} == "worker"
 PLIST_SUB+=	PREFORK="@comment " WORKER=""
 .else
@@ -89,31 +90,28 @@ PLIST_SUB+=	PREFORK="" WORKER="@comment "
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+= --enable-threads
 CFLAGS+=	-DFREEBSD_THREAD_HACK
+SHARED_MODULES+= cache file-cache disk-cache mem_cache
+PLIST_SUB+=	THREADS=""
+.else
+PLIST_SUB+=	THREADS="@comment "
 .endif
 
-.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+.if !defined(WITHOUT_SSL)
 SHARED_MODULES+= ssl
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
 PLIST_SUB+=	MODSSL=""
+_SSLBUGGY!=	${OPENSSLBASE}/bin/openssl version | \
+		${EGREP} "OpenSSL ([1-9]+)|([0\.9\.[6-9][e-z])|(0\.[1-9][0-9]+)" \
+		|| ${TRUE}
+.if empty(_SSLBUGGY)
+IGNORE=		"requires OpenSSL 0.9.6e or higher. Upgrade your base system"
+.endif
 RC_SUB+=	-e 's,@@SSL@@,ssl,g'
 .else
 PLIST_SUB+=	MODSSL="@comment "
 RC_SUB+=	-e 's,@@SSL@@,,g'
 .endif
 
-.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS)
-SHARED_MODULES+= cache file-cache disk-cache mem_cache
-PLIST_SUB+=	MODCACHE=""
-.else
-PLIST_SUB+=	MODCACHE="@comment "
-.endif
-
-.if !defined(WITHOUT_PROXY)
-SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
-PLIST_SUB+=	MODPROXY=""
-.else
-PLIST_SUB+=	MODPROXY="@comment "
-.endif
-
 .if defined(WITH_EXPERIMENTAL)
 SHARED_MODULES+= bucketeer case_filter case_filter_in ext_filter charset_lite \
 		optional_hook_export optional_hook_import \
@@ -137,7 +135,7 @@ post-patch:
 	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
 		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
 	 ); done
-	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
+	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
 	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
@@ -151,4 +149,4 @@ post-install:
 		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index c91856e7d4c5..d8a5b7f6874b 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.39.tar.gz) = b821c6babca68b4859b9ba38d1b345af
+MD5 (httpd-2.0.40.tar.gz) = fdb35bc3b5b7833e45a455b56a0d0be5
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in
index 398b43f9a899..c0e84224e034 100644
--- a/www/apache20/files/patch-Makefile.in
+++ b/www/apache20/files/patch-Makefile.in
@@ -1,61 +1,106 @@
---- Makefile.in.orig	Sat Jun 15 18:41:03 2002
-+++ Makefile.in	Sun Jul 21 03:15:18 2002
-@@ -31,12 +31,14 @@
- 	@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
- 	@cd $(top_srcdir)/docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		cp -f $$i $$i-dist; \
-+		$(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
+--- Makefile.in.orig	Fri Jul 26 00:47:12 2002
++++ Makefile.in	Sat Aug 10 09:38:48 2002
+@@ -36,10 +36,13 @@
+ 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+ 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ 	    fi; \
++	    cp -f $$i $$i-dist; \
++	    $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
  	done; \
  	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- 		cd $$j ; \
- 	for i in *-std*.conf ssl.conf; do \
--		[ -f $$i ] || continue; \
+ 	    cd $$j ; \
+ 	    for i in *-std*.conf; do \
 +		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
- 		( \
- 			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
- 			if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
-@@ -54,6 +56,9 @@
- 					if test "x$$j" = "xssl"; then \
- 						echo "<IfDefine SSL>"; \
- 					fi; \
+ 	    	( \
+ 	    		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+ 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
+@@ -57,6 +60,9 @@
+ 	    				if test "x$$j" = "xssl"; then \
+ 	    					echo "<IfDefine SSL>"; \
+ 	    				fi; \
 +					if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
 +					        echo -n "#"; \
 +					fi; \
- 					if test $$j != "^EOL^"; then \
- 						echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
- 					fi; \
-@@ -104,11 +109,14 @@
+ 	    				if test $$j != "^EOL^"; then \
+ 	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+ 	    				fi; \
+@@ -106,44 +112,32 @@
+ 	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
- 	@echo Installing HTML documents
--	@test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
--	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
+-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
+-           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
+-        else \
+-	    echo Installing HTML documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
+-	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+-	    cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing HTML documents
 +	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
 +	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
 +	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
-+.if !defined(NOPORTDOCS)
- 	@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
--	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
-+.endif
 +	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-error:
- 	@echo Installing error documents
-@@ -124,9 +132,10 @@
+-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
+-           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
+-        else \
+-	    echo Installing error documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
+-	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
+-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing error documents
++	@test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
++	cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
++	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	@test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
+ 
+ install-icons:
+-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
+-           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
+-        else \
+-	    echo Installing icons ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
+-	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
+-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing icons
++	@test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
++	cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
++	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	@test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
  
  install-cgi:
- 	@echo Installing CGIs
--	@test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
--	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
--	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
+-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
+-	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
+-	else \
+-	   echo Installing CGIs ; \
+-	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
+-	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
+-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing CGIs
 +	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
-+	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
-+	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
+@@ -185,11 +179,13 @@
+ 	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
+ 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ 	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
+-	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+ 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
+ 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
++.if !defined(NOPORTDOCS)
++	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+ 	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
+ 	@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf)
++.endif
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache20/files/patch-modules:http:http_request.c b/www/apache20/files/patch-modules:http:http_request.c
deleted file mode 100644
index e44aa29391f7..000000000000
--- a/www/apache20/files/patch-modules:http:http_request.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/http/http_request.c.orig	26 Jun 2002 19:45:06 -0000	1.150
-+++ modules/http/http_request.c	27 Jun 2002 04:40:47 -0000	1.151
-@@ -383,8 +383,6 @@
-         f = f->next;
-     }
- 
--    ap_add_input_filter("HTTP_IN", NULL, new, new->connection);
--
-     apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
-                    apr_itoa(r->pool, r->status));
diff --git a/www/apache20/files/patch-support:htpasswd.c b/www/apache20/files/patch-support:htpasswd.c
deleted file mode 100644
index f836f157fa1b..000000000000
--- a/www/apache20/files/patch-support:htpasswd.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- support/htpasswd.c.orig	Tue Jun 18 11:58:36 2002
-+++ support/htpasswd.c	Mon Jul  8 16:30:14 2002
-@@ -236,6 +236,7 @@
-     strcpy(record, user);
-     strcat(record, ":");
-     strcat(record, cpw);
-+    strcat(record, "\n");
-     return 0;
- }
- 
-@@ -375,7 +376,7 @@
-         }
-     }
- 
--    if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
-+    if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
-         apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
-         exit(ERR_SYNTAX);
-     }
-@@ -592,6 +593,7 @@
-                  */
-                 apr_file_printf(errfile, "Updating ");
-                 putline(ftemp, record);
-+                found++;
-             }
-         }
-     }
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 8371eabc37f2..7310e6844974 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -23,6 +23,7 @@ include/apache2/ap_config_layout.h
 include/apache2/ap_listen.h
 include/apache2/ap_mmn.h
 include/apache2/ap_mpm.h
+include/apache2/ap_regkey.h
 include/apache2/ap_release.h
 include/apache2/apr.h
 include/apache2/apr_allocator.h
@@ -52,9 +53,11 @@ include/apache2/apr_mmap.h
 include/apache2/apr_network_io.h
 include/apache2/apr_optional.h
 include/apache2/apr_optional_hooks.h
+include/apache2/apr_poll.h
 include/apache2/apr_pools.h
 include/apache2/apr_portable.h
 include/apache2/apr_proc_mutex.h
+include/apache2/apr_reslist.h
 include/apache2/apr_ring.h
 include/apache2/apr_rmm.h
 include/apache2/apr_sdbm.h
@@ -63,6 +66,7 @@ include/apache2/apr_shm.h
 include/apache2/apr_signal.h
 include/apache2/apr_strings.h
 include/apache2/apr_strmatch.h
+include/apache2/apr_support.h
 include/apache2/apr_tables.h
 include/apache2/apr_thread_cond.h
 include/apache2/apr_thread_mutex.h
@@ -143,7 +147,7 @@ libexec/apache2/mod_auth_dbm.so
 libexec/apache2/mod_auth_digest.so
 libexec/apache2/mod_autoindex.so
 %%EXPERIMENTAL%%libexec/apache2/mod_bucketeer.so
-%%MODCACHE%%libexec/apache2/mod_cache.so
+%%THREADS%%libexec/apache2/mod_cache.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter_in.so
 libexec/apache2/mod_cern_meta.so
@@ -154,17 +158,17 @@ libexec/apache2/mod_dav.so
 libexec/apache2/mod_dav_fs.so
 libexec/apache2/mod_deflate.so
 libexec/apache2/mod_dir.so
-%%MODCACHE%%libexec/apache2/mod_disk_cache.so
+%%THREADS%%libexec/apache2/mod_disk_cache.so
 libexec/apache2/mod_env.so
 libexec/apache2/mod_expires.so
 libexec/apache2/mod_ext_filter.so
-%%MODCACHE%%libexec/apache2/mod_file_cache.so
+%%THREADS%%libexec/apache2/mod_file_cache.so
 libexec/apache2/mod_headers.so
 libexec/apache2/mod_imap.so
 libexec/apache2/mod_include.so
 libexec/apache2/mod_info.so
 libexec/apache2/mod_log_config.so
-%%MODCACHE%%libexec/apache2/mod_mem_cache.so
+%%THREADS%%libexec/apache2/mod_mem_cache.so
 libexec/apache2/mod_mime.so
 libexec/apache2/mod_mime_magic.so
 libexec/apache2/mod_negotiation.so
@@ -172,10 +176,10 @@ libexec/apache2/mod_negotiation.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_hook_import.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_import.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_export.so
-%%MODPROXY%%libexec/apache2/mod_proxy.so
-%%MODPROXY%%libexec/apache2/mod_proxy_connect.so
-%%MODPROXY%%libexec/apache2/mod_proxy_ftp.so
-%%MODPROXY%%libexec/apache2/mod_proxy_http.so
+libexec/apache2/mod_proxy.so
+libexec/apache2/mod_proxy_connect.so
+libexec/apache2/mod_proxy_ftp.so
+libexec/apache2/mod_proxy_http.so
 libexec/apache2/mod_rewrite.so
 libexec/apache2/mod_setenvif.so
 libexec/apache2/mod_speling.so
@@ -211,11 +215,16 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/LICENSE
 %%PORTDOCS%%share/doc/apache2/bind.html.en
 %%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/bind.xml
+%%PORTDOCS%%share/doc/apache2/bind.xml.ja
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.en
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/configuring.html.en
 %%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/content-negotiation.html
+%%PORTDOCS%%share/doc/apache2/configuring.xml
+%%PORTDOCS%%share/doc/apache2/configuring.xml.ja
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html.en
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/custom-error.html.en
 %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/API.html
@@ -227,20 +236,26 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/hooks.html
 %%PORTDOCS%%share/doc/apache2/developer/index.html
 %%PORTDOCS%%share/doc/apache2/developer/layeredio.html
-%%PORTDOCS%%share/doc/apache2/developer/modules.html
+%%PORTDOCS%%share/doc/apache2/developer/modules.html.en
+%%PORTDOCS%%share/doc/apache2/developer/modules.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/request.html
 %%PORTDOCS%%share/doc/apache2/dns-caveats.html
-%%PORTDOCS%%share/doc/apache2/dso.html
+%%PORTDOCS%%share/doc/apache2/dso.html.en
+%%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/env.xml
 %%PORTDOCS%%share/doc/apache2/faq/index.html
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/filter.xml
 %%PORTDOCS%%share/doc/apache2/footer.html
+%%PORTDOCS%%share/doc/apache2/glossary.html
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/handler.xml
 %%PORTDOCS%%share/doc/apache2/header.html
 %%PORTDOCS%%share/doc/apache2/howto/auth.html.en
 %%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
@@ -248,6 +263,7 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.html
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.en
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/images/apache_header.gif
@@ -276,7 +292,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/invoking.html.en
 %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/logs.html
+%%PORTDOCS%%share/doc/apache2/logs.html.en
+%%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/logs.xml
 %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
 %%PORTDOCS%%share/doc/apache2/misc/descriptors.html
 %%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html
@@ -288,19 +306,26 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
 %%PORTDOCS%%share/doc/apache2/misc/security_tips.html
 %%PORTDOCS%%share/doc/apache2/misc/tutorials.html
-%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
+%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/core.html.en
 %%PORTDOCS%%share/doc/apache2/mod/core.xml
-%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.en
+%%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
+%%PORTDOCS%%share/doc/apache2/mod/directives.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/footer.html
 %%PORTDOCS%%share/doc/apache2/mod/header.html
 %%PORTDOCS%%share/doc/apache2/mod/index.html.en
+%%PORTDOCS%%share/doc/apache2/mod/index.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/index.xml
+%%PORTDOCS%%share/doc/apache2/mod/index.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
@@ -308,7 +333,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
@@ -316,7 +343,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
@@ -332,11 +361,19 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
@@ -370,7 +407,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
@@ -391,9 +430,12 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
-%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
@@ -444,7 +486,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/sitemap.html
+%%PORTDOCS%%share/doc/apache2/sitemap.html.en
+%%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
@@ -462,16 +505,17 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_overview_fig1.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
-%%PORTDOCS%%share/doc/apache2/stopping.html
-%%PORTDOCS%%share/doc/apache2/style/Makefile
-%%PORTDOCS%%share/doc/apache2/style/build.sh
-%%PORTDOCS%%share/doc/apache2/style/build.xml
+%%PORTDOCS%%share/doc/apache2/stopping.html.en
+%%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/style/common.dtd
 %%PORTDOCS%%share/doc/apache2/style/common.xsl
+%%PORTDOCS%%share/doc/apache2/style/de.xml
 %%PORTDOCS%%share/doc/apache2/style/en.xml
 %%PORTDOCS%%share/doc/apache2/style/ja.xml
 %%PORTDOCS%%share/doc/apache2/style/manual.css
 %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
+%%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
 %%PORTDOCS%%share/doc/apache2/style/sv.xml
 %%PORTDOCS%%share/doc/apache2/suexec.html.en
@@ -480,7 +524,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/upgrading.html.fr
 %%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
-%%PORTDOCS%%share/doc/apache2/urlmapping.html
+%%PORTDOCS%%share/doc/apache2/upgrading.xml
+%%PORTDOCS%%share/doc/apache2/urlmapping.html.en
+%%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
@@ -535,255 +581,259 @@ www/data-dist/index.html.ru.utf8
 www/data-dist/index.html.se
 www/data-dist/index.html.var
 www/data-dist/index.html.zh
-www/error/HTTP_BAD_GATEWAY.html.var
-www/error/HTTP_BAD_REQUEST.html.var
-www/error/HTTP_FORBIDDEN.html.var
-www/error/HTTP_GONE.html.var
-www/error/HTTP_INTERNAL_SERVER_ERROR.html.var
-www/error/HTTP_LENGTH_REQUIRED.html.var
-www/error/HTTP_METHOD_NOT_ALLOWED.html.var
-www/error/HTTP_NOT_ACCEPTABLE.html.var
-www/error/HTTP_NOT_FOUND.html.var
-www/error/HTTP_NOT_IMPLEMENTED.html.var
-www/error/HTTP_PRECONDITION_FAILED.html.var
-www/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-www/error/HTTP_REQUEST_TIME_OUT.html.var
-www/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-www/error/HTTP_SERVICE_UNAVAILABLE.html.var
-www/error/HTTP_UNAUTHORIZED.html.var
-www/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-www/error/HTTP_VARIANT_ALSO_VARIES.html.var
-www/error/README
-www/error/contact.html.var
-www/error/include/bottom.html
-www/error/include/spacer.html
-www/error/include/top.html
-www/icons/README
-www/icons/a.gif
-www/icons/a.png
-www/icons/alert.black.gif
-www/icons/alert.black.png
-www/icons/alert.red.gif
-www/icons/alert.red.png
-www/icons/apache_pb.gif
-www/icons/apache_pb.png
-www/icons/apache_pb2.gif
-www/icons/apache_pb2.png
-www/icons/apache_pb2_ani.gif
-www/icons/back.gif
-www/icons/back.png
-www/icons/ball.gray.gif
-www/icons/ball.gray.png
-www/icons/ball.red.gif
-www/icons/ball.red.png
-www/icons/binary.gif
-www/icons/binary.png
-www/icons/binhex.gif
-www/icons/binhex.png
-www/icons/blank.gif
-www/icons/blank.png
-www/icons/bomb.gif
-www/icons/bomb.png
-www/icons/box1.gif
-www/icons/box1.png
-www/icons/box2.gif
-www/icons/box2.png
-www/icons/broken.gif
-www/icons/broken.png
-www/icons/burst.gif
-www/icons/burst.png
-www/icons/c.gif
-www/icons/c.png
-www/icons/comp.blue.gif
-www/icons/comp.blue.png
-www/icons/comp.gray.gif
-www/icons/comp.gray.png
-www/icons/compressed.gif
-www/icons/compressed.png
-www/icons/continued.gif
-www/icons/continued.png
-www/icons/dir.gif
-www/icons/dir.png
-www/icons/diskimg.gif
-www/icons/diskimg.png
-www/icons/down.gif
-www/icons/down.png
-www/icons/dvi.gif
-www/icons/dvi.png
-www/icons/f.gif
-www/icons/f.png
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.open.png
-www/icons/folder.png
-www/icons/folder.sec.gif
-www/icons/folder.sec.png
-www/icons/forward.gif
-www/icons/forward.png
-www/icons/freebsd.gif
-www/icons/generic.gif
-www/icons/generic.png
-www/icons/generic.red.gif
-www/icons/generic.red.png
-www/icons/generic.sec.gif
-www/icons/generic.sec.png
-www/icons/hand.right.gif
-www/icons/hand.right.png
-www/icons/hand.up.gif
-www/icons/hand.up.png
-www/icons/icon.sheet.gif
-www/icons/icon.sheet.png
-www/icons/image1.gif
-www/icons/image1.png
-www/icons/image2.gif
-www/icons/image2.png
-www/icons/image3.gif
-www/icons/image3.png
-www/icons/index.gif
-www/icons/index.png
-www/icons/layout.gif
-www/icons/layout.png
-www/icons/left.gif
-www/icons/left.png
-www/icons/link.gif
-www/icons/link.png
-www/icons/movie.gif
-www/icons/movie.png
-www/icons/p.gif
-www/icons/p.png
-www/icons/patch.gif
-www/icons/patch.png
-www/icons/pdf.gif
-www/icons/pdf.png
-www/icons/pie0.gif
-www/icons/pie0.png
-www/icons/pie1.gif
-www/icons/pie1.png
-www/icons/pie2.gif
-www/icons/pie2.png
-www/icons/pie3.gif
-www/icons/pie3.png
-www/icons/pie4.gif
-www/icons/pie4.png
-www/icons/pie5.gif
-www/icons/pie5.png
-www/icons/pie6.gif
-www/icons/pie6.png
-www/icons/pie7.gif
-www/icons/pie7.png
-www/icons/pie8.gif
-www/icons/pie8.png
-www/icons/portal.gif
-www/icons/portal.png
-www/icons/ps.gif
-www/icons/ps.png
-www/icons/quill.gif
-www/icons/quill.png
-www/icons/right.gif
-www/icons/right.png
-www/icons/screw1.gif
-www/icons/screw1.png
-www/icons/screw2.gif
-www/icons/screw2.png
-www/icons/script.gif
-www/icons/script.png
-www/icons/small/README.txt
-www/icons/small/back.gif
-www/icons/small/back.png
-www/icons/small/binary.gif
-www/icons/small/binary.png
-www/icons/small/binhex.gif
-www/icons/small/binhex.png
-www/icons/small/blank.gif
-www/icons/small/blank.png
-www/icons/small/broken.gif
-www/icons/small/broken.png
-www/icons/small/burst.gif
-www/icons/small/burst.png
-www/icons/small/comp1.gif
-www/icons/small/comp1.png
-www/icons/small/comp2.gif
-www/icons/small/comp2.png
-www/icons/small/compressed.gif
-www/icons/small/compressed.png
-www/icons/small/continued.gif
-www/icons/small/continued.png
-www/icons/small/dir.gif
-www/icons/small/dir.png
-www/icons/small/dir2.gif
-www/icons/small/dir2.png
-www/icons/small/doc.gif
-www/icons/small/doc.png
-www/icons/small/forward.gif
-www/icons/small/forward.png
-www/icons/small/generic.gif
-www/icons/small/generic.png
-www/icons/small/generic2.gif
-www/icons/small/generic2.png
-www/icons/small/generic3.gif
-www/icons/small/generic3.png
-www/icons/small/image.gif
-www/icons/small/image.png
-www/icons/small/image2.gif
-www/icons/small/image2.png
-www/icons/small/index.gif
-www/icons/small/index.png
-www/icons/small/key.gif
-www/icons/small/key.png
-www/icons/small/movie.gif
-www/icons/small/movie.png
-www/icons/small/patch.gif
-www/icons/small/patch.png
-www/icons/small/ps.gif
-www/icons/small/ps.png
-www/icons/small/rainbow.gif
-www/icons/small/rainbow.png
-www/icons/small/sound.gif
-www/icons/small/sound.png
-www/icons/small/sound2.gif
-www/icons/small/sound2.png
-www/icons/small/tar.gif
-www/icons/small/tar.png
-www/icons/small/text.gif
-www/icons/small/text.png
-www/icons/small/transfer.gif
-www/icons/small/transfer.png
-www/icons/small/unknown.gif
-www/icons/small/unknown.png
-www/icons/small/uu.gif
-www/icons/small/uu.png
-www/icons/sound1.gif
-www/icons/sound1.png
-www/icons/sound2.gif
-www/icons/sound2.png
-www/icons/sphere1.gif
-www/icons/sphere1.png
-www/icons/sphere2.gif
-www/icons/sphere2.png
-www/icons/tar.gif
-www/icons/tar.png
-www/icons/tex.gif
-www/icons/tex.png
-www/icons/text.gif
-www/icons/text.png
-www/icons/transfer.gif
-www/icons/transfer.png
-www/icons/unknown.gif
-www/icons/unknown.png
-www/icons/up.gif
-www/icons/up.png
-www/icons/uu.gif
-www/icons/uu.png
-www/icons/uuencoded.gif
-www/icons/uuencoded.png
-www/icons/world1.gif
-www/icons/world1.png
-www/icons/world2.gif
-www/icons/world2.png
-@dirrm www/icons/small
-@dirrm www/icons
-@dirrm www/error/include
-@dirrm www/error
+@unexec if [ -L %D/www/error ]; then rm -f %D/www/error; fi
+@exec [ ! -d %D/www/error ] && ln -fs %D/www/error-dist %D/www/error
+www/error-dist/HTTP_BAD_GATEWAY.html.var
+www/error-dist/HTTP_BAD_REQUEST.html.var
+www/error-dist/HTTP_FORBIDDEN.html.var
+www/error-dist/HTTP_GONE.html.var
+www/error-dist/HTTP_INTERNAL_SERVER_ERROR.html.var
+www/error-dist/HTTP_LENGTH_REQUIRED.html.var
+www/error-dist/HTTP_METHOD_NOT_ALLOWED.html.var
+www/error-dist/HTTP_NOT_ACCEPTABLE.html.var
+www/error-dist/HTTP_NOT_FOUND.html.var
+www/error-dist/HTTP_NOT_IMPLEMENTED.html.var
+www/error-dist/HTTP_PRECONDITION_FAILED.html.var
+www/error-dist/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+www/error-dist/HTTP_REQUEST_TIME_OUT.html.var
+www/error-dist/HTTP_REQUEST_URI_TOO_LARGE.html.var
+www/error-dist/HTTP_SERVICE_UNAVAILABLE.html.var
+www/error-dist/HTTP_UNAUTHORIZED.html.var
+www/error-dist/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+www/error-dist/HTTP_VARIANT_ALSO_VARIES.html.var
+www/error-dist/README
+www/error-dist/contact.html.var
+www/error-dist/include/bottom.html
+www/error-dist/include/spacer.html
+www/error-dist/include/top.html
+@unexec if [ -L %D/www/icons ]; then rm -f %D/www/icons; fi
+@exec [ ! -d %D/www/icons ] && ln -fs %D/www/icons-dist %D/www/icons
+www/icons-dist/README
+www/icons-dist/a.gif
+www/icons-dist/a.png
+www/icons-dist/alert.black.gif
+www/icons-dist/alert.black.png
+www/icons-dist/alert.red.gif
+www/icons-dist/alert.red.png
+www/icons-dist/apache_pb.gif
+www/icons-dist/apache_pb.png
+www/icons-dist/apache_pb2.gif
+www/icons-dist/apache_pb2.png
+www/icons-dist/apache_pb2_ani.gif
+www/icons-dist/back.gif
+www/icons-dist/back.png
+www/icons-dist/ball.gray.gif
+www/icons-dist/ball.gray.png
+www/icons-dist/ball.red.gif
+www/icons-dist/ball.red.png
+www/icons-dist/binary.gif
+www/icons-dist/binary.png
+www/icons-dist/binhex.gif
+www/icons-dist/binhex.png
+www/icons-dist/blank.gif
+www/icons-dist/blank.png
+www/icons-dist/bomb.gif
+www/icons-dist/bomb.png
+www/icons-dist/box1.gif
+www/icons-dist/box1.png
+www/icons-dist/box2.gif
+www/icons-dist/box2.png
+www/icons-dist/broken.gif
+www/icons-dist/broken.png
+www/icons-dist/burst.gif
+www/icons-dist/burst.png
+www/icons-dist/c.gif
+www/icons-dist/c.png
+www/icons-dist/comp.blue.gif
+www/icons-dist/comp.blue.png
+www/icons-dist/comp.gray.gif
+www/icons-dist/comp.gray.png
+www/icons-dist/compressed.gif
+www/icons-dist/compressed.png
+www/icons-dist/continued.gif
+www/icons-dist/continued.png
+www/icons-dist/dir.gif
+www/icons-dist/dir.png
+www/icons-dist/diskimg.gif
+www/icons-dist/diskimg.png
+www/icons-dist/down.gif
+www/icons-dist/down.png
+www/icons-dist/dvi.gif
+www/icons-dist/dvi.png
+www/icons-dist/f.gif
+www/icons-dist/f.png
+www/icons-dist/folder.gif
+www/icons-dist/folder.open.gif
+www/icons-dist/folder.open.png
+www/icons-dist/folder.png
+www/icons-dist/folder.sec.gif
+www/icons-dist/folder.sec.png
+www/icons-dist/forward.gif
+www/icons-dist/forward.png
+www/icons-dist/freebsd.gif
+www/icons-dist/generic.gif
+www/icons-dist/generic.png
+www/icons-dist/generic.red.gif
+www/icons-dist/generic.red.png
+www/icons-dist/generic.sec.gif
+www/icons-dist/generic.sec.png
+www/icons-dist/hand.right.gif
+www/icons-dist/hand.right.png
+www/icons-dist/hand.up.gif
+www/icons-dist/hand.up.png
+www/icons-dist/icon.sheet.gif
+www/icons-dist/icon.sheet.png
+www/icons-dist/image1.gif
+www/icons-dist/image1.png
+www/icons-dist/image2.gif
+www/icons-dist/image2.png
+www/icons-dist/image3.gif
+www/icons-dist/image3.png
+www/icons-dist/index.gif
+www/icons-dist/index.png
+www/icons-dist/layout.gif
+www/icons-dist/layout.png
+www/icons-dist/left.gif
+www/icons-dist/left.png
+www/icons-dist/link.gif
+www/icons-dist/link.png
+www/icons-dist/movie.gif
+www/icons-dist/movie.png
+www/icons-dist/p.gif
+www/icons-dist/p.png
+www/icons-dist/patch.gif
+www/icons-dist/patch.png
+www/icons-dist/pdf.gif
+www/icons-dist/pdf.png
+www/icons-dist/pie0.gif
+www/icons-dist/pie0.png
+www/icons-dist/pie1.gif
+www/icons-dist/pie1.png
+www/icons-dist/pie2.gif
+www/icons-dist/pie2.png
+www/icons-dist/pie3.gif
+www/icons-dist/pie3.png
+www/icons-dist/pie4.gif
+www/icons-dist/pie4.png
+www/icons-dist/pie5.gif
+www/icons-dist/pie5.png
+www/icons-dist/pie6.gif
+www/icons-dist/pie6.png
+www/icons-dist/pie7.gif
+www/icons-dist/pie7.png
+www/icons-dist/pie8.gif
+www/icons-dist/pie8.png
+www/icons-dist/portal.gif
+www/icons-dist/portal.png
+www/icons-dist/ps.gif
+www/icons-dist/ps.png
+www/icons-dist/quill.gif
+www/icons-dist/quill.png
+www/icons-dist/right.gif
+www/icons-dist/right.png
+www/icons-dist/screw1.gif
+www/icons-dist/screw1.png
+www/icons-dist/screw2.gif
+www/icons-dist/screw2.png
+www/icons-dist/script.gif
+www/icons-dist/script.png
+www/icons-dist/small/README.txt
+www/icons-dist/small/back.gif
+www/icons-dist/small/back.png
+www/icons-dist/small/binary.gif
+www/icons-dist/small/binary.png
+www/icons-dist/small/binhex.gif
+www/icons-dist/small/binhex.png
+www/icons-dist/small/blank.gif
+www/icons-dist/small/blank.png
+www/icons-dist/small/broken.gif
+www/icons-dist/small/broken.png
+www/icons-dist/small/burst.gif
+www/icons-dist/small/burst.png
+www/icons-dist/small/comp1.gif
+www/icons-dist/small/comp1.png
+www/icons-dist/small/comp2.gif
+www/icons-dist/small/comp2.png
+www/icons-dist/small/compressed.gif
+www/icons-dist/small/compressed.png
+www/icons-dist/small/continued.gif
+www/icons-dist/small/continued.png
+www/icons-dist/small/dir.gif
+www/icons-dist/small/dir.png
+www/icons-dist/small/dir2.gif
+www/icons-dist/small/dir2.png
+www/icons-dist/small/doc.gif
+www/icons-dist/small/doc.png
+www/icons-dist/small/forward.gif
+www/icons-dist/small/forward.png
+www/icons-dist/small/generic.gif
+www/icons-dist/small/generic.png
+www/icons-dist/small/generic2.gif
+www/icons-dist/small/generic2.png
+www/icons-dist/small/generic3.gif
+www/icons-dist/small/generic3.png
+www/icons-dist/small/image.gif
+www/icons-dist/small/image.png
+www/icons-dist/small/image2.gif
+www/icons-dist/small/image2.png
+www/icons-dist/small/index.gif
+www/icons-dist/small/index.png
+www/icons-dist/small/key.gif
+www/icons-dist/small/key.png
+www/icons-dist/small/movie.gif
+www/icons-dist/small/movie.png
+www/icons-dist/small/patch.gif
+www/icons-dist/small/patch.png
+www/icons-dist/small/ps.gif
+www/icons-dist/small/ps.png
+www/icons-dist/small/rainbow.gif
+www/icons-dist/small/rainbow.png
+www/icons-dist/small/sound.gif
+www/icons-dist/small/sound.png
+www/icons-dist/small/sound2.gif
+www/icons-dist/small/sound2.png
+www/icons-dist/small/tar.gif
+www/icons-dist/small/tar.png
+www/icons-dist/small/text.gif
+www/icons-dist/small/text.png
+www/icons-dist/small/transfer.gif
+www/icons-dist/small/transfer.png
+www/icons-dist/small/unknown.gif
+www/icons-dist/small/unknown.png
+www/icons-dist/small/uu.gif
+www/icons-dist/small/uu.png
+www/icons-dist/sound1.gif
+www/icons-dist/sound1.png
+www/icons-dist/sound2.gif
+www/icons-dist/sound2.png
+www/icons-dist/sphere1.gif
+www/icons-dist/sphere1.png
+www/icons-dist/sphere2.gif
+www/icons-dist/sphere2.png
+www/icons-dist/tar.gif
+www/icons-dist/tar.png
+www/icons-dist/tex.gif
+www/icons-dist/tex.png
+www/icons-dist/text.gif
+www/icons-dist/text.png
+www/icons-dist/transfer.gif
+www/icons-dist/transfer.png
+www/icons-dist/unknown.gif
+www/icons-dist/unknown.png
+www/icons-dist/up.gif
+www/icons-dist/up.png
+www/icons-dist/uu.gif
+www/icons-dist/uu.png
+www/icons-dist/uuencoded.gif
+www/icons-dist/uuencoded.png
+www/icons-dist/world1.gif
+www/icons-dist/world1.png
+www/icons-dist/world2.gif
+www/icons-dist/world2.png
+@dirrm www/icons-dist/small
+@dirrm www/icons-dist
+@dirrm www/error-dist/include
+@dirrm www/error-dist
 @dirrm www/data-dist
 @dirrm www/cgi-bin-dist
 @dirrm www
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 6fd5dc4b47ba..383b746775d4 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.39
-PORTREVISION=	7
+PORTVERSION=	2.0.40
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
@@ -44,7 +43,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
-SHARED_MODULES= all cgid deflate ext_filter
+SHARED_MODULES= all cgid deflate ext_filter proxy proxy-connect proxy-ftp \
+		proxy-http
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
@@ -53,6 +53,12 @@ MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SUEXEC)
 SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
 SUEXEC_USERDIR?= public_html
@@ -72,11 +78,6 @@ PLIST_SUB+=	SUEXEC="@comment "
 .if ${WITH_MPM} != "prefork"
 PKGNAMESUFFIX=	-${WITH_MPM}
 WITH_THREADS=	yes
-.if !defined(FORCE_THREADING_MPM)
-FORBIDDEN=	"doesn't support threads on FreeBSD, officially. If you are\
-		prepared to risk unintended problems, make again with\
-		-DFORCE_THREADING_MPM"
-.endif
 .if ${WITH_MPM} == "worker"
 PLIST_SUB+=	PREFORK="@comment " WORKER=""
 .else
@@ -89,31 +90,28 @@ PLIST_SUB+=	PREFORK="" WORKER="@comment "
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+= --enable-threads
 CFLAGS+=	-DFREEBSD_THREAD_HACK
+SHARED_MODULES+= cache file-cache disk-cache mem_cache
+PLIST_SUB+=	THREADS=""
+.else
+PLIST_SUB+=	THREADS="@comment "
 .endif
 
-.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+.if !defined(WITHOUT_SSL)
 SHARED_MODULES+= ssl
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
 PLIST_SUB+=	MODSSL=""
+_SSLBUGGY!=	${OPENSSLBASE}/bin/openssl version | \
+		${EGREP} "OpenSSL ([1-9]+)|([0\.9\.[6-9][e-z])|(0\.[1-9][0-9]+)" \
+		|| ${TRUE}
+.if empty(_SSLBUGGY)
+IGNORE=		"requires OpenSSL 0.9.6e or higher. Upgrade your base system"
+.endif
 RC_SUB+=	-e 's,@@SSL@@,ssl,g'
 .else
 PLIST_SUB+=	MODSSL="@comment "
 RC_SUB+=	-e 's,@@SSL@@,,g'
 .endif
 
-.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS)
-SHARED_MODULES+= cache file-cache disk-cache mem_cache
-PLIST_SUB+=	MODCACHE=""
-.else
-PLIST_SUB+=	MODCACHE="@comment "
-.endif
-
-.if !defined(WITHOUT_PROXY)
-SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
-PLIST_SUB+=	MODPROXY=""
-.else
-PLIST_SUB+=	MODPROXY="@comment "
-.endif
-
 .if defined(WITH_EXPERIMENTAL)
 SHARED_MODULES+= bucketeer case_filter case_filter_in ext_filter charset_lite \
 		optional_hook_export optional_hook_import \
@@ -137,7 +135,7 @@ post-patch:
 	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
 		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
 	 ); done
-	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
+	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
 	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
@@ -151,4 +149,4 @@ post-install:
 		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index c91856e7d4c5..d8a5b7f6874b 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.39.tar.gz) = b821c6babca68b4859b9ba38d1b345af
+MD5 (httpd-2.0.40.tar.gz) = fdb35bc3b5b7833e45a455b56a0d0be5
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
index 398b43f9a899..c0e84224e034 100644
--- a/www/apache21/files/patch-Makefile.in
+++ b/www/apache21/files/patch-Makefile.in
@@ -1,61 +1,106 @@
---- Makefile.in.orig	Sat Jun 15 18:41:03 2002
-+++ Makefile.in	Sun Jul 21 03:15:18 2002
-@@ -31,12 +31,14 @@
- 	@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
- 	@cd $(top_srcdir)/docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		cp -f $$i $$i-dist; \
-+		$(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
+--- Makefile.in.orig	Fri Jul 26 00:47:12 2002
++++ Makefile.in	Sat Aug 10 09:38:48 2002
+@@ -36,10 +36,13 @@
+ 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+ 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ 	    fi; \
++	    cp -f $$i $$i-dist; \
++	    $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
  	done; \
  	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- 		cd $$j ; \
- 	for i in *-std*.conf ssl.conf; do \
--		[ -f $$i ] || continue; \
+ 	    cd $$j ; \
+ 	    for i in *-std*.conf; do \
 +		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
- 		( \
- 			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
- 			if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
-@@ -54,6 +56,9 @@
- 					if test "x$$j" = "xssl"; then \
- 						echo "<IfDefine SSL>"; \
- 					fi; \
+ 	    	( \
+ 	    		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+ 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
+@@ -57,6 +60,9 @@
+ 	    				if test "x$$j" = "xssl"; then \
+ 	    					echo "<IfDefine SSL>"; \
+ 	    				fi; \
 +					if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
 +					        echo -n "#"; \
 +					fi; \
- 					if test $$j != "^EOL^"; then \
- 						echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
- 					fi; \
-@@ -104,11 +109,14 @@
+ 	    				if test $$j != "^EOL^"; then \
+ 	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+ 	    				fi; \
+@@ -106,44 +112,32 @@
+ 	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
- 	@echo Installing HTML documents
--	@test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
--	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
+-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
+-           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
+-        else \
+-	    echo Installing HTML documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
+-	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+-	    cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing HTML documents
 +	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
 +	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
 +	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
-+.if !defined(NOPORTDOCS)
- 	@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
--	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
-+.endif
 +	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-error:
- 	@echo Installing error documents
-@@ -124,9 +132,10 @@
+-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
+-           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
+-        else \
+-	    echo Installing error documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
+-	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
+-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing error documents
++	@test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
++	cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
++	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	@test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
+ 
+ install-icons:
+-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
+-           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
+-        else \
+-	    echo Installing icons ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
+-	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
+-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing icons
++	@test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
++	cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
++	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	@test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
  
  install-cgi:
- 	@echo Installing CGIs
--	@test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
--	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
--	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
+-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
+-	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
+-	else \
+-	   echo Installing CGIs ; \
+-	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
+-	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
+-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing CGIs
 +	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
-+	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
-+	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
+@@ -185,11 +179,13 @@
+ 	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
+ 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ 	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
+-	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+ 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
+ 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
++.if !defined(NOPORTDOCS)
++	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+ 	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
+ 	@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf)
++.endif
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache21/files/patch-modules:http:http_request.c b/www/apache21/files/patch-modules:http:http_request.c
deleted file mode 100644
index e44aa29391f7..000000000000
--- a/www/apache21/files/patch-modules:http:http_request.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/http/http_request.c.orig	26 Jun 2002 19:45:06 -0000	1.150
-+++ modules/http/http_request.c	27 Jun 2002 04:40:47 -0000	1.151
-@@ -383,8 +383,6 @@
-         f = f->next;
-     }
- 
--    ap_add_input_filter("HTTP_IN", NULL, new, new->connection);
--
-     apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
-                    apr_itoa(r->pool, r->status));
diff --git a/www/apache21/files/patch-support:htpasswd.c b/www/apache21/files/patch-support:htpasswd.c
deleted file mode 100644
index f836f157fa1b..000000000000
--- a/www/apache21/files/patch-support:htpasswd.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- support/htpasswd.c.orig	Tue Jun 18 11:58:36 2002
-+++ support/htpasswd.c	Mon Jul  8 16:30:14 2002
-@@ -236,6 +236,7 @@
-     strcpy(record, user);
-     strcat(record, ":");
-     strcat(record, cpw);
-+    strcat(record, "\n");
-     return 0;
- }
- 
-@@ -375,7 +376,7 @@
-         }
-     }
- 
--    if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
-+    if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
-         apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
-         exit(ERR_SYNTAX);
-     }
-@@ -592,6 +593,7 @@
-                  */
-                 apr_file_printf(errfile, "Updating ");
-                 putline(ftemp, record);
-+                found++;
-             }
-         }
-     }
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 8371eabc37f2..7310e6844974 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -23,6 +23,7 @@ include/apache2/ap_config_layout.h
 include/apache2/ap_listen.h
 include/apache2/ap_mmn.h
 include/apache2/ap_mpm.h
+include/apache2/ap_regkey.h
 include/apache2/ap_release.h
 include/apache2/apr.h
 include/apache2/apr_allocator.h
@@ -52,9 +53,11 @@ include/apache2/apr_mmap.h
 include/apache2/apr_network_io.h
 include/apache2/apr_optional.h
 include/apache2/apr_optional_hooks.h
+include/apache2/apr_poll.h
 include/apache2/apr_pools.h
 include/apache2/apr_portable.h
 include/apache2/apr_proc_mutex.h
+include/apache2/apr_reslist.h
 include/apache2/apr_ring.h
 include/apache2/apr_rmm.h
 include/apache2/apr_sdbm.h
@@ -63,6 +66,7 @@ include/apache2/apr_shm.h
 include/apache2/apr_signal.h
 include/apache2/apr_strings.h
 include/apache2/apr_strmatch.h
+include/apache2/apr_support.h
 include/apache2/apr_tables.h
 include/apache2/apr_thread_cond.h
 include/apache2/apr_thread_mutex.h
@@ -143,7 +147,7 @@ libexec/apache2/mod_auth_dbm.so
 libexec/apache2/mod_auth_digest.so
 libexec/apache2/mod_autoindex.so
 %%EXPERIMENTAL%%libexec/apache2/mod_bucketeer.so
-%%MODCACHE%%libexec/apache2/mod_cache.so
+%%THREADS%%libexec/apache2/mod_cache.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter_in.so
 libexec/apache2/mod_cern_meta.so
@@ -154,17 +158,17 @@ libexec/apache2/mod_dav.so
 libexec/apache2/mod_dav_fs.so
 libexec/apache2/mod_deflate.so
 libexec/apache2/mod_dir.so
-%%MODCACHE%%libexec/apache2/mod_disk_cache.so
+%%THREADS%%libexec/apache2/mod_disk_cache.so
 libexec/apache2/mod_env.so
 libexec/apache2/mod_expires.so
 libexec/apache2/mod_ext_filter.so
-%%MODCACHE%%libexec/apache2/mod_file_cache.so
+%%THREADS%%libexec/apache2/mod_file_cache.so
 libexec/apache2/mod_headers.so
 libexec/apache2/mod_imap.so
 libexec/apache2/mod_include.so
 libexec/apache2/mod_info.so
 libexec/apache2/mod_log_config.so
-%%MODCACHE%%libexec/apache2/mod_mem_cache.so
+%%THREADS%%libexec/apache2/mod_mem_cache.so
 libexec/apache2/mod_mime.so
 libexec/apache2/mod_mime_magic.so
 libexec/apache2/mod_negotiation.so
@@ -172,10 +176,10 @@ libexec/apache2/mod_negotiation.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_hook_import.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_import.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_export.so
-%%MODPROXY%%libexec/apache2/mod_proxy.so
-%%MODPROXY%%libexec/apache2/mod_proxy_connect.so
-%%MODPROXY%%libexec/apache2/mod_proxy_ftp.so
-%%MODPROXY%%libexec/apache2/mod_proxy_http.so
+libexec/apache2/mod_proxy.so
+libexec/apache2/mod_proxy_connect.so
+libexec/apache2/mod_proxy_ftp.so
+libexec/apache2/mod_proxy_http.so
 libexec/apache2/mod_rewrite.so
 libexec/apache2/mod_setenvif.so
 libexec/apache2/mod_speling.so
@@ -211,11 +215,16 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/LICENSE
 %%PORTDOCS%%share/doc/apache2/bind.html.en
 %%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/bind.xml
+%%PORTDOCS%%share/doc/apache2/bind.xml.ja
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.en
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/configuring.html.en
 %%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/content-negotiation.html
+%%PORTDOCS%%share/doc/apache2/configuring.xml
+%%PORTDOCS%%share/doc/apache2/configuring.xml.ja
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html.en
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/custom-error.html.en
 %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/API.html
@@ -227,20 +236,26 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/hooks.html
 %%PORTDOCS%%share/doc/apache2/developer/index.html
 %%PORTDOCS%%share/doc/apache2/developer/layeredio.html
-%%PORTDOCS%%share/doc/apache2/developer/modules.html
+%%PORTDOCS%%share/doc/apache2/developer/modules.html.en
+%%PORTDOCS%%share/doc/apache2/developer/modules.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/request.html
 %%PORTDOCS%%share/doc/apache2/dns-caveats.html
-%%PORTDOCS%%share/doc/apache2/dso.html
+%%PORTDOCS%%share/doc/apache2/dso.html.en
+%%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/env.xml
 %%PORTDOCS%%share/doc/apache2/faq/index.html
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/filter.xml
 %%PORTDOCS%%share/doc/apache2/footer.html
+%%PORTDOCS%%share/doc/apache2/glossary.html
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/handler.xml
 %%PORTDOCS%%share/doc/apache2/header.html
 %%PORTDOCS%%share/doc/apache2/howto/auth.html.en
 %%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
@@ -248,6 +263,7 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.html
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.en
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/images/apache_header.gif
@@ -276,7 +292,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/invoking.html.en
 %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/logs.html
+%%PORTDOCS%%share/doc/apache2/logs.html.en
+%%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/logs.xml
 %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
 %%PORTDOCS%%share/doc/apache2/misc/descriptors.html
 %%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html
@@ -288,19 +306,26 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
 %%PORTDOCS%%share/doc/apache2/misc/security_tips.html
 %%PORTDOCS%%share/doc/apache2/misc/tutorials.html
-%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
+%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/core.html.en
 %%PORTDOCS%%share/doc/apache2/mod/core.xml
-%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.en
+%%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
+%%PORTDOCS%%share/doc/apache2/mod/directives.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/footer.html
 %%PORTDOCS%%share/doc/apache2/mod/header.html
 %%PORTDOCS%%share/doc/apache2/mod/index.html.en
+%%PORTDOCS%%share/doc/apache2/mod/index.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/index.xml
+%%PORTDOCS%%share/doc/apache2/mod/index.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
@@ -308,7 +333,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
@@ -316,7 +343,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
@@ -332,11 +361,19 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
@@ -370,7 +407,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
@@ -391,9 +430,12 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
-%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
@@ -444,7 +486,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/sitemap.html
+%%PORTDOCS%%share/doc/apache2/sitemap.html.en
+%%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
@@ -462,16 +505,17 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_overview_fig1.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
-%%PORTDOCS%%share/doc/apache2/stopping.html
-%%PORTDOCS%%share/doc/apache2/style/Makefile
-%%PORTDOCS%%share/doc/apache2/style/build.sh
-%%PORTDOCS%%share/doc/apache2/style/build.xml
+%%PORTDOCS%%share/doc/apache2/stopping.html.en
+%%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/style/common.dtd
 %%PORTDOCS%%share/doc/apache2/style/common.xsl
+%%PORTDOCS%%share/doc/apache2/style/de.xml
 %%PORTDOCS%%share/doc/apache2/style/en.xml
 %%PORTDOCS%%share/doc/apache2/style/ja.xml
 %%PORTDOCS%%share/doc/apache2/style/manual.css
 %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
+%%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
 %%PORTDOCS%%share/doc/apache2/style/sv.xml
 %%PORTDOCS%%share/doc/apache2/suexec.html.en
@@ -480,7 +524,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/upgrading.html.fr
 %%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
-%%PORTDOCS%%share/doc/apache2/urlmapping.html
+%%PORTDOCS%%share/doc/apache2/upgrading.xml
+%%PORTDOCS%%share/doc/apache2/urlmapping.html.en
+%%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
@@ -535,255 +581,259 @@ www/data-dist/index.html.ru.utf8
 www/data-dist/index.html.se
 www/data-dist/index.html.var
 www/data-dist/index.html.zh
-www/error/HTTP_BAD_GATEWAY.html.var
-www/error/HTTP_BAD_REQUEST.html.var
-www/error/HTTP_FORBIDDEN.html.var
-www/error/HTTP_GONE.html.var
-www/error/HTTP_INTERNAL_SERVER_ERROR.html.var
-www/error/HTTP_LENGTH_REQUIRED.html.var
-www/error/HTTP_METHOD_NOT_ALLOWED.html.var
-www/error/HTTP_NOT_ACCEPTABLE.html.var
-www/error/HTTP_NOT_FOUND.html.var
-www/error/HTTP_NOT_IMPLEMENTED.html.var
-www/error/HTTP_PRECONDITION_FAILED.html.var
-www/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-www/error/HTTP_REQUEST_TIME_OUT.html.var
-www/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-www/error/HTTP_SERVICE_UNAVAILABLE.html.var
-www/error/HTTP_UNAUTHORIZED.html.var
-www/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-www/error/HTTP_VARIANT_ALSO_VARIES.html.var
-www/error/README
-www/error/contact.html.var
-www/error/include/bottom.html
-www/error/include/spacer.html
-www/error/include/top.html
-www/icons/README
-www/icons/a.gif
-www/icons/a.png
-www/icons/alert.black.gif
-www/icons/alert.black.png
-www/icons/alert.red.gif
-www/icons/alert.red.png
-www/icons/apache_pb.gif
-www/icons/apache_pb.png
-www/icons/apache_pb2.gif
-www/icons/apache_pb2.png
-www/icons/apache_pb2_ani.gif
-www/icons/back.gif
-www/icons/back.png
-www/icons/ball.gray.gif
-www/icons/ball.gray.png
-www/icons/ball.red.gif
-www/icons/ball.red.png
-www/icons/binary.gif
-www/icons/binary.png
-www/icons/binhex.gif
-www/icons/binhex.png
-www/icons/blank.gif
-www/icons/blank.png
-www/icons/bomb.gif
-www/icons/bomb.png
-www/icons/box1.gif
-www/icons/box1.png
-www/icons/box2.gif
-www/icons/box2.png
-www/icons/broken.gif
-www/icons/broken.png
-www/icons/burst.gif
-www/icons/burst.png
-www/icons/c.gif
-www/icons/c.png
-www/icons/comp.blue.gif
-www/icons/comp.blue.png
-www/icons/comp.gray.gif
-www/icons/comp.gray.png
-www/icons/compressed.gif
-www/icons/compressed.png
-www/icons/continued.gif
-www/icons/continued.png
-www/icons/dir.gif
-www/icons/dir.png
-www/icons/diskimg.gif
-www/icons/diskimg.png
-www/icons/down.gif
-www/icons/down.png
-www/icons/dvi.gif
-www/icons/dvi.png
-www/icons/f.gif
-www/icons/f.png
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.open.png
-www/icons/folder.png
-www/icons/folder.sec.gif
-www/icons/folder.sec.png
-www/icons/forward.gif
-www/icons/forward.png
-www/icons/freebsd.gif
-www/icons/generic.gif
-www/icons/generic.png
-www/icons/generic.red.gif
-www/icons/generic.red.png
-www/icons/generic.sec.gif
-www/icons/generic.sec.png
-www/icons/hand.right.gif
-www/icons/hand.right.png
-www/icons/hand.up.gif
-www/icons/hand.up.png
-www/icons/icon.sheet.gif
-www/icons/icon.sheet.png
-www/icons/image1.gif
-www/icons/image1.png
-www/icons/image2.gif
-www/icons/image2.png
-www/icons/image3.gif
-www/icons/image3.png
-www/icons/index.gif
-www/icons/index.png
-www/icons/layout.gif
-www/icons/layout.png
-www/icons/left.gif
-www/icons/left.png
-www/icons/link.gif
-www/icons/link.png
-www/icons/movie.gif
-www/icons/movie.png
-www/icons/p.gif
-www/icons/p.png
-www/icons/patch.gif
-www/icons/patch.png
-www/icons/pdf.gif
-www/icons/pdf.png
-www/icons/pie0.gif
-www/icons/pie0.png
-www/icons/pie1.gif
-www/icons/pie1.png
-www/icons/pie2.gif
-www/icons/pie2.png
-www/icons/pie3.gif
-www/icons/pie3.png
-www/icons/pie4.gif
-www/icons/pie4.png
-www/icons/pie5.gif
-www/icons/pie5.png
-www/icons/pie6.gif
-www/icons/pie6.png
-www/icons/pie7.gif
-www/icons/pie7.png
-www/icons/pie8.gif
-www/icons/pie8.png
-www/icons/portal.gif
-www/icons/portal.png
-www/icons/ps.gif
-www/icons/ps.png
-www/icons/quill.gif
-www/icons/quill.png
-www/icons/right.gif
-www/icons/right.png
-www/icons/screw1.gif
-www/icons/screw1.png
-www/icons/screw2.gif
-www/icons/screw2.png
-www/icons/script.gif
-www/icons/script.png
-www/icons/small/README.txt
-www/icons/small/back.gif
-www/icons/small/back.png
-www/icons/small/binary.gif
-www/icons/small/binary.png
-www/icons/small/binhex.gif
-www/icons/small/binhex.png
-www/icons/small/blank.gif
-www/icons/small/blank.png
-www/icons/small/broken.gif
-www/icons/small/broken.png
-www/icons/small/burst.gif
-www/icons/small/burst.png
-www/icons/small/comp1.gif
-www/icons/small/comp1.png
-www/icons/small/comp2.gif
-www/icons/small/comp2.png
-www/icons/small/compressed.gif
-www/icons/small/compressed.png
-www/icons/small/continued.gif
-www/icons/small/continued.png
-www/icons/small/dir.gif
-www/icons/small/dir.png
-www/icons/small/dir2.gif
-www/icons/small/dir2.png
-www/icons/small/doc.gif
-www/icons/small/doc.png
-www/icons/small/forward.gif
-www/icons/small/forward.png
-www/icons/small/generic.gif
-www/icons/small/generic.png
-www/icons/small/generic2.gif
-www/icons/small/generic2.png
-www/icons/small/generic3.gif
-www/icons/small/generic3.png
-www/icons/small/image.gif
-www/icons/small/image.png
-www/icons/small/image2.gif
-www/icons/small/image2.png
-www/icons/small/index.gif
-www/icons/small/index.png
-www/icons/small/key.gif
-www/icons/small/key.png
-www/icons/small/movie.gif
-www/icons/small/movie.png
-www/icons/small/patch.gif
-www/icons/small/patch.png
-www/icons/small/ps.gif
-www/icons/small/ps.png
-www/icons/small/rainbow.gif
-www/icons/small/rainbow.png
-www/icons/small/sound.gif
-www/icons/small/sound.png
-www/icons/small/sound2.gif
-www/icons/small/sound2.png
-www/icons/small/tar.gif
-www/icons/small/tar.png
-www/icons/small/text.gif
-www/icons/small/text.png
-www/icons/small/transfer.gif
-www/icons/small/transfer.png
-www/icons/small/unknown.gif
-www/icons/small/unknown.png
-www/icons/small/uu.gif
-www/icons/small/uu.png
-www/icons/sound1.gif
-www/icons/sound1.png
-www/icons/sound2.gif
-www/icons/sound2.png
-www/icons/sphere1.gif
-www/icons/sphere1.png
-www/icons/sphere2.gif
-www/icons/sphere2.png
-www/icons/tar.gif
-www/icons/tar.png
-www/icons/tex.gif
-www/icons/tex.png
-www/icons/text.gif
-www/icons/text.png
-www/icons/transfer.gif
-www/icons/transfer.png
-www/icons/unknown.gif
-www/icons/unknown.png
-www/icons/up.gif
-www/icons/up.png
-www/icons/uu.gif
-www/icons/uu.png
-www/icons/uuencoded.gif
-www/icons/uuencoded.png
-www/icons/world1.gif
-www/icons/world1.png
-www/icons/world2.gif
-www/icons/world2.png
-@dirrm www/icons/small
-@dirrm www/icons
-@dirrm www/error/include
-@dirrm www/error
+@unexec if [ -L %D/www/error ]; then rm -f %D/www/error; fi
+@exec [ ! -d %D/www/error ] && ln -fs %D/www/error-dist %D/www/error
+www/error-dist/HTTP_BAD_GATEWAY.html.var
+www/error-dist/HTTP_BAD_REQUEST.html.var
+www/error-dist/HTTP_FORBIDDEN.html.var
+www/error-dist/HTTP_GONE.html.var
+www/error-dist/HTTP_INTERNAL_SERVER_ERROR.html.var
+www/error-dist/HTTP_LENGTH_REQUIRED.html.var
+www/error-dist/HTTP_METHOD_NOT_ALLOWED.html.var
+www/error-dist/HTTP_NOT_ACCEPTABLE.html.var
+www/error-dist/HTTP_NOT_FOUND.html.var
+www/error-dist/HTTP_NOT_IMPLEMENTED.html.var
+www/error-dist/HTTP_PRECONDITION_FAILED.html.var
+www/error-dist/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+www/error-dist/HTTP_REQUEST_TIME_OUT.html.var
+www/error-dist/HTTP_REQUEST_URI_TOO_LARGE.html.var
+www/error-dist/HTTP_SERVICE_UNAVAILABLE.html.var
+www/error-dist/HTTP_UNAUTHORIZED.html.var
+www/error-dist/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+www/error-dist/HTTP_VARIANT_ALSO_VARIES.html.var
+www/error-dist/README
+www/error-dist/contact.html.var
+www/error-dist/include/bottom.html
+www/error-dist/include/spacer.html
+www/error-dist/include/top.html
+@unexec if [ -L %D/www/icons ]; then rm -f %D/www/icons; fi
+@exec [ ! -d %D/www/icons ] && ln -fs %D/www/icons-dist %D/www/icons
+www/icons-dist/README
+www/icons-dist/a.gif
+www/icons-dist/a.png
+www/icons-dist/alert.black.gif
+www/icons-dist/alert.black.png
+www/icons-dist/alert.red.gif
+www/icons-dist/alert.red.png
+www/icons-dist/apache_pb.gif
+www/icons-dist/apache_pb.png
+www/icons-dist/apache_pb2.gif
+www/icons-dist/apache_pb2.png
+www/icons-dist/apache_pb2_ani.gif
+www/icons-dist/back.gif
+www/icons-dist/back.png
+www/icons-dist/ball.gray.gif
+www/icons-dist/ball.gray.png
+www/icons-dist/ball.red.gif
+www/icons-dist/ball.red.png
+www/icons-dist/binary.gif
+www/icons-dist/binary.png
+www/icons-dist/binhex.gif
+www/icons-dist/binhex.png
+www/icons-dist/blank.gif
+www/icons-dist/blank.png
+www/icons-dist/bomb.gif
+www/icons-dist/bomb.png
+www/icons-dist/box1.gif
+www/icons-dist/box1.png
+www/icons-dist/box2.gif
+www/icons-dist/box2.png
+www/icons-dist/broken.gif
+www/icons-dist/broken.png
+www/icons-dist/burst.gif
+www/icons-dist/burst.png
+www/icons-dist/c.gif
+www/icons-dist/c.png
+www/icons-dist/comp.blue.gif
+www/icons-dist/comp.blue.png
+www/icons-dist/comp.gray.gif
+www/icons-dist/comp.gray.png
+www/icons-dist/compressed.gif
+www/icons-dist/compressed.png
+www/icons-dist/continued.gif
+www/icons-dist/continued.png
+www/icons-dist/dir.gif
+www/icons-dist/dir.png
+www/icons-dist/diskimg.gif
+www/icons-dist/diskimg.png
+www/icons-dist/down.gif
+www/icons-dist/down.png
+www/icons-dist/dvi.gif
+www/icons-dist/dvi.png
+www/icons-dist/f.gif
+www/icons-dist/f.png
+www/icons-dist/folder.gif
+www/icons-dist/folder.open.gif
+www/icons-dist/folder.open.png
+www/icons-dist/folder.png
+www/icons-dist/folder.sec.gif
+www/icons-dist/folder.sec.png
+www/icons-dist/forward.gif
+www/icons-dist/forward.png
+www/icons-dist/freebsd.gif
+www/icons-dist/generic.gif
+www/icons-dist/generic.png
+www/icons-dist/generic.red.gif
+www/icons-dist/generic.red.png
+www/icons-dist/generic.sec.gif
+www/icons-dist/generic.sec.png
+www/icons-dist/hand.right.gif
+www/icons-dist/hand.right.png
+www/icons-dist/hand.up.gif
+www/icons-dist/hand.up.png
+www/icons-dist/icon.sheet.gif
+www/icons-dist/icon.sheet.png
+www/icons-dist/image1.gif
+www/icons-dist/image1.png
+www/icons-dist/image2.gif
+www/icons-dist/image2.png
+www/icons-dist/image3.gif
+www/icons-dist/image3.png
+www/icons-dist/index.gif
+www/icons-dist/index.png
+www/icons-dist/layout.gif
+www/icons-dist/layout.png
+www/icons-dist/left.gif
+www/icons-dist/left.png
+www/icons-dist/link.gif
+www/icons-dist/link.png
+www/icons-dist/movie.gif
+www/icons-dist/movie.png
+www/icons-dist/p.gif
+www/icons-dist/p.png
+www/icons-dist/patch.gif
+www/icons-dist/patch.png
+www/icons-dist/pdf.gif
+www/icons-dist/pdf.png
+www/icons-dist/pie0.gif
+www/icons-dist/pie0.png
+www/icons-dist/pie1.gif
+www/icons-dist/pie1.png
+www/icons-dist/pie2.gif
+www/icons-dist/pie2.png
+www/icons-dist/pie3.gif
+www/icons-dist/pie3.png
+www/icons-dist/pie4.gif
+www/icons-dist/pie4.png
+www/icons-dist/pie5.gif
+www/icons-dist/pie5.png
+www/icons-dist/pie6.gif
+www/icons-dist/pie6.png
+www/icons-dist/pie7.gif
+www/icons-dist/pie7.png
+www/icons-dist/pie8.gif
+www/icons-dist/pie8.png
+www/icons-dist/portal.gif
+www/icons-dist/portal.png
+www/icons-dist/ps.gif
+www/icons-dist/ps.png
+www/icons-dist/quill.gif
+www/icons-dist/quill.png
+www/icons-dist/right.gif
+www/icons-dist/right.png
+www/icons-dist/screw1.gif
+www/icons-dist/screw1.png
+www/icons-dist/screw2.gif
+www/icons-dist/screw2.png
+www/icons-dist/script.gif
+www/icons-dist/script.png
+www/icons-dist/small/README.txt
+www/icons-dist/small/back.gif
+www/icons-dist/small/back.png
+www/icons-dist/small/binary.gif
+www/icons-dist/small/binary.png
+www/icons-dist/small/binhex.gif
+www/icons-dist/small/binhex.png
+www/icons-dist/small/blank.gif
+www/icons-dist/small/blank.png
+www/icons-dist/small/broken.gif
+www/icons-dist/small/broken.png
+www/icons-dist/small/burst.gif
+www/icons-dist/small/burst.png
+www/icons-dist/small/comp1.gif
+www/icons-dist/small/comp1.png
+www/icons-dist/small/comp2.gif
+www/icons-dist/small/comp2.png
+www/icons-dist/small/compressed.gif
+www/icons-dist/small/compressed.png
+www/icons-dist/small/continued.gif
+www/icons-dist/small/continued.png
+www/icons-dist/small/dir.gif
+www/icons-dist/small/dir.png
+www/icons-dist/small/dir2.gif
+www/icons-dist/small/dir2.png
+www/icons-dist/small/doc.gif
+www/icons-dist/small/doc.png
+www/icons-dist/small/forward.gif
+www/icons-dist/small/forward.png
+www/icons-dist/small/generic.gif
+www/icons-dist/small/generic.png
+www/icons-dist/small/generic2.gif
+www/icons-dist/small/generic2.png
+www/icons-dist/small/generic3.gif
+www/icons-dist/small/generic3.png
+www/icons-dist/small/image.gif
+www/icons-dist/small/image.png
+www/icons-dist/small/image2.gif
+www/icons-dist/small/image2.png
+www/icons-dist/small/index.gif
+www/icons-dist/small/index.png
+www/icons-dist/small/key.gif
+www/icons-dist/small/key.png
+www/icons-dist/small/movie.gif
+www/icons-dist/small/movie.png
+www/icons-dist/small/patch.gif
+www/icons-dist/small/patch.png
+www/icons-dist/small/ps.gif
+www/icons-dist/small/ps.png
+www/icons-dist/small/rainbow.gif
+www/icons-dist/small/rainbow.png
+www/icons-dist/small/sound.gif
+www/icons-dist/small/sound.png
+www/icons-dist/small/sound2.gif
+www/icons-dist/small/sound2.png
+www/icons-dist/small/tar.gif
+www/icons-dist/small/tar.png
+www/icons-dist/small/text.gif
+www/icons-dist/small/text.png
+www/icons-dist/small/transfer.gif
+www/icons-dist/small/transfer.png
+www/icons-dist/small/unknown.gif
+www/icons-dist/small/unknown.png
+www/icons-dist/small/uu.gif
+www/icons-dist/small/uu.png
+www/icons-dist/sound1.gif
+www/icons-dist/sound1.png
+www/icons-dist/sound2.gif
+www/icons-dist/sound2.png
+www/icons-dist/sphere1.gif
+www/icons-dist/sphere1.png
+www/icons-dist/sphere2.gif
+www/icons-dist/sphere2.png
+www/icons-dist/tar.gif
+www/icons-dist/tar.png
+www/icons-dist/tex.gif
+www/icons-dist/tex.png
+www/icons-dist/text.gif
+www/icons-dist/text.png
+www/icons-dist/transfer.gif
+www/icons-dist/transfer.png
+www/icons-dist/unknown.gif
+www/icons-dist/unknown.png
+www/icons-dist/up.gif
+www/icons-dist/up.png
+www/icons-dist/uu.gif
+www/icons-dist/uu.png
+www/icons-dist/uuencoded.gif
+www/icons-dist/uuencoded.png
+www/icons-dist/world1.gif
+www/icons-dist/world1.png
+www/icons-dist/world2.gif
+www/icons-dist/world2.png
+@dirrm www/icons-dist/small
+@dirrm www/icons-dist
+@dirrm www/error-dist/include
+@dirrm www/error-dist
 @dirrm www/data-dist
 @dirrm www/cgi-bin-dist
 @dirrm www
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 6fd5dc4b47ba..383b746775d4 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.39
-PORTREVISION=	7
+PORTVERSION=	2.0.40
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
@@ -44,7 +43,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--includedir=${PREFIX_RELDEST}/include/apache2
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
-SHARED_MODULES= all cgid deflate ext_filter
+SHARED_MODULES= all cgid deflate ext_filter proxy proxy-connect proxy-ftp \
+		proxy-http
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
@@ -53,6 +53,12 @@ MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SUEXEC)
 SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
 SUEXEC_USERDIR?= public_html
@@ -72,11 +78,6 @@ PLIST_SUB+=	SUEXEC="@comment "
 .if ${WITH_MPM} != "prefork"
 PKGNAMESUFFIX=	-${WITH_MPM}
 WITH_THREADS=	yes
-.if !defined(FORCE_THREADING_MPM)
-FORBIDDEN=	"doesn't support threads on FreeBSD, officially. If you are\
-		prepared to risk unintended problems, make again with\
-		-DFORCE_THREADING_MPM"
-.endif
 .if ${WITH_MPM} == "worker"
 PLIST_SUB+=	PREFORK="@comment " WORKER=""
 .else
@@ -89,31 +90,28 @@ PLIST_SUB+=	PREFORK="" WORKER="@comment "
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+= --enable-threads
 CFLAGS+=	-DFREEBSD_THREAD_HACK
+SHARED_MODULES+= cache file-cache disk-cache mem_cache
+PLIST_SUB+=	THREADS=""
+.else
+PLIST_SUB+=	THREADS="@comment "
 .endif
 
-.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+.if !defined(WITHOUT_SSL)
 SHARED_MODULES+= ssl
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
 PLIST_SUB+=	MODSSL=""
+_SSLBUGGY!=	${OPENSSLBASE}/bin/openssl version | \
+		${EGREP} "OpenSSL ([1-9]+)|([0\.9\.[6-9][e-z])|(0\.[1-9][0-9]+)" \
+		|| ${TRUE}
+.if empty(_SSLBUGGY)
+IGNORE=		"requires OpenSSL 0.9.6e or higher. Upgrade your base system"
+.endif
 RC_SUB+=	-e 's,@@SSL@@,ssl,g'
 .else
 PLIST_SUB+=	MODSSL="@comment "
 RC_SUB+=	-e 's,@@SSL@@,,g'
 .endif
 
-.if !defined(WITHOUT_CACHE) && defined(WITH_THREADS)
-SHARED_MODULES+= cache file-cache disk-cache mem_cache
-PLIST_SUB+=	MODCACHE=""
-.else
-PLIST_SUB+=	MODCACHE="@comment "
-.endif
-
-.if !defined(WITHOUT_PROXY)
-SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
-PLIST_SUB+=	MODPROXY=""
-.else
-PLIST_SUB+=	MODPROXY="@comment "
-.endif
-
 .if defined(WITH_EXPERIMENTAL)
 SHARED_MODULES+= bucketeer case_filter case_filter_in ext_filter charset_lite \
 		optional_hook_export optional_hook_import \
@@ -137,7 +135,7 @@ post-patch:
 	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
 		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
 	 ); done
-	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
+	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
 	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
@@ -151,4 +149,4 @@ post-install:
 		${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index c91856e7d4c5..d8a5b7f6874b 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,2 +1,2 @@
-MD5 (httpd-2.0.39.tar.gz) = b821c6babca68b4859b9ba38d1b345af
+MD5 (httpd-2.0.40.tar.gz) = fdb35bc3b5b7833e45a455b56a0d0be5
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
index 398b43f9a899..c0e84224e034 100644
--- a/www/apache22/files/patch-Makefile.in
+++ b/www/apache22/files/patch-Makefile.in
@@ -1,61 +1,106 @@
---- Makefile.in.orig	Sat Jun 15 18:41:03 2002
-+++ Makefile.in	Sun Jul 21 03:15:18 2002
-@@ -31,12 +31,14 @@
- 	@test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
- 	@cd $(top_srcdir)/docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		cp -f $$i $$i-dist; \
-+		$(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
+--- Makefile.in.orig	Fri Jul 26 00:47:12 2002
++++ Makefile.in	Sat Aug 10 09:38:48 2002
+@@ -36,10 +36,13 @@
+ 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+ 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ 	    fi; \
++	    cp -f $$i $$i-dist; \
++	    $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
  	done; \
  	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- 		cd $$j ; \
- 	for i in *-std*.conf ssl.conf; do \
--		[ -f $$i ] || continue; \
+ 	    cd $$j ; \
+ 	    for i in *-std*.conf; do \
 +		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
- 		( \
- 			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
- 			if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
-@@ -54,6 +56,9 @@
- 					if test "x$$j" = "xssl"; then \
- 						echo "<IfDefine SSL>"; \
- 					fi; \
+ 	    	( \
+ 	    		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+ 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
+@@ -57,6 +60,9 @@
+ 	    				if test "x$$j" = "xssl"; then \
+ 	    					echo "<IfDefine SSL>"; \
+ 	    				fi; \
 +					if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
 +					        echo -n "#"; \
 +					fi; \
- 					if test $$j != "^EOL^"; then \
- 						echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
- 					fi; \
-@@ -104,11 +109,14 @@
+ 	    				if test $$j != "^EOL^"; then \
+ 	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+ 	    				fi; \
+@@ -106,44 +112,32 @@
+ 	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
- 	@echo Installing HTML documents
--	@test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
--	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
+-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
+-           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
+-        else \
+-	    echo Installing HTML documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
+-	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+-	    cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing HTML documents
 +	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
 +	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
 +	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
-+.if !defined(NOPORTDOCS)
- 	@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
--	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
-+.endif
 +	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-error:
- 	@echo Installing error documents
-@@ -124,9 +132,10 @@
+-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
+-           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
+-        else \
+-	    echo Installing error documents ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
+-	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
+-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing error documents
++	@test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
++	cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
++	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	@test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
+ 
+ install-icons:
+-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
+-           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
+-        else \
+-	    echo Installing icons ; \
+-	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
+-	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
+-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing icons
++	@test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
++	cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
++	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	@test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
  
  install-cgi:
- 	@echo Installing CGIs
--	@test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
--	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
--	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
+-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
+-	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
+-	else \
+-	   echo Installing CGIs ; \
+-	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
+-	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
+-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \
+-	fi
++	@echo Installing CGIs
 +	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
-+	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
-+	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
+@@ -185,11 +179,13 @@
+ 	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
+ 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ 	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
+-	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+ 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
+ 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
++.if !defined(NOPORTDOCS)
++	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
+ 	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
+ 	@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -print | xargs rm -rf)
++.endif
+ 
+ install-suexec:
+ 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache22/files/patch-modules:http:http_request.c b/www/apache22/files/patch-modules:http:http_request.c
deleted file mode 100644
index e44aa29391f7..000000000000
--- a/www/apache22/files/patch-modules:http:http_request.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/http/http_request.c.orig	26 Jun 2002 19:45:06 -0000	1.150
-+++ modules/http/http_request.c	27 Jun 2002 04:40:47 -0000	1.151
-@@ -383,8 +383,6 @@
-         f = f->next;
-     }
- 
--    ap_add_input_filter("HTTP_IN", NULL, new, new->connection);
--
-     apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",
-                    apr_itoa(r->pool, r->status));
diff --git a/www/apache22/files/patch-support:htpasswd.c b/www/apache22/files/patch-support:htpasswd.c
deleted file mode 100644
index f836f157fa1b..000000000000
--- a/www/apache22/files/patch-support:htpasswd.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- support/htpasswd.c.orig	Tue Jun 18 11:58:36 2002
-+++ support/htpasswd.c	Mon Jul  8 16:30:14 2002
-@@ -236,6 +236,7 @@
-     strcpy(record, user);
-     strcat(record, ":");
-     strcat(record, cpw);
-+    strcat(record, "\n");
-     return 0;
- }
- 
-@@ -375,7 +376,7 @@
-         }
-     }
- 
--    if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
-+    if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
-         apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
-         exit(ERR_SYNTAX);
-     }
-@@ -592,6 +593,7 @@
-                  */
-                 apr_file_printf(errfile, "Updating ");
-                 putline(ftemp, record);
-+                found++;
-             }
-         }
-     }
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 8371eabc37f2..7310e6844974 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -23,6 +23,7 @@ include/apache2/ap_config_layout.h
 include/apache2/ap_listen.h
 include/apache2/ap_mmn.h
 include/apache2/ap_mpm.h
+include/apache2/ap_regkey.h
 include/apache2/ap_release.h
 include/apache2/apr.h
 include/apache2/apr_allocator.h
@@ -52,9 +53,11 @@ include/apache2/apr_mmap.h
 include/apache2/apr_network_io.h
 include/apache2/apr_optional.h
 include/apache2/apr_optional_hooks.h
+include/apache2/apr_poll.h
 include/apache2/apr_pools.h
 include/apache2/apr_portable.h
 include/apache2/apr_proc_mutex.h
+include/apache2/apr_reslist.h
 include/apache2/apr_ring.h
 include/apache2/apr_rmm.h
 include/apache2/apr_sdbm.h
@@ -63,6 +66,7 @@ include/apache2/apr_shm.h
 include/apache2/apr_signal.h
 include/apache2/apr_strings.h
 include/apache2/apr_strmatch.h
+include/apache2/apr_support.h
 include/apache2/apr_tables.h
 include/apache2/apr_thread_cond.h
 include/apache2/apr_thread_mutex.h
@@ -143,7 +147,7 @@ libexec/apache2/mod_auth_dbm.so
 libexec/apache2/mod_auth_digest.so
 libexec/apache2/mod_autoindex.so
 %%EXPERIMENTAL%%libexec/apache2/mod_bucketeer.so
-%%MODCACHE%%libexec/apache2/mod_cache.so
+%%THREADS%%libexec/apache2/mod_cache.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter.so
 %%EXPERIMENTAL%%libexec/apache2/mod_case_filter_in.so
 libexec/apache2/mod_cern_meta.so
@@ -154,17 +158,17 @@ libexec/apache2/mod_dav.so
 libexec/apache2/mod_dav_fs.so
 libexec/apache2/mod_deflate.so
 libexec/apache2/mod_dir.so
-%%MODCACHE%%libexec/apache2/mod_disk_cache.so
+%%THREADS%%libexec/apache2/mod_disk_cache.so
 libexec/apache2/mod_env.so
 libexec/apache2/mod_expires.so
 libexec/apache2/mod_ext_filter.so
-%%MODCACHE%%libexec/apache2/mod_file_cache.so
+%%THREADS%%libexec/apache2/mod_file_cache.so
 libexec/apache2/mod_headers.so
 libexec/apache2/mod_imap.so
 libexec/apache2/mod_include.so
 libexec/apache2/mod_info.so
 libexec/apache2/mod_log_config.so
-%%MODCACHE%%libexec/apache2/mod_mem_cache.so
+%%THREADS%%libexec/apache2/mod_mem_cache.so
 libexec/apache2/mod_mime.so
 libexec/apache2/mod_mime_magic.so
 libexec/apache2/mod_negotiation.so
@@ -172,10 +176,10 @@ libexec/apache2/mod_negotiation.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_hook_import.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_import.so
 %%EXPERIMENTAL%%libexec/apache2/mod_optional_fn_export.so
-%%MODPROXY%%libexec/apache2/mod_proxy.so
-%%MODPROXY%%libexec/apache2/mod_proxy_connect.so
-%%MODPROXY%%libexec/apache2/mod_proxy_ftp.so
-%%MODPROXY%%libexec/apache2/mod_proxy_http.so
+libexec/apache2/mod_proxy.so
+libexec/apache2/mod_proxy_connect.so
+libexec/apache2/mod_proxy_ftp.so
+libexec/apache2/mod_proxy_http.so
 libexec/apache2/mod_rewrite.so
 libexec/apache2/mod_setenvif.so
 libexec/apache2/mod_speling.so
@@ -211,11 +215,16 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/LICENSE
 %%PORTDOCS%%share/doc/apache2/bind.html.en
 %%PORTDOCS%%share/doc/apache2/bind.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/bind.xml
+%%PORTDOCS%%share/doc/apache2/bind.xml.ja
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.en
 %%PORTDOCS%%share/doc/apache2/cgi_path.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/configuring.html.en
 %%PORTDOCS%%share/doc/apache2/configuring.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/content-negotiation.html
+%%PORTDOCS%%share/doc/apache2/configuring.xml
+%%PORTDOCS%%share/doc/apache2/configuring.xml.ja
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html.en
+%%PORTDOCS%%share/doc/apache2/content-negotiation.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/custom-error.html.en
 %%PORTDOCS%%share/doc/apache2/custom-error.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/API.html
@@ -227,20 +236,26 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/developer/hooks.html
 %%PORTDOCS%%share/doc/apache2/developer/index.html
 %%PORTDOCS%%share/doc/apache2/developer/layeredio.html
-%%PORTDOCS%%share/doc/apache2/developer/modules.html
+%%PORTDOCS%%share/doc/apache2/developer/modules.html.en
+%%PORTDOCS%%share/doc/apache2/developer/modules.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/developer/request.html
 %%PORTDOCS%%share/doc/apache2/dns-caveats.html
-%%PORTDOCS%%share/doc/apache2/dso.html
+%%PORTDOCS%%share/doc/apache2/dso.html.en
+%%PORTDOCS%%share/doc/apache2/dso.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/dso.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/ebcdic.html
 %%PORTDOCS%%share/doc/apache2/env.html.en
 %%PORTDOCS%%share/doc/apache2/env.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/env.xml
 %%PORTDOCS%%share/doc/apache2/faq/index.html
 %%PORTDOCS%%share/doc/apache2/filter.html.en
 %%PORTDOCS%%share/doc/apache2/filter.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/filter.xml
 %%PORTDOCS%%share/doc/apache2/footer.html
+%%PORTDOCS%%share/doc/apache2/glossary.html
 %%PORTDOCS%%share/doc/apache2/handler.html.en
 %%PORTDOCS%%share/doc/apache2/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/handler.xml
 %%PORTDOCS%%share/doc/apache2/header.html
 %%PORTDOCS%%share/doc/apache2/howto/auth.html.en
 %%PORTDOCS%%share/doc/apache2/howto/auth.html.ja.jis
@@ -248,6 +263,7 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/howto/cgi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/howto/footer.html
 %%PORTDOCS%%share/doc/apache2/howto/header.html
+%%PORTDOCS%%share/doc/apache2/howto/htaccess.html
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.en
 %%PORTDOCS%%share/doc/apache2/howto/ssi.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/images/apache_header.gif
@@ -276,7 +292,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/install.html.ko.euc-kr
 %%PORTDOCS%%share/doc/apache2/invoking.html.en
 %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/logs.html
+%%PORTDOCS%%share/doc/apache2/logs.html.en
+%%PORTDOCS%%share/doc/apache2/logs.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/logs.xml
 %%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html
 %%PORTDOCS%%share/doc/apache2/misc/descriptors.html
 %%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html
@@ -288,19 +306,26 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html
 %%PORTDOCS%%share/doc/apache2/misc/security_tips.html
 %%PORTDOCS%%share/doc/apache2/misc/tutorials.html
-%%PORTDOCS%%share/doc/apache2/mod/allmodules.html.en
 %%PORTDOCS%%share/doc/apache2/mod/allmodules.xml
+%%PORTDOCS%%share/doc/apache2/mod/allmodules.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/core.html.en
 %%PORTDOCS%%share/doc/apache2/mod/core.xml
-%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en
+%%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.html.en
+%%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/directives.xml
+%%PORTDOCS%%share/doc/apache2/mod/directives.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/footer.html
 %%PORTDOCS%%share/doc/apache2/mod/header.html
 %%PORTDOCS%%share/doc/apache2/mod/index.html.en
+%%PORTDOCS%%share/doc/apache2/mod/index.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/index.xml
+%%PORTDOCS%%share/doc/apache2/mod/index.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_access.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_access.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_actions.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_alias.html.en
@@ -308,7 +333,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_asis.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_auth.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_anon.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_dbm.html.en
@@ -316,7 +343,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_auth_digest.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_autoindex.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_cache.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_cern_meta.html.en
@@ -332,11 +361,19 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_dir.xml.ja
+%%PORTDOCS%%share/doc/apache2/mod/mod_echo.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_echo.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_env.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_env.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_example.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_expires.html.en
@@ -370,7 +407,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_setenvif.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mod_so.xml
+%%PORTDOCS%%share/doc/apache2/mod/mod_so.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_speling.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_ssl.html.en
@@ -391,9 +430,12 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/mod/mod_usertrack.xml
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mod_vhost_alias.xml
-%%PORTDOCS%%share/doc/apache2/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html.en
+%%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml
+%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml.ja
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en
 %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml
 %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en
@@ -444,7 +486,8 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/server-wide.html.en
 %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis
-%%PORTDOCS%%share/doc/apache2/sitemap.html
+%%PORTDOCS%%share/doc/apache2/sitemap.html.en
+%%PORTDOCS%%share/doc/apache2/sitemap.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/ssl/footer.html
 %%PORTDOCS%%share/doc/apache2/ssl/header.html
 %%PORTDOCS%%share/doc/apache2/ssl/index.html.en
@@ -462,16 +505,17 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_overview_fig1.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-000000.gif
 %%PORTDOCS%%share/doc/apache2/ssl/ssl_template.imgdot-1x1-transp.gif
-%%PORTDOCS%%share/doc/apache2/stopping.html
-%%PORTDOCS%%share/doc/apache2/style/Makefile
-%%PORTDOCS%%share/doc/apache2/style/build.sh
-%%PORTDOCS%%share/doc/apache2/style/build.xml
+%%PORTDOCS%%share/doc/apache2/stopping.html.en
+%%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis
+%%PORTDOCS%%share/doc/apache2/style/common.dtd
 %%PORTDOCS%%share/doc/apache2/style/common.xsl
+%%PORTDOCS%%share/doc/apache2/style/de.xml
 %%PORTDOCS%%share/doc/apache2/style/en.xml
 %%PORTDOCS%%share/doc/apache2/style/ja.xml
 %%PORTDOCS%%share/doc/apache2/style/manual.css
 %%PORTDOCS%%share/doc/apache2/style/manual.en.xsl
 %%PORTDOCS%%share/doc/apache2/style/manual.ja.xsl
+%%PORTDOCS%%share/doc/apache2/style/manualpage.dtd
 %%PORTDOCS%%share/doc/apache2/style/modulesynopsis.dtd
 %%PORTDOCS%%share/doc/apache2/style/sv.xml
 %%PORTDOCS%%share/doc/apache2/suexec.html.en
@@ -480,7 +524,9 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/upgrading.html.fr
 %%PORTDOCS%%share/doc/apache2/upgrading.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/upgrading.html.ko.euc-kr
-%%PORTDOCS%%share/doc/apache2/urlmapping.html
+%%PORTDOCS%%share/doc/apache2/upgrading.xml
+%%PORTDOCS%%share/doc/apache2/urlmapping.html.en
+%%PORTDOCS%%share/doc/apache2/urlmapping.html.ja.jis
 %%PORTDOCS%%share/doc/apache2/vhosts/details.html
 %%PORTDOCS%%share/doc/apache2/vhosts/examples.html
 %%PORTDOCS%%share/doc/apache2/vhosts/fd-limits.html.en
@@ -535,255 +581,259 @@ www/data-dist/index.html.ru.utf8
 www/data-dist/index.html.se
 www/data-dist/index.html.var
 www/data-dist/index.html.zh
-www/error/HTTP_BAD_GATEWAY.html.var
-www/error/HTTP_BAD_REQUEST.html.var
-www/error/HTTP_FORBIDDEN.html.var
-www/error/HTTP_GONE.html.var
-www/error/HTTP_INTERNAL_SERVER_ERROR.html.var
-www/error/HTTP_LENGTH_REQUIRED.html.var
-www/error/HTTP_METHOD_NOT_ALLOWED.html.var
-www/error/HTTP_NOT_ACCEPTABLE.html.var
-www/error/HTTP_NOT_FOUND.html.var
-www/error/HTTP_NOT_IMPLEMENTED.html.var
-www/error/HTTP_PRECONDITION_FAILED.html.var
-www/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-www/error/HTTP_REQUEST_TIME_OUT.html.var
-www/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-www/error/HTTP_SERVICE_UNAVAILABLE.html.var
-www/error/HTTP_UNAUTHORIZED.html.var
-www/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-www/error/HTTP_VARIANT_ALSO_VARIES.html.var
-www/error/README
-www/error/contact.html.var
-www/error/include/bottom.html
-www/error/include/spacer.html
-www/error/include/top.html
-www/icons/README
-www/icons/a.gif
-www/icons/a.png
-www/icons/alert.black.gif
-www/icons/alert.black.png
-www/icons/alert.red.gif
-www/icons/alert.red.png
-www/icons/apache_pb.gif
-www/icons/apache_pb.png
-www/icons/apache_pb2.gif
-www/icons/apache_pb2.png
-www/icons/apache_pb2_ani.gif
-www/icons/back.gif
-www/icons/back.png
-www/icons/ball.gray.gif
-www/icons/ball.gray.png
-www/icons/ball.red.gif
-www/icons/ball.red.png
-www/icons/binary.gif
-www/icons/binary.png
-www/icons/binhex.gif
-www/icons/binhex.png
-www/icons/blank.gif
-www/icons/blank.png
-www/icons/bomb.gif
-www/icons/bomb.png
-www/icons/box1.gif
-www/icons/box1.png
-www/icons/box2.gif
-www/icons/box2.png
-www/icons/broken.gif
-www/icons/broken.png
-www/icons/burst.gif
-www/icons/burst.png
-www/icons/c.gif
-www/icons/c.png
-www/icons/comp.blue.gif
-www/icons/comp.blue.png
-www/icons/comp.gray.gif
-www/icons/comp.gray.png
-www/icons/compressed.gif
-www/icons/compressed.png
-www/icons/continued.gif
-www/icons/continued.png
-www/icons/dir.gif
-www/icons/dir.png
-www/icons/diskimg.gif
-www/icons/diskimg.png
-www/icons/down.gif
-www/icons/down.png
-www/icons/dvi.gif
-www/icons/dvi.png
-www/icons/f.gif
-www/icons/f.png
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/folder.open.png
-www/icons/folder.png
-www/icons/folder.sec.gif
-www/icons/folder.sec.png
-www/icons/forward.gif
-www/icons/forward.png
-www/icons/freebsd.gif
-www/icons/generic.gif
-www/icons/generic.png
-www/icons/generic.red.gif
-www/icons/generic.red.png
-www/icons/generic.sec.gif
-www/icons/generic.sec.png
-www/icons/hand.right.gif
-www/icons/hand.right.png
-www/icons/hand.up.gif
-www/icons/hand.up.png
-www/icons/icon.sheet.gif
-www/icons/icon.sheet.png
-www/icons/image1.gif
-www/icons/image1.png
-www/icons/image2.gif
-www/icons/image2.png
-www/icons/image3.gif
-www/icons/image3.png
-www/icons/index.gif
-www/icons/index.png
-www/icons/layout.gif
-www/icons/layout.png
-www/icons/left.gif
-www/icons/left.png
-www/icons/link.gif
-www/icons/link.png
-www/icons/movie.gif
-www/icons/movie.png
-www/icons/p.gif
-www/icons/p.png
-www/icons/patch.gif
-www/icons/patch.png
-www/icons/pdf.gif
-www/icons/pdf.png
-www/icons/pie0.gif
-www/icons/pie0.png
-www/icons/pie1.gif
-www/icons/pie1.png
-www/icons/pie2.gif
-www/icons/pie2.png
-www/icons/pie3.gif
-www/icons/pie3.png
-www/icons/pie4.gif
-www/icons/pie4.png
-www/icons/pie5.gif
-www/icons/pie5.png
-www/icons/pie6.gif
-www/icons/pie6.png
-www/icons/pie7.gif
-www/icons/pie7.png
-www/icons/pie8.gif
-www/icons/pie8.png
-www/icons/portal.gif
-www/icons/portal.png
-www/icons/ps.gif
-www/icons/ps.png
-www/icons/quill.gif
-www/icons/quill.png
-www/icons/right.gif
-www/icons/right.png
-www/icons/screw1.gif
-www/icons/screw1.png
-www/icons/screw2.gif
-www/icons/screw2.png
-www/icons/script.gif
-www/icons/script.png
-www/icons/small/README.txt
-www/icons/small/back.gif
-www/icons/small/back.png
-www/icons/small/binary.gif
-www/icons/small/binary.png
-www/icons/small/binhex.gif
-www/icons/small/binhex.png
-www/icons/small/blank.gif
-www/icons/small/blank.png
-www/icons/small/broken.gif
-www/icons/small/broken.png
-www/icons/small/burst.gif
-www/icons/small/burst.png
-www/icons/small/comp1.gif
-www/icons/small/comp1.png
-www/icons/small/comp2.gif
-www/icons/small/comp2.png
-www/icons/small/compressed.gif
-www/icons/small/compressed.png
-www/icons/small/continued.gif
-www/icons/small/continued.png
-www/icons/small/dir.gif
-www/icons/small/dir.png
-www/icons/small/dir2.gif
-www/icons/small/dir2.png
-www/icons/small/doc.gif
-www/icons/small/doc.png
-www/icons/small/forward.gif
-www/icons/small/forward.png
-www/icons/small/generic.gif
-www/icons/small/generic.png
-www/icons/small/generic2.gif
-www/icons/small/generic2.png
-www/icons/small/generic3.gif
-www/icons/small/generic3.png
-www/icons/small/image.gif
-www/icons/small/image.png
-www/icons/small/image2.gif
-www/icons/small/image2.png
-www/icons/small/index.gif
-www/icons/small/index.png
-www/icons/small/key.gif
-www/icons/small/key.png
-www/icons/small/movie.gif
-www/icons/small/movie.png
-www/icons/small/patch.gif
-www/icons/small/patch.png
-www/icons/small/ps.gif
-www/icons/small/ps.png
-www/icons/small/rainbow.gif
-www/icons/small/rainbow.png
-www/icons/small/sound.gif
-www/icons/small/sound.png
-www/icons/small/sound2.gif
-www/icons/small/sound2.png
-www/icons/small/tar.gif
-www/icons/small/tar.png
-www/icons/small/text.gif
-www/icons/small/text.png
-www/icons/small/transfer.gif
-www/icons/small/transfer.png
-www/icons/small/unknown.gif
-www/icons/small/unknown.png
-www/icons/small/uu.gif
-www/icons/small/uu.png
-www/icons/sound1.gif
-www/icons/sound1.png
-www/icons/sound2.gif
-www/icons/sound2.png
-www/icons/sphere1.gif
-www/icons/sphere1.png
-www/icons/sphere2.gif
-www/icons/sphere2.png
-www/icons/tar.gif
-www/icons/tar.png
-www/icons/tex.gif
-www/icons/tex.png
-www/icons/text.gif
-www/icons/text.png
-www/icons/transfer.gif
-www/icons/transfer.png
-www/icons/unknown.gif
-www/icons/unknown.png
-www/icons/up.gif
-www/icons/up.png
-www/icons/uu.gif
-www/icons/uu.png
-www/icons/uuencoded.gif
-www/icons/uuencoded.png
-www/icons/world1.gif
-www/icons/world1.png
-www/icons/world2.gif
-www/icons/world2.png
-@dirrm www/icons/small
-@dirrm www/icons
-@dirrm www/error/include
-@dirrm www/error
+@unexec if [ -L %D/www/error ]; then rm -f %D/www/error; fi
+@exec [ ! -d %D/www/error ] && ln -fs %D/www/error-dist %D/www/error
+www/error-dist/HTTP_BAD_GATEWAY.html.var
+www/error-dist/HTTP_BAD_REQUEST.html.var
+www/error-dist/HTTP_FORBIDDEN.html.var
+www/error-dist/HTTP_GONE.html.var
+www/error-dist/HTTP_INTERNAL_SERVER_ERROR.html.var
+www/error-dist/HTTP_LENGTH_REQUIRED.html.var
+www/error-dist/HTTP_METHOD_NOT_ALLOWED.html.var
+www/error-dist/HTTP_NOT_ACCEPTABLE.html.var
+www/error-dist/HTTP_NOT_FOUND.html.var
+www/error-dist/HTTP_NOT_IMPLEMENTED.html.var
+www/error-dist/HTTP_PRECONDITION_FAILED.html.var
+www/error-dist/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+www/error-dist/HTTP_REQUEST_TIME_OUT.html.var
+www/error-dist/HTTP_REQUEST_URI_TOO_LARGE.html.var
+www/error-dist/HTTP_SERVICE_UNAVAILABLE.html.var
+www/error-dist/HTTP_UNAUTHORIZED.html.var
+www/error-dist/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+www/error-dist/HTTP_VARIANT_ALSO_VARIES.html.var
+www/error-dist/README
+www/error-dist/contact.html.var
+www/error-dist/include/bottom.html
+www/error-dist/include/spacer.html
+www/error-dist/include/top.html
+@unexec if [ -L %D/www/icons ]; then rm -f %D/www/icons; fi
+@exec [ ! -d %D/www/icons ] && ln -fs %D/www/icons-dist %D/www/icons
+www/icons-dist/README
+www/icons-dist/a.gif
+www/icons-dist/a.png
+www/icons-dist/alert.black.gif
+www/icons-dist/alert.black.png
+www/icons-dist/alert.red.gif
+www/icons-dist/alert.red.png
+www/icons-dist/apache_pb.gif
+www/icons-dist/apache_pb.png
+www/icons-dist/apache_pb2.gif
+www/icons-dist/apache_pb2.png
+www/icons-dist/apache_pb2_ani.gif
+www/icons-dist/back.gif
+www/icons-dist/back.png
+www/icons-dist/ball.gray.gif
+www/icons-dist/ball.gray.png
+www/icons-dist/ball.red.gif
+www/icons-dist/ball.red.png
+www/icons-dist/binary.gif
+www/icons-dist/binary.png
+www/icons-dist/binhex.gif
+www/icons-dist/binhex.png
+www/icons-dist/blank.gif
+www/icons-dist/blank.png
+www/icons-dist/bomb.gif
+www/icons-dist/bomb.png
+www/icons-dist/box1.gif
+www/icons-dist/box1.png
+www/icons-dist/box2.gif
+www/icons-dist/box2.png
+www/icons-dist/broken.gif
+www/icons-dist/broken.png
+www/icons-dist/burst.gif
+www/icons-dist/burst.png
+www/icons-dist/c.gif
+www/icons-dist/c.png
+www/icons-dist/comp.blue.gif
+www/icons-dist/comp.blue.png
+www/icons-dist/comp.gray.gif
+www/icons-dist/comp.gray.png
+www/icons-dist/compressed.gif
+www/icons-dist/compressed.png
+www/icons-dist/continued.gif
+www/icons-dist/continued.png
+www/icons-dist/dir.gif
+www/icons-dist/dir.png
+www/icons-dist/diskimg.gif
+www/icons-dist/diskimg.png
+www/icons-dist/down.gif
+www/icons-dist/down.png
+www/icons-dist/dvi.gif
+www/icons-dist/dvi.png
+www/icons-dist/f.gif
+www/icons-dist/f.png
+www/icons-dist/folder.gif
+www/icons-dist/folder.open.gif
+www/icons-dist/folder.open.png
+www/icons-dist/folder.png
+www/icons-dist/folder.sec.gif
+www/icons-dist/folder.sec.png
+www/icons-dist/forward.gif
+www/icons-dist/forward.png
+www/icons-dist/freebsd.gif
+www/icons-dist/generic.gif
+www/icons-dist/generic.png
+www/icons-dist/generic.red.gif
+www/icons-dist/generic.red.png
+www/icons-dist/generic.sec.gif
+www/icons-dist/generic.sec.png
+www/icons-dist/hand.right.gif
+www/icons-dist/hand.right.png
+www/icons-dist/hand.up.gif
+www/icons-dist/hand.up.png
+www/icons-dist/icon.sheet.gif
+www/icons-dist/icon.sheet.png
+www/icons-dist/image1.gif
+www/icons-dist/image1.png
+www/icons-dist/image2.gif
+www/icons-dist/image2.png
+www/icons-dist/image3.gif
+www/icons-dist/image3.png
+www/icons-dist/index.gif
+www/icons-dist/index.png
+www/icons-dist/layout.gif
+www/icons-dist/layout.png
+www/icons-dist/left.gif
+www/icons-dist/left.png
+www/icons-dist/link.gif
+www/icons-dist/link.png
+www/icons-dist/movie.gif
+www/icons-dist/movie.png
+www/icons-dist/p.gif
+www/icons-dist/p.png
+www/icons-dist/patch.gif
+www/icons-dist/patch.png
+www/icons-dist/pdf.gif
+www/icons-dist/pdf.png
+www/icons-dist/pie0.gif
+www/icons-dist/pie0.png
+www/icons-dist/pie1.gif
+www/icons-dist/pie1.png
+www/icons-dist/pie2.gif
+www/icons-dist/pie2.png
+www/icons-dist/pie3.gif
+www/icons-dist/pie3.png
+www/icons-dist/pie4.gif
+www/icons-dist/pie4.png
+www/icons-dist/pie5.gif
+www/icons-dist/pie5.png
+www/icons-dist/pie6.gif
+www/icons-dist/pie6.png
+www/icons-dist/pie7.gif
+www/icons-dist/pie7.png
+www/icons-dist/pie8.gif
+www/icons-dist/pie8.png
+www/icons-dist/portal.gif
+www/icons-dist/portal.png
+www/icons-dist/ps.gif
+www/icons-dist/ps.png
+www/icons-dist/quill.gif
+www/icons-dist/quill.png
+www/icons-dist/right.gif
+www/icons-dist/right.png
+www/icons-dist/screw1.gif
+www/icons-dist/screw1.png
+www/icons-dist/screw2.gif
+www/icons-dist/screw2.png
+www/icons-dist/script.gif
+www/icons-dist/script.png
+www/icons-dist/small/README.txt
+www/icons-dist/small/back.gif
+www/icons-dist/small/back.png
+www/icons-dist/small/binary.gif
+www/icons-dist/small/binary.png
+www/icons-dist/small/binhex.gif
+www/icons-dist/small/binhex.png
+www/icons-dist/small/blank.gif
+www/icons-dist/small/blank.png
+www/icons-dist/small/broken.gif
+www/icons-dist/small/broken.png
+www/icons-dist/small/burst.gif
+www/icons-dist/small/burst.png
+www/icons-dist/small/comp1.gif
+www/icons-dist/small/comp1.png
+www/icons-dist/small/comp2.gif
+www/icons-dist/small/comp2.png
+www/icons-dist/small/compressed.gif
+www/icons-dist/small/compressed.png
+www/icons-dist/small/continued.gif
+www/icons-dist/small/continued.png
+www/icons-dist/small/dir.gif
+www/icons-dist/small/dir.png
+www/icons-dist/small/dir2.gif
+www/icons-dist/small/dir2.png
+www/icons-dist/small/doc.gif
+www/icons-dist/small/doc.png
+www/icons-dist/small/forward.gif
+www/icons-dist/small/forward.png
+www/icons-dist/small/generic.gif
+www/icons-dist/small/generic.png
+www/icons-dist/small/generic2.gif
+www/icons-dist/small/generic2.png
+www/icons-dist/small/generic3.gif
+www/icons-dist/small/generic3.png
+www/icons-dist/small/image.gif
+www/icons-dist/small/image.png
+www/icons-dist/small/image2.gif
+www/icons-dist/small/image2.png
+www/icons-dist/small/index.gif
+www/icons-dist/small/index.png
+www/icons-dist/small/key.gif
+www/icons-dist/small/key.png
+www/icons-dist/small/movie.gif
+www/icons-dist/small/movie.png
+www/icons-dist/small/patch.gif
+www/icons-dist/small/patch.png
+www/icons-dist/small/ps.gif
+www/icons-dist/small/ps.png
+www/icons-dist/small/rainbow.gif
+www/icons-dist/small/rainbow.png
+www/icons-dist/small/sound.gif
+www/icons-dist/small/sound.png
+www/icons-dist/small/sound2.gif
+www/icons-dist/small/sound2.png
+www/icons-dist/small/tar.gif
+www/icons-dist/small/tar.png
+www/icons-dist/small/text.gif
+www/icons-dist/small/text.png
+www/icons-dist/small/transfer.gif
+www/icons-dist/small/transfer.png
+www/icons-dist/small/unknown.gif
+www/icons-dist/small/unknown.png
+www/icons-dist/small/uu.gif
+www/icons-dist/small/uu.png
+www/icons-dist/sound1.gif
+www/icons-dist/sound1.png
+www/icons-dist/sound2.gif
+www/icons-dist/sound2.png
+www/icons-dist/sphere1.gif
+www/icons-dist/sphere1.png
+www/icons-dist/sphere2.gif
+www/icons-dist/sphere2.png
+www/icons-dist/tar.gif
+www/icons-dist/tar.png
+www/icons-dist/tex.gif
+www/icons-dist/tex.png
+www/icons-dist/text.gif
+www/icons-dist/text.png
+www/icons-dist/transfer.gif
+www/icons-dist/transfer.png
+www/icons-dist/unknown.gif
+www/icons-dist/unknown.png
+www/icons-dist/up.gif
+www/icons-dist/up.png
+www/icons-dist/uu.gif
+www/icons-dist/uu.png
+www/icons-dist/uuencoded.gif
+www/icons-dist/uuencoded.png
+www/icons-dist/world1.gif
+www/icons-dist/world1.png
+www/icons-dist/world2.gif
+www/icons-dist/world2.png
+@dirrm www/icons-dist/small
+@dirrm www/icons-dist
+@dirrm www/error-dist/include
+@dirrm www/error-dist
 @dirrm www/data-dist
 @dirrm www/cgi-bin-dist
 @dirrm www