7 files changed, 378 insertions, 189 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 2819b5f10293..00c184ead5ea 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -3,77 +3,36 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp $
+# $Id: Makefile,v 1.46 1998/03/12 04:05:01 ache Exp $
 #
 
-DISTNAME=       apache_1.3b5
-PKGNAME=        apache-1.3b5
+DISTNAME=       apache_1.3b6
+PKGNAME=        apache-1.3b6
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
-# bsd.port.mk can't handle different base directory per dist patch yet
-#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b5/
-#PATCHFILES=     PR1847.patch PR1850.patch PR1889.patch
+#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b6/
 
 MAINTAINER=     ache@freebsd.org
 
 NO_LATEST_LINK=	yes
 
-# Set it for local-supplied patch, f.e.
-# VERS_ID = mods-1.0/me
-
-post-patch:
-	@cd ${WRKSRC}/conf && \
-	for I in access.conf-dist srm.conf-dist; do \
-	    sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \
-	    mv $${I}.new $${I}; \
-	done
-	@cd ${WRKSRC}/conf && \
-	sed -e "s#@@ServerRoot@@#${PREFIX}/etc/apache#g" < \
-		httpd.conf-dist > httpd.conf-dist.new && \
-	mv httpd.conf-dist.new httpd.conf-dist
-	@${RM} -rf ${WRKSRC}/icons/CVS
-.if defined(VERS_ID)
-	@cd ${WRKSRC}/src && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
-	< Configuration.old > Configuration
-.endif
-
-CONF_DIR=   ${PREFIX}/etc/apache
-MAN1=   apachectl.1 htpasswd.1
-MAN8=   httpd.8
-
-do-install:
-	install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/www/data \
-		${PREFIX}/www/icons ${PREFIX}/www/cgi-bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/httpd ${PREFIX}/sbin
-	cd ${WRKSRC}/src/support && \
-		${INSTALL_PROGRAM} htdigest htpasswd logresolve rotatelogs \
-		${PREFIX}/sbin
-	cd ${WRKSRC}/src/support && \
-		${INSTALL_SCRIPT} apachectl dbmmanage log_server_status \
-		${PREFIX}/sbin
-	${INSTALL_DATA} -o nobody ${WRKSRC}/icons/* ${PREFIX}/www/icons
-	${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
-		${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
-		       ${WRKSRC}/src/support/apachectl.1 \
-		${PREFIX}/man/man1
-	cd ${WRKSRC} && \
-	for file in httpd.conf srm.conf access.conf ; do \
-	    if [ ! -f ${CONF_DIR}/$$file ] ; then \
-		${INSTALL_DATA} conf/$$file-dist ${CONF_DIR}/$$file ; \
-	    fi ; \
-	    ${INSTALL_DATA} conf/$$file-dist ${CONF_DIR} ; \
-	done
-	cd ${WRKSRC} && \
-	for file in mime.types magic ; do \
-	    if [ ! -f ${CONF_DIR}/$$file ] ; then \
-		${INSTALL_DATA} conf/$$file ${CONF_DIR} ; \
-	    fi ; \
-	    ${INSTALL_DATA} conf/$$file ${CONF_DIR}/$${file}-dist ; \
-	done
+HAS_CONFIGURE=  yes
+CONFIGURE_ARGS+= --prefix=${PREFIX} \
+		 --localstatedir=/var \
+		 --datadir=${PREFIX}/www \
+		 --libexecdir=${PREFIX}/libexec/apache \
+		 --enable-shared=remain \
+		 --enable-module=most \
+		 --enable-module=auth_db \
+		 --disable-module=auth_dbm
+
+CONFIGURE_ENV+= \
+OPTIM='-DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:'${PREFIX}'/bin\\"'
+
+MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
+MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 47b5c0f31ad4..e290b622bf3f 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3b5.tar.gz) = d8ce21fe9fda2673fdd749f6281f331d
+MD5 (apache_1.3b6.tar.gz) = f58db5a72656a36605934fbcb215c154
diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab
new file mode 100644
index 000000000000..b0f108c37db2
--- /dev/null
+++ b/www/apache2/files/patch-ab
@@ -0,0 +1,133 @@
+*** Makefile.tmpl.orig	Tue Apr 14 23:17:36 1998
+--- Makefile.tmpl	Tue Apr 21 23:48:17 1998
+***************
+*** 207,218 ****
+  	$(MKDIR) $(mandir)/man1
+  	$(MKDIR) $(mandir)/man8
+  	$(MKDIR) $(sysconfdir)
+! 	$(MKDIR) $(datadir)/htdocs
+  	$(MKDIR) $(datadir)/icons
+! 	$(MKDIR) $(datadir)/cgi-bin
+  	$(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
+  	$(MKDIR) $(localstatedir)/$(localstatesubdir_run)
+! 	$(MKDIR) $(localstatedir)/proxy
+  	$(MKDIR) $(includedir)
+  	@echo "<=== [mktree]"
+  
+--- 207,218 ----
+  	$(MKDIR) $(mandir)/man1
+  	$(MKDIR) $(mandir)/man8
+  	$(MKDIR) $(sysconfdir)
+! 	$(MKDIR) $(datadir)/data.default
+  	$(MKDIR) $(datadir)/icons
+! 	$(MKDIR) $(datadir)/cgi-bin.default
+  	$(MKDIR) $(localstatedir)/$(localstatesubdir_logs)
+  	$(MKDIR) $(localstatedir)/$(localstatesubdir_run)
+! 	$(MKDIR) $(datadir)/proxy
+  	$(MKDIR) $(includedir)
+  	@echo "<=== [mktree]"
+  
+***************
+*** 311,327 ****
+  install-docroot:
+  	@echo "===> [docroot: Installing initial DocumentRoot files]"
+  	-(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
+! 	 (cd $(datadir)/htdocs/ && $(TAR) xf -)
+! 	-find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
+! 	-find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
+  	-(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
+  	 (cd $(datadir)/icons/ && $(TAR) xf -)
+  	-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
+  	-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
+  	-(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
+! 	 (cd $(datadir)/cgi-bin/ && $(TAR) xf -)
+! 	-find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
+! 	-find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
+  	@echo "<=== [docroot]"
+  
+  #   create the initial configuration by providing default files
+--- 311,333 ----
+  install-docroot:
+  	@echo "===> [docroot: Installing initial DocumentRoot files]"
+  	-(cd $(ROOT)/htdocs/ && $(TAR) cf - *) |\
+! 	 (cd $(datadir)/data.default/ && $(TAR) xf -)
+! 	-find $(datadir)/data.default/ -type d -exec chmod a+rx {} \;
+! 	-find $(datadir)/data.default/ -type f -exec chmod a+r {} \;
+! 	if [ ! -d $(datadir)/data ]; then \
+! 		$(CP) -Rp $(datadir)/data.default $(datadir)/data; \
+! 	fi
+  	-(cd $(ROOT)/icons/ && $(TAR) cf - *) |\
+  	 (cd $(datadir)/icons/ && $(TAR) xf -)
+  	-find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
+  	-find $(datadir)/icons/ -type f -exec chmod a+r {} \;
+  	-(cd $(ROOT)/cgi-bin/ && $(TAR) cf - *) |\
+! 	 (cd $(datadir)/cgi-bin.default/ && $(TAR) xf -)
+! 	-find $(datadir)/cgi-bin.default/ -type d -exec chmod a+rx {} \;
+! 	-find $(datadir)/cgi-bin.default/ -type f -exec chmod a+r {} \;
+! 	if [ ! -d $(datadir)/cgi-bin ]; then \
+! 		$(CP) -Rp $(datadir)/cgi-bin.default $(datadir)/cgi-bin; \
+! 	fi
+  	@echo "<=== [docroot]"
+  
+  #   create the initial configuration by providing default files
+***************
+*** 335,351 ****
+  		 echo ""; \
+  		 cat $(ROOT)/conf/$$conf-dist ) |\
+      	sed -e '/# LoadModule/r .install.conf' \
+!     	    -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+!     	    -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+          	-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+          	-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+!         	-e 's;@@ServerRoot@@/proxy;$(localstatedir)/proxy;' \
+          	-e 's;@@ServerRoot@@;$(prefix);' \
+          	-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
+          	-e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
+          	-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
+!         	-e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
+!         	-e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
+          	>.install.tmp && \
+  		echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
+  		$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+--- 341,356 ----
+  		 echo ""; \
+  		 cat $(ROOT)/conf/$$conf-dist ) |\
+      	sed -e '/# LoadModule/r .install.conf' \
+! 	    -e 's;@@ServerRoot@@/htdocs;$(datadir)/data;' \
+          	-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+          	-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+! 		-e 's;@@ServerRoot@@/proxy;$(datadir)/proxy;' \
+          	-e 's;@@ServerRoot@@;$(prefix);' \
+          	-e 's;logs/accept.lock;$(localstatedir)/$(localstatesubdir_run)/httpd.lock;' \
+          	-e 's;logs/apache_status;$(localstatedir)/$(localstatesubdir_run)/httpd.scoreboard;' \
+          	-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
+! 		-e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-access.log;' \
+! 		-e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/httpd-error.log;' \
+          	>.install.tmp && \
+  		echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
+  		$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \
+***************
+*** 356,363 ****
+  			echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
+  		fi; \
+  	done
+! 	$(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
+! 	$(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
+  	@echo "<=== [config]"
+  
+  
+--- 361,374 ----
+  			echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
+  		fi; \
+  	done
+! 	$(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types.default
+! 	if [ ! -f "$(sysconfdir)/mime.types" ]; then \
+! 		$(INSTALL_DATA) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types; \
+! 	fi
+! 	$(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic.default
+! 	if [ ! -f "$(sysconfdir)/magic" ]; then \
+! 		$(INSTALL_DATA) $(ROOT)/conf/magic $(sysconfdir)/magic; \
+! 	fi
+  	@echo "<=== [config]"
+  
+  
diff --git a/www/apache2/files/patch-ag b/www/apache2/files/patch-ag
index 4abfaa985725..7f0c21c34f13 100644
--- a/www/apache2/files/patch-ag
+++ b/www/apache2/files/patch-ag
@@ -1,7 +1,7 @@
-*** conf/httpd.conf-dist.orig	Wed Feb  4 22:42:29 1998
---- conf/httpd.conf-dist	Fri Feb 20 13:36:27 1998
+*** conf/httpd.conf-dist.orig	Wed Apr  1 17:16:39 1998
+--- conf/httpd.conf-dist	Tue Apr 21 23:43:19 1998
 ***************
-*** 34,40 ****
+*** 42,48 ****
   #  suggested workaround is to create a user www and use that user.
   
   User nobody
@@ -9,7 +9,7 @@
   
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
---- 34,40 ----
+--- 42,48 ----
   #  suggested workaround is to create a user www and use that user.
   
   User nobody
@@ -18,106 +18,53 @@
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
 ***************
-*** 47,53 ****
-  # mounted filesystem then please read the LockFile documentation,
-  # you will save yourself a lot of trouble.
+*** 86,92 ****
+  # The location of the access logfile (Common Logfile Format).
+  # If this does not start with /, ServerRoot is prepended to it.
   
-! ServerRoot @@ServerRoot@@
+! CustomLog logs/access_log common
   
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
---- 47,53 ----
-  # mounted filesystem then please read the LockFile documentation,
-  # you will save yourself a lot of trouble.
+  # If you would like to have an agent and referer logfile uncomment the
+  # following directives.
+--- 86,92 ----
+  # The location of the access logfile (Common Logfile Format).
+  # If this does not start with /, ServerRoot is prepended to it.
   
-! ServerRoot /usr/local/etc/apache
+! #CustomLog logs/access_log common
   
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
+  # If you would like to have an agent and referer logfile uncomment the
+  # following directives.
 ***************
-*** 59,79 ****
-  # ErrorLog: The location of the error log file. If this does not start
-  # with /, ServerRoot is prepended to it.
+*** 97,103 ****
+  # If you prefer a single logfile with access, agent and referer information
+  # (Combined Logfile Format) you can use the following directive.
   
-! ErrorLog logs/error_log
+! #CustomLog logs/access_log combined
   
-  # TransferLog: The location of the transfer log file. If this does not
-  # start with /, ServerRoot is prepended to it.
+  # PidFile: The file the server should log its pid to
+  PidFile logs/httpd.pid
+--- 97,103 ----
+  # If you prefer a single logfile with access, agent and referer information
+  # (Combined Logfile Format) you can use the following directive.
   
-! TransferLog logs/access_log
+! CustomLog logs/access_log combined
   
   # PidFile: The file the server should log its pid to
-! PidFile logs/httpd.pid
-  
-  # ScoreBoardFile: File used to store internal server process information.
+  PidFile logs/httpd.pid
+***************
+*** 106,112 ****
   # Not all architectures require this.  But if yours does (you'll know because
   # this file is created when you run Apache) then you *must* ensure that
   # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile logs/apache_status
+! ScoreBoardFile logs/apache_runtime_status
   
   # The LockFile directive sets the path to the lockfile used when Apache
   # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
---- 59,81 ----
-  # ErrorLog: The location of the error log file. If this does not start
-  # with /, ServerRoot is prepended to it.
-  
-! ErrorLog /var/log/httpd-error.log
-  
-  # TransferLog: The location of the transfer log file. If this does not
-  # start with /, ServerRoot is prepended to it.
-  
-! TransferLog /var/log/httpd-access.log
-! 
-! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
-  
-  # PidFile: The file the server should log its pid to
-! PidFile /var/run/httpd.pid
-  
-  # ScoreBoardFile: File used to store internal server process information.
+--- 106,112 ----
   # Not all architectures require this.  But if yours does (you'll know because
   # this file is created when you run Apache) then you *must* ensure that
   # no two invocations of Apache share the same scoreboard file.
-! ScoreBoardFile /var/run/apache_runtime_status
+! #ScoreBoardFile logs/apache_runtime_status
   
   # The LockFile directive sets the path to the lockfile used when Apache
   # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
-***************
-*** 172,178 ****
-  
-  # To enable the cache as well, edit and uncomment the following lines:
-  
-! #CacheRoot @@ServerRoot@@/proxy
-  #CacheSize 5
-  #CacheGcInterval 4
-  #CacheMaxExpire 24
---- 174,180 ----
-  
-  # To enable the cache as well, edit and uncomment the following lines:
-  
-! #CacheRoot /usr/local/etc/apache/proxy
-  #CacheSize 5
-  #CacheGcInterval 4
-  #CacheMaxExpire 24
-***************
-*** 196,205 ****
-   
-  #<VirtualHost host.some_domain.com>
-  #ServerAdmin webmaster@host.some_domain.com
-! #DocumentRoot /www/docs/host.some_domain.com
-  #ServerName host.some_domain.com
-! #ErrorLog logs/host.some_domain.com-error_log
-! #TransferLog logs/host.some_domain.com-access_log
-  #</VirtualHost>
-  
-  
---- 198,207 ----
-   
-  #<VirtualHost host.some_domain.com>
-  #ServerAdmin webmaster@host.some_domain.com
-! #DocumentRoot /usr/local/www/host.some_domain.com/data
-  #ServerName host.some_domain.com
-! #ErrorLog /var/log/host.some_domain.com-error_log
-! #TransferLog /var/log/host.some_domain.com-access_log
-  #</VirtualHost>
-  
-  
diff --git a/www/apache2/files/patch-ak b/www/apache2/files/patch-ak
index 6a053da102b7..a99c4343151c 100644
--- a/www/apache2/files/patch-ak
+++ b/www/apache2/files/patch-ak
@@ -1,28 +1,5 @@
-*** src/support/apachectl.orig	Sun Oct 26 02:35:19 1997
---- src/support/apachectl	Fri Nov 21 22:58:08 1997
-***************
-*** 21,30 ****
-  # --------------------                              --------------------
-  # 
-  # the path to your PID file
-! PIDFILE=/usr/local/apache/logs/httpd.pid
-  #
-  # the path to your httpd binary
-! HTTPD=/usr/local/apache/src/httpd
-  #
-  # a command that outputs a formatted text version of the HTML at the
-  # url given on the command line.  Designed for lynx, however other
---- 21,30 ----
-  # --------------------                              --------------------
-  # 
-  # the path to your PID file
-! PIDFILE=/var/run/httpd.pid
-  #
-  # the path to your httpd binary
-! HTTPD=/usr/local/sbin/httpd
-  #
-  # a command that outputs a formatted text version of the HTML at the
-  # url given on the command line.  Designed for lynx, however other
+*** src/support/apachectl.orig	Tue Mar 31 16:53:46 1998
+--- src/support/apachectl	Tue Apr 21 17:15:55 1998
 ***************
 *** 37,42 ****
 --- 37,44 ----
diff --git a/www/apache2/files/patch-al b/www/apache2/files/patch-al
index 893063557d83..039d6320f415 100644
--- a/www/apache2/files/patch-al
+++ b/www/apache2/files/patch-al
@@ -1,7 +1,7 @@
-*** src/support/log_server_status.orig	Thu Oct 23 00:30:46 1997
---- src/support/log_server_status	Fri Nov 21 23:05:50 1997
+*** src/support/log_server_status.orig	Tue Mar 31 16:53:50 1998
+--- src/support/log_server_status	Tue Apr 21 17:18:10 1998
 ***************
-*** 63,72 ****
+*** 67,76 ****
   #
   require 'sys/socket.ph';
   
@@ -12,7 +12,7 @@
   
   sub tcp_connect
   {
---- 63,72 ----
+--- 67,76 ----
   #
   require 'sys/socket.ph';
   
@@ -24,7 +24,7 @@
   sub tcp_connect
   {
 ***************
-*** 89,99 ****
+*** 93,103 ****
   ### Main
   
   {
@@ -36,7 +36,7 @@
   	if ($res) {
   		print OUT "$time:-1:-1:-1:-1:$res\n";
   		exit 1;
---- 89,99 ----
+--- 93,103 ----
   ### Main
   
   {
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 798a3cd1b7a8..854914a0cf41 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -1,21 +1,193 @@
+etc/apache/access.conf.default
+etc/apache/httpd.conf.default
+etc/apache/magic.default
+etc/apache/mime.types.default
+etc/apache/srm.conf.default
 etc/rc.d/apache.sh
-@exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf-dist
-etc/apache/srm.conf-dist
-etc/apache/access.conf-dist
-etc/apache/mime.types-dist
-etc/apache/magic-dist
-sbin/httpd
+include/apache/alloc.h
+include/apache/ap.h
+include/apache/ap_config.h
+include/apache/buff.h
+include/apache/compat.h
+include/apache/conf.h
+include/apache/explain.h
+include/apache/fnmatch.h
+include/apache/hsregex.h
+include/apache/http_conf_globals.h
+include/apache/http_config.h
+include/apache/http_core.h
+include/apache/http_log.h
+include/apache/http_main.h
+include/apache/http_protocol.h
+include/apache/http_request.h
+include/apache/http_vhost.h
+include/apache/httpd.h
+include/apache/md5.h
+include/apache/multithread.h
+include/apache/os.h
+include/apache/rfc1413.h
+include/apache/scoreboard.h
+include/apache/util_date.h
+include/apache/util_md5.h
+include/apache/util_script.h
+include/apache/util_uri.h
+libexec/apache/libproxy.so
+libexec/apache/mod_auth_anon.so
+libexec/apache/mod_auth_db.so
+libexec/apache/mod_cern_meta.so
+libexec/apache/mod_digest.so
+libexec/apache/mod_expires.so
+libexec/apache/mod_headers.so
+libexec/apache/mod_info.so
+libexec/apache/mod_mime_magic.so
+libexec/apache/mod_rewrite.so
+libexec/apache/mod_speling.so
+libexec/apache/mod_status.so
+libexec/apache/mod_unique_id.so
+libexec/apache/mod_usertrack.so
+man/man1/ab.1.gz
+man/man1/apachectl.1.gz
+man/man1/dbmmanage.1.gz
+man/man1/htdigest.1.gz
+man/man1/htpasswd.1.gz
+man/man8/apxs.8.gz
+man/man8/httpd.8.gz
+man/man8/logresolve.8.gz
+man/man8/rotatelogs.8.gz
+sbin/ab
 sbin/apachectl
+sbin/apxs
 sbin/dbmmanage
 sbin/htdigest
 sbin/htpasswd
-sbin/log_server_status
+sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-man/man1/apachectl.1.gz
-man/man1/htpasswd.1.gz
-man/man8/httpd.8.gz
+www/cgi-bin.default/printenv
+www/cgi-bin.default/test-cgi
+www/data.default/apache_pb.gif
+www/data.default/index.html
+www/data.default/manual/LICENSE
+www/data.default/manual/TODO
+www/data.default/manual/bind.html
+www/data.default/manual/cgi_path.html
+www/data.default/manual/content-negotiation.html
+www/data.default/manual/custom-error.html
+www/data.default/manual/dns-caveats.html
+www/data.default/manual/ebcdic.html
+www/data.default/manual/env.html
+www/data.default/manual/footer.html
+www/data.default/manual/handler.html
+www/data.default/manual/header.html
+www/data.default/manual/images/custom_errordocs.gif
+www/data.default/manual/images/home.gif
+www/data.default/manual/images/index.gif
+www/data.default/manual/images/mod_rewrite_fig1.fig
+www/data.default/manual/images/mod_rewrite_fig1.gif
+www/data.default/manual/images/mod_rewrite_fig2.fig
+www/data.default/manual/images/mod_rewrite_fig2.gif
+www/data.default/manual/images/sub.gif
+www/data.default/manual/index.html
+www/data.default/manual/install.html
+www/data.default/manual/invoking.html
+www/data.default/manual/keepalive.html
+www/data.default/manual/location.html
+www/data.default/manual/man-template.html
+www/data.default/manual/misc/API.html
+www/data.default/manual/misc/FAQ.html
+www/data.default/manual/misc/client_block_api.html
+www/data.default/manual/misc/compat_notes.html
+www/data.default/manual/misc/custom_errordocs.html
+www/data.default/manual/misc/descriptors.html
+www/data.default/manual/misc/fin_wait_2.html
+www/data.default/manual/misc/footer.html
+www/data.default/manual/misc/header.html
+www/data.default/manual/misc/howto.html
+www/data.default/manual/misc/index.html
+www/data.default/manual/misc/known_bugs.html
+www/data.default/manual/misc/known_client_problems.html
+www/data.default/manual/misc/nopgp.html
+www/data.default/manual/misc/perf-bsd44.html
+www/data.default/manual/misc/perf-dec.html
+www/data.default/manual/misc/perf-hp.html
+www/data.default/manual/misc/perf-tuning.html
+www/data.default/manual/misc/perf.html
+www/data.default/manual/misc/security_tips.html
+www/data.default/manual/misc/vif-info.html
+www/data.default/manual/misc/windoz_keepalive.html
+www/data.default/manual/mod/core.html
+www/data.default/manual/mod/directive-dict.html
+www/data.default/manual/mod/directives.html
+www/data.default/manual/mod/footer.html
+www/data.default/manual/mod/header.html
+www/data.default/manual/mod/index.html
+www/data.default/manual/mod/mod_access.html
+www/data.default/manual/mod/mod_actions.html
+www/data.default/manual/mod/mod_alias.html
+www/data.default/manual/mod/mod_asis.html
+www/data.default/manual/mod/mod_auth.html
+www/data.default/manual/mod/mod_auth_anon.html
+www/data.default/manual/mod/mod_auth_db.html
+www/data.default/manual/mod/mod_auth_dbm.html
+www/data.default/manual/mod/mod_autoindex.html
+www/data.default/manual/mod/mod_browser.html
+www/data.default/manual/mod/mod_cern_meta.html
+www/data.default/manual/mod/mod_cgi.html
+www/data.default/manual/mod/mod_cookies.html
+www/data.default/manual/mod/mod_digest.html
+www/data.default/manual/mod/mod_dir.html
+www/data.default/manual/mod/mod_dld.html
+www/data.default/manual/mod/mod_dll.html
+www/data.default/manual/mod/mod_env.html
+www/data.default/manual/mod/mod_example.html
+www/data.default/manual/mod/mod_expires.html
+www/data.default/manual/mod/mod_headers.html
+www/data.default/manual/mod/mod_imap.html
+www/data.default/manual/mod/mod_include.html
+www/data.default/manual/mod/mod_info.html
+www/data.default/manual/mod/mod_isapi.html
+www/data.default/manual/mod/mod_log_agent.html
+www/data.default/manual/mod/mod_log_common.html
+www/data.default/manual/mod/mod_log_config.html
+www/data.default/manual/mod/mod_log_referer.html
+www/data.default/manual/mod/mod_mime.html
+www/data.default/manual/mod/mod_mime_magic.html
+www/data.default/manual/mod/mod_mmap_static.html
+www/data.default/manual/mod/mod_negotiation.html
+www/data.default/manual/mod/mod_proxy.html
+www/data.default/manual/mod/mod_rewrite.html
+www/data.default/manual/mod/mod_setenvif.html
+www/data.default/manual/mod/mod_so.html
+www/data.default/manual/mod/mod_speling.html
+www/data.default/manual/mod/mod_status.html
+www/data.default/manual/mod/mod_unique_id.html
+www/data.default/manual/mod/mod_userdir.html
+www/data.default/manual/mod/mod_usertrack.html
+www/data.default/manual/multilogs.html
+www/data.default/manual/new_features_1_0.html
+www/data.default/manual/new_features_1_1.html
+www/data.default/manual/new_features_1_2.html
+www/data.default/manual/new_features_1_3.html
+www/data.default/manual/process-model.html
+www/data.default/manual/sections.html
+www/data.default/manual/sourcereorg.html
+www/data.default/manual/stopping.html
+www/data.default/manual/suexec.html
+www/data.default/manual/unixware.html
+www/data.default/manual/upgrading_to_1_3.html
+www/data.default/manual/vhosts/details.html
+www/data.default/manual/vhosts/details_1_2.html
+www/data.default/manual/vhosts/examples.html
+www/data.default/manual/vhosts/fd-limits.html
+www/data.default/manual/vhosts/footer.html
+www/data.default/manual/vhosts/header.html
+www/data.default/manual/vhosts/host.html
+www/data.default/manual/vhosts/index.html
+www/data.default/manual/vhosts/ip-based.html
+www/data.default/manual/vhosts/name-based.html
+www/data.default/manual/vhosts/vhosts-in-depth.html
+www/data.default/manual/vhosts/virtual-host.html
+www/data.default/manual/windows.html
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
@@ -92,3 +264,4 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
+@exec mkdir -p %D/www/proxy