Update to 2.0.28

PR:		32043
Submitted by:	maintainer

60 files changed, 3984 insertions, 3372 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index ea501e6245d5..48f99ccca4a3 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -6,19 +6,14 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.16
-PORTREVISION=	3
+PORTVERSION=	2.0.28
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
-		http://www.cybernic.com/mirror/dist/httpd/ \
-		http://mirrors.partnersforever.net/apache/dist/httpd/ \
-		http://www.technotopia.com/vroom/apache/dist/httpd/ \
-		http://www.tux.org/pub/net/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
+MASTER_SITES=	http://www.apache.org/dist/httpd/ \
+		http://apache.mirrorcentral.com/dist/httpd/ \
+		http://apache.missouri.edu/dist/httpd/ \
+		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
-		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
 DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
 
 MAINTAINER?=	perky@fallin.lv
@@ -26,46 +21,61 @@ MAINTAINER?=	perky@fallin.lv
 LATEST_LINK=	apache2
 
 WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
-FIND?=		find
-XARGS?=		xargs
-
-# apache2 doesn't process '--enable-share=max' option yet.
-# and some modules are very unstable at DSO mode.
-SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
-		auth_anon digest headers cern_meta expires include \
-		cgid status info usertrack dav dav_fs imap proxy \
-		auth_digest file_cache echo optional_fn_import \
-		optional_fn_export
-STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
-		userdir alias asis cgi mime log_config vhost_alias actions
+FIND=		find
+
+WITH_MPM?=	prefork # or perchild, threaded
+HTTP_PORT?=	80
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	\
-		--prefix=${PREFIX} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
+		--enable-so \
 		--with-suexec-docroot=${PREFIX}/www/data \
-		--enable-shared \
-		--disable-threads \
-		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
+		--with-mpm=${WITH_MPM} \
+		--with-port=${HTTP_PORT} \
+		--includedir=${PREFIX}/include/apache # for apr, apr-util
+CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+SHARED_MODULES=	all cgid
+
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	NOPORTDOCS=YES
+.endif
+
+.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+SHARED_MODULES+= ssl
+PLIST_SUB+=	SSLOPT=""
+.else
+PLIST_SUB+=	SSLOPT="@comment "
+.endif
+
+.if !defined(WITHOUT_PROXY)
+SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
+PLIST_SUB+=	PROXYOPT=""
+.else
+PLIST_SUB+=	PROXYOPT="@comment "
+.endif
 
-OPTIM+=		-DHARD_SERVER_LIMIT=512 \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+.if !defined(WITHOUT_CACHE)
+SHARED_MODULES+= cache mem-cache file-cache #disk-cache
+PLIST_SUB+=	CACHEOPT=""
+.else
+PLIST_SUB+=	CACHEOPT="@comment "
+.endif
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}'
+CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
 
-.for mod in ${SHARED_MODS}
-CONFIGURE_ARGS+= --enable-${mod}=shared
-.endfor
-.for mod in ${STATIC_MODS}
-CONFIGURE_ARGS+= --enable-${mod}=yes
-.endfor
+pre-extract:
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
+.endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
+	@${FIND} ${WRKSRC} -name "*.orig" -exec rm -f {} \;
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 3802044557de..61e9645cec3b 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1 +1 @@
-MD5 (httpd-2_0_16-beta.tar.gz) = 364fc61593185789cb9744bae1ebb655
+MD5 (httpd-2_0_28-beta.tar.gz) = 99a10290773221f16fd86383c598da0e
diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in
index 341c8dfd087f..4c26f2dcc806 100644
--- a/www/apache2/files/patch-Makefile.in
+++ b/www/apache2/files/patch-Makefile.in
@@ -1,123 +1,45 @@
---- Makefile.in.orig	Wed Apr  4 02:03:35 2001
-+++ Makefile.in	Sun Apr  8 06:06:58 2001
-@@ -16,7 +16,7 @@
- targets         = $(PROGRAMS) $(other_targets)
- phony_targets   = $(srcdir)/buildmark.c
- install_targets = install-conf install-htdocs install-icons install-other \
--	install-cgi install-include install-support install-suexec
-+	install-cgi install-include install-support install-manpages install-suexec
- DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
- 	configure generated_lists include/ap_config_auto.h \
- 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
-@@ -28,25 +28,32 @@
- install-conf:
- 	@echo Installing configuration files
- 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
-+
- 	@cd docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(sysconfdir); \
-+		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 	done; \
- 	for i in *-std*; do \
- 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
- 		    -e 's#@@Port@@#$(PORT)#g' \
--			< $$i > $(sysconfdir)/$$i; \
--		chmod 0644 $(sysconfdir)/$$i; \
-+			< $$i > $(sysconfdir)/$$i.default; \
-+		chmod 0644 $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 		file=`echo $$i|sed s/-std//`; \
- 		if [ "$$file" = "httpd.conf" ]; then \
- 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
- 		fi; \
- 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
--			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
-+			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
-+			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
- 		fi; \
- 	done
- 
- htdocs-srcdir = docs/docroot
-+htman-srcdir = docs/manual
-+doc_prefix = $(prefix)/share/doc/apache
-+man-srcdir = docs/man
- 
- docs::
- 	mkdir -p ./docs/api
-@@ -57,11 +64,14 @@
+--- Makefile.in.orig	Mon Oct 22 21:46:29 2001
++++ Makefile.in	Sat Nov 17 01:36:38 2001
+@@ -51,7 +51,7 @@
+ 					< $$i; \
+ 				for j in $(DSO_MODULES) "^EOL^"; do \
+ 					if test $$j != "^EOL^"; then \
+-						echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
++						echo "LoadModule $${j}_module ${libexecdir:S|^${prefix}/||}/mod_$${j}.so"; \
+ 					fi; \
+ 				done; \
+ 				sed -e '1,/@@LoadModule@@/d' \
+@@ -93,11 +93,14 @@
  
  install-htdocs:
  	@echo Installing HTML documents
 -	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
 -	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
--	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
--	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
+-	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
 -	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
-+	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
-+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
-+	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
-+	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
-+	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
-+	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
-+	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
-+	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-icons:
- 	@echo Installing icons
-@@ -71,24 +81,27 @@
++	@test -d $(htdocsdir).default || $(MKINSTALLDIRS) $(htdocsdir).default
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)
++	@test -e $(htdocsdir) || ln -sf $(htdocsdir).default $(htdocsdir)
++.if !defined(NOPORTDOCS)
++	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
++	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
++.endif
++	@(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-error:
+ 	@echo Installing error documents
+@@ -113,9 +116,10 @@
  
  install-cgi:
  	@echo Installing CGIs
 -	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
--	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
 -	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 +	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
-+	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
-+	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
 +	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
  
- install-support:
- 	@echo Installing Support Binaries
- 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
--	@cp -p $(srcdir)/support/httpd.exp $(bindir)
-+	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
-+	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
-+	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
- 	@cp -p $(builddir)/support/htpasswd $(bindir)
- 	@cp -p $(builddir)/support/htdigest $(bindir)
--	@cp -p $(builddir)/support/rotatelogs $(bindir)
--	@cp -p $(builddir)/support/logresolve $(bindir)
--	@cp -p $(builddir)/support/ab $(bindir)
--	@cp -p $(builddir)/support/apachectl $(bindir)
--	chmod 755 $(bindir)/apachectl
-+	@cp -p $(builddir)/support/rotatelogs $(sbindir)
-+	@cp -p $(builddir)/support/logresolve $(sbindir)
-+	@cp -p $(builddir)/support/ab $(sbindir)
-+	@cp -p $(builddir)/support/apachectl $(sbindir)
-+	chmod 755 $(sbindir)/apachectl
- 	@if test -f $(builddir)/support/apxs; then \
--	    cp -p $(builddir)/support/apxs $(bindir); \
--	    chmod 755 $(bindir)/apxs; \
-+	    cp -p $(builddir)/support/apxs $(sbindir); \
-+	    chmod 755 $(sbindir)/apxs; \
- 	fi
- 
- 
-@@ -117,6 +130,15 @@
- 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
- 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
- 	@chmod 644 $(includedir)/*.h
-+
-+install-manpages:
-+	@echo Installing manual pages
-+	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
-+	@for sect in 1 8; do \
-+		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
-+		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
-+	done;
-+	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-suexec:
- 	@if test -f $(builddir)/support/suexec; then \
+ install-other:
+ 	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
diff --git a/www/apache2/files/patch-build:rules.mk b/www/apache2/files/patch-build:rules.mk
deleted file mode 100644
index d5058a91d8ca..000000000000
--- a/www/apache2/files/patch-build:rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
-+++ build/rules.mk	Sun Apr  8 01:05:46 2001
-@@ -172,9 +172,9 @@
- all-p: $(targets)
- install-p: $(targets) $(install_targets)
- 	@if test -n '$(PROGRAMS)'; then \
--		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
-+		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
- 		for i in "$(PROGRAMS)"; do \
--			$(INSTALL_PROGRAM) $$i $(bindir); \
-+			$(INSTALL_PROGRAM) $$i $(sbindir); \
- 		done; \
- 	fi
- 
diff --git a/www/apache2/files/patch-config.layout b/www/apache2/files/patch-config.layout
index 75a700c6a805..0bb23d72594f 100644
--- a/www/apache2/files/patch-config.layout
+++ b/www/apache2/files/patch-config.layout
@@ -1,6 +1,6 @@
---- config.layout.orig	Sat Apr  7 04:19:44 2001
-+++ config.layout	Sat Apr  7 04:20:28 2001
-@@ -249,3 +249,22 @@
+--- config.layout.orig	Fri Oct 26 11:59:26 2001
++++ config.layout	Fri Nov 16 18:36:14 2001
+@@ -285,3 +285,25 @@
      logfiledir:    $prefix/logs
      proxycachedir: $prefix/proxy
  </Layout>
@@ -14,8 +14,11 @@
 +    mandir:        $prefix/man
 +    sysconfdir:    $prefix/etc/apache
 +    datadir:       $prefix/www
++    installbuilddir: $prefix/share/mk/apache
++    errordir:      $datadir/error
 +    iconsdir:      $datadir/icons
 +    htdocsdir:     $datadir/data
++    manualdir:     ${prefix}/share/doc/apache
 +    cgidir:        $datadir/cgi-bin
 +    includedir:    $prefix/include/apache
 +    localstatedir: /var
diff --git a/www/apache2/files/patch-configure b/www/apache2/files/patch-configure
index 2640a5466ac0..007d46173167 100644
--- a/www/apache2/files/patch-configure
+++ b/www/apache2/files/patch-configure
@@ -1,50 +1,32 @@
---- configure.orig	Wed Apr  4 12:45:36 2001
-+++ configure	Sat Apr 14 18:25:08 2001
-@@ -3760,7 +3760,9 @@
-       -e "s/[ 	]*$/'/g" \
-       $srcdir/config.layout > $pldconf
-   layout_name=$LAYOUT
-+  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
-   . $pldconf
-+  prefix=$prefix_backup
-   rm $pldconf
-   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
-@@ -3777,7 +3779,7 @@
-         ;;
-     esac
-     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
--    val=`echo $val | sed -e 's:$\([a-z_]*\):$(\1):g'`
-+    val=`echo $val | sed -e 's:$\([a-z_]*\):${\1}:g'`
-     if test "$autosuffix" = "yes"; then
-       if echo $val | grep apache >/dev/null; then
-         addtarget=no
-@@ -3788,7 +3790,7 @@
-         val="$val/apache"
-       fi
-     fi
--    eval "$var='$val'"
-+    eval "$var=\"$val\""
-   done
-   
+--- configure.orig	Tue Nov 13 04:07:39 2001
++++ configure	Fri Nov 16 23:32:52 2001
+@@ -1084,7 +1084,7 @@
+   esac
  
-@@ -9678,6 +9680,10 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr configured properly"
+   else
+@@ -1175,7 +1175,7 @@
+   esac
  
-   
-   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
-   
- 
-   
-@@ -9814,7 +9820,7 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr-util configured properly"
+   else
+@@ -10508,7 +10508,10 @@
  EOF
  
  cat >> confdefs.h <<EOF
 -#define SERVER_CONFIG_FILE "conf/$progname.conf"
 +#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
++#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
  EOF
  
  cat >> confdefs.h <<EOF
diff --git a/www/apache2/files/patch-docs:conf:httpd-std.conf b/www/apache2/files/patch-docs:conf:httpd-std.conf
index 928bc48b70d4..eb63c30ac79a 100644
--- a/www/apache2/files/patch-docs:conf:httpd-std.conf
+++ b/www/apache2/files/patch-docs:conf:httpd-std.conf
@@ -1,53 +1,24 @@
---- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
-+++ docs/conf/httpd-std.conf	Tue Oct 23 17:12:59 2001
+--- docs/conf/httpd-std.conf.orig	Fri Nov  9 07:31:28 2001
++++ docs/conf/httpd-std.conf	Sat Nov 17 01:49:29 2001
 @@ -64,7 +64,7 @@
- # PidFile: The file in which the server should record its process
- # identification number when it starts.
- #
--PidFile logs/httpd.pid
-+PidFile /var/run/httpd.pid
- 
- #
- # ScoreBoardFile: File used to store internal server process information.
-@@ -73,7 +73,7 @@
- # no two invocations of Apache share the same scoreboard file.
  #
+ <IfModule !mpm_winnt.c>
  <IfModule !perchild.c>
 -ScoreBoardFile logs/apache_runtime_status
 +ScoreBoardFile /var/run/apache_runtime_status
  </IfModule>
+ </IfModule>
+ 
+@@ -73,7 +73,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
  
  #
-@@ -182,6 +182,28 @@
- #
- # Example:
- # LoadModule foo_module modules/mod_foo.so
-+#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
-+#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
-+#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
-+#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
-+#LoadModule cgid_module			libexec/apache/mod_cgid.so
-+#LoadModule dav_module			libexec/apache/mod_dav.so
-+#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
-+#LoadModule digest_module		libexec/apache/mod_digest.so
-+#LoadModule expires_module		libexec/apache/mod_expires.so
-+#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
-+#LoadModule headers_module		libexec/apache/mod_headers.so
-+#LoadModule imap_module			libexec/apache/mod_imap.so
-+#LoadModule include_module		libexec/apache/mod_include.so
-+#LoadModule info_module			libexec/apache/mod_info.so
-+#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
-+#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
-+#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
-+#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
-+#LoadModule speling_module		libexec/apache/mod_speling.so
-+#LoadModule status_module		libexec/apache/mod_status.so
-+#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
-+#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
- 
- ### Section 2: 'Main' server configuration
- #
-@@ -220,8 +242,8 @@
+ # Timeout: The number of seconds before receives and sends time out.
+@@ -229,8 +229,8 @@
  #  when the value of (unsigned)Group is above 60000; 
  #  don't use Group #-1 on these systems!
  #
@@ -55,10 +26,10 @@
 -Group #-1
 +User www
 +Group www
+ </IfModule>
  
  #
- # ServerAdmin: Your address, where problems with the server should be
-@@ -249,7 +271,7 @@
+@@ -259,7 +259,7 @@
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  #
@@ -67,7 +38,7 @@
  
  #
  # Each directory to which Apache has access, can be configured with respect
-@@ -274,7 +296,7 @@
+@@ -284,7 +284,7 @@
  #
  # This should be changed to whatever you set DocumentRoot to.
  #
@@ -76,31 +47,7 @@
  
  #
  # This may also be "None", "All", or any combination of "Indexes",
-@@ -326,7 +348,22 @@
- # DirectoryIndex: Name of the file or files to use as a pre-written HTML
- # directory index.  Separate multiple entries with spaces.
- #
--DirectoryIndex index.html
-+<IfModule mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.php3 index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.php3 index.html
-+    </IfModule>
-+</IfModule>
-+<IfModule !mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.html
-+    </IfModule>
-+</IfModule>
- 
- #
- # AccessFileName: The name of the file to look for in each directory
-@@ -372,7 +409,7 @@
+@@ -377,7 +377,7 @@
  # TypesConfig describes where the mime.types file (or equivalent) is
  # to be found.
  #
@@ -109,8 +56,8 @@
  
  #
  # DefaultType is the default MIME type the server will use for a document
-@@ -397,7 +434,7 @@
- # module is part of the server.
+@@ -396,7 +396,7 @@
+ # directive tells the module where the hint definitions are located.
  #
  <IfModule mod_mime_magic.c>
 -    MIMEMagicFile conf/magic
@@ -118,7 +65,7 @@
  </IfModule>
  
  #
-@@ -417,7 +454,7 @@
+@@ -416,7 +416,7 @@
  # logged here.  If you *do* define an error logfile for a <VirtualHost>
  # container, that host's errors will be logged there and not here.
  #
@@ -127,7 +74,7 @@
  
  #
  # LogLevel: Control the number of messages logged to the error_log.
-@@ -442,7 +479,7 @@
+@@ -441,7 +441,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -136,7 +83,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -455,7 +492,7 @@
+@@ -454,7 +454,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -145,9 +92,9 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -474,9 +511,9 @@
- # require it to be present in the URL.  So "/icons" isn't aliased in this
- # example, only "/icons/"..
+@@ -478,9 +478,9 @@
+ # We include the /icons/ alias for FancyIndexed directory listings.  If you
+ # do not use FancyIndexing, you may comment this out.
  #
 -Alias /icons/ "@@ServerRoot@@/icons/"
 +Alias /icons/ "@@ServerRoot@@/www/icons/"
@@ -157,7 +104,19 @@
      Options Indexes MultiViews
      AllowOverride None
      Order allow,deny
-@@ -491,7 +528,7 @@
+@@ -492,9 +492,9 @@
+ # the manual, even if you choose to move your DocumentRoot.  You may comment
+ # this out if you do not care for the documentation.
+ #
+-Alias /manual "@@ServerRoot@@/manual"
++Alias /manual "@@ServerRoot@@/share/doc/apache"
+ 
+-<Directory "@@ServerRoot@@/manual">
++<Directory "@@ServerRoot@@/share/doc/apache">
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -509,21 +509,21 @@
  # The same rules about trailing "/" apply to ScriptAlias directives as to
  # Alias.
  #
@@ -166,7 +125,14 @@
  
  <IfModule mod_cgid.c>
  #
-@@ -505,7 +542,7 @@
+ # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
+ # for setting UNIX socket for communicating with cgid.
+ #
+-#Scriptsock            logs/cgisock
++Scriptsock            /var/run/cgisock
+ </IfModule>
+ 
+ #
  # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
  # CGI directory exists, if you have that configured.
  #
@@ -175,31 +141,24 @@
      AllowOverride None
      Options None
      Order allow,deny
-@@ -657,6 +694,7 @@
- AddLanguage ja .ja
- AddLanguage pl .po
- AddLanguage kr .kr
-+AddLanguage ko .kr
- AddLanguage pt .pt
- AddLanguage no .no
- AddLanguage pt-br .pt-br
-@@ -741,8 +779,17 @@
- # For example, the PHP3 module (not part of the Apache distribution - see
- # http://www.php.net) will typically use:
- #
--#AddType application/x-httpd-php3 .php3
--#AddType application/x-httpd-php3-source .phps
-+<IfModule mod_php3.c>
-+    AddType application/x-httpd-php3 .php3
-+    AddType application/x-httpd-php3-source .php3s
-+</IfModule>
-+#
-+# And for PHP 4.x, use:
-+#
-+<IfModule mod_php4.c>
-+    AddType application/x-httpd-php .php
-+    AddType application/x-httpd-php-source .phps
-+</IfModule>
- 
- AddType application/x-tar .tgz
+@@ -851,9 +851,9 @@
+ #
+ 
+ <IfModule mod_include.c>
+-    Alias /error/ "@@ServerRoot@@/error/"
++    Alias /error/ "@@ServerRoot@@/www/error/"
+ 
+-    <Directory "@@ServerRoot@@/error">
++    <Directory "@@ServerRoot@@/www/error">
+         AllowOverride None
+         Options IncludesNoExec
+         AddOutputFilter Includes html
+@@ -964,7 +964,7 @@
+ # Bring in additional module-specific configurations
+ #
+ <IfModule mod_ssl.c>
+-    Include conf/ssl.conf
++    Include etc/apache/ssl.conf
+ </IfModule>
+ 
  
diff --git a/www/apache2/files/patch-docs:conf:ssl-std.conf b/www/apache2/files/patch-docs:conf:ssl-std.conf
new file mode 100644
index 000000000000..f647b91fac48
--- /dev/null
+++ b/www/apache2/files/patch-docs:conf:ssl-std.conf
@@ -0,0 +1,96 @@
+--- docs/conf/ssl-std.conf.orig	Fri Nov 16 21:56:55 2001
++++ docs/conf/ssl-std.conf	Fri Nov 16 22:00:27 2001
+@@ -57,7 +57,7 @@
+ #SSLSessionCache        none
+ #SSLSessionCache        shmht:logs/ssl_scache(512000)
+ #SSLSessionCache        shmcb:logs/ssl_scache(512000)
+-SSLSessionCache         dbm:logs/ssl_scache
++SSLSessionCache         dbm:/var/log/httpd-ssl_scache
+ SSLSessionCacheTimeout  300
+ 
+ #   Semaphore:
+@@ -99,11 +99,11 @@
+ <VirtualHost _default_:443>
+ 
+ #  General setup for the virtual host
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ ServerName new.host.name:443
+ ServerAdmin you@your.address
+-ErrorLog logs/error_log
+-TransferLog logs/access_log
++ErrorLog /var/log/httpd-error.log
++TransferLog /var/log/httpd-access.log
+ 
+ #   SSL Engine Switch:
+ #   Enable/Disable SSL for this virtual host.
+@@ -122,16 +122,16 @@
+ #   built time. Keep in mind that if you've both a RSA and a DSA
+ #   certificate you can configure both in parallel (to also allow
+ #   the use of DSA ciphers, etc.)
+-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
+-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
++SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server.crt
++#SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server-dsa.crt
+ 
+ #   Server Private Key:
+ #   If the key is not combined with the certificate, use this
+ #   directive to point at the key file.  Keep in mind that if
+ #   you've both a RSA and a DSA private key you can configure
+ #   both in parallel (to also allow the use of DSA ciphers, etc.)
+-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
+-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
++SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server.key
++#SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server-dsa.key
+ 
+ #   Server Certificate Chain:
+ #   Point SSLCertificateChainFile at a file containing the
+@@ -140,7 +140,7 @@
+ #   the referenced file can be the same as SSLCertificateFile
+ #   when the CA certificates are directly appended to the server
+ #   certificate for convinience.
+-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
++#SSLCertificateChainFile @@ServerRoot@@/etc/apache/ssl.crt/ca.crt
+ 
+ #   Certificate Authority (CA):
+ #   Set the CA certificate verification path where to find CA
+@@ -149,8 +149,8 @@
+ #   Note: Inside SSLCACertificatePath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
+-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
++#SSLCACertificatePath @@ServerRoot@@/etc/apache/ssl.crt
++#SSLCACertificateFile @@ServerRoot@@/etc/apache/ssl.crt/ca-bundle.crt
+ 
+ #   Certificate Revocation Lists (CRL):
+ #   Set the CA revocation path where to find CA CRLs for client
+@@ -159,8 +159,8 @@
+ #   Note: Inside SSLCARevocationPath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
+-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
++#SSLCARevocationPath @@ServerRoot@@/etc/apache/ssl.crl
++#SSLCARevocationFile @@ServerRoot@@/etc/apache/ssl.crl/ca-bundle.crl
+ 
+ #   Client Authentication (Type):
+ #   Client certificate verification type and depth.  Types are
+@@ -220,7 +220,7 @@
+ <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+     SSLOptions +StdEnvVars
+ </Files>
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     SSLOptions +StdEnvVars
+ </Directory>
+ 
+@@ -255,7 +255,7 @@
+ #   Per-Server Logging:
+ #   The home of a custom SSL log file. Use this when you want a
+ #   compact non-error SSL logfile on a virtual host basis.
+-CustomLog logs/ssl_request_log \
++CustomLog /var/log/httpd-ssl_request.log \
+           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+ 
+ </VirtualHost>                                  
diff --git a/www/apache2/files/patch-include:httpd.h b/www/apache2/files/patch-include:httpd.h
deleted file mode 100644
index 9f8fdf34997b..000000000000
--- a/www/apache2/files/patch-include:httpd.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
-+++ include/httpd.h	Sat Apr  7 09:08:43 2001
-@@ -127,7 +127,7 @@
- /* Set default for OS/2 file system */
- #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
- #else
--#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
-+#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
- #endif
- #endif /* DOCUMENT_LOCATION */
- 
-@@ -144,7 +144,7 @@
- #if defined(OS2) || defined(WIN32)
- #define DEFAULT_ERRORLOG "logs/error.log"
- #else
--#define DEFAULT_ERRORLOG "logs/error_log"
-+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
- #endif
- #endif /* DEFAULT_ERRORLOG */
- 
-@@ -160,7 +160,7 @@
- 
- /* The name of the server config file */
- #ifndef SERVER_CONFIG_FILE
--#define SERVER_CONFIG_FILE "conf/httpd.conf"
-+#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
- #endif
- 
- /* Whether we should enable rfc1413 identity checking */
-@@ -247,7 +247,7 @@
- 
- /* The name of the MIME types file */
- #ifndef AP_TYPES_CONFIG_FILE
--#define AP_TYPES_CONFIG_FILE "conf/mime.types"
-+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
- #endif
- 
- /*
diff --git a/www/apache2/files/patch-srclib:apr-util:Makefile.in b/www/apache2/files/patch-srclib:apr-util:Makefile.in
deleted file mode 100644
index 652901dae28a..000000000000
--- a/www/apache2/files/patch-srclib:apr-util:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
-+++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
-@@ -22,8 +22,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -43,7 +43,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache2/files/patch-srclib:apr:Makefile.in b/www/apache2/files/patch-srclib:apr:Makefile.in
deleted file mode 100644
index 4c0292f73af8..000000000000
--- a/www/apache2/files/patch-srclib:apr:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
-+++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
-@@ -37,8 +37,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -58,7 +58,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    ./build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache2/files/patch-support:apachectl.in b/www/apache2/files/patch-support:apachectl.in
index 739a622d74de..f5b347b4633d 100644
--- a/www/apache2/files/patch-support:apachectl.in
+++ b/www/apache2/files/patch-support:apachectl.in
@@ -1,23 +1,22 @@
---- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
-+++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+--- support/apachectl.in.orig	Fri Nov 16 21:22:36 2001
++++ support/apachectl.in	Fri Nov 16 22:07:31 2001
 @@ -25,10 +25,10 @@
  # --------------------                              --------------------
  # 
  # the path to your PID file
--PIDFILE=@prefix@/logs/httpd.pid
-+PIDFILE=/var/run/httpd.pid
+-PIDFILE=@prefix@/logs/@progname@.pid
++PIDFILE=/var/run/@progname@.pid
  #
  # the path to your httpd binary, including options if necessary
--HTTPD='@prefix@/bin/httpd'
-+HTTPD='@prefix@/sbin/httpd'
+-HTTPD='@prefix@/bin/@progname@'
++HTTPD='@prefix@/sbin/@progname@'
  #
  # a command that outputs a formatted text version of the HTML at the
  # url given on the command line.  Designed for lynx, however other
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
-+
 +eval `limits -e -C daemon` >/dev/null 2>&1
  
  ERROR=0
diff --git a/www/apache2/files/patch-support:apxs.in b/www/apache2/files/patch-support:apxs.in
index 70ca84075675..9ababb75322e 100644
--- a/www/apache2/files/patch-support:apxs.in
+++ b/www/apache2/files/patch-support:apxs.in
@@ -1,11 +1,20 @@
---- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
-+++ support/apxs.in	Sat Apr  7 11:55:28 2001
-@@ -73,7 +73,7 @@
- my $prefix            = "$CFG_PREFIX";
- my $CFG_EXEC_PREFIX   = "@exec_prefix@";
- my $exec_prefix       = "$CFG_EXEC_PREFIX";
--my $CFG_SBINDIR       = "@bindir@";
-+my $CFG_SBINDIR       = "@sbindir@";
- my $CFG_INCLUDEDIR    = "@includedir@";
- my $CFG_LIBEXECDIR    = "@libexecdir@";
- my $CFG_SYSCONFDIR    = "@sysconfdir@";
+--- support/apxs.in.orig	Sat Nov  3 05:09:20 2001
++++ support/apxs.in	Sat Nov 17 02:51:43 2001
+@@ -66,7 +66,7 @@
+ 
+ # read the configuration variables once
+ my %config_vars = ();
+-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
++get_config_vars("$prefix/share/mk/apache/config_vars.mk",\%config_vars);
+ 
+ my $exec_prefix    = get_vars("exec_prefix");
+ my $CFG_TARGET     = get_vars("progname");
+@@ -218,7 +218,7 @@
+ ##
+ ##  Initial shared object support check
+ ##
+-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
++my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+ 
diff --git a/www/apache2/files/patch-support:log_server_status.in b/www/apache2/files/patch-support:log_server_status.in
index 3549aa89f8c5..d8a970ebe8cd 100644
--- a/www/apache2/files/patch-support:log_server_status.in
+++ b/www/apache2/files/patch-support:log_server_status.in
@@ -1,15 +1,15 @@
---- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
-+++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+--- support/log_server_status.in.orig	Fri Nov 16 22:11:16 2001
++++ support/log_server_status.in	Fri Nov 16 22:13:50 2001
 @@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
 -$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "/var/log/httpd-status-";
++$wherelog = "/var/log/httpd-status-";  # Logs will be like "/var/log/httpd-status-19960312.log"
  $server = "localhost";          # Name of server, could be "www.foo.com"
  $port = "80";                   # Port on server
 -$request = "/status/?auto";     # Request to send
-+$request = "/server-status/?auto";     # Request to send
++$request = "/status-status/?auto";     # Request to send
  
  sub tcp_connect
  {
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 95616fc8a1c6..d13c6b6e7a9a 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -1,490 +1,759 @@
-bin/htpasswd
-bin/htdigest
+etc/apache/highperformance-std.conf
+etc/apache/highperformance.conf
+etc/apache/httpd-std.conf
+etc/apache/httpd.conf
+etc/apache/magic
+etc/apache/mime.types
+etc/apache/ssl-std.conf
+etc/apache/ssl.conf
+@dirrm etc/apache
 etc/rc.d/apache.sh
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types.default
-@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/highperformance-std.conf %D/etc/apache/highperformance-std.conf.default; then rm -f %D/etc/apache/highperformance-std.conf; fi
-etc/apache/highperformance-std.conf.default
-@exec [ ! -f %B/highperformance-std.conf ] && cp %B/%f %B/highperformance-std.conf
-@unexec if cmp -s %D/etc/apache/highperformance.conf %D/etc/apache/highperformance.conf.default; then rm -f %D/etc/apache/highperformance.conf; fi
-etc/apache/highperformance.conf.default
-@exec [ ! -f %B/highperformance.conf ] && cp %B/%f %B/highperformance.conf
-@unexec if cmp -s %D/etc/apache/httpd-std.conf %D/etc/apache/httpd-std.conf.default; then rm -f %D/etc/apache/httpd-std.conf; fi
-etc/apache/httpd-std.conf.default
-@exec [ ! -f %B/httpd-std.conf ] && cp %B/%f %B/httpd-std.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+include/apache/ap_compat.h
+include/apache/ap_config.h
+include/apache/ap_config_auto.h
+include/apache/ap_listen.h
+include/apache/ap_mmn.h
+include/apache/ap_mpm.h
+include/apache/ap_release.h
 include/apache/apr.h
-include/apache/apr_want.h
-include/apache/apr_uuid.h
-include/apache/apr_user.h
-include/apache/apr_time.h
-include/apache/apr_thread_proc.h
-include/apache/apr_tables.h
-include/apache/apr_strings.h
-include/apache/apr_signal.h
-include/apache/apr_shmem.h
-include/apache/apr_portable.h
-include/apache/apr_pools.h
-include/apache/apr_network_io.h
-include/apache/apr_mmap.h
-include/apache/apr_md5.h
-include/apache/apr_lock.h
-include/apache/apr_lib.h
-include/apache/apr_hash.h
-include/apache/apr_getopt.h
-include/apache/apr_general.h
-include/apache/apr_fnmatch.h
-include/apache/apr_file_io.h
-include/apache/apr_file_info.h
-include/apache/apr_errno.h
-include/apache/apr_dso.h
+include/apache/apr_base64.h
+include/apache/apr_buckets.h
 include/apache/apr_compat.h
+include/apache/apr_date.h
+include/apache/apr_dbm.h
+include/apache/apr_dso.h
+include/apache/apr_errno.h
+include/apache/apr_file_info.h
+include/apache/apr_file_io.h
+include/apache/apr_fnmatch.h
+include/apache/apr_general.h
+include/apache/apr_getopt.h
+include/apache/apr_hash.h
+include/apache/apr_hooks.h
+include/apache/apr_inherit.h
+include/apache/apr_ldap.h
+include/apache/apr_lib.h
+include/apache/apr_lock.h
+include/apache/apr_md4.h
+include/apache/apr_md5.h
+include/apache/apr_mmap.h
+include/apache/apr_network_io.h
+include/apache/apr_optional.h
+include/apache/apr_optional_hooks.h
+include/apache/apr_pools.h
+include/apache/apr_portable.h
+include/apache/apr_proc_mutex.h
+include/apache/apr_ring.h
+include/apache/apr_sdbm.h
+include/apache/apr_sha1.h
+include/apache/apr_shmem.h
+include/apache/apr_signal.h
+include/apache/apr_strings.h
+include/apache/apr_tables.h
+include/apache/apr_thread_cond.h
+include/apache/apr_thread_mutex.h
+include/apache/apr_thread_proc.h
+include/apache/apr_thread_rwlock.h
+include/apache/apr_time.h
+include/apache/apr_uri.h
+include/apache/apr_user.h
+include/apache/apr_uuid.h
+include/apache/apr_want.h
 include/apache/apr_xlate.h
-include/apache/apr_base64.h
-include/apache/apu.h
 include/apache/apr_xml.h
-include/apache/apr_sha1.h
-include/apache/apr_sdbm.h
-include/apache/apr_ring.h
-include/apache/apr_optional.h
-include/apache/apr_hooks.h
-include/apache/apr_generic_hook.h
-include/apache/apr_dbm.h
-include/apache/apr_buckets.h
+include/apache/apu.h
 include/apache/apu_compat.h
-include/apache/ap_compat.h
-include/apache/util_uri.h
-include/apache/util_script.h
-include/apache/util_md5.h
-include/apache/util_filter.h
-include/apache/util_ebcdic.h
-include/apache/util_date.h
-include/apache/util_charset.h
-include/apache/util_cfgtree.h
-include/apache/scoreboard.h
-include/apache/rfc1413.h
-include/apache/pcreposix.h
-include/apache/mpm_common.h
-include/apache/httpd.h
-include/apache/http_vhost.h
-include/apache/http_request.h
-include/apache/http_protocol.h
-include/apache/http_main.h
-include/apache/http_log.h
-include/apache/http_core.h
-include/apache/http_connection.h
+include/apache/config.h
+include/apache/expat.h
 include/apache/http_config.h
-include/apache/ap_release.h
-include/apache/ap_mpm.h
-include/apache/ap_mmn.h
-include/apache/ap_listen.h
-include/apache/ap_config_auto.h
-include/apache/ap_config.h
-include/apache/util_xml.h
-include/apache/os.h
-include/apache/os-inline.c
-include/apache/mpm_default.h
-include/apache/mpm.h
+include/apache/http_connection.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/internal.h
+include/apache/mod_cgi.h
+include/apache/mod_core.h
 include/apache/mod_dav.h
 include/apache/mod_include.h
+include/apache/mod_proxy.h
+include/apache/mod_ssl.h
+include/apache/mpm.h
+include/apache/mpm_common.h
+include/apache/mpm_default.h
+include/apache/os.h
 include/apache/pcre.h
-include/apache/internal.h
-include/apache/config.h
+include/apache/pcreposix.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+include/apache/ssl_expr.h
+include/apache/ssl_expr_parse.h
+include/apache/ssl_util_ssl.h
+include/apache/ssl_util_table.h
 include/apache/unixd.h
-lib/libapr.la
+include/apache/util_cfgtree.h
+include/apache/util_charset.h
+include/apache/util_ebcdic.h
+include/apache/util_filter.h
+include/apache/util_ldap.h
+include/apache/util_md5.h
+include/apache/util_script.h
+include/apache/util_time.h
+include/apache/util_xml.h
+@dirrm include/apache
+lib/APRVARS
 lib/libapr.a
-lib/libaprutil.la
+lib/libapr.la
+lib/libapr.so.0
 lib/libaprutil.a
-libexec/apache/mod_auth_anon.so
+lib/libaprutil.la
+lib/libaprutil.so.0
+lib/libexpat.a
+lib/libexpat.la
+lib/libexpat.so.1
+libexec/apache/httpd.exp
+libexec/apache/mod_access.la
+libexec/apache/mod_access.so
+libexec/apache/mod_actions.la
+libexec/apache/mod_actions.so
+libexec/apache/mod_alias.la
+libexec/apache/mod_alias.so
+libexec/apache/mod_asis.la
+libexec/apache/mod_asis.so
+libexec/apache/mod_auth.la
+libexec/apache/mod_auth.so
 libexec/apache/mod_auth_anon.la
-libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_anon.so
 libexec/apache/mod_auth_db.la
-libexec/apache/mod_auth_digest.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_dbm.la
+libexec/apache/mod_auth_dbm.so
 libexec/apache/mod_auth_digest.la
-libexec/apache/mod_file_cache.so
-libexec/apache/mod_file_cache.la
-libexec/apache/mod_dav_fs.so
-libexec/apache/mod_dav_fs.la
-libexec/apache/mod_dav.so
-libexec/apache/mod_dav.la
-libexec/apache/mod_echo.so
-libexec/apache/mod_echo.la
-libexec/apache/mod_optional_fn_import.so
-libexec/apache/mod_optional_fn_import.la
-libexec/apache/mod_optional_fn_export.so
-libexec/apache/mod_optional_fn_export.la
-libexec/apache/mod_include.so
-libexec/apache/mod_include.la
-libexec/apache/mod_imap.so
-libexec/apache/mod_imap.la
-libexec/apache/mod_speling.so
-libexec/apache/mod_speling.la
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_rewrite.la
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mime_magic.la
-libexec/apache/mod_cern_meta.so
+libexec/apache/mod_auth_digest.so
+libexec/apache/mod_autoindex.la
+libexec/apache/mod_autoindex.so
+%%CACHEOPT%%libexec/apache/mod_cache.la
+%%CACHEOPT%%libexec/apache/mod_cache.so
 libexec/apache/mod_cern_meta.la
-libexec/apache/mod_expires.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_cgi.la
+libexec/apache/mod_cgi.so
+libexec/apache/mod_cgid.la
+libexec/apache/mod_cgid.so
+libexec/apache/mod_dav.la
+libexec/apache/mod_dav.so
+libexec/apache/mod_dav_fs.la
+libexec/apache/mod_dav_fs.so
+libexec/apache/mod_dir.la
+libexec/apache/mod_dir.so
+libexec/apache/mod_env.la
+libexec/apache/mod_env.so
 libexec/apache/mod_expires.la
-libexec/apache/mod_headers.so
+libexec/apache/mod_expires.so
+%%CACHEOPT%%libexec/apache/mod_file_cache.la
+%%CACHEOPT%%libexec/apache/mod_file_cache.so
 libexec/apache/mod_headers.la
-libexec/apache/mod_usertrack.so
-libexec/apache/mod_usertrack.la
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_unique_id.la
-libexec/apache/mod_status.so
-libexec/apache/mod_status.la
-libexec/apache/mod_info.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_imap.la
+libexec/apache/mod_imap.so
+libexec/apache/mod_include.la
+libexec/apache/mod_include.so
 libexec/apache/mod_info.la
-libexec/apache/mod_cgid.so
-libexec/apache/mod_cgid.la
-libexec/apache/httpd.exp
-sbin/rotatelogs
-sbin/htpasswd
-sbin/logresolve
+libexec/apache/mod_info.so
+libexec/apache/mod_log_config.la
+libexec/apache/mod_log_config.so
+%%CACHEOPT%%libexec/apache/mod_mem_cache.la
+%%CACHEOPT%%libexec/apache/mod_mem_cache.so
+libexec/apache/mod_mime.la
+libexec/apache/mod_mime.so
+libexec/apache/mod_mime_magic.la
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_negotiation.la
+libexec/apache/mod_negotiation.so
+%%PROXYOPT%%libexec/apache/mod_proxy.la
+%%PROXYOPT%%libexec/apache/mod_proxy.so
+%%PROXYOPT%%libexec/apache/mod_proxy_connect.la
+%%PROXYOPT%%libexec/apache/mod_proxy_connect.so
+%%PROXYOPT%%libexec/apache/mod_proxy_ftp.la
+%%PROXYOPT%%libexec/apache/mod_proxy_ftp.so
+%%PROXYOPT%%libexec/apache/mod_proxy_http.la
+%%PROXYOPT%%libexec/apache/mod_proxy_http.so
+libexec/apache/mod_rewrite.la
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_setenvif.la
+libexec/apache/mod_setenvif.so
+libexec/apache/mod_speling.la
+libexec/apache/mod_speling.so
+%%SSLOPT%%libexec/apache/mod_ssl.la
+%%SSLOPT%%libexec/apache/mod_ssl.so
+libexec/apache/mod_status.la
+libexec/apache/mod_status.so
+libexec/apache/mod_unique_id.la
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_userdir.la
+libexec/apache/mod_userdir.so
+libexec/apache/mod_usertrack.la
+libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.la
+libexec/apache/mod_vhost_alias.so
+@dirrm libexec/apache
 sbin/ab
 sbin/apachectl
 sbin/apxs
+sbin/checkgid
+sbin/dbmmanage
+sbin/htdigest
+sbin/htpasswd
 sbin/httpd
-share/doc/apache/README.rus
+sbin/logresolve
+sbin/rotatelogs
+%%PORTDOCS%%share/doc/apache/LICENSE
+%%PORTDOCS%%share/doc/apache/bind.html
+%%PORTDOCS%%share/doc/apache/cgi_path.html
+%%PORTDOCS%%share/doc/apache/configuring.html.en
+%%PORTDOCS%%share/doc/apache/configuring.html.ja.jis
+%%PORTDOCS%%share/doc/apache/content-negotiation.html
+%%PORTDOCS%%share/doc/apache/custom-error.html
+%%PORTDOCS%%share/doc/apache/developer/API.html
+%%PORTDOCS%%share/doc/apache/developer/debugging.html
+%%PORTDOCS%%share/doc/apache/developer/documenting.html
+%%PORTDOCS%%share/doc/apache/developer/footer.html
+%%PORTDOCS%%share/doc/apache/developer/header.html
+%%PORTDOCS%%share/doc/apache/developer/hooks.html
+%%PORTDOCS%%share/doc/apache/developer/index.html
+%%PORTDOCS%%share/doc/apache/developer/layeredio.html
+%%PORTDOCS%%share/doc/apache/developer/modules.html
+%%PORTDOCS%%share/doc/apache/developer/request.html
+%%PORTDOCS%%share/doc/apache/dns-caveats.html
+%%PORTDOCS%%share/doc/apache/dso.html
+%%PORTDOCS%%share/doc/apache/ebcdic.html
+%%PORTDOCS%%share/doc/apache/env.html
+%%PORTDOCS%%share/doc/apache/faq/footer.html
+%%PORTDOCS%%share/doc/apache/faq/header.html
+%%PORTDOCS%%share/doc/apache/faq/index.html
+%%PORTDOCS%%share/doc/apache/faq/support.html
+%%PORTDOCS%%share/doc/apache/filter.html
+%%PORTDOCS%%share/doc/apache/footer.html
+%%PORTDOCS%%share/doc/apache/handler.html.en
+%%PORTDOCS%%share/doc/apache/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache/header.html
+%%PORTDOCS%%share/doc/apache/howto/auth.html
+%%PORTDOCS%%share/doc/apache/howto/cgi.html.en
+%%PORTDOCS%%share/doc/apache/howto/cgi.html.ja.jis
+%%PORTDOCS%%share/doc/apache/howto/footer.html
+%%PORTDOCS%%share/doc/apache/howto/header.html
+%%PORTDOCS%%share/doc/apache/howto/ssi.html.en
+%%PORTDOCS%%share/doc/apache/howto/ssi.html.ja.jis
+%%PORTDOCS%%share/doc/apache/images/apache_header.gif
+%%PORTDOCS%%share/doc/apache/images/apache_header.png
+%%PORTDOCS%%share/doc/apache/images/custom_errordocs.gif
+%%PORTDOCS%%share/doc/apache/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache/images/home.gif
+%%PORTDOCS%%share/doc/apache/images/home.png
+%%PORTDOCS%%share/doc/apache/images/index.gif
+%%PORTDOCS%%share/doc/apache/images/index.png
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.fig
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.gif
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.png
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.fig
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.gif
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.png
+%%PORTDOCS%%share/doc/apache/images/pixel.gif
+%%PORTDOCS%%share/doc/apache/images/pixel.png
+%%PORTDOCS%%share/doc/apache/images/sub.gif
+%%PORTDOCS%%share/doc/apache/images/sub.png
+%%PORTDOCS%%share/doc/apache/index.html.en
+%%PORTDOCS%%share/doc/apache/index.html.fr
+%%PORTDOCS%%share/doc/apache/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache/install.html
+%%PORTDOCS%%share/doc/apache/invoking.html
+%%PORTDOCS%%share/doc/apache/logs.html
+%%PORTDOCS%%share/doc/apache/misc/custom_errordocs.html
+%%PORTDOCS%%share/doc/apache/misc/descriptors.html
+%%PORTDOCS%%share/doc/apache/misc/fin_wait_2.html
+%%PORTDOCS%%share/doc/apache/misc/footer.html
+%%PORTDOCS%%share/doc/apache/misc/header.html
+%%PORTDOCS%%share/doc/apache/misc/index.html
+%%PORTDOCS%%share/doc/apache/misc/known_client_problems.html
+%%PORTDOCS%%share/doc/apache/misc/perf-tuning.html
+%%PORTDOCS%%share/doc/apache/misc/rewriteguide.html
+%%PORTDOCS%%share/doc/apache/misc/security_tips.html
+%%PORTDOCS%%share/doc/apache/misc/tutorials.html
+%%PORTDOCS%%share/doc/apache/mod/core.html
+%%PORTDOCS%%share/doc/apache/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache/mod/directives.html
+%%PORTDOCS%%share/doc/apache/mod/footer.html
+%%PORTDOCS%%share/doc/apache/mod/header.html
+%%PORTDOCS%%share/doc/apache/mod/index-bytype.html
+%%PORTDOCS%%share/doc/apache/mod/index.html
+%%PORTDOCS%%share/doc/apache/mod/mod_TEMPLATE.html
+%%PORTDOCS%%share/doc/apache/mod/mod_access.html
+%%PORTDOCS%%share/doc/apache/mod/mod_actions.html
+%%PORTDOCS%%share/doc/apache/mod/mod_alias.html
+%%PORTDOCS%%share/doc/apache/mod/mod_asis.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_db.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_autoindex.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cern_meta.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cgi.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cgid.html
+%%PORTDOCS%%share/doc/apache/mod/mod_charset_lite.html
+%%PORTDOCS%%share/doc/apache/mod/mod_dav.html
+%%PORTDOCS%%share/doc/apache/mod/mod_dir.html
+%%PORTDOCS%%share/doc/apache/mod/mod_env.html
+%%PORTDOCS%%share/doc/apache/mod/mod_example.html
+%%PORTDOCS%%share/doc/apache/mod/mod_expires.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ext_filter.html
+%%PORTDOCS%%share/doc/apache/mod/mod_file_cache.html
+%%PORTDOCS%%share/doc/apache/mod/mod_headers.html
+%%PORTDOCS%%share/doc/apache/mod/mod_imap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_include.html
+%%PORTDOCS%%share/doc/apache/mod/mod_info.html
+%%PORTDOCS%%share/doc/apache/mod/mod_isapi.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ldap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_log_config.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mime.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mime_magic.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mmap_static.html
+%%PORTDOCS%%share/doc/apache/mod/mod_negotiation.html
+%%PORTDOCS%%share/doc/apache/mod/mod_proxy.html
+%%PORTDOCS%%share/doc/apache/mod/mod_rewrite.html
+%%PORTDOCS%%share/doc/apache/mod/mod_setenvif.html
+%%PORTDOCS%%share/doc/apache/mod/mod_so.html
+%%PORTDOCS%%share/doc/apache/mod/mod_speling.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ssl.html
+%%PORTDOCS%%share/doc/apache/mod/mod_status.html
+%%PORTDOCS%%share/doc/apache/mod/mod_suexec.html
+%%PORTDOCS%%share/doc/apache/mod/mod_unique_id.html
+%%PORTDOCS%%share/doc/apache/mod/mod_userdir.html
+%%PORTDOCS%%share/doc/apache/mod/mod_usertrack.html
+%%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html
+%%PORTDOCS%%share/doc/apache/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_common.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html
+%%PORTDOCS%%share/doc/apache/mod/perchild.html
+%%PORTDOCS%%share/doc/apache/mod/prefork.html
+%%PORTDOCS%%share/doc/apache/mod/threaded.html
+%%PORTDOCS%%share/doc/apache/mpm.html
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.en
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr
+%%PORTDOCS%%share/doc/apache/platform/footer.html
+%%PORTDOCS%%share/doc/apache/platform/header.html
+%%PORTDOCS%%share/doc/apache/platform/perf-hp.html
+%%PORTDOCS%%share/doc/apache/platform/win_compiling.html
+%%PORTDOCS%%share/doc/apache/platform/win_service.html
+%%PORTDOCS%%share/doc/apache/platform/windows.html
+%%PORTDOCS%%share/doc/apache/programs/ab.html
+%%PORTDOCS%%share/doc/apache/programs/apachectl.html
+%%PORTDOCS%%share/doc/apache/programs/apxs.html
+%%PORTDOCS%%share/doc/apache/programs/dbmmanage.html
+%%PORTDOCS%%share/doc/apache/programs/footer.html
+%%PORTDOCS%%share/doc/apache/programs/header.html
+%%PORTDOCS%%share/doc/apache/programs/htdigest.html
+%%PORTDOCS%%share/doc/apache/programs/htpasswd.html
+%%PORTDOCS%%share/doc/apache/programs/httpd.html
+%%PORTDOCS%%share/doc/apache/programs/index.html
+%%PORTDOCS%%share/doc/apache/programs/logresolve.html
+%%PORTDOCS%%share/doc/apache/programs/other.html
+%%PORTDOCS%%share/doc/apache/programs/rotatelogs.html
+%%PORTDOCS%%share/doc/apache/programs/suexec.html
+%%PORTDOCS%%share/doc/apache/search/manual-index.cgi
+%%PORTDOCS%%share/doc/apache/sections.html
+%%PORTDOCS%%share/doc/apache/server-wide.html.en
+%%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache/ssl/Makefile
+%%PORTDOCS%%share/doc/apache/ssl/footer.html
+%%PORTDOCS%%share/doc/apache/ssl/header.html
+%%PORTDOCS%%share/doc/apache/ssl/index.html
+%%PORTDOCS%%share/doc/apache/ssl/mod_ssl_sb.gif
+%%PORTDOCS%%share/doc/apache/ssl/openssl_ics.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_logo.jpg
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_title.jpg
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig2.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig3.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview_fig1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-chapter.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-2.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-3.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-4.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-5.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-6.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-7.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-000000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-transp.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.inc
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-n.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-s.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-n.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-s.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-abstract.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-compat.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-faq.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-gloss.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-howto.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-intro.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-over.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-preface.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-ref.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-toc.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-tutor.gif
+%%PORTDOCS%%share/doc/apache/stopping.html
+%%PORTDOCS%%share/doc/apache/suexec.html
+%%PORTDOCS%%share/doc/apache/upgrading.html.en
+%%PORTDOCS%%share/doc/apache/upgrading.html.fr
+%%PORTDOCS%%share/doc/apache/urlmapping.html
+%%PORTDOCS%%share/doc/apache/vhosts/details.html
+%%PORTDOCS%%share/doc/apache/vhosts/examples.html
+%%PORTDOCS%%share/doc/apache/vhosts/fd-limits.html
+%%PORTDOCS%%share/doc/apache/vhosts/footer.html
+%%PORTDOCS%%share/doc/apache/vhosts/header.html
+%%PORTDOCS%%share/doc/apache/vhosts/index.html
+%%PORTDOCS%%share/doc/apache/vhosts/ip-based.html
+%%PORTDOCS%%share/doc/apache/vhosts/mass.html
+%%PORTDOCS%%share/doc/apache/vhosts/name-based.html
+%%PORTDOCS%%@dirrm share/doc/apache/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache/ssl
+%%PORTDOCS%%@dirrm share/doc/apache/search
+%%PORTDOCS%%@dirrm share/doc/apache/programs
+%%PORTDOCS%%@dirrm share/doc/apache/platform
+%%PORTDOCS%%@dirrm share/doc/apache/mod
+%%PORTDOCS%%@dirrm share/doc/apache/misc
+%%PORTDOCS%%@dirrm share/doc/apache/images
+%%PORTDOCS%%@dirrm share/doc/apache/howto
+%%PORTDOCS%%@dirrm share/doc/apache/faq
+%%PORTDOCS%%@dirrm share/doc/apache/developer
+%%PORTDOCS%%@dirrm share/doc/apache
+share/mk/apache/config_vars.mk
+share/mk/apache/library.mk
+share/mk/apache/libtool
+share/mk/apache/ltlib.mk
+share/mk/apache/program.mk
+share/mk/apache/rules.mk
+share/mk/apache/special.mk
+@dirrm share/mk/apache
+@dirrm share/mk
 @exec mkdir -p %D/www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
-@exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/index.html.tw
-share/doc/apache/index.html.se
-share/doc/apache/index.html.ru.utf8
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.ltz
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.kr.iso2022-kr
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.ja.iso2022-jp
-share/doc/apache/index.html.it
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.et
-share/doc/apache/index.html.es
-share/doc/apache/index.html.en
-share/doc/apache/index.html.el
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.de
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.ca
-share/doc/apache/apache_pb.gif
-share/doc/apache/index.html.tw.Big5
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/client_block_api.html
-share/doc/apache/manual/misc/compat_notes.html
-share/doc/apache/manual/misc/custom_errordocs.html
-share/doc/apache/manual/misc/descriptors.html
-share/doc/apache/manual/misc/fin_wait_2.html
-share/doc/apache/manual/misc/footer.html
-share/doc/apache/manual/misc/header.html
-share/doc/apache/manual/misc/howto.html
-share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/rewriteguide.html
-share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/API.html
-share/doc/apache/manual/developer/modules.html
-share/doc/apache/manual/developer/documenting
-share/doc/apache/manual/developer/footer.html
-share/doc/apache/manual/developer/header.html
-share/doc/apache/manual/developer/hooks.html
-share/doc/apache/manual/developer/index.html
-share/doc/apache/manual/developer/layeredio.html
-share/doc/apache/manual/developer/debugging.html
-share/doc/apache/manual/platform/windows.html
-share/doc/apache/manual/platform/header.html
-share/doc/apache/manual/platform/netware.html
-share/doc/apache/manual/platform/perf-bsd44.html
-share/doc/apache/manual/platform/perf-dec.html
-share/doc/apache/manual/platform/perf-hp.html
-share/doc/apache/manual/platform/perf.html
-share/doc/apache/manual/platform/readme-tpf.html
-share/doc/apache/manual/platform/unixware.html
-share/doc/apache/manual/platform/win_compiling.html
-share/doc/apache/manual/platform/win_service.html
-share/doc/apache/manual/platform/footer.html
-share/doc/apache/manual/mod/threaded.html
-share/doc/apache/manual/mod/directive-dict.html
-share/doc/apache/manual/mod/directives.html
-share/doc/apache/manual/mod/footer.html
-share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index-bytype.html
-share/doc/apache/manual/mod/index.html
-share/doc/apache/manual/mod/mod_access.html
-share/doc/apache/manual/mod/mod_actions.html
-share/doc/apache/manual/mod/mod_alias.html
-share/doc/apache/manual/mod/mod_asis.html
-share/doc/apache/manual/mod/mod_auth.html
-share/doc/apache/manual/mod/mod_auth_anon.html
-share/doc/apache/manual/mod/mod_auth_db.html
-share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_digest.html
-share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_cern_meta.html
-share/doc/apache/manual/mod/mod_so.html
-share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_charset_lite.html
-share/doc/apache/manual/mod/mod_dav.html
-share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_env.html
-share/doc/apache/manual/mod/mod_example.html
-share/doc/apache/manual/mod/mod_expires.html
-share/doc/apache/manual/mod/mod_ext_filter.html
-share/doc/apache/manual/mod/mod_file_cache.html
-share/doc/apache/manual/mod/mod_headers.html
-share/doc/apache/manual/mod/mod_imap.html
-share/doc/apache/manual/mod/mod_include.html
-share/doc/apache/manual/mod/mod_info.html
-share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_mime.html
-share/doc/apache/manual/mod/mod_mime_magic.html
-share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html
-share/doc/apache/manual/mod/mod_proxy.html
-share/doc/apache/manual/mod/mod_rewrite.html
-share/doc/apache/manual/mod/mod_setenvif.html
-share/doc/apache/manual/mod/mod_speling.html
-share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.html
-share/doc/apache/manual/mod/mod_userdir.html
-share/doc/apache/manual/mod/mod_usertrack.html
-share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html
-share/doc/apache/manual/mod/mpm_common.html
-share/doc/apache/manual/mod/mpm_winnt.html
-share/doc/apache/manual/mod/perchild.html
-share/doc/apache/manual/mod/prefork.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/programs/apachectl.html
-share/doc/apache/manual/programs/apxs.html
-share/doc/apache/manual/programs/dbmmanage.html
-share/doc/apache/manual/programs/footer.html
-share/doc/apache/manual/programs/header.html
-share/doc/apache/manual/programs/htdigest.html
-share/doc/apache/manual/programs/htpasswd.html
-share/doc/apache/manual/programs/httpd.html
-share/doc/apache/manual/programs/index.html
-share/doc/apache/manual/programs/logresolve.html
-share/doc/apache/manual/programs/other.html
-share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/ab.html
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html
-share/doc/apache/manual/vhosts/footer.html
-share/doc/apache/manual/vhosts/header.html
-share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html
-share/doc/apache/manual/vhosts/ip-based.html
-share/doc/apache/manual/vhosts/mass.html
-share/doc/apache/manual/vhosts/name-based.html
-share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/new_features_2_0.html.fr
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/mpm.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/install.html
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html
-share/doc/apache/manual/header.html
-share/doc/apache/manual/handler.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/filter.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/custom-error.html
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/configuring.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/STATUS
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/upgrading.html.fr
-share/doc/apache/manual/upgrading.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/server-wide.html
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/process-model.html
-www/cgi-bin.default/test-cgi
+@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 www/cgi-bin.default/printenv
-www/icons/small/uu.gif
+www/cgi-bin.default/test-cgi
+www/cgi-bin.default/test-cgi.bat
+@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+www/data.default/apache_pb.gif
+www/data.default/apache_pb.png
+www/data.default/apache_pb2.gif
+www/data.default/apache_pb2.png
+www/data.default/apache_pb2_ani.gif
+www/data.default/error.README
+www/data.default/index.html.ca
+www/data.default/index.html.cz.iso8859-2
+www/data.default/index.html.de
+www/data.default/index.html.dk
+www/data.default/index.html.ee
+www/data.default/index.html.el
+www/data.default/index.html.en
+www/data.default/index.html.es
+www/data.default/index.html.et
+www/data.default/index.html.fr
+www/data.default/index.html.he.iso8859-8
+www/data.default/index.html.hr.iso8859-2
+www/data.default/index.html.it
+www/data.default/index.html.ja.iso2022-jp
+www/data.default/index.html.kr.iso2022-kr
+www/data.default/index.html.ltz.utf8
+www/data.default/index.html.lu.utf8
+www/data.default/index.html.nl
+www/data.default/index.html.nn
+www/data.default/index.html.no
+www/data.default/index.html.po.iso8859-2
+www/data.default/index.html.pt
+www/data.default/index.html.pt-br
+www/data.default/index.html.ru.cp-1251
+www/data.default/index.html.ru.cp866
+www/data.default/index.html.ru.iso-ru
+www/data.default/index.html.ru.koi8-r
+www/data.default/index.html.ru.utf8
+www/data.default/index.html.se
+www/data.default/index.html.tw
+www/data.default/index.html.tw.Big5
+www/data.default/index.html.var
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+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/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/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/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/README.txt
-www/icons/world1.gif
-www/icons/uuencoded.gif
-www/icons/uu.gif
-www/icons/up.gif
-www/icons/unknown.gif
-www/icons/transfer.gif
-www/icons/text.gif
-www/icons/tex.gif
-www/icons/tar.gif
-www/icons/sphere2.gif
-www/icons/sphere1.gif
-www/icons/sound2.gif
+www/icons/small/unknown.png
+www/icons/small/uu.gif
+www/icons/small/uu.png
 www/icons/sound1.gif
-www/icons/script.gif
-www/icons/screw2.gif
-www/icons/screw1.gif
-www/icons/right.gif
-www/icons/quill.gif
-www/icons/ps.gif
-www/icons/portal.gif
-www/icons/pie8.gif
-www/icons/pie7.gif
-www/icons/pie6.gif
-www/icons/pie5.gif
-www/icons/pie4.gif
-www/icons/pie3.gif
-www/icons/pie2.gif
-www/icons/pie1.gif
-www/icons/pie0.gif
-www/icons/pdf.gif
-www/icons/patch.gif
-www/icons/p.gif
-www/icons/movie.gif
-www/icons/link.gif
-www/icons/left.gif
-www/icons/layout.gif
-www/icons/index.gif
-www/icons/image3.gif
-www/icons/image2.gif
-www/icons/image1.gif
-www/icons/icon.sheet.gif
-www/icons/hand.up.gif
-www/icons/hand.right.gif
-www/icons/generic.sec.gif
-www/icons/generic.red.gif
-www/icons/generic.gif
-www/icons/forward.gif
-www/icons/folder.sec.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/f.gif
-www/icons/dvi.gif
-www/icons/down.gif
-www/icons/dir.gif
-www/icons/continued.gif
-www/icons/compressed.gif
-www/icons/comp.gray.gif
-www/icons/comp.blue.gif
-www/icons/c.gif
-www/icons/burst.gif
-www/icons/broken.gif
-www/icons/box2.gif
-www/icons/box1.gif
-www/icons/bomb.gif
-www/icons/blank.gif
-www/icons/binhex.gif
-www/icons/binary.gif
-www/icons/ball.red.gif
-www/icons/ball.gray.gif
-www/icons/back.gif
-www/icons/apache_pb.gif
-www/icons/alert.red.gif
-www/icons/alert.black.gif
-www/icons/a.gif
+www/icons/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/README
-@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
-@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
-@dirrm etc/apache
-@dirrm include/apache
-@dirrm libexec/apache
-@dirrm share/doc/apache/manual/vhosts
-@dirrm share/doc/apache/manual/search
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/platform
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/developer
-@dirrm share/doc/apache/manual
-@dirrm share/doc/apache
+www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
+@dirrm www/error/include
+@dirrm www/error
+@dirrm www/data.default
 @dirrm www/cgi-bin.default
 @dirrm www
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index ea501e6245d5..48f99ccca4a3 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -6,19 +6,14 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.16
-PORTREVISION=	3
+PORTVERSION=	2.0.28
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
-		http://www.cybernic.com/mirror/dist/httpd/ \
-		http://mirrors.partnersforever.net/apache/dist/httpd/ \
-		http://www.technotopia.com/vroom/apache/dist/httpd/ \
-		http://www.tux.org/pub/net/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
+MASTER_SITES=	http://www.apache.org/dist/httpd/ \
+		http://apache.mirrorcentral.com/dist/httpd/ \
+		http://apache.missouri.edu/dist/httpd/ \
+		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
-		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
 DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
 
 MAINTAINER?=	perky@fallin.lv
@@ -26,46 +21,61 @@ MAINTAINER?=	perky@fallin.lv
 LATEST_LINK=	apache2
 
 WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
-FIND?=		find
-XARGS?=		xargs
-
-# apache2 doesn't process '--enable-share=max' option yet.
-# and some modules are very unstable at DSO mode.
-SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
-		auth_anon digest headers cern_meta expires include \
-		cgid status info usertrack dav dav_fs imap proxy \
-		auth_digest file_cache echo optional_fn_import \
-		optional_fn_export
-STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
-		userdir alias asis cgi mime log_config vhost_alias actions
+FIND=		find
+
+WITH_MPM?=	prefork # or perchild, threaded
+HTTP_PORT?=	80
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	\
-		--prefix=${PREFIX} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
+		--enable-so \
 		--with-suexec-docroot=${PREFIX}/www/data \
-		--enable-shared \
-		--disable-threads \
-		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
+		--with-mpm=${WITH_MPM} \
+		--with-port=${HTTP_PORT} \
+		--includedir=${PREFIX}/include/apache # for apr, apr-util
+CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+SHARED_MODULES=	all cgid
+
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	NOPORTDOCS=YES
+.endif
+
+.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+SHARED_MODULES+= ssl
+PLIST_SUB+=	SSLOPT=""
+.else
+PLIST_SUB+=	SSLOPT="@comment "
+.endif
+
+.if !defined(WITHOUT_PROXY)
+SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
+PLIST_SUB+=	PROXYOPT=""
+.else
+PLIST_SUB+=	PROXYOPT="@comment "
+.endif
 
-OPTIM+=		-DHARD_SERVER_LIMIT=512 \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+.if !defined(WITHOUT_CACHE)
+SHARED_MODULES+= cache mem-cache file-cache #disk-cache
+PLIST_SUB+=	CACHEOPT=""
+.else
+PLIST_SUB+=	CACHEOPT="@comment "
+.endif
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}'
+CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
 
-.for mod in ${SHARED_MODS}
-CONFIGURE_ARGS+= --enable-${mod}=shared
-.endfor
-.for mod in ${STATIC_MODS}
-CONFIGURE_ARGS+= --enable-${mod}=yes
-.endfor
+pre-extract:
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
+.endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
+	@${FIND} ${WRKSRC} -name "*.orig" -exec rm -f {} \;
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index 3802044557de..61e9645cec3b 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1 +1 @@
-MD5 (httpd-2_0_16-beta.tar.gz) = 364fc61593185789cb9744bae1ebb655
+MD5 (httpd-2_0_28-beta.tar.gz) = 99a10290773221f16fd86383c598da0e
diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in
index 341c8dfd087f..4c26f2dcc806 100644
--- a/www/apache20/files/patch-Makefile.in
+++ b/www/apache20/files/patch-Makefile.in
@@ -1,123 +1,45 @@
---- Makefile.in.orig	Wed Apr  4 02:03:35 2001
-+++ Makefile.in	Sun Apr  8 06:06:58 2001
-@@ -16,7 +16,7 @@
- targets         = $(PROGRAMS) $(other_targets)
- phony_targets   = $(srcdir)/buildmark.c
- install_targets = install-conf install-htdocs install-icons install-other \
--	install-cgi install-include install-support install-suexec
-+	install-cgi install-include install-support install-manpages install-suexec
- DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
- 	configure generated_lists include/ap_config_auto.h \
- 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
-@@ -28,25 +28,32 @@
- install-conf:
- 	@echo Installing configuration files
- 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
-+
- 	@cd docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(sysconfdir); \
-+		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 	done; \
- 	for i in *-std*; do \
- 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
- 		    -e 's#@@Port@@#$(PORT)#g' \
--			< $$i > $(sysconfdir)/$$i; \
--		chmod 0644 $(sysconfdir)/$$i; \
-+			< $$i > $(sysconfdir)/$$i.default; \
-+		chmod 0644 $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 		file=`echo $$i|sed s/-std//`; \
- 		if [ "$$file" = "httpd.conf" ]; then \
- 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
- 		fi; \
- 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
--			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
-+			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
-+			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
- 		fi; \
- 	done
- 
- htdocs-srcdir = docs/docroot
-+htman-srcdir = docs/manual
-+doc_prefix = $(prefix)/share/doc/apache
-+man-srcdir = docs/man
- 
- docs::
- 	mkdir -p ./docs/api
-@@ -57,11 +64,14 @@
+--- Makefile.in.orig	Mon Oct 22 21:46:29 2001
++++ Makefile.in	Sat Nov 17 01:36:38 2001
+@@ -51,7 +51,7 @@
+ 					< $$i; \
+ 				for j in $(DSO_MODULES) "^EOL^"; do \
+ 					if test $$j != "^EOL^"; then \
+-						echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
++						echo "LoadModule $${j}_module ${libexecdir:S|^${prefix}/||}/mod_$${j}.so"; \
+ 					fi; \
+ 				done; \
+ 				sed -e '1,/@@LoadModule@@/d' \
+@@ -93,11 +93,14 @@
  
  install-htdocs:
  	@echo Installing HTML documents
 -	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
 -	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
--	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
--	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
+-	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
 -	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
-+	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
-+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
-+	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
-+	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
-+	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
-+	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
-+	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
-+	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-icons:
- 	@echo Installing icons
-@@ -71,24 +81,27 @@
++	@test -d $(htdocsdir).default || $(MKINSTALLDIRS) $(htdocsdir).default
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)
++	@test -e $(htdocsdir) || ln -sf $(htdocsdir).default $(htdocsdir)
++.if !defined(NOPORTDOCS)
++	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
++	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
++.endif
++	@(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-error:
+ 	@echo Installing error documents
+@@ -113,9 +116,10 @@
  
  install-cgi:
  	@echo Installing CGIs
 -	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
--	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
 -	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 +	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
-+	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
-+	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
 +	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
  
- install-support:
- 	@echo Installing Support Binaries
- 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
--	@cp -p $(srcdir)/support/httpd.exp $(bindir)
-+	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
-+	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
-+	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
- 	@cp -p $(builddir)/support/htpasswd $(bindir)
- 	@cp -p $(builddir)/support/htdigest $(bindir)
--	@cp -p $(builddir)/support/rotatelogs $(bindir)
--	@cp -p $(builddir)/support/logresolve $(bindir)
--	@cp -p $(builddir)/support/ab $(bindir)
--	@cp -p $(builddir)/support/apachectl $(bindir)
--	chmod 755 $(bindir)/apachectl
-+	@cp -p $(builddir)/support/rotatelogs $(sbindir)
-+	@cp -p $(builddir)/support/logresolve $(sbindir)
-+	@cp -p $(builddir)/support/ab $(sbindir)
-+	@cp -p $(builddir)/support/apachectl $(sbindir)
-+	chmod 755 $(sbindir)/apachectl
- 	@if test -f $(builddir)/support/apxs; then \
--	    cp -p $(builddir)/support/apxs $(bindir); \
--	    chmod 755 $(bindir)/apxs; \
-+	    cp -p $(builddir)/support/apxs $(sbindir); \
-+	    chmod 755 $(sbindir)/apxs; \
- 	fi
- 
- 
-@@ -117,6 +130,15 @@
- 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
- 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
- 	@chmod 644 $(includedir)/*.h
-+
-+install-manpages:
-+	@echo Installing manual pages
-+	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
-+	@for sect in 1 8; do \
-+		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
-+		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
-+	done;
-+	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-suexec:
- 	@if test -f $(builddir)/support/suexec; then \
+ install-other:
+ 	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
diff --git a/www/apache20/files/patch-build:rules.mk b/www/apache20/files/patch-build:rules.mk
deleted file mode 100644
index d5058a91d8ca..000000000000
--- a/www/apache20/files/patch-build:rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
-+++ build/rules.mk	Sun Apr  8 01:05:46 2001
-@@ -172,9 +172,9 @@
- all-p: $(targets)
- install-p: $(targets) $(install_targets)
- 	@if test -n '$(PROGRAMS)'; then \
--		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
-+		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
- 		for i in "$(PROGRAMS)"; do \
--			$(INSTALL_PROGRAM) $$i $(bindir); \
-+			$(INSTALL_PROGRAM) $$i $(sbindir); \
- 		done; \
- 	fi
- 
diff --git a/www/apache20/files/patch-config.layout b/www/apache20/files/patch-config.layout
index 75a700c6a805..0bb23d72594f 100644
--- a/www/apache20/files/patch-config.layout
+++ b/www/apache20/files/patch-config.layout
@@ -1,6 +1,6 @@
---- config.layout.orig	Sat Apr  7 04:19:44 2001
-+++ config.layout	Sat Apr  7 04:20:28 2001
-@@ -249,3 +249,22 @@
+--- config.layout.orig	Fri Oct 26 11:59:26 2001
++++ config.layout	Fri Nov 16 18:36:14 2001
+@@ -285,3 +285,25 @@
      logfiledir:    $prefix/logs
      proxycachedir: $prefix/proxy
  </Layout>
@@ -14,8 +14,11 @@
 +    mandir:        $prefix/man
 +    sysconfdir:    $prefix/etc/apache
 +    datadir:       $prefix/www
++    installbuilddir: $prefix/share/mk/apache
++    errordir:      $datadir/error
 +    iconsdir:      $datadir/icons
 +    htdocsdir:     $datadir/data
++    manualdir:     ${prefix}/share/doc/apache
 +    cgidir:        $datadir/cgi-bin
 +    includedir:    $prefix/include/apache
 +    localstatedir: /var
diff --git a/www/apache20/files/patch-configure b/www/apache20/files/patch-configure
index 2640a5466ac0..007d46173167 100644
--- a/www/apache20/files/patch-configure
+++ b/www/apache20/files/patch-configure
@@ -1,50 +1,32 @@
---- configure.orig	Wed Apr  4 12:45:36 2001
-+++ configure	Sat Apr 14 18:25:08 2001
-@@ -3760,7 +3760,9 @@
-       -e "s/[ 	]*$/'/g" \
-       $srcdir/config.layout > $pldconf
-   layout_name=$LAYOUT
-+  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
-   . $pldconf
-+  prefix=$prefix_backup
-   rm $pldconf
-   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
-@@ -3777,7 +3779,7 @@
-         ;;
-     esac
-     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
--    val=`echo $val | sed -e 's:$\([a-z_]*\):$(\1):g'`
-+    val=`echo $val | sed -e 's:$\([a-z_]*\):${\1}:g'`
-     if test "$autosuffix" = "yes"; then
-       if echo $val | grep apache >/dev/null; then
-         addtarget=no
-@@ -3788,7 +3790,7 @@
-         val="$val/apache"
-       fi
-     fi
--    eval "$var='$val'"
-+    eval "$var=\"$val\""
-   done
-   
+--- configure.orig	Tue Nov 13 04:07:39 2001
++++ configure	Fri Nov 16 23:32:52 2001
+@@ -1084,7 +1084,7 @@
+   esac
  
-@@ -9678,6 +9680,10 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr configured properly"
+   else
+@@ -1175,7 +1175,7 @@
+   esac
  
-   
-   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
-   
- 
-   
-@@ -9814,7 +9820,7 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr-util configured properly"
+   else
+@@ -10508,7 +10508,10 @@
  EOF
  
  cat >> confdefs.h <<EOF
 -#define SERVER_CONFIG_FILE "conf/$progname.conf"
 +#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
++#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
  EOF
  
  cat >> confdefs.h <<EOF
diff --git a/www/apache20/files/patch-docs:conf:httpd-std.conf b/www/apache20/files/patch-docs:conf:httpd-std.conf
index 928bc48b70d4..eb63c30ac79a 100644
--- a/www/apache20/files/patch-docs:conf:httpd-std.conf
+++ b/www/apache20/files/patch-docs:conf:httpd-std.conf
@@ -1,53 +1,24 @@
---- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
-+++ docs/conf/httpd-std.conf	Tue Oct 23 17:12:59 2001
+--- docs/conf/httpd-std.conf.orig	Fri Nov  9 07:31:28 2001
++++ docs/conf/httpd-std.conf	Sat Nov 17 01:49:29 2001
 @@ -64,7 +64,7 @@
- # PidFile: The file in which the server should record its process
- # identification number when it starts.
- #
--PidFile logs/httpd.pid
-+PidFile /var/run/httpd.pid
- 
- #
- # ScoreBoardFile: File used to store internal server process information.
-@@ -73,7 +73,7 @@
- # no two invocations of Apache share the same scoreboard file.
  #
+ <IfModule !mpm_winnt.c>
  <IfModule !perchild.c>
 -ScoreBoardFile logs/apache_runtime_status
 +ScoreBoardFile /var/run/apache_runtime_status
  </IfModule>
+ </IfModule>
+ 
+@@ -73,7 +73,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
  
  #
-@@ -182,6 +182,28 @@
- #
- # Example:
- # LoadModule foo_module modules/mod_foo.so
-+#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
-+#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
-+#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
-+#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
-+#LoadModule cgid_module			libexec/apache/mod_cgid.so
-+#LoadModule dav_module			libexec/apache/mod_dav.so
-+#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
-+#LoadModule digest_module		libexec/apache/mod_digest.so
-+#LoadModule expires_module		libexec/apache/mod_expires.so
-+#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
-+#LoadModule headers_module		libexec/apache/mod_headers.so
-+#LoadModule imap_module			libexec/apache/mod_imap.so
-+#LoadModule include_module		libexec/apache/mod_include.so
-+#LoadModule info_module			libexec/apache/mod_info.so
-+#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
-+#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
-+#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
-+#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
-+#LoadModule speling_module		libexec/apache/mod_speling.so
-+#LoadModule status_module		libexec/apache/mod_status.so
-+#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
-+#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
- 
- ### Section 2: 'Main' server configuration
- #
-@@ -220,8 +242,8 @@
+ # Timeout: The number of seconds before receives and sends time out.
+@@ -229,8 +229,8 @@
  #  when the value of (unsigned)Group is above 60000; 
  #  don't use Group #-1 on these systems!
  #
@@ -55,10 +26,10 @@
 -Group #-1
 +User www
 +Group www
+ </IfModule>
  
  #
- # ServerAdmin: Your address, where problems with the server should be
-@@ -249,7 +271,7 @@
+@@ -259,7 +259,7 @@
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  #
@@ -67,7 +38,7 @@
  
  #
  # Each directory to which Apache has access, can be configured with respect
-@@ -274,7 +296,7 @@
+@@ -284,7 +284,7 @@
  #
  # This should be changed to whatever you set DocumentRoot to.
  #
@@ -76,31 +47,7 @@
  
  #
  # This may also be "None", "All", or any combination of "Indexes",
-@@ -326,7 +348,22 @@
- # DirectoryIndex: Name of the file or files to use as a pre-written HTML
- # directory index.  Separate multiple entries with spaces.
- #
--DirectoryIndex index.html
-+<IfModule mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.php3 index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.php3 index.html
-+    </IfModule>
-+</IfModule>
-+<IfModule !mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.html
-+    </IfModule>
-+</IfModule>
- 
- #
- # AccessFileName: The name of the file to look for in each directory
-@@ -372,7 +409,7 @@
+@@ -377,7 +377,7 @@
  # TypesConfig describes where the mime.types file (or equivalent) is
  # to be found.
  #
@@ -109,8 +56,8 @@
  
  #
  # DefaultType is the default MIME type the server will use for a document
-@@ -397,7 +434,7 @@
- # module is part of the server.
+@@ -396,7 +396,7 @@
+ # directive tells the module where the hint definitions are located.
  #
  <IfModule mod_mime_magic.c>
 -    MIMEMagicFile conf/magic
@@ -118,7 +65,7 @@
  </IfModule>
  
  #
-@@ -417,7 +454,7 @@
+@@ -416,7 +416,7 @@
  # logged here.  If you *do* define an error logfile for a <VirtualHost>
  # container, that host's errors will be logged there and not here.
  #
@@ -127,7 +74,7 @@
  
  #
  # LogLevel: Control the number of messages logged to the error_log.
-@@ -442,7 +479,7 @@
+@@ -441,7 +441,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -136,7 +83,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -455,7 +492,7 @@
+@@ -454,7 +454,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -145,9 +92,9 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -474,9 +511,9 @@
- # require it to be present in the URL.  So "/icons" isn't aliased in this
- # example, only "/icons/"..
+@@ -478,9 +478,9 @@
+ # We include the /icons/ alias for FancyIndexed directory listings.  If you
+ # do not use FancyIndexing, you may comment this out.
  #
 -Alias /icons/ "@@ServerRoot@@/icons/"
 +Alias /icons/ "@@ServerRoot@@/www/icons/"
@@ -157,7 +104,19 @@
      Options Indexes MultiViews
      AllowOverride None
      Order allow,deny
-@@ -491,7 +528,7 @@
+@@ -492,9 +492,9 @@
+ # the manual, even if you choose to move your DocumentRoot.  You may comment
+ # this out if you do not care for the documentation.
+ #
+-Alias /manual "@@ServerRoot@@/manual"
++Alias /manual "@@ServerRoot@@/share/doc/apache"
+ 
+-<Directory "@@ServerRoot@@/manual">
++<Directory "@@ServerRoot@@/share/doc/apache">
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -509,21 +509,21 @@
  # The same rules about trailing "/" apply to ScriptAlias directives as to
  # Alias.
  #
@@ -166,7 +125,14 @@
  
  <IfModule mod_cgid.c>
  #
-@@ -505,7 +542,7 @@
+ # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
+ # for setting UNIX socket for communicating with cgid.
+ #
+-#Scriptsock            logs/cgisock
++Scriptsock            /var/run/cgisock
+ </IfModule>
+ 
+ #
  # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
  # CGI directory exists, if you have that configured.
  #
@@ -175,31 +141,24 @@
      AllowOverride None
      Options None
      Order allow,deny
-@@ -657,6 +694,7 @@
- AddLanguage ja .ja
- AddLanguage pl .po
- AddLanguage kr .kr
-+AddLanguage ko .kr
- AddLanguage pt .pt
- AddLanguage no .no
- AddLanguage pt-br .pt-br
-@@ -741,8 +779,17 @@
- # For example, the PHP3 module (not part of the Apache distribution - see
- # http://www.php.net) will typically use:
- #
--#AddType application/x-httpd-php3 .php3
--#AddType application/x-httpd-php3-source .phps
-+<IfModule mod_php3.c>
-+    AddType application/x-httpd-php3 .php3
-+    AddType application/x-httpd-php3-source .php3s
-+</IfModule>
-+#
-+# And for PHP 4.x, use:
-+#
-+<IfModule mod_php4.c>
-+    AddType application/x-httpd-php .php
-+    AddType application/x-httpd-php-source .phps
-+</IfModule>
- 
- AddType application/x-tar .tgz
+@@ -851,9 +851,9 @@
+ #
+ 
+ <IfModule mod_include.c>
+-    Alias /error/ "@@ServerRoot@@/error/"
++    Alias /error/ "@@ServerRoot@@/www/error/"
+ 
+-    <Directory "@@ServerRoot@@/error">
++    <Directory "@@ServerRoot@@/www/error">
+         AllowOverride None
+         Options IncludesNoExec
+         AddOutputFilter Includes html
+@@ -964,7 +964,7 @@
+ # Bring in additional module-specific configurations
+ #
+ <IfModule mod_ssl.c>
+-    Include conf/ssl.conf
++    Include etc/apache/ssl.conf
+ </IfModule>
+ 
  
diff --git a/www/apache20/files/patch-docs:conf:ssl-std.conf b/www/apache20/files/patch-docs:conf:ssl-std.conf
new file mode 100644
index 000000000000..f647b91fac48
--- /dev/null
+++ b/www/apache20/files/patch-docs:conf:ssl-std.conf
@@ -0,0 +1,96 @@
+--- docs/conf/ssl-std.conf.orig	Fri Nov 16 21:56:55 2001
++++ docs/conf/ssl-std.conf	Fri Nov 16 22:00:27 2001
+@@ -57,7 +57,7 @@
+ #SSLSessionCache        none
+ #SSLSessionCache        shmht:logs/ssl_scache(512000)
+ #SSLSessionCache        shmcb:logs/ssl_scache(512000)
+-SSLSessionCache         dbm:logs/ssl_scache
++SSLSessionCache         dbm:/var/log/httpd-ssl_scache
+ SSLSessionCacheTimeout  300
+ 
+ #   Semaphore:
+@@ -99,11 +99,11 @@
+ <VirtualHost _default_:443>
+ 
+ #  General setup for the virtual host
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ ServerName new.host.name:443
+ ServerAdmin you@your.address
+-ErrorLog logs/error_log
+-TransferLog logs/access_log
++ErrorLog /var/log/httpd-error.log
++TransferLog /var/log/httpd-access.log
+ 
+ #   SSL Engine Switch:
+ #   Enable/Disable SSL for this virtual host.
+@@ -122,16 +122,16 @@
+ #   built time. Keep in mind that if you've both a RSA and a DSA
+ #   certificate you can configure both in parallel (to also allow
+ #   the use of DSA ciphers, etc.)
+-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
+-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
++SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server.crt
++#SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server-dsa.crt
+ 
+ #   Server Private Key:
+ #   If the key is not combined with the certificate, use this
+ #   directive to point at the key file.  Keep in mind that if
+ #   you've both a RSA and a DSA private key you can configure
+ #   both in parallel (to also allow the use of DSA ciphers, etc.)
+-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
+-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
++SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server.key
++#SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server-dsa.key
+ 
+ #   Server Certificate Chain:
+ #   Point SSLCertificateChainFile at a file containing the
+@@ -140,7 +140,7 @@
+ #   the referenced file can be the same as SSLCertificateFile
+ #   when the CA certificates are directly appended to the server
+ #   certificate for convinience.
+-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
++#SSLCertificateChainFile @@ServerRoot@@/etc/apache/ssl.crt/ca.crt
+ 
+ #   Certificate Authority (CA):
+ #   Set the CA certificate verification path where to find CA
+@@ -149,8 +149,8 @@
+ #   Note: Inside SSLCACertificatePath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
+-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
++#SSLCACertificatePath @@ServerRoot@@/etc/apache/ssl.crt
++#SSLCACertificateFile @@ServerRoot@@/etc/apache/ssl.crt/ca-bundle.crt
+ 
+ #   Certificate Revocation Lists (CRL):
+ #   Set the CA revocation path where to find CA CRLs for client
+@@ -159,8 +159,8 @@
+ #   Note: Inside SSLCARevocationPath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
+-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
++#SSLCARevocationPath @@ServerRoot@@/etc/apache/ssl.crl
++#SSLCARevocationFile @@ServerRoot@@/etc/apache/ssl.crl/ca-bundle.crl
+ 
+ #   Client Authentication (Type):
+ #   Client certificate verification type and depth.  Types are
+@@ -220,7 +220,7 @@
+ <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+     SSLOptions +StdEnvVars
+ </Files>
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     SSLOptions +StdEnvVars
+ </Directory>
+ 
+@@ -255,7 +255,7 @@
+ #   Per-Server Logging:
+ #   The home of a custom SSL log file. Use this when you want a
+ #   compact non-error SSL logfile on a virtual host basis.
+-CustomLog logs/ssl_request_log \
++CustomLog /var/log/httpd-ssl_request.log \
+           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+ 
+ </VirtualHost>                                  
diff --git a/www/apache20/files/patch-include:httpd.h b/www/apache20/files/patch-include:httpd.h
deleted file mode 100644
index 9f8fdf34997b..000000000000
--- a/www/apache20/files/patch-include:httpd.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
-+++ include/httpd.h	Sat Apr  7 09:08:43 2001
-@@ -127,7 +127,7 @@
- /* Set default for OS/2 file system */
- #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
- #else
--#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
-+#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
- #endif
- #endif /* DOCUMENT_LOCATION */
- 
-@@ -144,7 +144,7 @@
- #if defined(OS2) || defined(WIN32)
- #define DEFAULT_ERRORLOG "logs/error.log"
- #else
--#define DEFAULT_ERRORLOG "logs/error_log"
-+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
- #endif
- #endif /* DEFAULT_ERRORLOG */
- 
-@@ -160,7 +160,7 @@
- 
- /* The name of the server config file */
- #ifndef SERVER_CONFIG_FILE
--#define SERVER_CONFIG_FILE "conf/httpd.conf"
-+#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
- #endif
- 
- /* Whether we should enable rfc1413 identity checking */
-@@ -247,7 +247,7 @@
- 
- /* The name of the MIME types file */
- #ifndef AP_TYPES_CONFIG_FILE
--#define AP_TYPES_CONFIG_FILE "conf/mime.types"
-+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
- #endif
- 
- /*
diff --git a/www/apache20/files/patch-srclib:apr-util:Makefile.in b/www/apache20/files/patch-srclib:apr-util:Makefile.in
deleted file mode 100644
index 652901dae28a..000000000000
--- a/www/apache20/files/patch-srclib:apr-util:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
-+++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
-@@ -22,8 +22,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -43,7 +43,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache20/files/patch-srclib:apr:Makefile.in b/www/apache20/files/patch-srclib:apr:Makefile.in
deleted file mode 100644
index 4c0292f73af8..000000000000
--- a/www/apache20/files/patch-srclib:apr:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
-+++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
-@@ -37,8 +37,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -58,7 +58,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    ./build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache20/files/patch-support:apachectl.in b/www/apache20/files/patch-support:apachectl.in
index 739a622d74de..f5b347b4633d 100644
--- a/www/apache20/files/patch-support:apachectl.in
+++ b/www/apache20/files/patch-support:apachectl.in
@@ -1,23 +1,22 @@
---- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
-+++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+--- support/apachectl.in.orig	Fri Nov 16 21:22:36 2001
++++ support/apachectl.in	Fri Nov 16 22:07:31 2001
 @@ -25,10 +25,10 @@
  # --------------------                              --------------------
  # 
  # the path to your PID file
--PIDFILE=@prefix@/logs/httpd.pid
-+PIDFILE=/var/run/httpd.pid
+-PIDFILE=@prefix@/logs/@progname@.pid
++PIDFILE=/var/run/@progname@.pid
  #
  # the path to your httpd binary, including options if necessary
--HTTPD='@prefix@/bin/httpd'
-+HTTPD='@prefix@/sbin/httpd'
+-HTTPD='@prefix@/bin/@progname@'
++HTTPD='@prefix@/sbin/@progname@'
  #
  # a command that outputs a formatted text version of the HTML at the
  # url given on the command line.  Designed for lynx, however other
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
-+
 +eval `limits -e -C daemon` >/dev/null 2>&1
  
  ERROR=0
diff --git a/www/apache20/files/patch-support:apxs.in b/www/apache20/files/patch-support:apxs.in
index 70ca84075675..9ababb75322e 100644
--- a/www/apache20/files/patch-support:apxs.in
+++ b/www/apache20/files/patch-support:apxs.in
@@ -1,11 +1,20 @@
---- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
-+++ support/apxs.in	Sat Apr  7 11:55:28 2001
-@@ -73,7 +73,7 @@
- my $prefix            = "$CFG_PREFIX";
- my $CFG_EXEC_PREFIX   = "@exec_prefix@";
- my $exec_prefix       = "$CFG_EXEC_PREFIX";
--my $CFG_SBINDIR       = "@bindir@";
-+my $CFG_SBINDIR       = "@sbindir@";
- my $CFG_INCLUDEDIR    = "@includedir@";
- my $CFG_LIBEXECDIR    = "@libexecdir@";
- my $CFG_SYSCONFDIR    = "@sysconfdir@";
+--- support/apxs.in.orig	Sat Nov  3 05:09:20 2001
++++ support/apxs.in	Sat Nov 17 02:51:43 2001
+@@ -66,7 +66,7 @@
+ 
+ # read the configuration variables once
+ my %config_vars = ();
+-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
++get_config_vars("$prefix/share/mk/apache/config_vars.mk",\%config_vars);
+ 
+ my $exec_prefix    = get_vars("exec_prefix");
+ my $CFG_TARGET     = get_vars("progname");
+@@ -218,7 +218,7 @@
+ ##
+ ##  Initial shared object support check
+ ##
+-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
++my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+ 
diff --git a/www/apache20/files/patch-support:log_server_status.in b/www/apache20/files/patch-support:log_server_status.in
index 3549aa89f8c5..d8a970ebe8cd 100644
--- a/www/apache20/files/patch-support:log_server_status.in
+++ b/www/apache20/files/patch-support:log_server_status.in
@@ -1,15 +1,15 @@
---- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
-+++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+--- support/log_server_status.in.orig	Fri Nov 16 22:11:16 2001
++++ support/log_server_status.in	Fri Nov 16 22:13:50 2001
 @@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
 -$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "/var/log/httpd-status-";
++$wherelog = "/var/log/httpd-status-";  # Logs will be like "/var/log/httpd-status-19960312.log"
  $server = "localhost";          # Name of server, could be "www.foo.com"
  $port = "80";                   # Port on server
 -$request = "/status/?auto";     # Request to send
-+$request = "/server-status/?auto";     # Request to send
++$request = "/status-status/?auto";     # Request to send
  
  sub tcp_connect
  {
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 95616fc8a1c6..d13c6b6e7a9a 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -1,490 +1,759 @@
-bin/htpasswd
-bin/htdigest
+etc/apache/highperformance-std.conf
+etc/apache/highperformance.conf
+etc/apache/httpd-std.conf
+etc/apache/httpd.conf
+etc/apache/magic
+etc/apache/mime.types
+etc/apache/ssl-std.conf
+etc/apache/ssl.conf
+@dirrm etc/apache
 etc/rc.d/apache.sh
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types.default
-@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/highperformance-std.conf %D/etc/apache/highperformance-std.conf.default; then rm -f %D/etc/apache/highperformance-std.conf; fi
-etc/apache/highperformance-std.conf.default
-@exec [ ! -f %B/highperformance-std.conf ] && cp %B/%f %B/highperformance-std.conf
-@unexec if cmp -s %D/etc/apache/highperformance.conf %D/etc/apache/highperformance.conf.default; then rm -f %D/etc/apache/highperformance.conf; fi
-etc/apache/highperformance.conf.default
-@exec [ ! -f %B/highperformance.conf ] && cp %B/%f %B/highperformance.conf
-@unexec if cmp -s %D/etc/apache/httpd-std.conf %D/etc/apache/httpd-std.conf.default; then rm -f %D/etc/apache/httpd-std.conf; fi
-etc/apache/httpd-std.conf.default
-@exec [ ! -f %B/httpd-std.conf ] && cp %B/%f %B/httpd-std.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+include/apache/ap_compat.h
+include/apache/ap_config.h
+include/apache/ap_config_auto.h
+include/apache/ap_listen.h
+include/apache/ap_mmn.h
+include/apache/ap_mpm.h
+include/apache/ap_release.h
 include/apache/apr.h
-include/apache/apr_want.h
-include/apache/apr_uuid.h
-include/apache/apr_user.h
-include/apache/apr_time.h
-include/apache/apr_thread_proc.h
-include/apache/apr_tables.h
-include/apache/apr_strings.h
-include/apache/apr_signal.h
-include/apache/apr_shmem.h
-include/apache/apr_portable.h
-include/apache/apr_pools.h
-include/apache/apr_network_io.h
-include/apache/apr_mmap.h
-include/apache/apr_md5.h
-include/apache/apr_lock.h
-include/apache/apr_lib.h
-include/apache/apr_hash.h
-include/apache/apr_getopt.h
-include/apache/apr_general.h
-include/apache/apr_fnmatch.h
-include/apache/apr_file_io.h
-include/apache/apr_file_info.h
-include/apache/apr_errno.h
-include/apache/apr_dso.h
+include/apache/apr_base64.h
+include/apache/apr_buckets.h
 include/apache/apr_compat.h
+include/apache/apr_date.h
+include/apache/apr_dbm.h
+include/apache/apr_dso.h
+include/apache/apr_errno.h
+include/apache/apr_file_info.h
+include/apache/apr_file_io.h
+include/apache/apr_fnmatch.h
+include/apache/apr_general.h
+include/apache/apr_getopt.h
+include/apache/apr_hash.h
+include/apache/apr_hooks.h
+include/apache/apr_inherit.h
+include/apache/apr_ldap.h
+include/apache/apr_lib.h
+include/apache/apr_lock.h
+include/apache/apr_md4.h
+include/apache/apr_md5.h
+include/apache/apr_mmap.h
+include/apache/apr_network_io.h
+include/apache/apr_optional.h
+include/apache/apr_optional_hooks.h
+include/apache/apr_pools.h
+include/apache/apr_portable.h
+include/apache/apr_proc_mutex.h
+include/apache/apr_ring.h
+include/apache/apr_sdbm.h
+include/apache/apr_sha1.h
+include/apache/apr_shmem.h
+include/apache/apr_signal.h
+include/apache/apr_strings.h
+include/apache/apr_tables.h
+include/apache/apr_thread_cond.h
+include/apache/apr_thread_mutex.h
+include/apache/apr_thread_proc.h
+include/apache/apr_thread_rwlock.h
+include/apache/apr_time.h
+include/apache/apr_uri.h
+include/apache/apr_user.h
+include/apache/apr_uuid.h
+include/apache/apr_want.h
 include/apache/apr_xlate.h
-include/apache/apr_base64.h
-include/apache/apu.h
 include/apache/apr_xml.h
-include/apache/apr_sha1.h
-include/apache/apr_sdbm.h
-include/apache/apr_ring.h
-include/apache/apr_optional.h
-include/apache/apr_hooks.h
-include/apache/apr_generic_hook.h
-include/apache/apr_dbm.h
-include/apache/apr_buckets.h
+include/apache/apu.h
 include/apache/apu_compat.h
-include/apache/ap_compat.h
-include/apache/util_uri.h
-include/apache/util_script.h
-include/apache/util_md5.h
-include/apache/util_filter.h
-include/apache/util_ebcdic.h
-include/apache/util_date.h
-include/apache/util_charset.h
-include/apache/util_cfgtree.h
-include/apache/scoreboard.h
-include/apache/rfc1413.h
-include/apache/pcreposix.h
-include/apache/mpm_common.h
-include/apache/httpd.h
-include/apache/http_vhost.h
-include/apache/http_request.h
-include/apache/http_protocol.h
-include/apache/http_main.h
-include/apache/http_log.h
-include/apache/http_core.h
-include/apache/http_connection.h
+include/apache/config.h
+include/apache/expat.h
 include/apache/http_config.h
-include/apache/ap_release.h
-include/apache/ap_mpm.h
-include/apache/ap_mmn.h
-include/apache/ap_listen.h
-include/apache/ap_config_auto.h
-include/apache/ap_config.h
-include/apache/util_xml.h
-include/apache/os.h
-include/apache/os-inline.c
-include/apache/mpm_default.h
-include/apache/mpm.h
+include/apache/http_connection.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/internal.h
+include/apache/mod_cgi.h
+include/apache/mod_core.h
 include/apache/mod_dav.h
 include/apache/mod_include.h
+include/apache/mod_proxy.h
+include/apache/mod_ssl.h
+include/apache/mpm.h
+include/apache/mpm_common.h
+include/apache/mpm_default.h
+include/apache/os.h
 include/apache/pcre.h
-include/apache/internal.h
-include/apache/config.h
+include/apache/pcreposix.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+include/apache/ssl_expr.h
+include/apache/ssl_expr_parse.h
+include/apache/ssl_util_ssl.h
+include/apache/ssl_util_table.h
 include/apache/unixd.h
-lib/libapr.la
+include/apache/util_cfgtree.h
+include/apache/util_charset.h
+include/apache/util_ebcdic.h
+include/apache/util_filter.h
+include/apache/util_ldap.h
+include/apache/util_md5.h
+include/apache/util_script.h
+include/apache/util_time.h
+include/apache/util_xml.h
+@dirrm include/apache
+lib/APRVARS
 lib/libapr.a
-lib/libaprutil.la
+lib/libapr.la
+lib/libapr.so.0
 lib/libaprutil.a
-libexec/apache/mod_auth_anon.so
+lib/libaprutil.la
+lib/libaprutil.so.0
+lib/libexpat.a
+lib/libexpat.la
+lib/libexpat.so.1
+libexec/apache/httpd.exp
+libexec/apache/mod_access.la
+libexec/apache/mod_access.so
+libexec/apache/mod_actions.la
+libexec/apache/mod_actions.so
+libexec/apache/mod_alias.la
+libexec/apache/mod_alias.so
+libexec/apache/mod_asis.la
+libexec/apache/mod_asis.so
+libexec/apache/mod_auth.la
+libexec/apache/mod_auth.so
 libexec/apache/mod_auth_anon.la
-libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_anon.so
 libexec/apache/mod_auth_db.la
-libexec/apache/mod_auth_digest.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_dbm.la
+libexec/apache/mod_auth_dbm.so
 libexec/apache/mod_auth_digest.la
-libexec/apache/mod_file_cache.so
-libexec/apache/mod_file_cache.la
-libexec/apache/mod_dav_fs.so
-libexec/apache/mod_dav_fs.la
-libexec/apache/mod_dav.so
-libexec/apache/mod_dav.la
-libexec/apache/mod_echo.so
-libexec/apache/mod_echo.la
-libexec/apache/mod_optional_fn_import.so
-libexec/apache/mod_optional_fn_import.la
-libexec/apache/mod_optional_fn_export.so
-libexec/apache/mod_optional_fn_export.la
-libexec/apache/mod_include.so
-libexec/apache/mod_include.la
-libexec/apache/mod_imap.so
-libexec/apache/mod_imap.la
-libexec/apache/mod_speling.so
-libexec/apache/mod_speling.la
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_rewrite.la
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mime_magic.la
-libexec/apache/mod_cern_meta.so
+libexec/apache/mod_auth_digest.so
+libexec/apache/mod_autoindex.la
+libexec/apache/mod_autoindex.so
+%%CACHEOPT%%libexec/apache/mod_cache.la
+%%CACHEOPT%%libexec/apache/mod_cache.so
 libexec/apache/mod_cern_meta.la
-libexec/apache/mod_expires.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_cgi.la
+libexec/apache/mod_cgi.so
+libexec/apache/mod_cgid.la
+libexec/apache/mod_cgid.so
+libexec/apache/mod_dav.la
+libexec/apache/mod_dav.so
+libexec/apache/mod_dav_fs.la
+libexec/apache/mod_dav_fs.so
+libexec/apache/mod_dir.la
+libexec/apache/mod_dir.so
+libexec/apache/mod_env.la
+libexec/apache/mod_env.so
 libexec/apache/mod_expires.la
-libexec/apache/mod_headers.so
+libexec/apache/mod_expires.so
+%%CACHEOPT%%libexec/apache/mod_file_cache.la
+%%CACHEOPT%%libexec/apache/mod_file_cache.so
 libexec/apache/mod_headers.la
-libexec/apache/mod_usertrack.so
-libexec/apache/mod_usertrack.la
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_unique_id.la
-libexec/apache/mod_status.so
-libexec/apache/mod_status.la
-libexec/apache/mod_info.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_imap.la
+libexec/apache/mod_imap.so
+libexec/apache/mod_include.la
+libexec/apache/mod_include.so
 libexec/apache/mod_info.la
-libexec/apache/mod_cgid.so
-libexec/apache/mod_cgid.la
-libexec/apache/httpd.exp
-sbin/rotatelogs
-sbin/htpasswd
-sbin/logresolve
+libexec/apache/mod_info.so
+libexec/apache/mod_log_config.la
+libexec/apache/mod_log_config.so
+%%CACHEOPT%%libexec/apache/mod_mem_cache.la
+%%CACHEOPT%%libexec/apache/mod_mem_cache.so
+libexec/apache/mod_mime.la
+libexec/apache/mod_mime.so
+libexec/apache/mod_mime_magic.la
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_negotiation.la
+libexec/apache/mod_negotiation.so
+%%PROXYOPT%%libexec/apache/mod_proxy.la
+%%PROXYOPT%%libexec/apache/mod_proxy.so
+%%PROXYOPT%%libexec/apache/mod_proxy_connect.la
+%%PROXYOPT%%libexec/apache/mod_proxy_connect.so
+%%PROXYOPT%%libexec/apache/mod_proxy_ftp.la
+%%PROXYOPT%%libexec/apache/mod_proxy_ftp.so
+%%PROXYOPT%%libexec/apache/mod_proxy_http.la
+%%PROXYOPT%%libexec/apache/mod_proxy_http.so
+libexec/apache/mod_rewrite.la
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_setenvif.la
+libexec/apache/mod_setenvif.so
+libexec/apache/mod_speling.la
+libexec/apache/mod_speling.so
+%%SSLOPT%%libexec/apache/mod_ssl.la
+%%SSLOPT%%libexec/apache/mod_ssl.so
+libexec/apache/mod_status.la
+libexec/apache/mod_status.so
+libexec/apache/mod_unique_id.la
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_userdir.la
+libexec/apache/mod_userdir.so
+libexec/apache/mod_usertrack.la
+libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.la
+libexec/apache/mod_vhost_alias.so
+@dirrm libexec/apache
 sbin/ab
 sbin/apachectl
 sbin/apxs
+sbin/checkgid
+sbin/dbmmanage
+sbin/htdigest
+sbin/htpasswd
 sbin/httpd
-share/doc/apache/README.rus
+sbin/logresolve
+sbin/rotatelogs
+%%PORTDOCS%%share/doc/apache/LICENSE
+%%PORTDOCS%%share/doc/apache/bind.html
+%%PORTDOCS%%share/doc/apache/cgi_path.html
+%%PORTDOCS%%share/doc/apache/configuring.html.en
+%%PORTDOCS%%share/doc/apache/configuring.html.ja.jis
+%%PORTDOCS%%share/doc/apache/content-negotiation.html
+%%PORTDOCS%%share/doc/apache/custom-error.html
+%%PORTDOCS%%share/doc/apache/developer/API.html
+%%PORTDOCS%%share/doc/apache/developer/debugging.html
+%%PORTDOCS%%share/doc/apache/developer/documenting.html
+%%PORTDOCS%%share/doc/apache/developer/footer.html
+%%PORTDOCS%%share/doc/apache/developer/header.html
+%%PORTDOCS%%share/doc/apache/developer/hooks.html
+%%PORTDOCS%%share/doc/apache/developer/index.html
+%%PORTDOCS%%share/doc/apache/developer/layeredio.html
+%%PORTDOCS%%share/doc/apache/developer/modules.html
+%%PORTDOCS%%share/doc/apache/developer/request.html
+%%PORTDOCS%%share/doc/apache/dns-caveats.html
+%%PORTDOCS%%share/doc/apache/dso.html
+%%PORTDOCS%%share/doc/apache/ebcdic.html
+%%PORTDOCS%%share/doc/apache/env.html
+%%PORTDOCS%%share/doc/apache/faq/footer.html
+%%PORTDOCS%%share/doc/apache/faq/header.html
+%%PORTDOCS%%share/doc/apache/faq/index.html
+%%PORTDOCS%%share/doc/apache/faq/support.html
+%%PORTDOCS%%share/doc/apache/filter.html
+%%PORTDOCS%%share/doc/apache/footer.html
+%%PORTDOCS%%share/doc/apache/handler.html.en
+%%PORTDOCS%%share/doc/apache/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache/header.html
+%%PORTDOCS%%share/doc/apache/howto/auth.html
+%%PORTDOCS%%share/doc/apache/howto/cgi.html.en
+%%PORTDOCS%%share/doc/apache/howto/cgi.html.ja.jis
+%%PORTDOCS%%share/doc/apache/howto/footer.html
+%%PORTDOCS%%share/doc/apache/howto/header.html
+%%PORTDOCS%%share/doc/apache/howto/ssi.html.en
+%%PORTDOCS%%share/doc/apache/howto/ssi.html.ja.jis
+%%PORTDOCS%%share/doc/apache/images/apache_header.gif
+%%PORTDOCS%%share/doc/apache/images/apache_header.png
+%%PORTDOCS%%share/doc/apache/images/custom_errordocs.gif
+%%PORTDOCS%%share/doc/apache/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache/images/home.gif
+%%PORTDOCS%%share/doc/apache/images/home.png
+%%PORTDOCS%%share/doc/apache/images/index.gif
+%%PORTDOCS%%share/doc/apache/images/index.png
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.fig
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.gif
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.png
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.fig
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.gif
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.png
+%%PORTDOCS%%share/doc/apache/images/pixel.gif
+%%PORTDOCS%%share/doc/apache/images/pixel.png
+%%PORTDOCS%%share/doc/apache/images/sub.gif
+%%PORTDOCS%%share/doc/apache/images/sub.png
+%%PORTDOCS%%share/doc/apache/index.html.en
+%%PORTDOCS%%share/doc/apache/index.html.fr
+%%PORTDOCS%%share/doc/apache/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache/install.html
+%%PORTDOCS%%share/doc/apache/invoking.html
+%%PORTDOCS%%share/doc/apache/logs.html
+%%PORTDOCS%%share/doc/apache/misc/custom_errordocs.html
+%%PORTDOCS%%share/doc/apache/misc/descriptors.html
+%%PORTDOCS%%share/doc/apache/misc/fin_wait_2.html
+%%PORTDOCS%%share/doc/apache/misc/footer.html
+%%PORTDOCS%%share/doc/apache/misc/header.html
+%%PORTDOCS%%share/doc/apache/misc/index.html
+%%PORTDOCS%%share/doc/apache/misc/known_client_problems.html
+%%PORTDOCS%%share/doc/apache/misc/perf-tuning.html
+%%PORTDOCS%%share/doc/apache/misc/rewriteguide.html
+%%PORTDOCS%%share/doc/apache/misc/security_tips.html
+%%PORTDOCS%%share/doc/apache/misc/tutorials.html
+%%PORTDOCS%%share/doc/apache/mod/core.html
+%%PORTDOCS%%share/doc/apache/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache/mod/directives.html
+%%PORTDOCS%%share/doc/apache/mod/footer.html
+%%PORTDOCS%%share/doc/apache/mod/header.html
+%%PORTDOCS%%share/doc/apache/mod/index-bytype.html
+%%PORTDOCS%%share/doc/apache/mod/index.html
+%%PORTDOCS%%share/doc/apache/mod/mod_TEMPLATE.html
+%%PORTDOCS%%share/doc/apache/mod/mod_access.html
+%%PORTDOCS%%share/doc/apache/mod/mod_actions.html
+%%PORTDOCS%%share/doc/apache/mod/mod_alias.html
+%%PORTDOCS%%share/doc/apache/mod/mod_asis.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_db.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_autoindex.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cern_meta.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cgi.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cgid.html
+%%PORTDOCS%%share/doc/apache/mod/mod_charset_lite.html
+%%PORTDOCS%%share/doc/apache/mod/mod_dav.html
+%%PORTDOCS%%share/doc/apache/mod/mod_dir.html
+%%PORTDOCS%%share/doc/apache/mod/mod_env.html
+%%PORTDOCS%%share/doc/apache/mod/mod_example.html
+%%PORTDOCS%%share/doc/apache/mod/mod_expires.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ext_filter.html
+%%PORTDOCS%%share/doc/apache/mod/mod_file_cache.html
+%%PORTDOCS%%share/doc/apache/mod/mod_headers.html
+%%PORTDOCS%%share/doc/apache/mod/mod_imap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_include.html
+%%PORTDOCS%%share/doc/apache/mod/mod_info.html
+%%PORTDOCS%%share/doc/apache/mod/mod_isapi.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ldap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_log_config.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mime.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mime_magic.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mmap_static.html
+%%PORTDOCS%%share/doc/apache/mod/mod_negotiation.html
+%%PORTDOCS%%share/doc/apache/mod/mod_proxy.html
+%%PORTDOCS%%share/doc/apache/mod/mod_rewrite.html
+%%PORTDOCS%%share/doc/apache/mod/mod_setenvif.html
+%%PORTDOCS%%share/doc/apache/mod/mod_so.html
+%%PORTDOCS%%share/doc/apache/mod/mod_speling.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ssl.html
+%%PORTDOCS%%share/doc/apache/mod/mod_status.html
+%%PORTDOCS%%share/doc/apache/mod/mod_suexec.html
+%%PORTDOCS%%share/doc/apache/mod/mod_unique_id.html
+%%PORTDOCS%%share/doc/apache/mod/mod_userdir.html
+%%PORTDOCS%%share/doc/apache/mod/mod_usertrack.html
+%%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html
+%%PORTDOCS%%share/doc/apache/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_common.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html
+%%PORTDOCS%%share/doc/apache/mod/perchild.html
+%%PORTDOCS%%share/doc/apache/mod/prefork.html
+%%PORTDOCS%%share/doc/apache/mod/threaded.html
+%%PORTDOCS%%share/doc/apache/mpm.html
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.en
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr
+%%PORTDOCS%%share/doc/apache/platform/footer.html
+%%PORTDOCS%%share/doc/apache/platform/header.html
+%%PORTDOCS%%share/doc/apache/platform/perf-hp.html
+%%PORTDOCS%%share/doc/apache/platform/win_compiling.html
+%%PORTDOCS%%share/doc/apache/platform/win_service.html
+%%PORTDOCS%%share/doc/apache/platform/windows.html
+%%PORTDOCS%%share/doc/apache/programs/ab.html
+%%PORTDOCS%%share/doc/apache/programs/apachectl.html
+%%PORTDOCS%%share/doc/apache/programs/apxs.html
+%%PORTDOCS%%share/doc/apache/programs/dbmmanage.html
+%%PORTDOCS%%share/doc/apache/programs/footer.html
+%%PORTDOCS%%share/doc/apache/programs/header.html
+%%PORTDOCS%%share/doc/apache/programs/htdigest.html
+%%PORTDOCS%%share/doc/apache/programs/htpasswd.html
+%%PORTDOCS%%share/doc/apache/programs/httpd.html
+%%PORTDOCS%%share/doc/apache/programs/index.html
+%%PORTDOCS%%share/doc/apache/programs/logresolve.html
+%%PORTDOCS%%share/doc/apache/programs/other.html
+%%PORTDOCS%%share/doc/apache/programs/rotatelogs.html
+%%PORTDOCS%%share/doc/apache/programs/suexec.html
+%%PORTDOCS%%share/doc/apache/search/manual-index.cgi
+%%PORTDOCS%%share/doc/apache/sections.html
+%%PORTDOCS%%share/doc/apache/server-wide.html.en
+%%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache/ssl/Makefile
+%%PORTDOCS%%share/doc/apache/ssl/footer.html
+%%PORTDOCS%%share/doc/apache/ssl/header.html
+%%PORTDOCS%%share/doc/apache/ssl/index.html
+%%PORTDOCS%%share/doc/apache/ssl/mod_ssl_sb.gif
+%%PORTDOCS%%share/doc/apache/ssl/openssl_ics.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_logo.jpg
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_title.jpg
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig2.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig3.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview_fig1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-chapter.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-2.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-3.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-4.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-5.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-6.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-7.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-000000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-transp.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.inc
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-n.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-s.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-n.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-s.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-abstract.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-compat.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-faq.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-gloss.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-howto.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-intro.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-over.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-preface.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-ref.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-toc.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-tutor.gif
+%%PORTDOCS%%share/doc/apache/stopping.html
+%%PORTDOCS%%share/doc/apache/suexec.html
+%%PORTDOCS%%share/doc/apache/upgrading.html.en
+%%PORTDOCS%%share/doc/apache/upgrading.html.fr
+%%PORTDOCS%%share/doc/apache/urlmapping.html
+%%PORTDOCS%%share/doc/apache/vhosts/details.html
+%%PORTDOCS%%share/doc/apache/vhosts/examples.html
+%%PORTDOCS%%share/doc/apache/vhosts/fd-limits.html
+%%PORTDOCS%%share/doc/apache/vhosts/footer.html
+%%PORTDOCS%%share/doc/apache/vhosts/header.html
+%%PORTDOCS%%share/doc/apache/vhosts/index.html
+%%PORTDOCS%%share/doc/apache/vhosts/ip-based.html
+%%PORTDOCS%%share/doc/apache/vhosts/mass.html
+%%PORTDOCS%%share/doc/apache/vhosts/name-based.html
+%%PORTDOCS%%@dirrm share/doc/apache/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache/ssl
+%%PORTDOCS%%@dirrm share/doc/apache/search
+%%PORTDOCS%%@dirrm share/doc/apache/programs
+%%PORTDOCS%%@dirrm share/doc/apache/platform
+%%PORTDOCS%%@dirrm share/doc/apache/mod
+%%PORTDOCS%%@dirrm share/doc/apache/misc
+%%PORTDOCS%%@dirrm share/doc/apache/images
+%%PORTDOCS%%@dirrm share/doc/apache/howto
+%%PORTDOCS%%@dirrm share/doc/apache/faq
+%%PORTDOCS%%@dirrm share/doc/apache/developer
+%%PORTDOCS%%@dirrm share/doc/apache
+share/mk/apache/config_vars.mk
+share/mk/apache/library.mk
+share/mk/apache/libtool
+share/mk/apache/ltlib.mk
+share/mk/apache/program.mk
+share/mk/apache/rules.mk
+share/mk/apache/special.mk
+@dirrm share/mk/apache
+@dirrm share/mk
 @exec mkdir -p %D/www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
-@exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/index.html.tw
-share/doc/apache/index.html.se
-share/doc/apache/index.html.ru.utf8
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.ltz
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.kr.iso2022-kr
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.ja.iso2022-jp
-share/doc/apache/index.html.it
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.et
-share/doc/apache/index.html.es
-share/doc/apache/index.html.en
-share/doc/apache/index.html.el
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.de
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.ca
-share/doc/apache/apache_pb.gif
-share/doc/apache/index.html.tw.Big5
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/client_block_api.html
-share/doc/apache/manual/misc/compat_notes.html
-share/doc/apache/manual/misc/custom_errordocs.html
-share/doc/apache/manual/misc/descriptors.html
-share/doc/apache/manual/misc/fin_wait_2.html
-share/doc/apache/manual/misc/footer.html
-share/doc/apache/manual/misc/header.html
-share/doc/apache/manual/misc/howto.html
-share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/rewriteguide.html
-share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/API.html
-share/doc/apache/manual/developer/modules.html
-share/doc/apache/manual/developer/documenting
-share/doc/apache/manual/developer/footer.html
-share/doc/apache/manual/developer/header.html
-share/doc/apache/manual/developer/hooks.html
-share/doc/apache/manual/developer/index.html
-share/doc/apache/manual/developer/layeredio.html
-share/doc/apache/manual/developer/debugging.html
-share/doc/apache/manual/platform/windows.html
-share/doc/apache/manual/platform/header.html
-share/doc/apache/manual/platform/netware.html
-share/doc/apache/manual/platform/perf-bsd44.html
-share/doc/apache/manual/platform/perf-dec.html
-share/doc/apache/manual/platform/perf-hp.html
-share/doc/apache/manual/platform/perf.html
-share/doc/apache/manual/platform/readme-tpf.html
-share/doc/apache/manual/platform/unixware.html
-share/doc/apache/manual/platform/win_compiling.html
-share/doc/apache/manual/platform/win_service.html
-share/doc/apache/manual/platform/footer.html
-share/doc/apache/manual/mod/threaded.html
-share/doc/apache/manual/mod/directive-dict.html
-share/doc/apache/manual/mod/directives.html
-share/doc/apache/manual/mod/footer.html
-share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index-bytype.html
-share/doc/apache/manual/mod/index.html
-share/doc/apache/manual/mod/mod_access.html
-share/doc/apache/manual/mod/mod_actions.html
-share/doc/apache/manual/mod/mod_alias.html
-share/doc/apache/manual/mod/mod_asis.html
-share/doc/apache/manual/mod/mod_auth.html
-share/doc/apache/manual/mod/mod_auth_anon.html
-share/doc/apache/manual/mod/mod_auth_db.html
-share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_digest.html
-share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_cern_meta.html
-share/doc/apache/manual/mod/mod_so.html
-share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_charset_lite.html
-share/doc/apache/manual/mod/mod_dav.html
-share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_env.html
-share/doc/apache/manual/mod/mod_example.html
-share/doc/apache/manual/mod/mod_expires.html
-share/doc/apache/manual/mod/mod_ext_filter.html
-share/doc/apache/manual/mod/mod_file_cache.html
-share/doc/apache/manual/mod/mod_headers.html
-share/doc/apache/manual/mod/mod_imap.html
-share/doc/apache/manual/mod/mod_include.html
-share/doc/apache/manual/mod/mod_info.html
-share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_mime.html
-share/doc/apache/manual/mod/mod_mime_magic.html
-share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html
-share/doc/apache/manual/mod/mod_proxy.html
-share/doc/apache/manual/mod/mod_rewrite.html
-share/doc/apache/manual/mod/mod_setenvif.html
-share/doc/apache/manual/mod/mod_speling.html
-share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.html
-share/doc/apache/manual/mod/mod_userdir.html
-share/doc/apache/manual/mod/mod_usertrack.html
-share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html
-share/doc/apache/manual/mod/mpm_common.html
-share/doc/apache/manual/mod/mpm_winnt.html
-share/doc/apache/manual/mod/perchild.html
-share/doc/apache/manual/mod/prefork.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/programs/apachectl.html
-share/doc/apache/manual/programs/apxs.html
-share/doc/apache/manual/programs/dbmmanage.html
-share/doc/apache/manual/programs/footer.html
-share/doc/apache/manual/programs/header.html
-share/doc/apache/manual/programs/htdigest.html
-share/doc/apache/manual/programs/htpasswd.html
-share/doc/apache/manual/programs/httpd.html
-share/doc/apache/manual/programs/index.html
-share/doc/apache/manual/programs/logresolve.html
-share/doc/apache/manual/programs/other.html
-share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/ab.html
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html
-share/doc/apache/manual/vhosts/footer.html
-share/doc/apache/manual/vhosts/header.html
-share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html
-share/doc/apache/manual/vhosts/ip-based.html
-share/doc/apache/manual/vhosts/mass.html
-share/doc/apache/manual/vhosts/name-based.html
-share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/new_features_2_0.html.fr
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/mpm.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/install.html
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html
-share/doc/apache/manual/header.html
-share/doc/apache/manual/handler.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/filter.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/custom-error.html
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/configuring.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/STATUS
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/upgrading.html.fr
-share/doc/apache/manual/upgrading.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/server-wide.html
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/process-model.html
-www/cgi-bin.default/test-cgi
+@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 www/cgi-bin.default/printenv
-www/icons/small/uu.gif
+www/cgi-bin.default/test-cgi
+www/cgi-bin.default/test-cgi.bat
+@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+www/data.default/apache_pb.gif
+www/data.default/apache_pb.png
+www/data.default/apache_pb2.gif
+www/data.default/apache_pb2.png
+www/data.default/apache_pb2_ani.gif
+www/data.default/error.README
+www/data.default/index.html.ca
+www/data.default/index.html.cz.iso8859-2
+www/data.default/index.html.de
+www/data.default/index.html.dk
+www/data.default/index.html.ee
+www/data.default/index.html.el
+www/data.default/index.html.en
+www/data.default/index.html.es
+www/data.default/index.html.et
+www/data.default/index.html.fr
+www/data.default/index.html.he.iso8859-8
+www/data.default/index.html.hr.iso8859-2
+www/data.default/index.html.it
+www/data.default/index.html.ja.iso2022-jp
+www/data.default/index.html.kr.iso2022-kr
+www/data.default/index.html.ltz.utf8
+www/data.default/index.html.lu.utf8
+www/data.default/index.html.nl
+www/data.default/index.html.nn
+www/data.default/index.html.no
+www/data.default/index.html.po.iso8859-2
+www/data.default/index.html.pt
+www/data.default/index.html.pt-br
+www/data.default/index.html.ru.cp-1251
+www/data.default/index.html.ru.cp866
+www/data.default/index.html.ru.iso-ru
+www/data.default/index.html.ru.koi8-r
+www/data.default/index.html.ru.utf8
+www/data.default/index.html.se
+www/data.default/index.html.tw
+www/data.default/index.html.tw.Big5
+www/data.default/index.html.var
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+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/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/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/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/README.txt
-www/icons/world1.gif
-www/icons/uuencoded.gif
-www/icons/uu.gif
-www/icons/up.gif
-www/icons/unknown.gif
-www/icons/transfer.gif
-www/icons/text.gif
-www/icons/tex.gif
-www/icons/tar.gif
-www/icons/sphere2.gif
-www/icons/sphere1.gif
-www/icons/sound2.gif
+www/icons/small/unknown.png
+www/icons/small/uu.gif
+www/icons/small/uu.png
 www/icons/sound1.gif
-www/icons/script.gif
-www/icons/screw2.gif
-www/icons/screw1.gif
-www/icons/right.gif
-www/icons/quill.gif
-www/icons/ps.gif
-www/icons/portal.gif
-www/icons/pie8.gif
-www/icons/pie7.gif
-www/icons/pie6.gif
-www/icons/pie5.gif
-www/icons/pie4.gif
-www/icons/pie3.gif
-www/icons/pie2.gif
-www/icons/pie1.gif
-www/icons/pie0.gif
-www/icons/pdf.gif
-www/icons/patch.gif
-www/icons/p.gif
-www/icons/movie.gif
-www/icons/link.gif
-www/icons/left.gif
-www/icons/layout.gif
-www/icons/index.gif
-www/icons/image3.gif
-www/icons/image2.gif
-www/icons/image1.gif
-www/icons/icon.sheet.gif
-www/icons/hand.up.gif
-www/icons/hand.right.gif
-www/icons/generic.sec.gif
-www/icons/generic.red.gif
-www/icons/generic.gif
-www/icons/forward.gif
-www/icons/folder.sec.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/f.gif
-www/icons/dvi.gif
-www/icons/down.gif
-www/icons/dir.gif
-www/icons/continued.gif
-www/icons/compressed.gif
-www/icons/comp.gray.gif
-www/icons/comp.blue.gif
-www/icons/c.gif
-www/icons/burst.gif
-www/icons/broken.gif
-www/icons/box2.gif
-www/icons/box1.gif
-www/icons/bomb.gif
-www/icons/blank.gif
-www/icons/binhex.gif
-www/icons/binary.gif
-www/icons/ball.red.gif
-www/icons/ball.gray.gif
-www/icons/back.gif
-www/icons/apache_pb.gif
-www/icons/alert.red.gif
-www/icons/alert.black.gif
-www/icons/a.gif
+www/icons/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/README
-@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
-@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
-@dirrm etc/apache
-@dirrm include/apache
-@dirrm libexec/apache
-@dirrm share/doc/apache/manual/vhosts
-@dirrm share/doc/apache/manual/search
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/platform
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/developer
-@dirrm share/doc/apache/manual
-@dirrm share/doc/apache
+www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
+@dirrm www/error/include
+@dirrm www/error
+@dirrm www/data.default
 @dirrm www/cgi-bin.default
 @dirrm www
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index ea501e6245d5..48f99ccca4a3 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -6,19 +6,14 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.16
-PORTREVISION=	3
+PORTVERSION=	2.0.28
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
-		http://www.cybernic.com/mirror/dist/httpd/ \
-		http://mirrors.partnersforever.net/apache/dist/httpd/ \
-		http://www.technotopia.com/vroom/apache/dist/httpd/ \
-		http://www.tux.org/pub/net/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
+MASTER_SITES=	http://www.apache.org/dist/httpd/ \
+		http://apache.mirrorcentral.com/dist/httpd/ \
+		http://apache.missouri.edu/dist/httpd/ \
+		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
-		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
 DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
 
 MAINTAINER?=	perky@fallin.lv
@@ -26,46 +21,61 @@ MAINTAINER?=	perky@fallin.lv
 LATEST_LINK=	apache2
 
 WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
-FIND?=		find
-XARGS?=		xargs
-
-# apache2 doesn't process '--enable-share=max' option yet.
-# and some modules are very unstable at DSO mode.
-SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
-		auth_anon digest headers cern_meta expires include \
-		cgid status info usertrack dav dav_fs imap proxy \
-		auth_digest file_cache echo optional_fn_import \
-		optional_fn_export
-STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
-		userdir alias asis cgi mime log_config vhost_alias actions
+FIND=		find
+
+WITH_MPM?=	prefork # or perchild, threaded
+HTTP_PORT?=	80
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	\
-		--prefix=${PREFIX} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
+		--enable-so \
 		--with-suexec-docroot=${PREFIX}/www/data \
-		--enable-shared \
-		--disable-threads \
-		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
+		--with-mpm=${WITH_MPM} \
+		--with-port=${HTTP_PORT} \
+		--includedir=${PREFIX}/include/apache # for apr, apr-util
+CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+SHARED_MODULES=	all cgid
+
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	NOPORTDOCS=YES
+.endif
+
+.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+SHARED_MODULES+= ssl
+PLIST_SUB+=	SSLOPT=""
+.else
+PLIST_SUB+=	SSLOPT="@comment "
+.endif
+
+.if !defined(WITHOUT_PROXY)
+SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
+PLIST_SUB+=	PROXYOPT=""
+.else
+PLIST_SUB+=	PROXYOPT="@comment "
+.endif
 
-OPTIM+=		-DHARD_SERVER_LIMIT=512 \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+.if !defined(WITHOUT_CACHE)
+SHARED_MODULES+= cache mem-cache file-cache #disk-cache
+PLIST_SUB+=	CACHEOPT=""
+.else
+PLIST_SUB+=	CACHEOPT="@comment "
+.endif
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}'
+CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
 
-.for mod in ${SHARED_MODS}
-CONFIGURE_ARGS+= --enable-${mod}=shared
-.endfor
-.for mod in ${STATIC_MODS}
-CONFIGURE_ARGS+= --enable-${mod}=yes
-.endfor
+pre-extract:
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
+.endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
+	@${FIND} ${WRKSRC} -name "*.orig" -exec rm -f {} \;
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index 3802044557de..61e9645cec3b 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1 +1 @@
-MD5 (httpd-2_0_16-beta.tar.gz) = 364fc61593185789cb9744bae1ebb655
+MD5 (httpd-2_0_28-beta.tar.gz) = 99a10290773221f16fd86383c598da0e
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
index 341c8dfd087f..4c26f2dcc806 100644
--- a/www/apache21/files/patch-Makefile.in
+++ b/www/apache21/files/patch-Makefile.in
@@ -1,123 +1,45 @@
---- Makefile.in.orig	Wed Apr  4 02:03:35 2001
-+++ Makefile.in	Sun Apr  8 06:06:58 2001
-@@ -16,7 +16,7 @@
- targets         = $(PROGRAMS) $(other_targets)
- phony_targets   = $(srcdir)/buildmark.c
- install_targets = install-conf install-htdocs install-icons install-other \
--	install-cgi install-include install-support install-suexec
-+	install-cgi install-include install-support install-manpages install-suexec
- DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
- 	configure generated_lists include/ap_config_auto.h \
- 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
-@@ -28,25 +28,32 @@
- install-conf:
- 	@echo Installing configuration files
- 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
-+
- 	@cd docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(sysconfdir); \
-+		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 	done; \
- 	for i in *-std*; do \
- 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
- 		    -e 's#@@Port@@#$(PORT)#g' \
--			< $$i > $(sysconfdir)/$$i; \
--		chmod 0644 $(sysconfdir)/$$i; \
-+			< $$i > $(sysconfdir)/$$i.default; \
-+		chmod 0644 $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 		file=`echo $$i|sed s/-std//`; \
- 		if [ "$$file" = "httpd.conf" ]; then \
- 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
- 		fi; \
- 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
--			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
-+			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
-+			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
- 		fi; \
- 	done
- 
- htdocs-srcdir = docs/docroot
-+htman-srcdir = docs/manual
-+doc_prefix = $(prefix)/share/doc/apache
-+man-srcdir = docs/man
- 
- docs::
- 	mkdir -p ./docs/api
-@@ -57,11 +64,14 @@
+--- Makefile.in.orig	Mon Oct 22 21:46:29 2001
++++ Makefile.in	Sat Nov 17 01:36:38 2001
+@@ -51,7 +51,7 @@
+ 					< $$i; \
+ 				for j in $(DSO_MODULES) "^EOL^"; do \
+ 					if test $$j != "^EOL^"; then \
+-						echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
++						echo "LoadModule $${j}_module ${libexecdir:S|^${prefix}/||}/mod_$${j}.so"; \
+ 					fi; \
+ 				done; \
+ 				sed -e '1,/@@LoadModule@@/d' \
+@@ -93,11 +93,14 @@
  
  install-htdocs:
  	@echo Installing HTML documents
 -	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
 -	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
--	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
--	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
+-	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
 -	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
-+	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
-+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
-+	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
-+	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
-+	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
-+	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
-+	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
-+	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-icons:
- 	@echo Installing icons
-@@ -71,24 +81,27 @@
++	@test -d $(htdocsdir).default || $(MKINSTALLDIRS) $(htdocsdir).default
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)
++	@test -e $(htdocsdir) || ln -sf $(htdocsdir).default $(htdocsdir)
++.if !defined(NOPORTDOCS)
++	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
++	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
++.endif
++	@(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-error:
+ 	@echo Installing error documents
+@@ -113,9 +116,10 @@
  
  install-cgi:
  	@echo Installing CGIs
 -	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
--	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
 -	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 +	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
-+	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
-+	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
 +	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
  
- install-support:
- 	@echo Installing Support Binaries
- 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
--	@cp -p $(srcdir)/support/httpd.exp $(bindir)
-+	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
-+	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
-+	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
- 	@cp -p $(builddir)/support/htpasswd $(bindir)
- 	@cp -p $(builddir)/support/htdigest $(bindir)
--	@cp -p $(builddir)/support/rotatelogs $(bindir)
--	@cp -p $(builddir)/support/logresolve $(bindir)
--	@cp -p $(builddir)/support/ab $(bindir)
--	@cp -p $(builddir)/support/apachectl $(bindir)
--	chmod 755 $(bindir)/apachectl
-+	@cp -p $(builddir)/support/rotatelogs $(sbindir)
-+	@cp -p $(builddir)/support/logresolve $(sbindir)
-+	@cp -p $(builddir)/support/ab $(sbindir)
-+	@cp -p $(builddir)/support/apachectl $(sbindir)
-+	chmod 755 $(sbindir)/apachectl
- 	@if test -f $(builddir)/support/apxs; then \
--	    cp -p $(builddir)/support/apxs $(bindir); \
--	    chmod 755 $(bindir)/apxs; \
-+	    cp -p $(builddir)/support/apxs $(sbindir); \
-+	    chmod 755 $(sbindir)/apxs; \
- 	fi
- 
- 
-@@ -117,6 +130,15 @@
- 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
- 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
- 	@chmod 644 $(includedir)/*.h
-+
-+install-manpages:
-+	@echo Installing manual pages
-+	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
-+	@for sect in 1 8; do \
-+		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
-+		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
-+	done;
-+	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-suexec:
- 	@if test -f $(builddir)/support/suexec; then \
+ install-other:
+ 	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
diff --git a/www/apache21/files/patch-build:rules.mk b/www/apache21/files/patch-build:rules.mk
deleted file mode 100644
index d5058a91d8ca..000000000000
--- a/www/apache21/files/patch-build:rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
-+++ build/rules.mk	Sun Apr  8 01:05:46 2001
-@@ -172,9 +172,9 @@
- all-p: $(targets)
- install-p: $(targets) $(install_targets)
- 	@if test -n '$(PROGRAMS)'; then \
--		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
-+		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
- 		for i in "$(PROGRAMS)"; do \
--			$(INSTALL_PROGRAM) $$i $(bindir); \
-+			$(INSTALL_PROGRAM) $$i $(sbindir); \
- 		done; \
- 	fi
- 
diff --git a/www/apache21/files/patch-config.layout b/www/apache21/files/patch-config.layout
index 75a700c6a805..0bb23d72594f 100644
--- a/www/apache21/files/patch-config.layout
+++ b/www/apache21/files/patch-config.layout
@@ -1,6 +1,6 @@
---- config.layout.orig	Sat Apr  7 04:19:44 2001
-+++ config.layout	Sat Apr  7 04:20:28 2001
-@@ -249,3 +249,22 @@
+--- config.layout.orig	Fri Oct 26 11:59:26 2001
++++ config.layout	Fri Nov 16 18:36:14 2001
+@@ -285,3 +285,25 @@
      logfiledir:    $prefix/logs
      proxycachedir: $prefix/proxy
  </Layout>
@@ -14,8 +14,11 @@
 +    mandir:        $prefix/man
 +    sysconfdir:    $prefix/etc/apache
 +    datadir:       $prefix/www
++    installbuilddir: $prefix/share/mk/apache
++    errordir:      $datadir/error
 +    iconsdir:      $datadir/icons
 +    htdocsdir:     $datadir/data
++    manualdir:     ${prefix}/share/doc/apache
 +    cgidir:        $datadir/cgi-bin
 +    includedir:    $prefix/include/apache
 +    localstatedir: /var
diff --git a/www/apache21/files/patch-configure b/www/apache21/files/patch-configure
index 2640a5466ac0..007d46173167 100644
--- a/www/apache21/files/patch-configure
+++ b/www/apache21/files/patch-configure
@@ -1,50 +1,32 @@
---- configure.orig	Wed Apr  4 12:45:36 2001
-+++ configure	Sat Apr 14 18:25:08 2001
-@@ -3760,7 +3760,9 @@
-       -e "s/[ 	]*$/'/g" \
-       $srcdir/config.layout > $pldconf
-   layout_name=$LAYOUT
-+  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
-   . $pldconf
-+  prefix=$prefix_backup
-   rm $pldconf
-   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
-@@ -3777,7 +3779,7 @@
-         ;;
-     esac
-     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
--    val=`echo $val | sed -e 's:$\([a-z_]*\):$(\1):g'`
-+    val=`echo $val | sed -e 's:$\([a-z_]*\):${\1}:g'`
-     if test "$autosuffix" = "yes"; then
-       if echo $val | grep apache >/dev/null; then
-         addtarget=no
-@@ -3788,7 +3790,7 @@
-         val="$val/apache"
-       fi
-     fi
--    eval "$var='$val'"
-+    eval "$var=\"$val\""
-   done
-   
+--- configure.orig	Tue Nov 13 04:07:39 2001
++++ configure	Fri Nov 16 23:32:52 2001
+@@ -1084,7 +1084,7 @@
+   esac
  
-@@ -9678,6 +9680,10 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr configured properly"
+   else
+@@ -1175,7 +1175,7 @@
+   esac
  
-   
-   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
-   
- 
-   
-@@ -9814,7 +9820,7 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr-util configured properly"
+   else
+@@ -10508,7 +10508,10 @@
  EOF
  
  cat >> confdefs.h <<EOF
 -#define SERVER_CONFIG_FILE "conf/$progname.conf"
 +#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
++#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
  EOF
  
  cat >> confdefs.h <<EOF
diff --git a/www/apache21/files/patch-docs:conf:httpd-std.conf b/www/apache21/files/patch-docs:conf:httpd-std.conf
index 928bc48b70d4..eb63c30ac79a 100644
--- a/www/apache21/files/patch-docs:conf:httpd-std.conf
+++ b/www/apache21/files/patch-docs:conf:httpd-std.conf
@@ -1,53 +1,24 @@
---- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
-+++ docs/conf/httpd-std.conf	Tue Oct 23 17:12:59 2001
+--- docs/conf/httpd-std.conf.orig	Fri Nov  9 07:31:28 2001
++++ docs/conf/httpd-std.conf	Sat Nov 17 01:49:29 2001
 @@ -64,7 +64,7 @@
- # PidFile: The file in which the server should record its process
- # identification number when it starts.
- #
--PidFile logs/httpd.pid
-+PidFile /var/run/httpd.pid
- 
- #
- # ScoreBoardFile: File used to store internal server process information.
-@@ -73,7 +73,7 @@
- # no two invocations of Apache share the same scoreboard file.
  #
+ <IfModule !mpm_winnt.c>
  <IfModule !perchild.c>
 -ScoreBoardFile logs/apache_runtime_status
 +ScoreBoardFile /var/run/apache_runtime_status
  </IfModule>
+ </IfModule>
+ 
+@@ -73,7 +73,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
  
  #
-@@ -182,6 +182,28 @@
- #
- # Example:
- # LoadModule foo_module modules/mod_foo.so
-+#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
-+#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
-+#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
-+#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
-+#LoadModule cgid_module			libexec/apache/mod_cgid.so
-+#LoadModule dav_module			libexec/apache/mod_dav.so
-+#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
-+#LoadModule digest_module		libexec/apache/mod_digest.so
-+#LoadModule expires_module		libexec/apache/mod_expires.so
-+#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
-+#LoadModule headers_module		libexec/apache/mod_headers.so
-+#LoadModule imap_module			libexec/apache/mod_imap.so
-+#LoadModule include_module		libexec/apache/mod_include.so
-+#LoadModule info_module			libexec/apache/mod_info.so
-+#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
-+#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
-+#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
-+#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
-+#LoadModule speling_module		libexec/apache/mod_speling.so
-+#LoadModule status_module		libexec/apache/mod_status.so
-+#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
-+#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
- 
- ### Section 2: 'Main' server configuration
- #
-@@ -220,8 +242,8 @@
+ # Timeout: The number of seconds before receives and sends time out.
+@@ -229,8 +229,8 @@
  #  when the value of (unsigned)Group is above 60000; 
  #  don't use Group #-1 on these systems!
  #
@@ -55,10 +26,10 @@
 -Group #-1
 +User www
 +Group www
+ </IfModule>
  
  #
- # ServerAdmin: Your address, where problems with the server should be
-@@ -249,7 +271,7 @@
+@@ -259,7 +259,7 @@
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  #
@@ -67,7 +38,7 @@
  
  #
  # Each directory to which Apache has access, can be configured with respect
-@@ -274,7 +296,7 @@
+@@ -284,7 +284,7 @@
  #
  # This should be changed to whatever you set DocumentRoot to.
  #
@@ -76,31 +47,7 @@
  
  #
  # This may also be "None", "All", or any combination of "Indexes",
-@@ -326,7 +348,22 @@
- # DirectoryIndex: Name of the file or files to use as a pre-written HTML
- # directory index.  Separate multiple entries with spaces.
- #
--DirectoryIndex index.html
-+<IfModule mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.php3 index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.php3 index.html
-+    </IfModule>
-+</IfModule>
-+<IfModule !mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.html
-+    </IfModule>
-+</IfModule>
- 
- #
- # AccessFileName: The name of the file to look for in each directory
-@@ -372,7 +409,7 @@
+@@ -377,7 +377,7 @@
  # TypesConfig describes where the mime.types file (or equivalent) is
  # to be found.
  #
@@ -109,8 +56,8 @@
  
  #
  # DefaultType is the default MIME type the server will use for a document
-@@ -397,7 +434,7 @@
- # module is part of the server.
+@@ -396,7 +396,7 @@
+ # directive tells the module where the hint definitions are located.
  #
  <IfModule mod_mime_magic.c>
 -    MIMEMagicFile conf/magic
@@ -118,7 +65,7 @@
  </IfModule>
  
  #
-@@ -417,7 +454,7 @@
+@@ -416,7 +416,7 @@
  # logged here.  If you *do* define an error logfile for a <VirtualHost>
  # container, that host's errors will be logged there and not here.
  #
@@ -127,7 +74,7 @@
  
  #
  # LogLevel: Control the number of messages logged to the error_log.
-@@ -442,7 +479,7 @@
+@@ -441,7 +441,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -136,7 +83,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -455,7 +492,7 @@
+@@ -454,7 +454,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -145,9 +92,9 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -474,9 +511,9 @@
- # require it to be present in the URL.  So "/icons" isn't aliased in this
- # example, only "/icons/"..
+@@ -478,9 +478,9 @@
+ # We include the /icons/ alias for FancyIndexed directory listings.  If you
+ # do not use FancyIndexing, you may comment this out.
  #
 -Alias /icons/ "@@ServerRoot@@/icons/"
 +Alias /icons/ "@@ServerRoot@@/www/icons/"
@@ -157,7 +104,19 @@
      Options Indexes MultiViews
      AllowOverride None
      Order allow,deny
-@@ -491,7 +528,7 @@
+@@ -492,9 +492,9 @@
+ # the manual, even if you choose to move your DocumentRoot.  You may comment
+ # this out if you do not care for the documentation.
+ #
+-Alias /manual "@@ServerRoot@@/manual"
++Alias /manual "@@ServerRoot@@/share/doc/apache"
+ 
+-<Directory "@@ServerRoot@@/manual">
++<Directory "@@ServerRoot@@/share/doc/apache">
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -509,21 +509,21 @@
  # The same rules about trailing "/" apply to ScriptAlias directives as to
  # Alias.
  #
@@ -166,7 +125,14 @@
  
  <IfModule mod_cgid.c>
  #
-@@ -505,7 +542,7 @@
+ # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
+ # for setting UNIX socket for communicating with cgid.
+ #
+-#Scriptsock            logs/cgisock
++Scriptsock            /var/run/cgisock
+ </IfModule>
+ 
+ #
  # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
  # CGI directory exists, if you have that configured.
  #
@@ -175,31 +141,24 @@
      AllowOverride None
      Options None
      Order allow,deny
-@@ -657,6 +694,7 @@
- AddLanguage ja .ja
- AddLanguage pl .po
- AddLanguage kr .kr
-+AddLanguage ko .kr
- AddLanguage pt .pt
- AddLanguage no .no
- AddLanguage pt-br .pt-br
-@@ -741,8 +779,17 @@
- # For example, the PHP3 module (not part of the Apache distribution - see
- # http://www.php.net) will typically use:
- #
--#AddType application/x-httpd-php3 .php3
--#AddType application/x-httpd-php3-source .phps
-+<IfModule mod_php3.c>
-+    AddType application/x-httpd-php3 .php3
-+    AddType application/x-httpd-php3-source .php3s
-+</IfModule>
-+#
-+# And for PHP 4.x, use:
-+#
-+<IfModule mod_php4.c>
-+    AddType application/x-httpd-php .php
-+    AddType application/x-httpd-php-source .phps
-+</IfModule>
- 
- AddType application/x-tar .tgz
+@@ -851,9 +851,9 @@
+ #
+ 
+ <IfModule mod_include.c>
+-    Alias /error/ "@@ServerRoot@@/error/"
++    Alias /error/ "@@ServerRoot@@/www/error/"
+ 
+-    <Directory "@@ServerRoot@@/error">
++    <Directory "@@ServerRoot@@/www/error">
+         AllowOverride None
+         Options IncludesNoExec
+         AddOutputFilter Includes html
+@@ -964,7 +964,7 @@
+ # Bring in additional module-specific configurations
+ #
+ <IfModule mod_ssl.c>
+-    Include conf/ssl.conf
++    Include etc/apache/ssl.conf
+ </IfModule>
+ 
  
diff --git a/www/apache21/files/patch-docs:conf:ssl-std.conf b/www/apache21/files/patch-docs:conf:ssl-std.conf
new file mode 100644
index 000000000000..f647b91fac48
--- /dev/null
+++ b/www/apache21/files/patch-docs:conf:ssl-std.conf
@@ -0,0 +1,96 @@
+--- docs/conf/ssl-std.conf.orig	Fri Nov 16 21:56:55 2001
++++ docs/conf/ssl-std.conf	Fri Nov 16 22:00:27 2001
+@@ -57,7 +57,7 @@
+ #SSLSessionCache        none
+ #SSLSessionCache        shmht:logs/ssl_scache(512000)
+ #SSLSessionCache        shmcb:logs/ssl_scache(512000)
+-SSLSessionCache         dbm:logs/ssl_scache
++SSLSessionCache         dbm:/var/log/httpd-ssl_scache
+ SSLSessionCacheTimeout  300
+ 
+ #   Semaphore:
+@@ -99,11 +99,11 @@
+ <VirtualHost _default_:443>
+ 
+ #  General setup for the virtual host
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ ServerName new.host.name:443
+ ServerAdmin you@your.address
+-ErrorLog logs/error_log
+-TransferLog logs/access_log
++ErrorLog /var/log/httpd-error.log
++TransferLog /var/log/httpd-access.log
+ 
+ #   SSL Engine Switch:
+ #   Enable/Disable SSL for this virtual host.
+@@ -122,16 +122,16 @@
+ #   built time. Keep in mind that if you've both a RSA and a DSA
+ #   certificate you can configure both in parallel (to also allow
+ #   the use of DSA ciphers, etc.)
+-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
+-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
++SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server.crt
++#SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server-dsa.crt
+ 
+ #   Server Private Key:
+ #   If the key is not combined with the certificate, use this
+ #   directive to point at the key file.  Keep in mind that if
+ #   you've both a RSA and a DSA private key you can configure
+ #   both in parallel (to also allow the use of DSA ciphers, etc.)
+-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
+-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
++SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server.key
++#SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server-dsa.key
+ 
+ #   Server Certificate Chain:
+ #   Point SSLCertificateChainFile at a file containing the
+@@ -140,7 +140,7 @@
+ #   the referenced file can be the same as SSLCertificateFile
+ #   when the CA certificates are directly appended to the server
+ #   certificate for convinience.
+-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
++#SSLCertificateChainFile @@ServerRoot@@/etc/apache/ssl.crt/ca.crt
+ 
+ #   Certificate Authority (CA):
+ #   Set the CA certificate verification path where to find CA
+@@ -149,8 +149,8 @@
+ #   Note: Inside SSLCACertificatePath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
+-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
++#SSLCACertificatePath @@ServerRoot@@/etc/apache/ssl.crt
++#SSLCACertificateFile @@ServerRoot@@/etc/apache/ssl.crt/ca-bundle.crt
+ 
+ #   Certificate Revocation Lists (CRL):
+ #   Set the CA revocation path where to find CA CRLs for client
+@@ -159,8 +159,8 @@
+ #   Note: Inside SSLCARevocationPath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
+-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
++#SSLCARevocationPath @@ServerRoot@@/etc/apache/ssl.crl
++#SSLCARevocationFile @@ServerRoot@@/etc/apache/ssl.crl/ca-bundle.crl
+ 
+ #   Client Authentication (Type):
+ #   Client certificate verification type and depth.  Types are
+@@ -220,7 +220,7 @@
+ <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+     SSLOptions +StdEnvVars
+ </Files>
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     SSLOptions +StdEnvVars
+ </Directory>
+ 
+@@ -255,7 +255,7 @@
+ #   Per-Server Logging:
+ #   The home of a custom SSL log file. Use this when you want a
+ #   compact non-error SSL logfile on a virtual host basis.
+-CustomLog logs/ssl_request_log \
++CustomLog /var/log/httpd-ssl_request.log \
+           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+ 
+ </VirtualHost>                                  
diff --git a/www/apache21/files/patch-include:httpd.h b/www/apache21/files/patch-include:httpd.h
deleted file mode 100644
index 9f8fdf34997b..000000000000
--- a/www/apache21/files/patch-include:httpd.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
-+++ include/httpd.h	Sat Apr  7 09:08:43 2001
-@@ -127,7 +127,7 @@
- /* Set default for OS/2 file system */
- #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
- #else
--#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
-+#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
- #endif
- #endif /* DOCUMENT_LOCATION */
- 
-@@ -144,7 +144,7 @@
- #if defined(OS2) || defined(WIN32)
- #define DEFAULT_ERRORLOG "logs/error.log"
- #else
--#define DEFAULT_ERRORLOG "logs/error_log"
-+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
- #endif
- #endif /* DEFAULT_ERRORLOG */
- 
-@@ -160,7 +160,7 @@
- 
- /* The name of the server config file */
- #ifndef SERVER_CONFIG_FILE
--#define SERVER_CONFIG_FILE "conf/httpd.conf"
-+#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
- #endif
- 
- /* Whether we should enable rfc1413 identity checking */
-@@ -247,7 +247,7 @@
- 
- /* The name of the MIME types file */
- #ifndef AP_TYPES_CONFIG_FILE
--#define AP_TYPES_CONFIG_FILE "conf/mime.types"
-+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
- #endif
- 
- /*
diff --git a/www/apache21/files/patch-srclib:apr-util:Makefile.in b/www/apache21/files/patch-srclib:apr-util:Makefile.in
deleted file mode 100644
index 652901dae28a..000000000000
--- a/www/apache21/files/patch-srclib:apr-util:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
-+++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
-@@ -22,8 +22,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -43,7 +43,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache21/files/patch-srclib:apr:Makefile.in b/www/apache21/files/patch-srclib:apr:Makefile.in
deleted file mode 100644
index 4c0292f73af8..000000000000
--- a/www/apache21/files/patch-srclib:apr:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
-+++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
-@@ -37,8 +37,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -58,7 +58,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    ./build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache21/files/patch-support:apachectl.in b/www/apache21/files/patch-support:apachectl.in
index 739a622d74de..f5b347b4633d 100644
--- a/www/apache21/files/patch-support:apachectl.in
+++ b/www/apache21/files/patch-support:apachectl.in
@@ -1,23 +1,22 @@
---- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
-+++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+--- support/apachectl.in.orig	Fri Nov 16 21:22:36 2001
++++ support/apachectl.in	Fri Nov 16 22:07:31 2001
 @@ -25,10 +25,10 @@
  # --------------------                              --------------------
  # 
  # the path to your PID file
--PIDFILE=@prefix@/logs/httpd.pid
-+PIDFILE=/var/run/httpd.pid
+-PIDFILE=@prefix@/logs/@progname@.pid
++PIDFILE=/var/run/@progname@.pid
  #
  # the path to your httpd binary, including options if necessary
--HTTPD='@prefix@/bin/httpd'
-+HTTPD='@prefix@/sbin/httpd'
+-HTTPD='@prefix@/bin/@progname@'
++HTTPD='@prefix@/sbin/@progname@'
  #
  # a command that outputs a formatted text version of the HTML at the
  # url given on the command line.  Designed for lynx, however other
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
-+
 +eval `limits -e -C daemon` >/dev/null 2>&1
  
  ERROR=0
diff --git a/www/apache21/files/patch-support:apxs.in b/www/apache21/files/patch-support:apxs.in
index 70ca84075675..9ababb75322e 100644
--- a/www/apache21/files/patch-support:apxs.in
+++ b/www/apache21/files/patch-support:apxs.in
@@ -1,11 +1,20 @@
---- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
-+++ support/apxs.in	Sat Apr  7 11:55:28 2001
-@@ -73,7 +73,7 @@
- my $prefix            = "$CFG_PREFIX";
- my $CFG_EXEC_PREFIX   = "@exec_prefix@";
- my $exec_prefix       = "$CFG_EXEC_PREFIX";
--my $CFG_SBINDIR       = "@bindir@";
-+my $CFG_SBINDIR       = "@sbindir@";
- my $CFG_INCLUDEDIR    = "@includedir@";
- my $CFG_LIBEXECDIR    = "@libexecdir@";
- my $CFG_SYSCONFDIR    = "@sysconfdir@";
+--- support/apxs.in.orig	Sat Nov  3 05:09:20 2001
++++ support/apxs.in	Sat Nov 17 02:51:43 2001
+@@ -66,7 +66,7 @@
+ 
+ # read the configuration variables once
+ my %config_vars = ();
+-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
++get_config_vars("$prefix/share/mk/apache/config_vars.mk",\%config_vars);
+ 
+ my $exec_prefix    = get_vars("exec_prefix");
+ my $CFG_TARGET     = get_vars("progname");
+@@ -218,7 +218,7 @@
+ ##
+ ##  Initial shared object support check
+ ##
+-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
++my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+ 
diff --git a/www/apache21/files/patch-support:log_server_status.in b/www/apache21/files/patch-support:log_server_status.in
index 3549aa89f8c5..d8a970ebe8cd 100644
--- a/www/apache21/files/patch-support:log_server_status.in
+++ b/www/apache21/files/patch-support:log_server_status.in
@@ -1,15 +1,15 @@
---- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
-+++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+--- support/log_server_status.in.orig	Fri Nov 16 22:11:16 2001
++++ support/log_server_status.in	Fri Nov 16 22:13:50 2001
 @@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
 -$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "/var/log/httpd-status-";
++$wherelog = "/var/log/httpd-status-";  # Logs will be like "/var/log/httpd-status-19960312.log"
  $server = "localhost";          # Name of server, could be "www.foo.com"
  $port = "80";                   # Port on server
 -$request = "/status/?auto";     # Request to send
-+$request = "/server-status/?auto";     # Request to send
++$request = "/status-status/?auto";     # Request to send
  
  sub tcp_connect
  {
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 95616fc8a1c6..d13c6b6e7a9a 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -1,490 +1,759 @@
-bin/htpasswd
-bin/htdigest
+etc/apache/highperformance-std.conf
+etc/apache/highperformance.conf
+etc/apache/httpd-std.conf
+etc/apache/httpd.conf
+etc/apache/magic
+etc/apache/mime.types
+etc/apache/ssl-std.conf
+etc/apache/ssl.conf
+@dirrm etc/apache
 etc/rc.d/apache.sh
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types.default
-@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/highperformance-std.conf %D/etc/apache/highperformance-std.conf.default; then rm -f %D/etc/apache/highperformance-std.conf; fi
-etc/apache/highperformance-std.conf.default
-@exec [ ! -f %B/highperformance-std.conf ] && cp %B/%f %B/highperformance-std.conf
-@unexec if cmp -s %D/etc/apache/highperformance.conf %D/etc/apache/highperformance.conf.default; then rm -f %D/etc/apache/highperformance.conf; fi
-etc/apache/highperformance.conf.default
-@exec [ ! -f %B/highperformance.conf ] && cp %B/%f %B/highperformance.conf
-@unexec if cmp -s %D/etc/apache/httpd-std.conf %D/etc/apache/httpd-std.conf.default; then rm -f %D/etc/apache/httpd-std.conf; fi
-etc/apache/httpd-std.conf.default
-@exec [ ! -f %B/httpd-std.conf ] && cp %B/%f %B/httpd-std.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+include/apache/ap_compat.h
+include/apache/ap_config.h
+include/apache/ap_config_auto.h
+include/apache/ap_listen.h
+include/apache/ap_mmn.h
+include/apache/ap_mpm.h
+include/apache/ap_release.h
 include/apache/apr.h
-include/apache/apr_want.h
-include/apache/apr_uuid.h
-include/apache/apr_user.h
-include/apache/apr_time.h
-include/apache/apr_thread_proc.h
-include/apache/apr_tables.h
-include/apache/apr_strings.h
-include/apache/apr_signal.h
-include/apache/apr_shmem.h
-include/apache/apr_portable.h
-include/apache/apr_pools.h
-include/apache/apr_network_io.h
-include/apache/apr_mmap.h
-include/apache/apr_md5.h
-include/apache/apr_lock.h
-include/apache/apr_lib.h
-include/apache/apr_hash.h
-include/apache/apr_getopt.h
-include/apache/apr_general.h
-include/apache/apr_fnmatch.h
-include/apache/apr_file_io.h
-include/apache/apr_file_info.h
-include/apache/apr_errno.h
-include/apache/apr_dso.h
+include/apache/apr_base64.h
+include/apache/apr_buckets.h
 include/apache/apr_compat.h
+include/apache/apr_date.h
+include/apache/apr_dbm.h
+include/apache/apr_dso.h
+include/apache/apr_errno.h
+include/apache/apr_file_info.h
+include/apache/apr_file_io.h
+include/apache/apr_fnmatch.h
+include/apache/apr_general.h
+include/apache/apr_getopt.h
+include/apache/apr_hash.h
+include/apache/apr_hooks.h
+include/apache/apr_inherit.h
+include/apache/apr_ldap.h
+include/apache/apr_lib.h
+include/apache/apr_lock.h
+include/apache/apr_md4.h
+include/apache/apr_md5.h
+include/apache/apr_mmap.h
+include/apache/apr_network_io.h
+include/apache/apr_optional.h
+include/apache/apr_optional_hooks.h
+include/apache/apr_pools.h
+include/apache/apr_portable.h
+include/apache/apr_proc_mutex.h
+include/apache/apr_ring.h
+include/apache/apr_sdbm.h
+include/apache/apr_sha1.h
+include/apache/apr_shmem.h
+include/apache/apr_signal.h
+include/apache/apr_strings.h
+include/apache/apr_tables.h
+include/apache/apr_thread_cond.h
+include/apache/apr_thread_mutex.h
+include/apache/apr_thread_proc.h
+include/apache/apr_thread_rwlock.h
+include/apache/apr_time.h
+include/apache/apr_uri.h
+include/apache/apr_user.h
+include/apache/apr_uuid.h
+include/apache/apr_want.h
 include/apache/apr_xlate.h
-include/apache/apr_base64.h
-include/apache/apu.h
 include/apache/apr_xml.h
-include/apache/apr_sha1.h
-include/apache/apr_sdbm.h
-include/apache/apr_ring.h
-include/apache/apr_optional.h
-include/apache/apr_hooks.h
-include/apache/apr_generic_hook.h
-include/apache/apr_dbm.h
-include/apache/apr_buckets.h
+include/apache/apu.h
 include/apache/apu_compat.h
-include/apache/ap_compat.h
-include/apache/util_uri.h
-include/apache/util_script.h
-include/apache/util_md5.h
-include/apache/util_filter.h
-include/apache/util_ebcdic.h
-include/apache/util_date.h
-include/apache/util_charset.h
-include/apache/util_cfgtree.h
-include/apache/scoreboard.h
-include/apache/rfc1413.h
-include/apache/pcreposix.h
-include/apache/mpm_common.h
-include/apache/httpd.h
-include/apache/http_vhost.h
-include/apache/http_request.h
-include/apache/http_protocol.h
-include/apache/http_main.h
-include/apache/http_log.h
-include/apache/http_core.h
-include/apache/http_connection.h
+include/apache/config.h
+include/apache/expat.h
 include/apache/http_config.h
-include/apache/ap_release.h
-include/apache/ap_mpm.h
-include/apache/ap_mmn.h
-include/apache/ap_listen.h
-include/apache/ap_config_auto.h
-include/apache/ap_config.h
-include/apache/util_xml.h
-include/apache/os.h
-include/apache/os-inline.c
-include/apache/mpm_default.h
-include/apache/mpm.h
+include/apache/http_connection.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/internal.h
+include/apache/mod_cgi.h
+include/apache/mod_core.h
 include/apache/mod_dav.h
 include/apache/mod_include.h
+include/apache/mod_proxy.h
+include/apache/mod_ssl.h
+include/apache/mpm.h
+include/apache/mpm_common.h
+include/apache/mpm_default.h
+include/apache/os.h
 include/apache/pcre.h
-include/apache/internal.h
-include/apache/config.h
+include/apache/pcreposix.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+include/apache/ssl_expr.h
+include/apache/ssl_expr_parse.h
+include/apache/ssl_util_ssl.h
+include/apache/ssl_util_table.h
 include/apache/unixd.h
-lib/libapr.la
+include/apache/util_cfgtree.h
+include/apache/util_charset.h
+include/apache/util_ebcdic.h
+include/apache/util_filter.h
+include/apache/util_ldap.h
+include/apache/util_md5.h
+include/apache/util_script.h
+include/apache/util_time.h
+include/apache/util_xml.h
+@dirrm include/apache
+lib/APRVARS
 lib/libapr.a
-lib/libaprutil.la
+lib/libapr.la
+lib/libapr.so.0
 lib/libaprutil.a
-libexec/apache/mod_auth_anon.so
+lib/libaprutil.la
+lib/libaprutil.so.0
+lib/libexpat.a
+lib/libexpat.la
+lib/libexpat.so.1
+libexec/apache/httpd.exp
+libexec/apache/mod_access.la
+libexec/apache/mod_access.so
+libexec/apache/mod_actions.la
+libexec/apache/mod_actions.so
+libexec/apache/mod_alias.la
+libexec/apache/mod_alias.so
+libexec/apache/mod_asis.la
+libexec/apache/mod_asis.so
+libexec/apache/mod_auth.la
+libexec/apache/mod_auth.so
 libexec/apache/mod_auth_anon.la
-libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_anon.so
 libexec/apache/mod_auth_db.la
-libexec/apache/mod_auth_digest.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_dbm.la
+libexec/apache/mod_auth_dbm.so
 libexec/apache/mod_auth_digest.la
-libexec/apache/mod_file_cache.so
-libexec/apache/mod_file_cache.la
-libexec/apache/mod_dav_fs.so
-libexec/apache/mod_dav_fs.la
-libexec/apache/mod_dav.so
-libexec/apache/mod_dav.la
-libexec/apache/mod_echo.so
-libexec/apache/mod_echo.la
-libexec/apache/mod_optional_fn_import.so
-libexec/apache/mod_optional_fn_import.la
-libexec/apache/mod_optional_fn_export.so
-libexec/apache/mod_optional_fn_export.la
-libexec/apache/mod_include.so
-libexec/apache/mod_include.la
-libexec/apache/mod_imap.so
-libexec/apache/mod_imap.la
-libexec/apache/mod_speling.so
-libexec/apache/mod_speling.la
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_rewrite.la
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mime_magic.la
-libexec/apache/mod_cern_meta.so
+libexec/apache/mod_auth_digest.so
+libexec/apache/mod_autoindex.la
+libexec/apache/mod_autoindex.so
+%%CACHEOPT%%libexec/apache/mod_cache.la
+%%CACHEOPT%%libexec/apache/mod_cache.so
 libexec/apache/mod_cern_meta.la
-libexec/apache/mod_expires.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_cgi.la
+libexec/apache/mod_cgi.so
+libexec/apache/mod_cgid.la
+libexec/apache/mod_cgid.so
+libexec/apache/mod_dav.la
+libexec/apache/mod_dav.so
+libexec/apache/mod_dav_fs.la
+libexec/apache/mod_dav_fs.so
+libexec/apache/mod_dir.la
+libexec/apache/mod_dir.so
+libexec/apache/mod_env.la
+libexec/apache/mod_env.so
 libexec/apache/mod_expires.la
-libexec/apache/mod_headers.so
+libexec/apache/mod_expires.so
+%%CACHEOPT%%libexec/apache/mod_file_cache.la
+%%CACHEOPT%%libexec/apache/mod_file_cache.so
 libexec/apache/mod_headers.la
-libexec/apache/mod_usertrack.so
-libexec/apache/mod_usertrack.la
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_unique_id.la
-libexec/apache/mod_status.so
-libexec/apache/mod_status.la
-libexec/apache/mod_info.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_imap.la
+libexec/apache/mod_imap.so
+libexec/apache/mod_include.la
+libexec/apache/mod_include.so
 libexec/apache/mod_info.la
-libexec/apache/mod_cgid.so
-libexec/apache/mod_cgid.la
-libexec/apache/httpd.exp
-sbin/rotatelogs
-sbin/htpasswd
-sbin/logresolve
+libexec/apache/mod_info.so
+libexec/apache/mod_log_config.la
+libexec/apache/mod_log_config.so
+%%CACHEOPT%%libexec/apache/mod_mem_cache.la
+%%CACHEOPT%%libexec/apache/mod_mem_cache.so
+libexec/apache/mod_mime.la
+libexec/apache/mod_mime.so
+libexec/apache/mod_mime_magic.la
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_negotiation.la
+libexec/apache/mod_negotiation.so
+%%PROXYOPT%%libexec/apache/mod_proxy.la
+%%PROXYOPT%%libexec/apache/mod_proxy.so
+%%PROXYOPT%%libexec/apache/mod_proxy_connect.la
+%%PROXYOPT%%libexec/apache/mod_proxy_connect.so
+%%PROXYOPT%%libexec/apache/mod_proxy_ftp.la
+%%PROXYOPT%%libexec/apache/mod_proxy_ftp.so
+%%PROXYOPT%%libexec/apache/mod_proxy_http.la
+%%PROXYOPT%%libexec/apache/mod_proxy_http.so
+libexec/apache/mod_rewrite.la
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_setenvif.la
+libexec/apache/mod_setenvif.so
+libexec/apache/mod_speling.la
+libexec/apache/mod_speling.so
+%%SSLOPT%%libexec/apache/mod_ssl.la
+%%SSLOPT%%libexec/apache/mod_ssl.so
+libexec/apache/mod_status.la
+libexec/apache/mod_status.so
+libexec/apache/mod_unique_id.la
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_userdir.la
+libexec/apache/mod_userdir.so
+libexec/apache/mod_usertrack.la
+libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.la
+libexec/apache/mod_vhost_alias.so
+@dirrm libexec/apache
 sbin/ab
 sbin/apachectl
 sbin/apxs
+sbin/checkgid
+sbin/dbmmanage
+sbin/htdigest
+sbin/htpasswd
 sbin/httpd
-share/doc/apache/README.rus
+sbin/logresolve
+sbin/rotatelogs
+%%PORTDOCS%%share/doc/apache/LICENSE
+%%PORTDOCS%%share/doc/apache/bind.html
+%%PORTDOCS%%share/doc/apache/cgi_path.html
+%%PORTDOCS%%share/doc/apache/configuring.html.en
+%%PORTDOCS%%share/doc/apache/configuring.html.ja.jis
+%%PORTDOCS%%share/doc/apache/content-negotiation.html
+%%PORTDOCS%%share/doc/apache/custom-error.html
+%%PORTDOCS%%share/doc/apache/developer/API.html
+%%PORTDOCS%%share/doc/apache/developer/debugging.html
+%%PORTDOCS%%share/doc/apache/developer/documenting.html
+%%PORTDOCS%%share/doc/apache/developer/footer.html
+%%PORTDOCS%%share/doc/apache/developer/header.html
+%%PORTDOCS%%share/doc/apache/developer/hooks.html
+%%PORTDOCS%%share/doc/apache/developer/index.html
+%%PORTDOCS%%share/doc/apache/developer/layeredio.html
+%%PORTDOCS%%share/doc/apache/developer/modules.html
+%%PORTDOCS%%share/doc/apache/developer/request.html
+%%PORTDOCS%%share/doc/apache/dns-caveats.html
+%%PORTDOCS%%share/doc/apache/dso.html
+%%PORTDOCS%%share/doc/apache/ebcdic.html
+%%PORTDOCS%%share/doc/apache/env.html
+%%PORTDOCS%%share/doc/apache/faq/footer.html
+%%PORTDOCS%%share/doc/apache/faq/header.html
+%%PORTDOCS%%share/doc/apache/faq/index.html
+%%PORTDOCS%%share/doc/apache/faq/support.html
+%%PORTDOCS%%share/doc/apache/filter.html
+%%PORTDOCS%%share/doc/apache/footer.html
+%%PORTDOCS%%share/doc/apache/handler.html.en
+%%PORTDOCS%%share/doc/apache/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache/header.html
+%%PORTDOCS%%share/doc/apache/howto/auth.html
+%%PORTDOCS%%share/doc/apache/howto/cgi.html.en
+%%PORTDOCS%%share/doc/apache/howto/cgi.html.ja.jis
+%%PORTDOCS%%share/doc/apache/howto/footer.html
+%%PORTDOCS%%share/doc/apache/howto/header.html
+%%PORTDOCS%%share/doc/apache/howto/ssi.html.en
+%%PORTDOCS%%share/doc/apache/howto/ssi.html.ja.jis
+%%PORTDOCS%%share/doc/apache/images/apache_header.gif
+%%PORTDOCS%%share/doc/apache/images/apache_header.png
+%%PORTDOCS%%share/doc/apache/images/custom_errordocs.gif
+%%PORTDOCS%%share/doc/apache/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache/images/home.gif
+%%PORTDOCS%%share/doc/apache/images/home.png
+%%PORTDOCS%%share/doc/apache/images/index.gif
+%%PORTDOCS%%share/doc/apache/images/index.png
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.fig
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.gif
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.png
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.fig
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.gif
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.png
+%%PORTDOCS%%share/doc/apache/images/pixel.gif
+%%PORTDOCS%%share/doc/apache/images/pixel.png
+%%PORTDOCS%%share/doc/apache/images/sub.gif
+%%PORTDOCS%%share/doc/apache/images/sub.png
+%%PORTDOCS%%share/doc/apache/index.html.en
+%%PORTDOCS%%share/doc/apache/index.html.fr
+%%PORTDOCS%%share/doc/apache/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache/install.html
+%%PORTDOCS%%share/doc/apache/invoking.html
+%%PORTDOCS%%share/doc/apache/logs.html
+%%PORTDOCS%%share/doc/apache/misc/custom_errordocs.html
+%%PORTDOCS%%share/doc/apache/misc/descriptors.html
+%%PORTDOCS%%share/doc/apache/misc/fin_wait_2.html
+%%PORTDOCS%%share/doc/apache/misc/footer.html
+%%PORTDOCS%%share/doc/apache/misc/header.html
+%%PORTDOCS%%share/doc/apache/misc/index.html
+%%PORTDOCS%%share/doc/apache/misc/known_client_problems.html
+%%PORTDOCS%%share/doc/apache/misc/perf-tuning.html
+%%PORTDOCS%%share/doc/apache/misc/rewriteguide.html
+%%PORTDOCS%%share/doc/apache/misc/security_tips.html
+%%PORTDOCS%%share/doc/apache/misc/tutorials.html
+%%PORTDOCS%%share/doc/apache/mod/core.html
+%%PORTDOCS%%share/doc/apache/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache/mod/directives.html
+%%PORTDOCS%%share/doc/apache/mod/footer.html
+%%PORTDOCS%%share/doc/apache/mod/header.html
+%%PORTDOCS%%share/doc/apache/mod/index-bytype.html
+%%PORTDOCS%%share/doc/apache/mod/index.html
+%%PORTDOCS%%share/doc/apache/mod/mod_TEMPLATE.html
+%%PORTDOCS%%share/doc/apache/mod/mod_access.html
+%%PORTDOCS%%share/doc/apache/mod/mod_actions.html
+%%PORTDOCS%%share/doc/apache/mod/mod_alias.html
+%%PORTDOCS%%share/doc/apache/mod/mod_asis.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_db.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_autoindex.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cern_meta.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cgi.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cgid.html
+%%PORTDOCS%%share/doc/apache/mod/mod_charset_lite.html
+%%PORTDOCS%%share/doc/apache/mod/mod_dav.html
+%%PORTDOCS%%share/doc/apache/mod/mod_dir.html
+%%PORTDOCS%%share/doc/apache/mod/mod_env.html
+%%PORTDOCS%%share/doc/apache/mod/mod_example.html
+%%PORTDOCS%%share/doc/apache/mod/mod_expires.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ext_filter.html
+%%PORTDOCS%%share/doc/apache/mod/mod_file_cache.html
+%%PORTDOCS%%share/doc/apache/mod/mod_headers.html
+%%PORTDOCS%%share/doc/apache/mod/mod_imap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_include.html
+%%PORTDOCS%%share/doc/apache/mod/mod_info.html
+%%PORTDOCS%%share/doc/apache/mod/mod_isapi.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ldap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_log_config.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mime.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mime_magic.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mmap_static.html
+%%PORTDOCS%%share/doc/apache/mod/mod_negotiation.html
+%%PORTDOCS%%share/doc/apache/mod/mod_proxy.html
+%%PORTDOCS%%share/doc/apache/mod/mod_rewrite.html
+%%PORTDOCS%%share/doc/apache/mod/mod_setenvif.html
+%%PORTDOCS%%share/doc/apache/mod/mod_so.html
+%%PORTDOCS%%share/doc/apache/mod/mod_speling.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ssl.html
+%%PORTDOCS%%share/doc/apache/mod/mod_status.html
+%%PORTDOCS%%share/doc/apache/mod/mod_suexec.html
+%%PORTDOCS%%share/doc/apache/mod/mod_unique_id.html
+%%PORTDOCS%%share/doc/apache/mod/mod_userdir.html
+%%PORTDOCS%%share/doc/apache/mod/mod_usertrack.html
+%%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html
+%%PORTDOCS%%share/doc/apache/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_common.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html
+%%PORTDOCS%%share/doc/apache/mod/perchild.html
+%%PORTDOCS%%share/doc/apache/mod/prefork.html
+%%PORTDOCS%%share/doc/apache/mod/threaded.html
+%%PORTDOCS%%share/doc/apache/mpm.html
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.en
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr
+%%PORTDOCS%%share/doc/apache/platform/footer.html
+%%PORTDOCS%%share/doc/apache/platform/header.html
+%%PORTDOCS%%share/doc/apache/platform/perf-hp.html
+%%PORTDOCS%%share/doc/apache/platform/win_compiling.html
+%%PORTDOCS%%share/doc/apache/platform/win_service.html
+%%PORTDOCS%%share/doc/apache/platform/windows.html
+%%PORTDOCS%%share/doc/apache/programs/ab.html
+%%PORTDOCS%%share/doc/apache/programs/apachectl.html
+%%PORTDOCS%%share/doc/apache/programs/apxs.html
+%%PORTDOCS%%share/doc/apache/programs/dbmmanage.html
+%%PORTDOCS%%share/doc/apache/programs/footer.html
+%%PORTDOCS%%share/doc/apache/programs/header.html
+%%PORTDOCS%%share/doc/apache/programs/htdigest.html
+%%PORTDOCS%%share/doc/apache/programs/htpasswd.html
+%%PORTDOCS%%share/doc/apache/programs/httpd.html
+%%PORTDOCS%%share/doc/apache/programs/index.html
+%%PORTDOCS%%share/doc/apache/programs/logresolve.html
+%%PORTDOCS%%share/doc/apache/programs/other.html
+%%PORTDOCS%%share/doc/apache/programs/rotatelogs.html
+%%PORTDOCS%%share/doc/apache/programs/suexec.html
+%%PORTDOCS%%share/doc/apache/search/manual-index.cgi
+%%PORTDOCS%%share/doc/apache/sections.html
+%%PORTDOCS%%share/doc/apache/server-wide.html.en
+%%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache/ssl/Makefile
+%%PORTDOCS%%share/doc/apache/ssl/footer.html
+%%PORTDOCS%%share/doc/apache/ssl/header.html
+%%PORTDOCS%%share/doc/apache/ssl/index.html
+%%PORTDOCS%%share/doc/apache/ssl/mod_ssl_sb.gif
+%%PORTDOCS%%share/doc/apache/ssl/openssl_ics.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_logo.jpg
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_title.jpg
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig2.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig3.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview_fig1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-chapter.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-2.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-3.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-4.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-5.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-6.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-7.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-000000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-transp.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.inc
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-n.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-s.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-n.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-s.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-abstract.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-compat.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-faq.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-gloss.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-howto.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-intro.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-over.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-preface.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-ref.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-toc.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-tutor.gif
+%%PORTDOCS%%share/doc/apache/stopping.html
+%%PORTDOCS%%share/doc/apache/suexec.html
+%%PORTDOCS%%share/doc/apache/upgrading.html.en
+%%PORTDOCS%%share/doc/apache/upgrading.html.fr
+%%PORTDOCS%%share/doc/apache/urlmapping.html
+%%PORTDOCS%%share/doc/apache/vhosts/details.html
+%%PORTDOCS%%share/doc/apache/vhosts/examples.html
+%%PORTDOCS%%share/doc/apache/vhosts/fd-limits.html
+%%PORTDOCS%%share/doc/apache/vhosts/footer.html
+%%PORTDOCS%%share/doc/apache/vhosts/header.html
+%%PORTDOCS%%share/doc/apache/vhosts/index.html
+%%PORTDOCS%%share/doc/apache/vhosts/ip-based.html
+%%PORTDOCS%%share/doc/apache/vhosts/mass.html
+%%PORTDOCS%%share/doc/apache/vhosts/name-based.html
+%%PORTDOCS%%@dirrm share/doc/apache/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache/ssl
+%%PORTDOCS%%@dirrm share/doc/apache/search
+%%PORTDOCS%%@dirrm share/doc/apache/programs
+%%PORTDOCS%%@dirrm share/doc/apache/platform
+%%PORTDOCS%%@dirrm share/doc/apache/mod
+%%PORTDOCS%%@dirrm share/doc/apache/misc
+%%PORTDOCS%%@dirrm share/doc/apache/images
+%%PORTDOCS%%@dirrm share/doc/apache/howto
+%%PORTDOCS%%@dirrm share/doc/apache/faq
+%%PORTDOCS%%@dirrm share/doc/apache/developer
+%%PORTDOCS%%@dirrm share/doc/apache
+share/mk/apache/config_vars.mk
+share/mk/apache/library.mk
+share/mk/apache/libtool
+share/mk/apache/ltlib.mk
+share/mk/apache/program.mk
+share/mk/apache/rules.mk
+share/mk/apache/special.mk
+@dirrm share/mk/apache
+@dirrm share/mk
 @exec mkdir -p %D/www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
-@exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/index.html.tw
-share/doc/apache/index.html.se
-share/doc/apache/index.html.ru.utf8
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.ltz
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.kr.iso2022-kr
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.ja.iso2022-jp
-share/doc/apache/index.html.it
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.et
-share/doc/apache/index.html.es
-share/doc/apache/index.html.en
-share/doc/apache/index.html.el
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.de
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.ca
-share/doc/apache/apache_pb.gif
-share/doc/apache/index.html.tw.Big5
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/client_block_api.html
-share/doc/apache/manual/misc/compat_notes.html
-share/doc/apache/manual/misc/custom_errordocs.html
-share/doc/apache/manual/misc/descriptors.html
-share/doc/apache/manual/misc/fin_wait_2.html
-share/doc/apache/manual/misc/footer.html
-share/doc/apache/manual/misc/header.html
-share/doc/apache/manual/misc/howto.html
-share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/rewriteguide.html
-share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/API.html
-share/doc/apache/manual/developer/modules.html
-share/doc/apache/manual/developer/documenting
-share/doc/apache/manual/developer/footer.html
-share/doc/apache/manual/developer/header.html
-share/doc/apache/manual/developer/hooks.html
-share/doc/apache/manual/developer/index.html
-share/doc/apache/manual/developer/layeredio.html
-share/doc/apache/manual/developer/debugging.html
-share/doc/apache/manual/platform/windows.html
-share/doc/apache/manual/platform/header.html
-share/doc/apache/manual/platform/netware.html
-share/doc/apache/manual/platform/perf-bsd44.html
-share/doc/apache/manual/platform/perf-dec.html
-share/doc/apache/manual/platform/perf-hp.html
-share/doc/apache/manual/platform/perf.html
-share/doc/apache/manual/platform/readme-tpf.html
-share/doc/apache/manual/platform/unixware.html
-share/doc/apache/manual/platform/win_compiling.html
-share/doc/apache/manual/platform/win_service.html
-share/doc/apache/manual/platform/footer.html
-share/doc/apache/manual/mod/threaded.html
-share/doc/apache/manual/mod/directive-dict.html
-share/doc/apache/manual/mod/directives.html
-share/doc/apache/manual/mod/footer.html
-share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index-bytype.html
-share/doc/apache/manual/mod/index.html
-share/doc/apache/manual/mod/mod_access.html
-share/doc/apache/manual/mod/mod_actions.html
-share/doc/apache/manual/mod/mod_alias.html
-share/doc/apache/manual/mod/mod_asis.html
-share/doc/apache/manual/mod/mod_auth.html
-share/doc/apache/manual/mod/mod_auth_anon.html
-share/doc/apache/manual/mod/mod_auth_db.html
-share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_digest.html
-share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_cern_meta.html
-share/doc/apache/manual/mod/mod_so.html
-share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_charset_lite.html
-share/doc/apache/manual/mod/mod_dav.html
-share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_env.html
-share/doc/apache/manual/mod/mod_example.html
-share/doc/apache/manual/mod/mod_expires.html
-share/doc/apache/manual/mod/mod_ext_filter.html
-share/doc/apache/manual/mod/mod_file_cache.html
-share/doc/apache/manual/mod/mod_headers.html
-share/doc/apache/manual/mod/mod_imap.html
-share/doc/apache/manual/mod/mod_include.html
-share/doc/apache/manual/mod/mod_info.html
-share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_mime.html
-share/doc/apache/manual/mod/mod_mime_magic.html
-share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html
-share/doc/apache/manual/mod/mod_proxy.html
-share/doc/apache/manual/mod/mod_rewrite.html
-share/doc/apache/manual/mod/mod_setenvif.html
-share/doc/apache/manual/mod/mod_speling.html
-share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.html
-share/doc/apache/manual/mod/mod_userdir.html
-share/doc/apache/manual/mod/mod_usertrack.html
-share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html
-share/doc/apache/manual/mod/mpm_common.html
-share/doc/apache/manual/mod/mpm_winnt.html
-share/doc/apache/manual/mod/perchild.html
-share/doc/apache/manual/mod/prefork.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/programs/apachectl.html
-share/doc/apache/manual/programs/apxs.html
-share/doc/apache/manual/programs/dbmmanage.html
-share/doc/apache/manual/programs/footer.html
-share/doc/apache/manual/programs/header.html
-share/doc/apache/manual/programs/htdigest.html
-share/doc/apache/manual/programs/htpasswd.html
-share/doc/apache/manual/programs/httpd.html
-share/doc/apache/manual/programs/index.html
-share/doc/apache/manual/programs/logresolve.html
-share/doc/apache/manual/programs/other.html
-share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/ab.html
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html
-share/doc/apache/manual/vhosts/footer.html
-share/doc/apache/manual/vhosts/header.html
-share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html
-share/doc/apache/manual/vhosts/ip-based.html
-share/doc/apache/manual/vhosts/mass.html
-share/doc/apache/manual/vhosts/name-based.html
-share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/new_features_2_0.html.fr
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/mpm.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/install.html
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html
-share/doc/apache/manual/header.html
-share/doc/apache/manual/handler.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/filter.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/custom-error.html
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/configuring.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/STATUS
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/upgrading.html.fr
-share/doc/apache/manual/upgrading.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/server-wide.html
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/process-model.html
-www/cgi-bin.default/test-cgi
+@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 www/cgi-bin.default/printenv
-www/icons/small/uu.gif
+www/cgi-bin.default/test-cgi
+www/cgi-bin.default/test-cgi.bat
+@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+www/data.default/apache_pb.gif
+www/data.default/apache_pb.png
+www/data.default/apache_pb2.gif
+www/data.default/apache_pb2.png
+www/data.default/apache_pb2_ani.gif
+www/data.default/error.README
+www/data.default/index.html.ca
+www/data.default/index.html.cz.iso8859-2
+www/data.default/index.html.de
+www/data.default/index.html.dk
+www/data.default/index.html.ee
+www/data.default/index.html.el
+www/data.default/index.html.en
+www/data.default/index.html.es
+www/data.default/index.html.et
+www/data.default/index.html.fr
+www/data.default/index.html.he.iso8859-8
+www/data.default/index.html.hr.iso8859-2
+www/data.default/index.html.it
+www/data.default/index.html.ja.iso2022-jp
+www/data.default/index.html.kr.iso2022-kr
+www/data.default/index.html.ltz.utf8
+www/data.default/index.html.lu.utf8
+www/data.default/index.html.nl
+www/data.default/index.html.nn
+www/data.default/index.html.no
+www/data.default/index.html.po.iso8859-2
+www/data.default/index.html.pt
+www/data.default/index.html.pt-br
+www/data.default/index.html.ru.cp-1251
+www/data.default/index.html.ru.cp866
+www/data.default/index.html.ru.iso-ru
+www/data.default/index.html.ru.koi8-r
+www/data.default/index.html.ru.utf8
+www/data.default/index.html.se
+www/data.default/index.html.tw
+www/data.default/index.html.tw.Big5
+www/data.default/index.html.var
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+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/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/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/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/README.txt
-www/icons/world1.gif
-www/icons/uuencoded.gif
-www/icons/uu.gif
-www/icons/up.gif
-www/icons/unknown.gif
-www/icons/transfer.gif
-www/icons/text.gif
-www/icons/tex.gif
-www/icons/tar.gif
-www/icons/sphere2.gif
-www/icons/sphere1.gif
-www/icons/sound2.gif
+www/icons/small/unknown.png
+www/icons/small/uu.gif
+www/icons/small/uu.png
 www/icons/sound1.gif
-www/icons/script.gif
-www/icons/screw2.gif
-www/icons/screw1.gif
-www/icons/right.gif
-www/icons/quill.gif
-www/icons/ps.gif
-www/icons/portal.gif
-www/icons/pie8.gif
-www/icons/pie7.gif
-www/icons/pie6.gif
-www/icons/pie5.gif
-www/icons/pie4.gif
-www/icons/pie3.gif
-www/icons/pie2.gif
-www/icons/pie1.gif
-www/icons/pie0.gif
-www/icons/pdf.gif
-www/icons/patch.gif
-www/icons/p.gif
-www/icons/movie.gif
-www/icons/link.gif
-www/icons/left.gif
-www/icons/layout.gif
-www/icons/index.gif
-www/icons/image3.gif
-www/icons/image2.gif
-www/icons/image1.gif
-www/icons/icon.sheet.gif
-www/icons/hand.up.gif
-www/icons/hand.right.gif
-www/icons/generic.sec.gif
-www/icons/generic.red.gif
-www/icons/generic.gif
-www/icons/forward.gif
-www/icons/folder.sec.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/f.gif
-www/icons/dvi.gif
-www/icons/down.gif
-www/icons/dir.gif
-www/icons/continued.gif
-www/icons/compressed.gif
-www/icons/comp.gray.gif
-www/icons/comp.blue.gif
-www/icons/c.gif
-www/icons/burst.gif
-www/icons/broken.gif
-www/icons/box2.gif
-www/icons/box1.gif
-www/icons/bomb.gif
-www/icons/blank.gif
-www/icons/binhex.gif
-www/icons/binary.gif
-www/icons/ball.red.gif
-www/icons/ball.gray.gif
-www/icons/back.gif
-www/icons/apache_pb.gif
-www/icons/alert.red.gif
-www/icons/alert.black.gif
-www/icons/a.gif
+www/icons/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/README
-@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
-@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
-@dirrm etc/apache
-@dirrm include/apache
-@dirrm libexec/apache
-@dirrm share/doc/apache/manual/vhosts
-@dirrm share/doc/apache/manual/search
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/platform
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/developer
-@dirrm share/doc/apache/manual
-@dirrm share/doc/apache
+www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
+@dirrm www/error/include
+@dirrm www/error
+@dirrm www/data.default
 @dirrm www/cgi-bin.default
 @dirrm www
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index ea501e6245d5..48f99ccca4a3 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -6,19 +6,14 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.16
-PORTREVISION=	3
+PORTVERSION=	2.0.28
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
-		http://www.cybernic.com/mirror/dist/httpd/ \
-		http://mirrors.partnersforever.net/apache/dist/httpd/ \
-		http://www.technotopia.com/vroom/apache/dist/httpd/ \
-		http://www.tux.org/pub/net/apache/dist/httpd/ \
-		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
-		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
-		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
+MASTER_SITES=	http://www.apache.org/dist/httpd/ \
+		http://apache.mirrorcentral.com/dist/httpd/ \
+		http://apache.missouri.edu/dist/httpd/ \
+		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
-		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
 DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
 
 MAINTAINER?=	perky@fallin.lv
@@ -26,46 +21,61 @@ MAINTAINER?=	perky@fallin.lv
 LATEST_LINK=	apache2
 
 WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
-FIND?=		find
-XARGS?=		xargs
-
-# apache2 doesn't process '--enable-share=max' option yet.
-# and some modules are very unstable at DSO mode.
-SHARED_MODS?=	unique_id mime_magic rewrite speling auth_db \
-		auth_anon digest headers cern_meta expires include \
-		cgid status info usertrack dav dav_fs imap proxy \
-		auth_digest file_cache echo optional_fn_import \
-		optional_fn_export
-STATIC_MODS?=	so env setenvif dir autoindex access auth negotiation \
-		userdir alias asis cgi mime log_config vhost_alias actions
+FIND=		find
+
+WITH_MPM?=	prefork # or perchild, threaded
+HTTP_PORT?=	80
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	\
-		--prefix=${PREFIX} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL} \
+		--enable-so \
 		--with-suexec-docroot=${PREFIX}/www/data \
-		--enable-shared \
-		--disable-threads \
-		--with-mpm=prefork  # Apache's thread doesn't work well in FreeBSD
+		--with-mpm=${WITH_MPM} \
+		--with-port=${HTTP_PORT} \
+		--includedir=${PREFIX}/include/apache # for apr, apr-util
+CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+SHARED_MODULES=	all cgid
+
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	NOPORTDOCS=YES
+.endif
+
+.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+SHARED_MODULES+= ssl
+PLIST_SUB+=	SSLOPT=""
+.else
+PLIST_SUB+=	SSLOPT="@comment "
+.endif
+
+.if !defined(WITHOUT_PROXY)
+SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
+PLIST_SUB+=	PROXYOPT=""
+.else
+PLIST_SUB+=	PROXYOPT="@comment "
+.endif
 
-OPTIM+=		-DHARD_SERVER_LIMIT=512 \
-		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+.if !defined(WITHOUT_CACHE)
+SHARED_MODULES+= cache mem-cache file-cache #disk-cache
+PLIST_SUB+=	CACHEOPT=""
+.else
+PLIST_SUB+=	CACHEOPT="@comment "
+.endif
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}'
+CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
 
-.for mod in ${SHARED_MODS}
-CONFIGURE_ARGS+= --enable-${mod}=shared
-.endfor
-.for mod in ${STATIC_MODS}
-CONFIGURE_ARGS+= --enable-${mod}=yes
-.endfor
+pre-extract:
+.if !defined(WITHOUT_SSL)
+	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
+.endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f
+	@${FIND} ${WRKSRC} -name "*.orig" -exec rm -f {} \;
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 3802044557de..61e9645cec3b 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1 +1 @@
-MD5 (httpd-2_0_16-beta.tar.gz) = 364fc61593185789cb9744bae1ebb655
+MD5 (httpd-2_0_28-beta.tar.gz) = 99a10290773221f16fd86383c598da0e
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
index 341c8dfd087f..4c26f2dcc806 100644
--- a/www/apache22/files/patch-Makefile.in
+++ b/www/apache22/files/patch-Makefile.in
@@ -1,123 +1,45 @@
---- Makefile.in.orig	Wed Apr  4 02:03:35 2001
-+++ Makefile.in	Sun Apr  8 06:06:58 2001
-@@ -16,7 +16,7 @@
- targets         = $(PROGRAMS) $(other_targets)
- phony_targets   = $(srcdir)/buildmark.c
- install_targets = install-conf install-htdocs install-icons install-other \
--	install-cgi install-include install-support install-suexec
-+	install-cgi install-include install-support install-manpages install-suexec
- DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
- 	configure generated_lists include/ap_config_auto.h \
- 	include/ap_config_auto.h.in include/ap_config_path.h install-sh \
-@@ -28,25 +28,32 @@
- install-conf:
- 	@echo Installing configuration files
- 	@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
-+
- 	@cd docs/conf; \
- 	for i in mime.types magic; do \
--		$(INSTALL_DATA) $$i $(sysconfdir); \
-+		$(INSTALL_DATA) $$i $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 	done; \
- 	for i in *-std*; do \
- 		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
- 		    -e 's#@@Port@@#$(PORT)#g' \
--			< $$i > $(sysconfdir)/$$i; \
--		chmod 0644 $(sysconfdir)/$$i; \
-+			< $$i > $(sysconfdir)/$$i.default; \
-+		chmod 0644 $(sysconfdir)/$$i.default; \
-+		test -f $(sysconfdir)/$$i || cp -fp $(sysconfdir)/$$i.default $(sysconfdir)/$$i; \
- 		file=`echo $$i|sed s/-std//`; \
- 		if [ "$$file" = "httpd.conf" ]; then \
- 			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
- 		fi; \
- 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
--			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
-+			$(INSTALL_DATA) $(sysconfdir)/$$i.default $(sysconfdir)/$$file.default; \
-+			test -f $(sysconfdir)/$$file || cp -fp $(sysconfdir)/$$file.default $(sysconfdir)/$$file; \
- 		fi; \
- 	done
- 
- htdocs-srcdir = docs/docroot
-+htman-srcdir = docs/manual
-+doc_prefix = $(prefix)/share/doc/apache
-+man-srcdir = docs/man
- 
- docs::
- 	mkdir -p ./docs/api
-@@ -57,11 +64,14 @@
+--- Makefile.in.orig	Mon Oct 22 21:46:29 2001
++++ Makefile.in	Sat Nov 17 01:36:38 2001
+@@ -51,7 +51,7 @@
+ 					< $$i; \
+ 				for j in $(DSO_MODULES) "^EOL^"; do \
+ 					if test $$j != "^EOL^"; then \
+-						echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
++						echo "LoadModule $${j}_module ${libexecdir:S|^${prefix}/||}/mod_$${j}.so"; \
+ 					fi; \
+ 				done; \
+ 				sed -e '1,/@@LoadModule@@/d' \
+@@ -93,11 +93,14 @@
  
  install-htdocs:
  	@echo Installing HTML documents
 -	@test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
 -	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
--	@test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
--	@test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+-	@test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
+-	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
 -	@(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
-+	@test -d $(doc_prefix) || $(MKINSTALLDIRS) $(doc_prefix)
-+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(doc_prefix))
-+	@test -d $(doc_prefix)/manual || $(MKINSTALLDIRS) $(doc_prefix)/manual
-+	@test -d $(htman-srcdir) && (cd $(htman-srcdir) && cp -rp * $(doc_prefix)/manual)
-+	@test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && rm -rf $(htdocsdir))
-+	@test -d $(htdocsdir) || ln -s $(doc_prefix) $(htdocsdir)
-+	@test -d $(htdocsdir).default || ln -s $(doc_prefix) $(htdocsdir).default
-+	@(cd $(doc_prefix) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-icons:
- 	@echo Installing icons
-@@ -71,24 +81,27 @@
++	@test -d $(htdocsdir).default || $(MKINSTALLDIRS) $(htdocsdir).default
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)
++	@test -e $(htdocsdir) || ln -sf $(htdocsdir).default $(htdocsdir)
++.if !defined(NOPORTDOCS)
++	@test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
++	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
++.endif
++	@(cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
+ 
+ install-error:
+ 	@echo Installing error documents
+@@ -113,9 +116,10 @@
  
  install-cgi:
  	@echo Installing CGIs
 -	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
--	@(cd docs/cgi-examples && cp -rp * $(cgidir))
+-	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
 -	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 +	@test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
-+	@(cd docs/cgi-examples && cp -rp * $(cgidir).default)
-+	@test -d $(cgidir) || ln -s $(cgidir).default $(cgidir)
++	@(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
++	@test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
 +	@(cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;)
  
- install-support:
- 	@echo Installing Support Binaries
- 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
--	@cp -p $(srcdir)/support/httpd.exp $(bindir)
-+	@test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir)
-+	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
-+	@cp -p $(srcdir)/support/httpd.exp $(libexecdir)
- 	@cp -p $(builddir)/support/htpasswd $(bindir)
- 	@cp -p $(builddir)/support/htdigest $(bindir)
--	@cp -p $(builddir)/support/rotatelogs $(bindir)
--	@cp -p $(builddir)/support/logresolve $(bindir)
--	@cp -p $(builddir)/support/ab $(bindir)
--	@cp -p $(builddir)/support/apachectl $(bindir)
--	chmod 755 $(bindir)/apachectl
-+	@cp -p $(builddir)/support/rotatelogs $(sbindir)
-+	@cp -p $(builddir)/support/logresolve $(sbindir)
-+	@cp -p $(builddir)/support/ab $(sbindir)
-+	@cp -p $(builddir)/support/apachectl $(sbindir)
-+	chmod 755 $(sbindir)/apachectl
- 	@if test -f $(builddir)/support/apxs; then \
--	    cp -p $(builddir)/support/apxs $(bindir); \
--	    chmod 755 $(bindir)/apxs; \
-+	    cp -p $(builddir)/support/apxs $(sbindir); \
-+	    chmod 755 $(sbindir)/apxs; \
- 	fi
- 
- 
-@@ -117,6 +130,15 @@
- 	@cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
- 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
- 	@chmod 644 $(includedir)/*.h
-+
-+install-manpages:
-+	@echo Installing manual pages
-+	@test -d $(mandir) || $(MKINSTALLDIRS) $(mandir)
-+	@for sect in 1 8; do \
-+		test -d $(mandir)/man$$sect || $(MKINSTALLDIRS) $(mandir)/man$$sect; \
-+		test -d $(man-srcdir) && (cd $(man-srcdir) && cp -p *.$$sect $(mandir)/man$$sect); \
-+	done;
-+	@(cd $(mandir) && find . -name "CVS" -print | xargs rm -rf {} \;)
- 
- install-suexec:
- 	@if test -f $(builddir)/support/suexec; then \
+ install-other:
+ 	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
diff --git a/www/apache22/files/patch-build:rules.mk b/www/apache22/files/patch-build:rules.mk
deleted file mode 100644
index d5058a91d8ca..000000000000
--- a/www/apache22/files/patch-build:rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- build/rules.mk.orig	Sun Apr  8 01:06:22 2001
-+++ build/rules.mk	Sun Apr  8 01:05:46 2001
-@@ -172,9 +172,9 @@
- all-p: $(targets)
- install-p: $(targets) $(install_targets)
- 	@if test -n '$(PROGRAMS)'; then \
--		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
-+		test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
- 		for i in "$(PROGRAMS)"; do \
--			$(INSTALL_PROGRAM) $$i $(bindir); \
-+			$(INSTALL_PROGRAM) $$i $(sbindir); \
- 		done; \
- 	fi
- 
diff --git a/www/apache22/files/patch-config.layout b/www/apache22/files/patch-config.layout
index 75a700c6a805..0bb23d72594f 100644
--- a/www/apache22/files/patch-config.layout
+++ b/www/apache22/files/patch-config.layout
@@ -1,6 +1,6 @@
---- config.layout.orig	Sat Apr  7 04:19:44 2001
-+++ config.layout	Sat Apr  7 04:20:28 2001
-@@ -249,3 +249,22 @@
+--- config.layout.orig	Fri Oct 26 11:59:26 2001
++++ config.layout	Fri Nov 16 18:36:14 2001
+@@ -285,3 +285,25 @@
      logfiledir:    $prefix/logs
      proxycachedir: $prefix/proxy
  </Layout>
@@ -14,8 +14,11 @@
 +    mandir:        $prefix/man
 +    sysconfdir:    $prefix/etc/apache
 +    datadir:       $prefix/www
++    installbuilddir: $prefix/share/mk/apache
++    errordir:      $datadir/error
 +    iconsdir:      $datadir/icons
 +    htdocsdir:     $datadir/data
++    manualdir:     ${prefix}/share/doc/apache
 +    cgidir:        $datadir/cgi-bin
 +    includedir:    $prefix/include/apache
 +    localstatedir: /var
diff --git a/www/apache22/files/patch-configure b/www/apache22/files/patch-configure
index 2640a5466ac0..007d46173167 100644
--- a/www/apache22/files/patch-configure
+++ b/www/apache22/files/patch-configure
@@ -1,50 +1,32 @@
---- configure.orig	Wed Apr  4 12:45:36 2001
-+++ configure	Sat Apr 14 18:25:08 2001
-@@ -3760,7 +3760,9 @@
-       -e "s/[ 	]*$/'/g" \
-       $srcdir/config.layout > $pldconf
-   layout_name=$LAYOUT
-+  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
-   . $pldconf
-+  prefix=$prefix_backup
-   rm $pldconf
-   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
-@@ -3777,7 +3779,7 @@
-         ;;
-     esac
-     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
--    val=`echo $val | sed -e 's:$\([a-z_]*\):$(\1):g'`
-+    val=`echo $val | sed -e 's:$\([a-z_]*\):${\1}:g'`
-     if test "$autosuffix" = "yes"; then
-       if echo $val | grep apache >/dev/null; then
-         addtarget=no
-@@ -3788,7 +3790,7 @@
-         val="$val/apache"
-       fi
-     fi
--    eval "$var='$val'"
-+    eval "$var=\"$val\""
-   done
-   
+--- configure.orig	Tue Nov 13 04:07:39 2001
++++ configure	Fri Nov 16 23:32:52 2001
+@@ -1084,7 +1084,7 @@
+   esac
  
-@@ -9678,6 +9680,10 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr configured properly"
+   else
+@@ -1175,7 +1175,7 @@
+   esac
  
-   
-   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
-   
- 
-   
-@@ -9814,7 +9820,7 @@
+   # The eval makes quoting arguments work.
+-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix $disable_shared"
++  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
+   then :
+     echo "srclib/apr-util configured properly"
+   else
+@@ -10508,7 +10508,10 @@
  EOF
  
  cat >> confdefs.h <<EOF
 -#define SERVER_CONFIG_FILE "conf/$progname.conf"
 +#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
++#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
++#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
++#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
  EOF
  
  cat >> confdefs.h <<EOF
diff --git a/www/apache22/files/patch-docs:conf:httpd-std.conf b/www/apache22/files/patch-docs:conf:httpd-std.conf
index 928bc48b70d4..eb63c30ac79a 100644
--- a/www/apache22/files/patch-docs:conf:httpd-std.conf
+++ b/www/apache22/files/patch-docs:conf:httpd-std.conf
@@ -1,53 +1,24 @@
---- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
-+++ docs/conf/httpd-std.conf	Tue Oct 23 17:12:59 2001
+--- docs/conf/httpd-std.conf.orig	Fri Nov  9 07:31:28 2001
++++ docs/conf/httpd-std.conf	Sat Nov 17 01:49:29 2001
 @@ -64,7 +64,7 @@
- # PidFile: The file in which the server should record its process
- # identification number when it starts.
- #
--PidFile logs/httpd.pid
-+PidFile /var/run/httpd.pid
- 
- #
- # ScoreBoardFile: File used to store internal server process information.
-@@ -73,7 +73,7 @@
- # no two invocations of Apache share the same scoreboard file.
  #
+ <IfModule !mpm_winnt.c>
  <IfModule !perchild.c>
 -ScoreBoardFile logs/apache_runtime_status
 +ScoreBoardFile /var/run/apache_runtime_status
  </IfModule>
+ </IfModule>
+ 
+@@ -73,7 +73,7 @@
+ # PidFile: The file in which the server should record its process
+ # identification number when it starts.
+ #
+-PidFile logs/httpd.pid
++PidFile /var/run/httpd.pid
  
  #
-@@ -182,6 +182,28 @@
- #
- # Example:
- # LoadModule foo_module modules/mod_foo.so
-+#LoadModule auth_anon_module		libexec/apache/mod_auth_anon.so
-+#LoadModule auth_db_module		libexec/apache/mod_auth_db.so
-+#LoadModule auth_digest_module		libexec/apache/mod_auth_digest.so
-+#LoadModule cern_meta_module		libexec/apache/mod_cern_meta.so
-+#LoadModule cgid_module			libexec/apache/mod_cgid.so
-+#LoadModule dav_module			libexec/apache/mod_dav.so
-+#LoadModule dav_fs_module		libexec/apache/mod_dav_fs.so
-+#LoadModule digest_module		libexec/apache/mod_digest.so
-+#LoadModule expires_module		libexec/apache/mod_expires.so
-+#LoadModule file_cache_module		libexec/apache/mod_file_cache.so
-+#LoadModule headers_module		libexec/apache/mod_headers.so
-+#LoadModule imap_module			libexec/apache/mod_imap.so
-+#LoadModule include_module		libexec/apache/mod_include.so
-+#LoadModule info_module			libexec/apache/mod_info.so
-+#LoadModule mime_magic_module		libexec/apache/mod_mime_magic.so
-+#LoadModule optional_fn_export_module	libexec/apache/mod_optional_fn_export.so
-+#LoadModule optional_fn_import_module	libexec/apache/mod_optional_fn_import.so
-+#LoadModule rewrite_module		libexec/apache/mod_rewrite.so
-+#LoadModule speling_module		libexec/apache/mod_speling.so
-+#LoadModule status_module		libexec/apache/mod_status.so
-+#LoadModule unique_id_module		libexec/apache/mod_unique_id.so
-+#LoadModule usertrack_module		libexec/apache/mod_usertrack.so
- 
- ### Section 2: 'Main' server configuration
- #
-@@ -220,8 +242,8 @@
+ # Timeout: The number of seconds before receives and sends time out.
+@@ -229,8 +229,8 @@
  #  when the value of (unsigned)Group is above 60000; 
  #  don't use Group #-1 on these systems!
  #
@@ -55,10 +26,10 @@
 -Group #-1
 +User www
 +Group www
+ </IfModule>
  
  #
- # ServerAdmin: Your address, where problems with the server should be
-@@ -249,7 +271,7 @@
+@@ -259,7 +259,7 @@
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  #
@@ -67,7 +38,7 @@
  
  #
  # Each directory to which Apache has access, can be configured with respect
-@@ -274,7 +296,7 @@
+@@ -284,7 +284,7 @@
  #
  # This should be changed to whatever you set DocumentRoot to.
  #
@@ -76,31 +47,7 @@
  
  #
  # This may also be "None", "All", or any combination of "Indexes",
-@@ -326,7 +348,22 @@
- # DirectoryIndex: Name of the file or files to use as a pre-written HTML
- # directory index.  Separate multiple entries with spaces.
- #
--DirectoryIndex index.html
-+<IfModule mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.php3 index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.php3 index.html
-+    </IfModule>
-+</IfModule>
-+<IfModule !mod_php3.c>
-+    <IfModule mod_php4.c>
-+        DirectoryIndex index.php index.html
-+    </IfModule>
-+    <IfModule !mod_php4.c>
-+        DirectoryIndex index.html
-+    </IfModule>
-+</IfModule>
- 
- #
- # AccessFileName: The name of the file to look for in each directory
-@@ -372,7 +409,7 @@
+@@ -377,7 +377,7 @@
  # TypesConfig describes where the mime.types file (or equivalent) is
  # to be found.
  #
@@ -109,8 +56,8 @@
  
  #
  # DefaultType is the default MIME type the server will use for a document
-@@ -397,7 +434,7 @@
- # module is part of the server.
+@@ -396,7 +396,7 @@
+ # directive tells the module where the hint definitions are located.
  #
  <IfModule mod_mime_magic.c>
 -    MIMEMagicFile conf/magic
@@ -118,7 +65,7 @@
  </IfModule>
  
  #
-@@ -417,7 +454,7 @@
+@@ -416,7 +416,7 @@
  # logged here.  If you *do* define an error logfile for a <VirtualHost>
  # container, that host's errors will be logged there and not here.
  #
@@ -127,7 +74,7 @@
  
  #
  # LogLevel: Control the number of messages logged to the error_log.
-@@ -442,7 +479,7 @@
+@@ -441,7 +441,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -136,7 +83,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -455,7 +492,7 @@
+@@ -454,7 +454,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -145,9 +92,9 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -474,9 +511,9 @@
- # require it to be present in the URL.  So "/icons" isn't aliased in this
- # example, only "/icons/"..
+@@ -478,9 +478,9 @@
+ # We include the /icons/ alias for FancyIndexed directory listings.  If you
+ # do not use FancyIndexing, you may comment this out.
  #
 -Alias /icons/ "@@ServerRoot@@/icons/"
 +Alias /icons/ "@@ServerRoot@@/www/icons/"
@@ -157,7 +104,19 @@
      Options Indexes MultiViews
      AllowOverride None
      Order allow,deny
-@@ -491,7 +528,7 @@
+@@ -492,9 +492,9 @@
+ # the manual, even if you choose to move your DocumentRoot.  You may comment
+ # this out if you do not care for the documentation.
+ #
+-Alias /manual "@@ServerRoot@@/manual"
++Alias /manual "@@ServerRoot@@/share/doc/apache"
+ 
+-<Directory "@@ServerRoot@@/manual">
++<Directory "@@ServerRoot@@/share/doc/apache">
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -509,21 +509,21 @@
  # The same rules about trailing "/" apply to ScriptAlias directives as to
  # Alias.
  #
@@ -166,7 +125,14 @@
  
  <IfModule mod_cgid.c>
  #
-@@ -505,7 +542,7 @@
+ # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
+ # for setting UNIX socket for communicating with cgid.
+ #
+-#Scriptsock            logs/cgisock
++Scriptsock            /var/run/cgisock
+ </IfModule>
+ 
+ #
  # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
  # CGI directory exists, if you have that configured.
  #
@@ -175,31 +141,24 @@
      AllowOverride None
      Options None
      Order allow,deny
-@@ -657,6 +694,7 @@
- AddLanguage ja .ja
- AddLanguage pl .po
- AddLanguage kr .kr
-+AddLanguage ko .kr
- AddLanguage pt .pt
- AddLanguage no .no
- AddLanguage pt-br .pt-br
-@@ -741,8 +779,17 @@
- # For example, the PHP3 module (not part of the Apache distribution - see
- # http://www.php.net) will typically use:
- #
--#AddType application/x-httpd-php3 .php3
--#AddType application/x-httpd-php3-source .phps
-+<IfModule mod_php3.c>
-+    AddType application/x-httpd-php3 .php3
-+    AddType application/x-httpd-php3-source .php3s
-+</IfModule>
-+#
-+# And for PHP 4.x, use:
-+#
-+<IfModule mod_php4.c>
-+    AddType application/x-httpd-php .php
-+    AddType application/x-httpd-php-source .phps
-+</IfModule>
- 
- AddType application/x-tar .tgz
+@@ -851,9 +851,9 @@
+ #
+ 
+ <IfModule mod_include.c>
+-    Alias /error/ "@@ServerRoot@@/error/"
++    Alias /error/ "@@ServerRoot@@/www/error/"
+ 
+-    <Directory "@@ServerRoot@@/error">
++    <Directory "@@ServerRoot@@/www/error">
+         AllowOverride None
+         Options IncludesNoExec
+         AddOutputFilter Includes html
+@@ -964,7 +964,7 @@
+ # Bring in additional module-specific configurations
+ #
+ <IfModule mod_ssl.c>
+-    Include conf/ssl.conf
++    Include etc/apache/ssl.conf
+ </IfModule>
+ 
  
diff --git a/www/apache22/files/patch-docs:conf:ssl-std.conf b/www/apache22/files/patch-docs:conf:ssl-std.conf
new file mode 100644
index 000000000000..f647b91fac48
--- /dev/null
+++ b/www/apache22/files/patch-docs:conf:ssl-std.conf
@@ -0,0 +1,96 @@
+--- docs/conf/ssl-std.conf.orig	Fri Nov 16 21:56:55 2001
++++ docs/conf/ssl-std.conf	Fri Nov 16 22:00:27 2001
+@@ -57,7 +57,7 @@
+ #SSLSessionCache        none
+ #SSLSessionCache        shmht:logs/ssl_scache(512000)
+ #SSLSessionCache        shmcb:logs/ssl_scache(512000)
+-SSLSessionCache         dbm:logs/ssl_scache
++SSLSessionCache         dbm:/var/log/httpd-ssl_scache
+ SSLSessionCacheTimeout  300
+ 
+ #   Semaphore:
+@@ -99,11 +99,11 @@
+ <VirtualHost _default_:443>
+ 
+ #  General setup for the virtual host
+-DocumentRoot "@@ServerRoot@@/htdocs"
++DocumentRoot "@@ServerRoot@@/www/data"
+ ServerName new.host.name:443
+ ServerAdmin you@your.address
+-ErrorLog logs/error_log
+-TransferLog logs/access_log
++ErrorLog /var/log/httpd-error.log
++TransferLog /var/log/httpd-access.log
+ 
+ #   SSL Engine Switch:
+ #   Enable/Disable SSL for this virtual host.
+@@ -122,16 +122,16 @@
+ #   built time. Keep in mind that if you've both a RSA and a DSA
+ #   certificate you can configure both in parallel (to also allow
+ #   the use of DSA ciphers, etc.)
+-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
+-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
++SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server.crt
++#SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server-dsa.crt
+ 
+ #   Server Private Key:
+ #   If the key is not combined with the certificate, use this
+ #   directive to point at the key file.  Keep in mind that if
+ #   you've both a RSA and a DSA private key you can configure
+ #   both in parallel (to also allow the use of DSA ciphers, etc.)
+-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
+-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
++SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server.key
++#SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server-dsa.key
+ 
+ #   Server Certificate Chain:
+ #   Point SSLCertificateChainFile at a file containing the
+@@ -140,7 +140,7 @@
+ #   the referenced file can be the same as SSLCertificateFile
+ #   when the CA certificates are directly appended to the server
+ #   certificate for convinience.
+-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
++#SSLCertificateChainFile @@ServerRoot@@/etc/apache/ssl.crt/ca.crt
+ 
+ #   Certificate Authority (CA):
+ #   Set the CA certificate verification path where to find CA
+@@ -149,8 +149,8 @@
+ #   Note: Inside SSLCACertificatePath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
+-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
++#SSLCACertificatePath @@ServerRoot@@/etc/apache/ssl.crt
++#SSLCACertificateFile @@ServerRoot@@/etc/apache/ssl.crt/ca-bundle.crt
+ 
+ #   Certificate Revocation Lists (CRL):
+ #   Set the CA revocation path where to find CA CRLs for client
+@@ -159,8 +159,8 @@
+ #   Note: Inside SSLCARevocationPath you need hash symlinks
+ #         to point to the certificate files. Use the provided
+ #         Makefile to update the hash symlinks after changes.
+-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
+-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
++#SSLCARevocationPath @@ServerRoot@@/etc/apache/ssl.crl
++#SSLCARevocationFile @@ServerRoot@@/etc/apache/ssl.crl/ca-bundle.crl
+ 
+ #   Client Authentication (Type):
+ #   Client certificate verification type and depth.  Types are
+@@ -220,7 +220,7 @@
+ <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+     SSLOptions +StdEnvVars
+ </Files>
+-<Directory "@@ServerRoot@@/cgi-bin">
++<Directory "@@ServerRoot@@/www/cgi-bin">
+     SSLOptions +StdEnvVars
+ </Directory>
+ 
+@@ -255,7 +255,7 @@
+ #   Per-Server Logging:
+ #   The home of a custom SSL log file. Use this when you want a
+ #   compact non-error SSL logfile on a virtual host basis.
+-CustomLog logs/ssl_request_log \
++CustomLog /var/log/httpd-ssl_request.log \
+           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+ 
+ </VirtualHost>                                  
diff --git a/www/apache22/files/patch-include:httpd.h b/www/apache22/files/patch-include:httpd.h
deleted file mode 100644
index 9f8fdf34997b..000000000000
--- a/www/apache22/files/patch-include:httpd.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- include/httpd.h.orig	Sat Apr  7 09:11:19 2001
-+++ include/httpd.h	Sat Apr  7 09:08:43 2001
-@@ -127,7 +127,7 @@
- /* Set default for OS/2 file system */
- #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
- #else
--#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
-+#define DOCUMENT_LOCATION  HTTPD_ROOT "/www/data"
- #endif
- #endif /* DOCUMENT_LOCATION */
- 
-@@ -144,7 +144,7 @@
- #if defined(OS2) || defined(WIN32)
- #define DEFAULT_ERRORLOG "logs/error.log"
- #else
--#define DEFAULT_ERRORLOG "logs/error_log"
-+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
- #endif
- #endif /* DEFAULT_ERRORLOG */
- 
-@@ -160,7 +160,7 @@
- 
- /* The name of the server config file */
- #ifndef SERVER_CONFIG_FILE
--#define SERVER_CONFIG_FILE "conf/httpd.conf"
-+#define SERVER_CONFIG_FILE "etc/apache/httpd.conf"
- #endif
- 
- /* Whether we should enable rfc1413 identity checking */
-@@ -247,7 +247,7 @@
- 
- /* The name of the MIME types file */
- #ifndef AP_TYPES_CONFIG_FILE
--#define AP_TYPES_CONFIG_FILE "conf/mime.types"
-+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
- #endif
- 
- /*
diff --git a/www/apache22/files/patch-srclib:apr-util:Makefile.in b/www/apache22/files/patch-srclib:apr-util:Makefile.in
deleted file mode 100644
index 652901dae28a..000000000000
--- a/www/apache22/files/patch-srclib:apr-util:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr-util/Makefile.in.orig	Wed Apr  4 12:27:42 2001
-+++ srclib/apr-util/Makefile.in	Sun Apr  8 03:34:15 2001
-@@ -22,8 +22,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -43,7 +43,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
diff --git a/www/apache22/files/patch-srclib:apr:Makefile.in b/www/apache22/files/patch-srclib:apr:Makefile.in
deleted file mode 100644
index 4c0292f73af8..000000000000
--- a/www/apache22/files/patch-srclib:apr:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- srclib/apr/Makefile.in.orig	Wed Apr  4 05:32:06 2001
-+++ srclib/apr/Makefile.in	Sun Apr  8 03:33:43 2001
-@@ -37,8 +37,8 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+libdir=$(prefix)/lib
-+includedir=$(prefix)/include/apache
- 
- delete-lib:
- 	@if test -f $(TARGET_LIB); then \
-@@ -58,7 +58,7 @@
- 	if [ ! -d $(libdir) ]; then \
- 	    ./build/mkdir.sh $(libdir); \
- 	fi; \
--	libtool --mode=install cp $(TARGET_LIB) $(libdir)
-+	../../libtool --mode=install cp $(TARGET_LIB) $(libdir)
- 
- $(TARGET_LIB):
- 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
diff --git a/www/apache22/files/patch-support:apachectl.in b/www/apache22/files/patch-support:apachectl.in
index 739a622d74de..f5b347b4633d 100644
--- a/www/apache22/files/patch-support:apachectl.in
+++ b/www/apache22/files/patch-support:apachectl.in
@@ -1,23 +1,22 @@
---- support/apachectl.in.orig	Fri Feb 16 13:26:53 2001
-+++ support/apachectl.in	Sun Apr  8 03:49:34 2001
+--- support/apachectl.in.orig	Fri Nov 16 21:22:36 2001
++++ support/apachectl.in	Fri Nov 16 22:07:31 2001
 @@ -25,10 +25,10 @@
  # --------------------                              --------------------
  # 
  # the path to your PID file
--PIDFILE=@prefix@/logs/httpd.pid
-+PIDFILE=/var/run/httpd.pid
+-PIDFILE=@prefix@/logs/@progname@.pid
++PIDFILE=/var/run/@progname@.pid
  #
  # the path to your httpd binary, including options if necessary
--HTTPD='@prefix@/bin/httpd'
-+HTTPD='@prefix@/sbin/httpd'
+-HTTPD='@prefix@/bin/@progname@'
++HTTPD='@prefix@/sbin/@progname@'
  #
  # a command that outputs a formatted text version of the HTML at the
  # url given on the command line.  Designed for lynx, however other
-@@ -41,6 +41,8 @@
+@@ -41,6 +41,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
-+
 +eval `limits -e -C daemon` >/dev/null 2>&1
  
  ERROR=0
diff --git a/www/apache22/files/patch-support:apxs.in b/www/apache22/files/patch-support:apxs.in
index 70ca84075675..9ababb75322e 100644
--- a/www/apache22/files/patch-support:apxs.in
+++ b/www/apache22/files/patch-support:apxs.in
@@ -1,11 +1,20 @@
---- support/apxs.in.orig	Sat Apr  7 11:56:15 2001
-+++ support/apxs.in	Sat Apr  7 11:55:28 2001
-@@ -73,7 +73,7 @@
- my $prefix            = "$CFG_PREFIX";
- my $CFG_EXEC_PREFIX   = "@exec_prefix@";
- my $exec_prefix       = "$CFG_EXEC_PREFIX";
--my $CFG_SBINDIR       = "@bindir@";
-+my $CFG_SBINDIR       = "@sbindir@";
- my $CFG_INCLUDEDIR    = "@includedir@";
- my $CFG_LIBEXECDIR    = "@libexecdir@";
- my $CFG_SYSCONFDIR    = "@sysconfdir@";
+--- support/apxs.in.orig	Sat Nov  3 05:09:20 2001
++++ support/apxs.in	Sat Nov 17 02:51:43 2001
+@@ -66,7 +66,7 @@
+ 
+ # read the configuration variables once
+ my %config_vars = ();
+-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
++get_config_vars("$prefix/share/mk/apache/config_vars.mk",\%config_vars);
+ 
+ my $exec_prefix    = get_vars("exec_prefix");
+ my $CFG_TARGET     = get_vars("progname");
+@@ -218,7 +218,7 @@
+ ##
+ ##  Initial shared object support check
+ ##
+-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
++my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+ 
diff --git a/www/apache22/files/patch-support:log_server_status.in b/www/apache22/files/patch-support:log_server_status.in
index 3549aa89f8c5..d8a970ebe8cd 100644
--- a/www/apache22/files/patch-support:log_server_status.in
+++ b/www/apache22/files/patch-support:log_server_status.in
@@ -1,15 +1,15 @@
---- support/log_server_status.in.orig	Mon Mar 12 08:40:47 2001
-+++ support/log_server_status.in	Sat Apr  7 05:45:42 2001
+--- support/log_server_status.in.orig	Fri Nov 16 22:11:16 2001
++++ support/log_server_status.in	Fri Nov 16 22:13:50 2001
 @@ -63,10 +63,10 @@
  #
  require 'sys/socket.ph';
  
 -$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "/var/log/httpd-status-";
++$wherelog = "/var/log/httpd-status-";  # Logs will be like "/var/log/httpd-status-19960312.log"
  $server = "localhost";          # Name of server, could be "www.foo.com"
  $port = "80";                   # Port on server
 -$request = "/status/?auto";     # Request to send
-+$request = "/server-status/?auto";     # Request to send
++$request = "/status-status/?auto";     # Request to send
  
  sub tcp_connect
  {
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 95616fc8a1c6..d13c6b6e7a9a 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -1,490 +1,759 @@
-bin/htpasswd
-bin/htdigest
+etc/apache/highperformance-std.conf
+etc/apache/highperformance.conf
+etc/apache/httpd-std.conf
+etc/apache/httpd.conf
+etc/apache/magic
+etc/apache/mime.types
+etc/apache/ssl-std.conf
+etc/apache/ssl.conf
+@dirrm etc/apache
 etc/rc.d/apache.sh
-@unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types.default; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types.default
-@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
-@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic.default
-@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache/highperformance-std.conf %D/etc/apache/highperformance-std.conf.default; then rm -f %D/etc/apache/highperformance-std.conf; fi
-etc/apache/highperformance-std.conf.default
-@exec [ ! -f %B/highperformance-std.conf ] && cp %B/%f %B/highperformance-std.conf
-@unexec if cmp -s %D/etc/apache/highperformance.conf %D/etc/apache/highperformance.conf.default; then rm -f %D/etc/apache/highperformance.conf; fi
-etc/apache/highperformance.conf.default
-@exec [ ! -f %B/highperformance.conf ] && cp %B/%f %B/highperformance.conf
-@unexec if cmp -s %D/etc/apache/httpd-std.conf %D/etc/apache/httpd-std.conf.default; then rm -f %D/etc/apache/httpd-std.conf; fi
-etc/apache/httpd-std.conf.default
-@exec [ ! -f %B/httpd-std.conf ] && cp %B/%f %B/httpd-std.conf
-@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf.default
-@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+include/apache/ap_compat.h
+include/apache/ap_config.h
+include/apache/ap_config_auto.h
+include/apache/ap_listen.h
+include/apache/ap_mmn.h
+include/apache/ap_mpm.h
+include/apache/ap_release.h
 include/apache/apr.h
-include/apache/apr_want.h
-include/apache/apr_uuid.h
-include/apache/apr_user.h
-include/apache/apr_time.h
-include/apache/apr_thread_proc.h
-include/apache/apr_tables.h
-include/apache/apr_strings.h
-include/apache/apr_signal.h
-include/apache/apr_shmem.h
-include/apache/apr_portable.h
-include/apache/apr_pools.h
-include/apache/apr_network_io.h
-include/apache/apr_mmap.h
-include/apache/apr_md5.h
-include/apache/apr_lock.h
-include/apache/apr_lib.h
-include/apache/apr_hash.h
-include/apache/apr_getopt.h
-include/apache/apr_general.h
-include/apache/apr_fnmatch.h
-include/apache/apr_file_io.h
-include/apache/apr_file_info.h
-include/apache/apr_errno.h
-include/apache/apr_dso.h
+include/apache/apr_base64.h
+include/apache/apr_buckets.h
 include/apache/apr_compat.h
+include/apache/apr_date.h
+include/apache/apr_dbm.h
+include/apache/apr_dso.h
+include/apache/apr_errno.h
+include/apache/apr_file_info.h
+include/apache/apr_file_io.h
+include/apache/apr_fnmatch.h
+include/apache/apr_general.h
+include/apache/apr_getopt.h
+include/apache/apr_hash.h
+include/apache/apr_hooks.h
+include/apache/apr_inherit.h
+include/apache/apr_ldap.h
+include/apache/apr_lib.h
+include/apache/apr_lock.h
+include/apache/apr_md4.h
+include/apache/apr_md5.h
+include/apache/apr_mmap.h
+include/apache/apr_network_io.h
+include/apache/apr_optional.h
+include/apache/apr_optional_hooks.h
+include/apache/apr_pools.h
+include/apache/apr_portable.h
+include/apache/apr_proc_mutex.h
+include/apache/apr_ring.h
+include/apache/apr_sdbm.h
+include/apache/apr_sha1.h
+include/apache/apr_shmem.h
+include/apache/apr_signal.h
+include/apache/apr_strings.h
+include/apache/apr_tables.h
+include/apache/apr_thread_cond.h
+include/apache/apr_thread_mutex.h
+include/apache/apr_thread_proc.h
+include/apache/apr_thread_rwlock.h
+include/apache/apr_time.h
+include/apache/apr_uri.h
+include/apache/apr_user.h
+include/apache/apr_uuid.h
+include/apache/apr_want.h
 include/apache/apr_xlate.h
-include/apache/apr_base64.h
-include/apache/apu.h
 include/apache/apr_xml.h
-include/apache/apr_sha1.h
-include/apache/apr_sdbm.h
-include/apache/apr_ring.h
-include/apache/apr_optional.h
-include/apache/apr_hooks.h
-include/apache/apr_generic_hook.h
-include/apache/apr_dbm.h
-include/apache/apr_buckets.h
+include/apache/apu.h
 include/apache/apu_compat.h
-include/apache/ap_compat.h
-include/apache/util_uri.h
-include/apache/util_script.h
-include/apache/util_md5.h
-include/apache/util_filter.h
-include/apache/util_ebcdic.h
-include/apache/util_date.h
-include/apache/util_charset.h
-include/apache/util_cfgtree.h
-include/apache/scoreboard.h
-include/apache/rfc1413.h
-include/apache/pcreposix.h
-include/apache/mpm_common.h
-include/apache/httpd.h
-include/apache/http_vhost.h
-include/apache/http_request.h
-include/apache/http_protocol.h
-include/apache/http_main.h
-include/apache/http_log.h
-include/apache/http_core.h
-include/apache/http_connection.h
+include/apache/config.h
+include/apache/expat.h
 include/apache/http_config.h
-include/apache/ap_release.h
-include/apache/ap_mpm.h
-include/apache/ap_mmn.h
-include/apache/ap_listen.h
-include/apache/ap_config_auto.h
-include/apache/ap_config.h
-include/apache/util_xml.h
-include/apache/os.h
-include/apache/os-inline.c
-include/apache/mpm_default.h
-include/apache/mpm.h
+include/apache/http_connection.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/internal.h
+include/apache/mod_cgi.h
+include/apache/mod_core.h
 include/apache/mod_dav.h
 include/apache/mod_include.h
+include/apache/mod_proxy.h
+include/apache/mod_ssl.h
+include/apache/mpm.h
+include/apache/mpm_common.h
+include/apache/mpm_default.h
+include/apache/os.h
 include/apache/pcre.h
-include/apache/internal.h
-include/apache/config.h
+include/apache/pcreposix.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+include/apache/ssl_expr.h
+include/apache/ssl_expr_parse.h
+include/apache/ssl_util_ssl.h
+include/apache/ssl_util_table.h
 include/apache/unixd.h
-lib/libapr.la
+include/apache/util_cfgtree.h
+include/apache/util_charset.h
+include/apache/util_ebcdic.h
+include/apache/util_filter.h
+include/apache/util_ldap.h
+include/apache/util_md5.h
+include/apache/util_script.h
+include/apache/util_time.h
+include/apache/util_xml.h
+@dirrm include/apache
+lib/APRVARS
 lib/libapr.a
-lib/libaprutil.la
+lib/libapr.la
+lib/libapr.so.0
 lib/libaprutil.a
-libexec/apache/mod_auth_anon.so
+lib/libaprutil.la
+lib/libaprutil.so.0
+lib/libexpat.a
+lib/libexpat.la
+lib/libexpat.so.1
+libexec/apache/httpd.exp
+libexec/apache/mod_access.la
+libexec/apache/mod_access.so
+libexec/apache/mod_actions.la
+libexec/apache/mod_actions.so
+libexec/apache/mod_alias.la
+libexec/apache/mod_alias.so
+libexec/apache/mod_asis.la
+libexec/apache/mod_asis.so
+libexec/apache/mod_auth.la
+libexec/apache/mod_auth.so
 libexec/apache/mod_auth_anon.la
-libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_anon.so
 libexec/apache/mod_auth_db.la
-libexec/apache/mod_auth_digest.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_auth_dbm.la
+libexec/apache/mod_auth_dbm.so
 libexec/apache/mod_auth_digest.la
-libexec/apache/mod_file_cache.so
-libexec/apache/mod_file_cache.la
-libexec/apache/mod_dav_fs.so
-libexec/apache/mod_dav_fs.la
-libexec/apache/mod_dav.so
-libexec/apache/mod_dav.la
-libexec/apache/mod_echo.so
-libexec/apache/mod_echo.la
-libexec/apache/mod_optional_fn_import.so
-libexec/apache/mod_optional_fn_import.la
-libexec/apache/mod_optional_fn_export.so
-libexec/apache/mod_optional_fn_export.la
-libexec/apache/mod_include.so
-libexec/apache/mod_include.la
-libexec/apache/mod_imap.so
-libexec/apache/mod_imap.la
-libexec/apache/mod_speling.so
-libexec/apache/mod_speling.la
-libexec/apache/mod_rewrite.so
-libexec/apache/mod_rewrite.la
-libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mime_magic.la
-libexec/apache/mod_cern_meta.so
+libexec/apache/mod_auth_digest.so
+libexec/apache/mod_autoindex.la
+libexec/apache/mod_autoindex.so
+%%CACHEOPT%%libexec/apache/mod_cache.la
+%%CACHEOPT%%libexec/apache/mod_cache.so
 libexec/apache/mod_cern_meta.la
-libexec/apache/mod_expires.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_cgi.la
+libexec/apache/mod_cgi.so
+libexec/apache/mod_cgid.la
+libexec/apache/mod_cgid.so
+libexec/apache/mod_dav.la
+libexec/apache/mod_dav.so
+libexec/apache/mod_dav_fs.la
+libexec/apache/mod_dav_fs.so
+libexec/apache/mod_dir.la
+libexec/apache/mod_dir.so
+libexec/apache/mod_env.la
+libexec/apache/mod_env.so
 libexec/apache/mod_expires.la
-libexec/apache/mod_headers.so
+libexec/apache/mod_expires.so
+%%CACHEOPT%%libexec/apache/mod_file_cache.la
+%%CACHEOPT%%libexec/apache/mod_file_cache.so
 libexec/apache/mod_headers.la
-libexec/apache/mod_usertrack.so
-libexec/apache/mod_usertrack.la
-libexec/apache/mod_unique_id.so
-libexec/apache/mod_unique_id.la
-libexec/apache/mod_status.so
-libexec/apache/mod_status.la
-libexec/apache/mod_info.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_imap.la
+libexec/apache/mod_imap.so
+libexec/apache/mod_include.la
+libexec/apache/mod_include.so
 libexec/apache/mod_info.la
-libexec/apache/mod_cgid.so
-libexec/apache/mod_cgid.la
-libexec/apache/httpd.exp
-sbin/rotatelogs
-sbin/htpasswd
-sbin/logresolve
+libexec/apache/mod_info.so
+libexec/apache/mod_log_config.la
+libexec/apache/mod_log_config.so
+%%CACHEOPT%%libexec/apache/mod_mem_cache.la
+%%CACHEOPT%%libexec/apache/mod_mem_cache.so
+libexec/apache/mod_mime.la
+libexec/apache/mod_mime.so
+libexec/apache/mod_mime_magic.la
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_negotiation.la
+libexec/apache/mod_negotiation.so
+%%PROXYOPT%%libexec/apache/mod_proxy.la
+%%PROXYOPT%%libexec/apache/mod_proxy.so
+%%PROXYOPT%%libexec/apache/mod_proxy_connect.la
+%%PROXYOPT%%libexec/apache/mod_proxy_connect.so
+%%PROXYOPT%%libexec/apache/mod_proxy_ftp.la
+%%PROXYOPT%%libexec/apache/mod_proxy_ftp.so
+%%PROXYOPT%%libexec/apache/mod_proxy_http.la
+%%PROXYOPT%%libexec/apache/mod_proxy_http.so
+libexec/apache/mod_rewrite.la
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_setenvif.la
+libexec/apache/mod_setenvif.so
+libexec/apache/mod_speling.la
+libexec/apache/mod_speling.so
+%%SSLOPT%%libexec/apache/mod_ssl.la
+%%SSLOPT%%libexec/apache/mod_ssl.so
+libexec/apache/mod_status.la
+libexec/apache/mod_status.so
+libexec/apache/mod_unique_id.la
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_userdir.la
+libexec/apache/mod_userdir.so
+libexec/apache/mod_usertrack.la
+libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.la
+libexec/apache/mod_vhost_alias.so
+@dirrm libexec/apache
 sbin/ab
 sbin/apachectl
 sbin/apxs
+sbin/checkgid
+sbin/dbmmanage
+sbin/htdigest
+sbin/htpasswd
 sbin/httpd
-share/doc/apache/README.rus
+sbin/logresolve
+sbin/rotatelogs
+%%PORTDOCS%%share/doc/apache/LICENSE
+%%PORTDOCS%%share/doc/apache/bind.html
+%%PORTDOCS%%share/doc/apache/cgi_path.html
+%%PORTDOCS%%share/doc/apache/configuring.html.en
+%%PORTDOCS%%share/doc/apache/configuring.html.ja.jis
+%%PORTDOCS%%share/doc/apache/content-negotiation.html
+%%PORTDOCS%%share/doc/apache/custom-error.html
+%%PORTDOCS%%share/doc/apache/developer/API.html
+%%PORTDOCS%%share/doc/apache/developer/debugging.html
+%%PORTDOCS%%share/doc/apache/developer/documenting.html
+%%PORTDOCS%%share/doc/apache/developer/footer.html
+%%PORTDOCS%%share/doc/apache/developer/header.html
+%%PORTDOCS%%share/doc/apache/developer/hooks.html
+%%PORTDOCS%%share/doc/apache/developer/index.html
+%%PORTDOCS%%share/doc/apache/developer/layeredio.html
+%%PORTDOCS%%share/doc/apache/developer/modules.html
+%%PORTDOCS%%share/doc/apache/developer/request.html
+%%PORTDOCS%%share/doc/apache/dns-caveats.html
+%%PORTDOCS%%share/doc/apache/dso.html
+%%PORTDOCS%%share/doc/apache/ebcdic.html
+%%PORTDOCS%%share/doc/apache/env.html
+%%PORTDOCS%%share/doc/apache/faq/footer.html
+%%PORTDOCS%%share/doc/apache/faq/header.html
+%%PORTDOCS%%share/doc/apache/faq/index.html
+%%PORTDOCS%%share/doc/apache/faq/support.html
+%%PORTDOCS%%share/doc/apache/filter.html
+%%PORTDOCS%%share/doc/apache/footer.html
+%%PORTDOCS%%share/doc/apache/handler.html.en
+%%PORTDOCS%%share/doc/apache/handler.html.ja.jis
+%%PORTDOCS%%share/doc/apache/header.html
+%%PORTDOCS%%share/doc/apache/howto/auth.html
+%%PORTDOCS%%share/doc/apache/howto/cgi.html.en
+%%PORTDOCS%%share/doc/apache/howto/cgi.html.ja.jis
+%%PORTDOCS%%share/doc/apache/howto/footer.html
+%%PORTDOCS%%share/doc/apache/howto/header.html
+%%PORTDOCS%%share/doc/apache/howto/ssi.html.en
+%%PORTDOCS%%share/doc/apache/howto/ssi.html.ja.jis
+%%PORTDOCS%%share/doc/apache/images/apache_header.gif
+%%PORTDOCS%%share/doc/apache/images/apache_header.png
+%%PORTDOCS%%share/doc/apache/images/custom_errordocs.gif
+%%PORTDOCS%%share/doc/apache/images/custom_errordocs.png
+%%PORTDOCS%%share/doc/apache/images/home.gif
+%%PORTDOCS%%share/doc/apache/images/home.png
+%%PORTDOCS%%share/doc/apache/images/index.gif
+%%PORTDOCS%%share/doc/apache/images/index.png
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.fig
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.gif
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig1.png
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.fig
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.gif
+%%PORTDOCS%%share/doc/apache/images/mod_rewrite_fig2.png
+%%PORTDOCS%%share/doc/apache/images/pixel.gif
+%%PORTDOCS%%share/doc/apache/images/pixel.png
+%%PORTDOCS%%share/doc/apache/images/sub.gif
+%%PORTDOCS%%share/doc/apache/images/sub.png
+%%PORTDOCS%%share/doc/apache/index.html.en
+%%PORTDOCS%%share/doc/apache/index.html.fr
+%%PORTDOCS%%share/doc/apache/index.html.ja.jis
+%%PORTDOCS%%share/doc/apache/install.html
+%%PORTDOCS%%share/doc/apache/invoking.html
+%%PORTDOCS%%share/doc/apache/logs.html
+%%PORTDOCS%%share/doc/apache/misc/custom_errordocs.html
+%%PORTDOCS%%share/doc/apache/misc/descriptors.html
+%%PORTDOCS%%share/doc/apache/misc/fin_wait_2.html
+%%PORTDOCS%%share/doc/apache/misc/footer.html
+%%PORTDOCS%%share/doc/apache/misc/header.html
+%%PORTDOCS%%share/doc/apache/misc/index.html
+%%PORTDOCS%%share/doc/apache/misc/known_client_problems.html
+%%PORTDOCS%%share/doc/apache/misc/perf-tuning.html
+%%PORTDOCS%%share/doc/apache/misc/rewriteguide.html
+%%PORTDOCS%%share/doc/apache/misc/security_tips.html
+%%PORTDOCS%%share/doc/apache/misc/tutorials.html
+%%PORTDOCS%%share/doc/apache/mod/core.html
+%%PORTDOCS%%share/doc/apache/mod/directive-dict.html
+%%PORTDOCS%%share/doc/apache/mod/directives.html
+%%PORTDOCS%%share/doc/apache/mod/footer.html
+%%PORTDOCS%%share/doc/apache/mod/header.html
+%%PORTDOCS%%share/doc/apache/mod/index-bytype.html
+%%PORTDOCS%%share/doc/apache/mod/index.html
+%%PORTDOCS%%share/doc/apache/mod/mod_TEMPLATE.html
+%%PORTDOCS%%share/doc/apache/mod/mod_access.html
+%%PORTDOCS%%share/doc/apache/mod/mod_actions.html
+%%PORTDOCS%%share/doc/apache/mod/mod_alias.html
+%%PORTDOCS%%share/doc/apache/mod/mod_asis.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_anon.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_db.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_dbm.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_digest.html
+%%PORTDOCS%%share/doc/apache/mod/mod_auth_ldap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_autoindex.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cern_meta.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cgi.html
+%%PORTDOCS%%share/doc/apache/mod/mod_cgid.html
+%%PORTDOCS%%share/doc/apache/mod/mod_charset_lite.html
+%%PORTDOCS%%share/doc/apache/mod/mod_dav.html
+%%PORTDOCS%%share/doc/apache/mod/mod_dir.html
+%%PORTDOCS%%share/doc/apache/mod/mod_env.html
+%%PORTDOCS%%share/doc/apache/mod/mod_example.html
+%%PORTDOCS%%share/doc/apache/mod/mod_expires.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ext_filter.html
+%%PORTDOCS%%share/doc/apache/mod/mod_file_cache.html
+%%PORTDOCS%%share/doc/apache/mod/mod_headers.html
+%%PORTDOCS%%share/doc/apache/mod/mod_imap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_include.html
+%%PORTDOCS%%share/doc/apache/mod/mod_info.html
+%%PORTDOCS%%share/doc/apache/mod/mod_isapi.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ldap.html
+%%PORTDOCS%%share/doc/apache/mod/mod_log_config.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mime.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mime_magic.html
+%%PORTDOCS%%share/doc/apache/mod/mod_mmap_static.html
+%%PORTDOCS%%share/doc/apache/mod/mod_negotiation.html
+%%PORTDOCS%%share/doc/apache/mod/mod_proxy.html
+%%PORTDOCS%%share/doc/apache/mod/mod_rewrite.html
+%%PORTDOCS%%share/doc/apache/mod/mod_setenvif.html
+%%PORTDOCS%%share/doc/apache/mod/mod_so.html
+%%PORTDOCS%%share/doc/apache/mod/mod_speling.html
+%%PORTDOCS%%share/doc/apache/mod/mod_ssl.html
+%%PORTDOCS%%share/doc/apache/mod/mod_status.html
+%%PORTDOCS%%share/doc/apache/mod/mod_suexec.html
+%%PORTDOCS%%share/doc/apache/mod/mod_unique_id.html
+%%PORTDOCS%%share/doc/apache/mod/mod_userdir.html
+%%PORTDOCS%%share/doc/apache/mod/mod_usertrack.html
+%%PORTDOCS%%share/doc/apache/mod/mod_vhost_alias.html
+%%PORTDOCS%%share/doc/apache/mod/module-dict.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_common.html
+%%PORTDOCS%%share/doc/apache/mod/mpm_winnt.html
+%%PORTDOCS%%share/doc/apache/mod/perchild.html
+%%PORTDOCS%%share/doc/apache/mod/prefork.html
+%%PORTDOCS%%share/doc/apache/mod/threaded.html
+%%PORTDOCS%%share/doc/apache/mpm.html
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.en
+%%PORTDOCS%%share/doc/apache/new_features_2_0.html.fr
+%%PORTDOCS%%share/doc/apache/platform/footer.html
+%%PORTDOCS%%share/doc/apache/platform/header.html
+%%PORTDOCS%%share/doc/apache/platform/perf-hp.html
+%%PORTDOCS%%share/doc/apache/platform/win_compiling.html
+%%PORTDOCS%%share/doc/apache/platform/win_service.html
+%%PORTDOCS%%share/doc/apache/platform/windows.html
+%%PORTDOCS%%share/doc/apache/programs/ab.html
+%%PORTDOCS%%share/doc/apache/programs/apachectl.html
+%%PORTDOCS%%share/doc/apache/programs/apxs.html
+%%PORTDOCS%%share/doc/apache/programs/dbmmanage.html
+%%PORTDOCS%%share/doc/apache/programs/footer.html
+%%PORTDOCS%%share/doc/apache/programs/header.html
+%%PORTDOCS%%share/doc/apache/programs/htdigest.html
+%%PORTDOCS%%share/doc/apache/programs/htpasswd.html
+%%PORTDOCS%%share/doc/apache/programs/httpd.html
+%%PORTDOCS%%share/doc/apache/programs/index.html
+%%PORTDOCS%%share/doc/apache/programs/logresolve.html
+%%PORTDOCS%%share/doc/apache/programs/other.html
+%%PORTDOCS%%share/doc/apache/programs/rotatelogs.html
+%%PORTDOCS%%share/doc/apache/programs/suexec.html
+%%PORTDOCS%%share/doc/apache/search/manual-index.cgi
+%%PORTDOCS%%share/doc/apache/sections.html
+%%PORTDOCS%%share/doc/apache/server-wide.html.en
+%%PORTDOCS%%share/doc/apache/server-wide.html.ja.jis
+%%PORTDOCS%%share/doc/apache/ssl/Makefile
+%%PORTDOCS%%share/doc/apache/ssl/footer.html
+%%PORTDOCS%%share/doc/apache/ssl/header.html
+%%PORTDOCS%%share/doc/apache/ssl/index.html
+%%PORTDOCS%%share/doc/apache/ssl/mod_ssl_sb.gif
+%%PORTDOCS%%share/doc/apache/ssl/openssl_ics.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_compat.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_logo.jpg
+%%PORTDOCS%%share/doc/apache/ssl/ssl_cover_title.jpg
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_faq.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_glossary.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_howto.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig2.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_intro_fig3.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_overview_fig1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.gfont000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.html
+%%PORTDOCS%%share/doc/apache/ssl/ssl_reference.wml
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-chapter.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-1.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-2.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-3.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-4.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-5.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-6.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.head-num-7.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-000000.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.imgdot-1x1-transp.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.inc
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-n.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-next-s.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-n.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.navbut-prev-s.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-abstract.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-compat.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-faq.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-gloss.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-howto.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-intro.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-over.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-preface.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-ref.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-toc.gif
+%%PORTDOCS%%share/doc/apache/ssl/ssl_template.title-tutor.gif
+%%PORTDOCS%%share/doc/apache/stopping.html
+%%PORTDOCS%%share/doc/apache/suexec.html
+%%PORTDOCS%%share/doc/apache/upgrading.html.en
+%%PORTDOCS%%share/doc/apache/upgrading.html.fr
+%%PORTDOCS%%share/doc/apache/urlmapping.html
+%%PORTDOCS%%share/doc/apache/vhosts/details.html
+%%PORTDOCS%%share/doc/apache/vhosts/examples.html
+%%PORTDOCS%%share/doc/apache/vhosts/fd-limits.html
+%%PORTDOCS%%share/doc/apache/vhosts/footer.html
+%%PORTDOCS%%share/doc/apache/vhosts/header.html
+%%PORTDOCS%%share/doc/apache/vhosts/index.html
+%%PORTDOCS%%share/doc/apache/vhosts/ip-based.html
+%%PORTDOCS%%share/doc/apache/vhosts/mass.html
+%%PORTDOCS%%share/doc/apache/vhosts/name-based.html
+%%PORTDOCS%%@dirrm share/doc/apache/vhosts
+%%PORTDOCS%%@dirrm share/doc/apache/ssl
+%%PORTDOCS%%@dirrm share/doc/apache/search
+%%PORTDOCS%%@dirrm share/doc/apache/programs
+%%PORTDOCS%%@dirrm share/doc/apache/platform
+%%PORTDOCS%%@dirrm share/doc/apache/mod
+%%PORTDOCS%%@dirrm share/doc/apache/misc
+%%PORTDOCS%%@dirrm share/doc/apache/images
+%%PORTDOCS%%@dirrm share/doc/apache/howto
+%%PORTDOCS%%@dirrm share/doc/apache/faq
+%%PORTDOCS%%@dirrm share/doc/apache/developer
+%%PORTDOCS%%@dirrm share/doc/apache
+share/mk/apache/config_vars.mk
+share/mk/apache/library.mk
+share/mk/apache/libtool
+share/mk/apache/ltlib.mk
+share/mk/apache/program.mk
+share/mk/apache/rules.mk
+share/mk/apache/special.mk
+@dirrm share/mk/apache
+@dirrm share/mk
 @exec mkdir -p %D/www
-@exec ln -fs %B %D/www/data.default
-@unexec rm -f %D/www/data.default
-@exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
 @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-share/doc/apache/index.html.tw
-share/doc/apache/index.html.se
-share/doc/apache/index.html.ru.utf8
-share/doc/apache/index.html.ru.ucs4
-share/doc/apache/index.html.ru.ucs2
-share/doc/apache/index.html.ru.koi8-r
-share/doc/apache/index.html.ru.iso-ru
-share/doc/apache/index.html.ru.cp866
-share/doc/apache/index.html.ru.cp-1251
-share/doc/apache/index.html.pt-br
-share/doc/apache/index.html.pt
-share/doc/apache/index.html.po.iso-pl
-share/doc/apache/index.html.no
-share/doc/apache/index.html.nl
-share/doc/apache/index.html.lu
-share/doc/apache/index.html.ltz
-share/doc/apache/index.html.kr.iso-kr
-share/doc/apache/index.html.kr.iso2022-kr
-share/doc/apache/index.html.ja.jis
-share/doc/apache/index.html.ja.iso2022-jp
-share/doc/apache/index.html.it
-share/doc/apache/index.html.he.iso8859-8
-share/doc/apache/index.html.fr
-share/doc/apache/index.html.et
-share/doc/apache/index.html.es
-share/doc/apache/index.html.en
-share/doc/apache/index.html.el
-share/doc/apache/index.html.ee
-share/doc/apache/index.html.dk
-share/doc/apache/index.html.de
-share/doc/apache/index.html.cz
-share/doc/apache/index.html.ca
-share/doc/apache/apache_pb.gif
-share/doc/apache/index.html.tw.Big5
-share/doc/apache/manual/misc/tutorials.html
-share/doc/apache/manual/misc/FAQ.html
-share/doc/apache/manual/misc/known_client_problems.html
-share/doc/apache/manual/misc/client_block_api.html
-share/doc/apache/manual/misc/compat_notes.html
-share/doc/apache/manual/misc/custom_errordocs.html
-share/doc/apache/manual/misc/descriptors.html
-share/doc/apache/manual/misc/fin_wait_2.html
-share/doc/apache/manual/misc/footer.html
-share/doc/apache/manual/misc/header.html
-share/doc/apache/manual/misc/howto.html
-share/doc/apache/manual/misc/index.html
-share/doc/apache/manual/misc/perf-tuning.html
-share/doc/apache/manual/misc/rewriteguide.html
-share/doc/apache/manual/misc/security_tips.html
-share/doc/apache/manual/misc/API.html
-share/doc/apache/manual/developer/modules.html
-share/doc/apache/manual/developer/documenting
-share/doc/apache/manual/developer/footer.html
-share/doc/apache/manual/developer/header.html
-share/doc/apache/manual/developer/hooks.html
-share/doc/apache/manual/developer/index.html
-share/doc/apache/manual/developer/layeredio.html
-share/doc/apache/manual/developer/debugging.html
-share/doc/apache/manual/platform/windows.html
-share/doc/apache/manual/platform/header.html
-share/doc/apache/manual/platform/netware.html
-share/doc/apache/manual/platform/perf-bsd44.html
-share/doc/apache/manual/platform/perf-dec.html
-share/doc/apache/manual/platform/perf-hp.html
-share/doc/apache/manual/platform/perf.html
-share/doc/apache/manual/platform/readme-tpf.html
-share/doc/apache/manual/platform/unixware.html
-share/doc/apache/manual/platform/win_compiling.html
-share/doc/apache/manual/platform/win_service.html
-share/doc/apache/manual/platform/footer.html
-share/doc/apache/manual/mod/threaded.html
-share/doc/apache/manual/mod/directive-dict.html
-share/doc/apache/manual/mod/directives.html
-share/doc/apache/manual/mod/footer.html
-share/doc/apache/manual/mod/header.html
-share/doc/apache/manual/mod/index-bytype.html
-share/doc/apache/manual/mod/index.html
-share/doc/apache/manual/mod/mod_access.html
-share/doc/apache/manual/mod/mod_actions.html
-share/doc/apache/manual/mod/mod_alias.html
-share/doc/apache/manual/mod/mod_asis.html
-share/doc/apache/manual/mod/mod_auth.html
-share/doc/apache/manual/mod/mod_auth_anon.html
-share/doc/apache/manual/mod/mod_auth_db.html
-share/doc/apache/manual/mod/mod_auth_dbm.html
-share/doc/apache/manual/mod/mod_auth_digest.html
-share/doc/apache/manual/mod/mod_autoindex.html
-share/doc/apache/manual/mod/mod_cern_meta.html
-share/doc/apache/manual/mod/mod_so.html
-share/doc/apache/manual/mod/mod_cgi.html
-share/doc/apache/manual/mod/mod_charset_lite.html
-share/doc/apache/manual/mod/mod_dav.html
-share/doc/apache/manual/mod/mod_dir.html
-share/doc/apache/manual/mod/mod_env.html
-share/doc/apache/manual/mod/mod_example.html
-share/doc/apache/manual/mod/mod_expires.html
-share/doc/apache/manual/mod/mod_ext_filter.html
-share/doc/apache/manual/mod/mod_file_cache.html
-share/doc/apache/manual/mod/mod_headers.html
-share/doc/apache/manual/mod/mod_imap.html
-share/doc/apache/manual/mod/mod_include.html
-share/doc/apache/manual/mod/mod_info.html
-share/doc/apache/manual/mod/mod_isapi.html
-share/doc/apache/manual/mod/mod_log_config.html
-share/doc/apache/manual/mod/mod_mime.html
-share/doc/apache/manual/mod/mod_mime_magic.html
-share/doc/apache/manual/mod/mod_mmap_static.html
-share/doc/apache/manual/mod/mod_negotiation.html
-share/doc/apache/manual/mod/mod_proxy.html
-share/doc/apache/manual/mod/mod_rewrite.html
-share/doc/apache/manual/mod/mod_setenvif.html
-share/doc/apache/manual/mod/mod_speling.html
-share/doc/apache/manual/mod/mod_status.html
-share/doc/apache/manual/mod/mod_unique_id.html
-share/doc/apache/manual/mod/mod_userdir.html
-share/doc/apache/manual/mod/mod_usertrack.html
-share/doc/apache/manual/mod/mod_vhost_alias.html
-share/doc/apache/manual/mod/module-dict.html
-share/doc/apache/manual/mod/mpm_common.html
-share/doc/apache/manual/mod/mpm_winnt.html
-share/doc/apache/manual/mod/perchild.html
-share/doc/apache/manual/mod/prefork.html
-share/doc/apache/manual/mod/core.html
-share/doc/apache/manual/search/manual-index.cgi
-share/doc/apache/manual/programs/suexec.html
-share/doc/apache/manual/programs/apachectl.html
-share/doc/apache/manual/programs/apxs.html
-share/doc/apache/manual/programs/dbmmanage.html
-share/doc/apache/manual/programs/footer.html
-share/doc/apache/manual/programs/header.html
-share/doc/apache/manual/programs/htdigest.html
-share/doc/apache/manual/programs/htpasswd.html
-share/doc/apache/manual/programs/httpd.html
-share/doc/apache/manual/programs/index.html
-share/doc/apache/manual/programs/logresolve.html
-share/doc/apache/manual/programs/other.html
-share/doc/apache/manual/programs/rotatelogs.html
-share/doc/apache/manual/programs/ab.html
-share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/images/custom_errordocs.gif
-share/doc/apache/manual/images/home.gif
-share/doc/apache/manual/images/index.gif
-share/doc/apache/manual/images/mod_rewrite_fig1.fig
-share/doc/apache/manual/images/mod_rewrite_fig1.gif
-share/doc/apache/manual/images/mod_rewrite_fig2.fig
-share/doc/apache/manual/images/mod_rewrite_fig2.gif
-share/doc/apache/manual/images/pixel.gif
-share/doc/apache/manual/images/apache_header.gif
-share/doc/apache/manual/howto/cgi.html.en
-share/doc/apache/manual/howto/cgi.html.ja.jis
-share/doc/apache/manual/howto/footer.html
-share/doc/apache/manual/howto/header.html
-share/doc/apache/manual/howto/ssi.html.en
-share/doc/apache/manual/howto/ssi.html.ja.jis
-share/doc/apache/manual/vhosts/virtual-host.html
-share/doc/apache/manual/vhosts/examples.html
-share/doc/apache/manual/vhosts/fd-limits.html
-share/doc/apache/manual/vhosts/footer.html
-share/doc/apache/manual/vhosts/header.html
-share/doc/apache/manual/vhosts/host.html
-share/doc/apache/manual/vhosts/index.html
-share/doc/apache/manual/vhosts/ip-based.html
-share/doc/apache/manual/vhosts/mass.html
-share/doc/apache/manual/vhosts/name-based.html
-share/doc/apache/manual/vhosts/vhosts-in-depth.html
-share/doc/apache/manual/vhosts/details.html
-share/doc/apache/manual/new_features_2_0.html.fr
-share/doc/apache/manual/new_features_2_0.html
-share/doc/apache/manual/mpm.html
-share/doc/apache/manual/location.html
-share/doc/apache/manual/invoking.html
-share/doc/apache/manual/install.html
-share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/index.html.fr
-share/doc/apache/manual/index.html
-share/doc/apache/manual/header.html
-share/doc/apache/manual/handler.html
-share/doc/apache/manual/footer.html
-share/doc/apache/manual/filter.html
-share/doc/apache/manual/env.html
-share/doc/apache/manual/ebcdic.html
-share/doc/apache/manual/dso.html
-share/doc/apache/manual/dns-caveats.html
-share/doc/apache/manual/custom-error.html
-share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/configuring.html
-share/doc/apache/manual/cgi_path.html
-share/doc/apache/manual/bind.html
-share/doc/apache/manual/STATUS
-share/doc/apache/manual/LICENSE
-share/doc/apache/manual/urlmapping.html
-share/doc/apache/manual/upgrading.html.fr
-share/doc/apache/manual/upgrading.html
-share/doc/apache/manual/suexec.html
-share/doc/apache/manual/stopping.html
-share/doc/apache/manual/server-wide.html
-share/doc/apache/manual/sections.html
-share/doc/apache/manual/process-model.html
-www/cgi-bin.default/test-cgi
+@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 www/cgi-bin.default/printenv
-www/icons/small/uu.gif
+www/cgi-bin.default/test-cgi
+www/cgi-bin.default/test-cgi.bat
+@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+www/data.default/apache_pb.gif
+www/data.default/apache_pb.png
+www/data.default/apache_pb2.gif
+www/data.default/apache_pb2.png
+www/data.default/apache_pb2_ani.gif
+www/data.default/error.README
+www/data.default/index.html.ca
+www/data.default/index.html.cz.iso8859-2
+www/data.default/index.html.de
+www/data.default/index.html.dk
+www/data.default/index.html.ee
+www/data.default/index.html.el
+www/data.default/index.html.en
+www/data.default/index.html.es
+www/data.default/index.html.et
+www/data.default/index.html.fr
+www/data.default/index.html.he.iso8859-8
+www/data.default/index.html.hr.iso8859-2
+www/data.default/index.html.it
+www/data.default/index.html.ja.iso2022-jp
+www/data.default/index.html.kr.iso2022-kr
+www/data.default/index.html.ltz.utf8
+www/data.default/index.html.lu.utf8
+www/data.default/index.html.nl
+www/data.default/index.html.nn
+www/data.default/index.html.no
+www/data.default/index.html.po.iso8859-2
+www/data.default/index.html.pt
+www/data.default/index.html.pt-br
+www/data.default/index.html.ru.cp-1251
+www/data.default/index.html.ru.cp866
+www/data.default/index.html.ru.iso-ru
+www/data.default/index.html.ru.koi8-r
+www/data.default/index.html.ru.utf8
+www/data.default/index.html.se
+www/data.default/index.html.tw
+www/data.default/index.html.tw.Big5
+www/data.default/index.html.var
+@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
+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/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/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/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/README.txt
-www/icons/world1.gif
-www/icons/uuencoded.gif
-www/icons/uu.gif
-www/icons/up.gif
-www/icons/unknown.gif
-www/icons/transfer.gif
-www/icons/text.gif
-www/icons/tex.gif
-www/icons/tar.gif
-www/icons/sphere2.gif
-www/icons/sphere1.gif
-www/icons/sound2.gif
+www/icons/small/unknown.png
+www/icons/small/uu.gif
+www/icons/small/uu.png
 www/icons/sound1.gif
-www/icons/script.gif
-www/icons/screw2.gif
-www/icons/screw1.gif
-www/icons/right.gif
-www/icons/quill.gif
-www/icons/ps.gif
-www/icons/portal.gif
-www/icons/pie8.gif
-www/icons/pie7.gif
-www/icons/pie6.gif
-www/icons/pie5.gif
-www/icons/pie4.gif
-www/icons/pie3.gif
-www/icons/pie2.gif
-www/icons/pie1.gif
-www/icons/pie0.gif
-www/icons/pdf.gif
-www/icons/patch.gif
-www/icons/p.gif
-www/icons/movie.gif
-www/icons/link.gif
-www/icons/left.gif
-www/icons/layout.gif
-www/icons/index.gif
-www/icons/image3.gif
-www/icons/image2.gif
-www/icons/image1.gif
-www/icons/icon.sheet.gif
-www/icons/hand.up.gif
-www/icons/hand.right.gif
-www/icons/generic.sec.gif
-www/icons/generic.red.gif
-www/icons/generic.gif
-www/icons/forward.gif
-www/icons/folder.sec.gif
-www/icons/folder.gif
-www/icons/folder.open.gif
-www/icons/f.gif
-www/icons/dvi.gif
-www/icons/down.gif
-www/icons/dir.gif
-www/icons/continued.gif
-www/icons/compressed.gif
-www/icons/comp.gray.gif
-www/icons/comp.blue.gif
-www/icons/c.gif
-www/icons/burst.gif
-www/icons/broken.gif
-www/icons/box2.gif
-www/icons/box1.gif
-www/icons/bomb.gif
-www/icons/blank.gif
-www/icons/binhex.gif
-www/icons/binary.gif
-www/icons/ball.red.gif
-www/icons/ball.gray.gif
-www/icons/back.gif
-www/icons/apache_pb.gif
-www/icons/alert.red.gif
-www/icons/alert.black.gif
-www/icons/a.gif
+www/icons/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/README
-@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
-@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
-@dirrm etc/apache
-@dirrm include/apache
-@dirrm libexec/apache
-@dirrm share/doc/apache/manual/vhosts
-@dirrm share/doc/apache/manual/search
-@dirrm share/doc/apache/manual/programs
-@dirrm share/doc/apache/manual/platform
-@dirrm share/doc/apache/manual/mod
-@dirrm share/doc/apache/manual/misc
-@dirrm share/doc/apache/manual/images
-@dirrm share/doc/apache/manual/howto
-@dirrm share/doc/apache/manual/developer
-@dirrm share/doc/apache/manual
-@dirrm share/doc/apache
+www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
+@dirrm www/error/include
+@dirrm www/error
+@dirrm www/data.default
 @dirrm www/cgi-bin.default
 @dirrm www