7 files changed, 572 insertions, 414 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 591c3351eeb2..60bb9a69a867 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION= 	${VERSION_APACHE}+${VERSION_MODSSL}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://www.apache.org/dist/ \
 		http://www.modssl.org/source/ \
@@ -56,30 +56,23 @@ Y2K=		http://www.modssl.org/docs/2.7/ssl_faq.html#y2k
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--target=apache \
-		--with-layout=GNU \
+		--server-gid=nogroup \
 		--with-perl=${PERL} \
-		--bindir=${PREFIX}/bin \
-		--sbindir=${PREFIX}/sbin \
-		--libexecdir=${PREFIX}/libexec/apache \
-		--mandir=${PREFIX}/man \
-		--sysconfdir=${PREFIX}/etc/apache \
-		--datadir=${PREFIX}/share/apache \
-		--includedir=${PREFIX}/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log \
-		--proxycachedir=/var/spool/apache \
+		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
+		--suexec-docroot=${PREFIX}/www/data \
 		--without-confadjust \
 		--enable-module=most \
 		--enable-module=auth_db \
+		--enable-module=mmap_static \
 		--disable-module=auth_dbm \
+		--enable-shared=max \
 		--enable-module=ssl \
-		--enable-module=define \
-		--enable-shared=max
+		--enable-module=define
 
 OPTIM=		-DHARD_SERVER_LIMIT=512 \
-		-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\"
+		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
+		-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\" \
+		-DACCEPT_FILTER_NAME=\\"httpready\\"
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
 OPTIM+=		-DBUFFERED_LOGS -DFD_SETSIZE=1024
@@ -96,7 +89,7 @@ CONFIGURE_ENV=	CFLAGS='${CFLAGS}' \
 INSTALL_TARGET=	install-quiet
 
 MAN1=	dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=	ab.8 apachectl.8 apxs.8 apache.8 logresolve.8 rotatelogs.8
+MAN8=	ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 TYPE=	test
 CRT=
@@ -123,13 +116,9 @@ certificate:
 	&& ${MAKE} certificate TYPE=${TYPE} CRT=${CRT} KEY=${KEY}
 
 post-install:
-	@${RM} -f ${PREFIX}/etc/apache/access.conf.*
-	@${RM} -f ${PREFIX}/etc/apache/srm.conf.*
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
-		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl startssl >/dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
-		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
 .include <bsd.port.post.mk>
diff --git a/www/apache13-modssl/files/FreeBSD.layout b/www/apache13-modssl/files/FreeBSD.layout
new file mode 100644
index 000000000000..5524e186e9c0
--- /dev/null
+++ b/www/apache13-modssl/files/FreeBSD.layout
@@ -0,0 +1,19 @@
+#   FreeBSD layout...
+<Layout FreeBSD>
+    prefix:        /usr/local
+    exec_prefix:   $prefix
+    bindir:        $exec_prefix/bin
+    sbindir:       $exec_prefix/sbin
+    libexecdir:    $exec_prefix/libexec/apache
+    mandir:        $prefix/man
+    sysconfdir:    $prefix/etc/apache
+    datadir:       $prefix/www
+    iconsdir:      $datadir/icons
+    htdocsdir:     $datadir/data
+    cgidir:        $datadir/cgi-bin
+    includedir:    $prefix/include/apache
+    localstatedir: /var
+    runtimedir:    $localstatedir/run
+    logfiledir:    $localstatedir/log
+    proxycachedir: $datadir/proxy
+</Layout>
diff --git a/www/apache13-modssl/files/apache.sh b/www/apache13-modssl/files/apache.sh
index 619918254852..8e6e38810fa8 100644
--- a/www/apache13-modssl/files/apache.sh
+++ b/www/apache13-modssl/files/apache.sh
@@ -7,10 +7,10 @@ fi
 
 case "$1" in
 start)
-	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'
+	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl startssl > /dev/null && echo -n ' apache'
 	;;
 stop)
-	[ -r /var/run/httpd.pid ] && ${PREFIX}/apachectl stop > /dev/null && echo -n ' apache'
+	[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache'
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa
index 448bc9bf1589..700446754c32 100644
--- a/www/apache13-modssl/files/patch-aa
+++ b/www/apache13-modssl/files/patch-aa
@@ -9,3 +9,25 @@
  fi
  
  ##
+@@ -1232,8 +1232,8 @@
+     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
+-    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
+-    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
++    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
++    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
+     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
+     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
+     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
+@@ -1330,8 +1330,8 @@
+ echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
+ echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
+-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
+-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
++echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
++echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
+ echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
+ echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
+ echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache13-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac
index 77ead0f0b54a..a009e6138b06 100644
--- a/www/apache13-modssl/files/patch-ac
+++ b/www/apache13-modssl/files/patch-ac
@@ -20,6 +20,30 @@
  
  #
  # ServerAdmin: Your address, where problems with the server should be
+@@ -354,7 +354,22 @@
+ # directory index.  Separate multiple entries with spaces.
+ #
+ <IfModule mod_dir.c>
+-    DirectoryIndex index.html
++    <IfModule mod_php3.c>
++        <IfModule mod_php4.c>
++            DirectoryIndex index.php index.php3 index.html
++        </IfModule>
++        <IfModule !mod_php4.c>
++            DirectoryIndex index.php3 index.html
++        </IfModule>
++    </IfModule>
++    <IfModule !mod_php3.c>
++        <IfModule mod_php4.c>
++            DirectoryIndex index.php index.html
++        </IfModule>
++        <IfModule !mod_php4.c>
++            DirectoryIndex index.html
++        </IfModule>
++    </IfModule>
+ </IfModule>
+ 
+ #
 @@ -469,7 +469,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
@@ -38,3 +62,25 @@
  
  #
  # Optionally add a line containing the server version and virtual host
+@@ -708,13 +723,17 @@
+     # For example, the PHP 3.x module (not part of the Apache distribution - see
+     # http://www.php.net) will typically use:
+     #
+-    #AddType application/x-httpd-php3 .php3
+-    #AddType application/x-httpd-php3-source .phps
++    <IfModule mod_php3.c>
++        AddType application/x-httpd-php3 .php3
++        AddType application/x-httpd-php3-source .php3s
++    </IfModule>
+     #
+     # And for PHP 4.x, use:
+     #
+-    #AddType application/x-httpd-php .php
+-    #AddType application/x-httpd-php-source .phps
++    <IfModule mod_php4.c>
++        AddType application/x-httpd-php .php
++        AddType application/x-httpd-php-source .phps
++    </IfModule>
+ 
+     AddType application/x-tar .tgz
+ 
diff --git a/www/apache13-modssl/files/patch-ai b/www/apache13-modssl/files/patch-ai
new file mode 100644
index 000000000000..11517ba25548
--- /dev/null
+++ b/www/apache13-modssl/files/patch-ai
@@ -0,0 +1,65 @@
+--- Makefile.tmpl.orig	Thu Oct 19 11:30:46 2000
++++ Makefile.tmpl	Thu Oct 19 11:43:48 2000
+@@ -125,2 +125,3 @@
+ proxycachedir   = @proxycachedir@
++doc_prefix	= $(prefix)/share/doc/apache
+ 
+@@ -327,5 +328,5 @@
+ 	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
+-	$(MKDIR) $(root)$(htdocsdir)
++	$(MKDIR) $(root)$(doc_prefix)
+ 	$(MKDIR) $(root)$(iconsdir)
+-	$(MKDIR) $(root)$(cgidir)
++	$(MKDIR) $(root)$(cgidir).default
+ 	$(MKDIR) $(root)$(includedir)
+@@ -528,14 +529,18 @@
+ 	@echo "===> [data: Installing initial data files]"
+-	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
+-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
+-	else \
++#	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
++#		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
++#	else \
+ 		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
+ 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
+-		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
+-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+-	fi
+-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
+-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+-	else \
++		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
++		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
++		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
++#	fi
++	if [ ! -d $(root)$(htdocsdir) ]; then \
++		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
++	fi
++	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
++#	-@if [ -f $(root)$(cgidir)/printenv ]; then \
++#		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
++#	else \
+ 		for script in printenv test-cgi; do \
+@@ -544,5 +549,8 @@
+ 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
+-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
++			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
++			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
+ 		done; \
++#	fi
++	if [ ! -d $(root)$(cgidir) ]; then \
++		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
+ 	fi
+@@ -594,6 +602,6 @@
+ 			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
+-			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
+-			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
+-			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
+-			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
++			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \
++			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \
++			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \
++			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \
+ 			-e 's;conf/magic;$(sysconfdir)/magic;' \
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index f96979349f59..ba8a1730b8c6 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -1,52 +1,53 @@
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
-sbin/ab
-sbin/apache
-sbin/apachectl
-sbin/apxs
-sbin/logresolve
-sbin/rotatelogs
-etc/rc.d/apache.sh
-etc/apache/access.conf
-etc/apache/apache.conf
-etc/apache/apache.conf.default
-etc/apache/magic
+@unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
+etc/apache/access.conf.default
+@exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf
+@unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf.default; then rm -f %D/etc/apache/httpd.conf; fi
+etc/apache/httpd.conf.default
+@exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf
+@unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic.default; then rm -f %D/etc/apache/magic; fi
 etc/apache/magic.default
-etc/apache/mime.types
+@exec [ ! -f %B/magic ] && cp %B/%f %B/magic
+@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
-etc/apache/srm.conf
-etc/apache/ssl.crt/README.CRT
+@exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types
+@unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi
+etc/apache/srm.conf.default
+@exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf
+etc/apache/ssl.crl/Makefile
+etc/apache/ssl.crl/README.CRL
 etc/apache/ssl.crt/Makefile
+etc/apache/ssl.crt/README.CRT
 etc/apache/ssl.crt/ca-bundle.crt
-etc/apache/ssl.crt/snakeoil-ca-rsa.crt
+etc/apache/ssl.crt/server.crt
 etc/apache/ssl.crt/snakeoil-ca-dsa.crt
-etc/apache/ssl.crt/snakeoil-rsa.crt
+etc/apache/ssl.crt/snakeoil-ca-rsa.crt
 etc/apache/ssl.crt/snakeoil-dsa.crt
-etc/apache/ssl.crt/server.crt
-etc/apache/ssl.crl/README.CRL
-etc/apache/ssl.crl/Makefile
+etc/apache/ssl.crt/snakeoil-rsa.crt
 etc/apache/ssl.csr/README.CSR
 etc/apache/ssl.csr/server.csr
-etc/apache/ssl.prm/README.PRM
-etc/apache/ssl.prm/snakeoil-ca-dsa.prm
-etc/apache/ssl.prm/snakeoil-dsa.prm
 etc/apache/ssl.key/README.KEY
-etc/apache/ssl.key/snakeoil-ca-rsa.key
+etc/apache/ssl.key/server.key
 etc/apache/ssl.key/snakeoil-ca-dsa.key
-etc/apache/ssl.key/snakeoil-rsa.key
+etc/apache/ssl.key/snakeoil-ca-rsa.key
 etc/apache/ssl.key/snakeoil-dsa.key
-etc/apache/ssl.key/server.key
-include/apache/ap_alloc.h
-include/apache/ap_ctx.h
-include/apache/ap_hook.h
-include/apache/ap_mm.h
+etc/apache/ssl.key/snakeoil-rsa.key
+etc/apache/ssl.prm/README.PRM
+etc/apache/ssl.prm/snakeoil-ca-dsa.prm
+etc/apache/ssl.prm/snakeoil-dsa.prm
+etc/rc.d/apache.sh
 include/apache/ap.h
+include/apache/ap_alloc.h
 include/apache/ap_compat.h
 include/apache/ap_config.h
 include/apache/ap_config_auto.h
+include/apache/ap_ctx.h
 include/apache/ap_ctype.h
+include/apache/ap_hook.h
 include/apache/ap_md5.h
+include/apache/ap_mm.h
 include/apache/ap_mmn.h
 include/apache/ap_sha1.h
 include/apache/buff.h
@@ -65,8 +66,8 @@ include/apache/http_request.h
 include/apache/http_vhost.h
 include/apache/httpd.h
 include/apache/multithread.h
-include/apache/os.h
 include/apache/os-inline.c
+include/apache/os.h
 include/apache/rfc1413.h
 include/apache/scoreboard.h
 include/apache/util_date.h
@@ -74,20 +75,19 @@ include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
 include/apache/xml/asciitab.h
-include/apache/xml/xmltok.h
-include/apache/xml/xmlrole.h
-include/apache/xml/xmlparse.h
-include/apache/xml/xmldef.h
-include/apache/xml/utf8tab.h
-include/apache/xml/nametab.h
-include/apache/xml/latin1tab.h
-include/apache/xml/iasciitab.h
 include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
 include/apache/xml/xmltok_impl.h
 libexec/apache/httpd.exp
 libexec/apache/libproxy.so
 libexec/apache/libssl.so
-libexec/apache/mod_define.so
 libexec/apache/mod_access.so
 libexec/apache/mod_actions.so
 libexec/apache/mod_alias.so
@@ -98,6 +98,7 @@ libexec/apache/mod_auth_db.so
 libexec/apache/mod_autoindex.so
 libexec/apache/mod_cern_meta.so
 libexec/apache/mod_cgi.so
+libexec/apache/mod_define.so
 libexec/apache/mod_digest.so
 libexec/apache/mod_dir.so
 libexec/apache/mod_env.so
@@ -109,6 +110,7 @@ libexec/apache/mod_info.so
 libexec/apache/mod_log_config.so
 libexec/apache/mod_mime.so
 libexec/apache/mod_mime_magic.so
+libexec/apache/mod_mmap_static.so
 libexec/apache/mod_negotiation.so
 libexec/apache/mod_rewrite.so
 libexec/apache/mod_setenvif.so
@@ -118,343 +120,357 @@ libexec/apache/mod_unique_id.so
 libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
 libexec/apache/mod_vhost_alias.so
-share/apache/cgi-bin/printenv
-share/apache/cgi-bin/test-cgi
-share/apache/htdocs/README.rus
-share/apache/htdocs/apache_pb.gif
-share/apache/htdocs/index.html.ca
-share/apache/htdocs/index.html.cz
-share/apache/htdocs/index.html.de
-share/apache/htdocs/index.html.dk
-share/apache/htdocs/index.html.ee
-share/apache/htdocs/index.html.en
-share/apache/htdocs/index.html.es
-share/apache/htdocs/index.html.fr
-share/apache/htdocs/index.html.it
-share/apache/htdocs/index.html.ja.jis
-share/apache/htdocs/index.html.lu
-share/apache/htdocs/index.html.nl
-share/apache/htdocs/index.html.po.iso-pl
-share/apache/htdocs/index.html.pt
-share/apache/htdocs/index.html.pt-br
-share/apache/htdocs/index.html.se
-share/apache/htdocs/index.html.he.iso8859-8
-share/apache/htdocs/index.html.kr.iso-kr
-share/apache/htdocs/index.html.no
-share/apache/htdocs/index.html.ru.cp-1251
-share/apache/htdocs/index.html.ru.cp866
-share/apache/htdocs/index.html.ru.iso-ru
-share/apache/htdocs/index.html.ru.koi8-r
-share/apache/htdocs/index.html.ru.ucs2
-share/apache/htdocs/index.html.ru.ucs4
-share/apache/htdocs/index.html.ru.utf8
-share/apache/htdocs/index.html.tw.Big5
-share/apache/htdocs/manual/LICENSE
-share/apache/htdocs/manual/bind.html
-share/apache/htdocs/manual/cgi_path.html
-share/apache/htdocs/manual/content-negotiation.html
-share/apache/htdocs/manual/custom-error.html
-share/apache/htdocs/manual/dns-caveats.html
-share/apache/htdocs/manual/dso.html
-share/apache/htdocs/manual/ebcdic.html
-share/apache/htdocs/manual/env.html
-share/apache/htdocs/manual/footer.html
-share/apache/htdocs/manual/handler.html
-share/apache/htdocs/manual/header.html
-share/apache/htdocs/manual/images/apache_pb.gif
-share/apache/htdocs/manual/images/feather.jpg
-share/apache/htdocs/manual/images/custom_errordocs.gif
-share/apache/htdocs/manual/images/home.gif
-share/apache/htdocs/manual/images/index.gif
-share/apache/htdocs/manual/images/mod_rewrite_fig1.fig
-share/apache/htdocs/manual/images/mod_rewrite_fig1.gif
-share/apache/htdocs/manual/images/mod_rewrite_fig2.fig
-share/apache/htdocs/manual/images/mod_rewrite_fig2.gif
-share/apache/htdocs/manual/images/mod_ssl_sb.gif
-share/apache/htdocs/manual/images/openssl_ics.gif
-share/apache/htdocs/manual/images/sub.gif
-share/apache/htdocs/manual/index.html
-share/apache/htdocs/manual/install.html
-share/apache/htdocs/manual/invoking.html
-share/apache/htdocs/manual/keepalive.html
-share/apache/htdocs/manual/location.html
-share/apache/htdocs/manual/man-template.html
-share/apache/htdocs/manual/netware.html
-share/apache/htdocs/manual/install-tpf.html
-share/apache/htdocs/manual/readme-tpf.html
-share/apache/htdocs/manual/configuring.html
-share/apache/htdocs/manual/mpeix.html
-share/apache/htdocs/manual/new_features_2_0.html
-share/apache/htdocs/manual/win_compiling.html
-share/apache/htdocs/manual/win_service.html
-share/apache/htdocs/manual/misc/API.html
-share/apache/htdocs/manual/misc/FAQ.html
-share/apache/htdocs/manual/misc/HTTP_Features.tsv
-share/apache/htdocs/manual/misc/client_block_api.html
-share/apache/htdocs/manual/misc/compat_notes.html
-share/apache/htdocs/manual/misc/custom_errordocs.html
-share/apache/htdocs/manual/misc/descriptors.html
-share/apache/htdocs/manual/misc/fin_wait_2.html
-share/apache/htdocs/manual/misc/footer.html
-share/apache/htdocs/manual/misc/header.html
-share/apache/htdocs/manual/misc/howto.html
-share/apache/htdocs/manual/misc/index.html
-share/apache/htdocs/manual/misc/known_client_problems.html
-share/apache/htdocs/manual/misc/nopgp.html
-share/apache/htdocs/manual/misc/perf-bsd44.html
-share/apache/htdocs/manual/misc/perf-dec.html
-share/apache/htdocs/manual/misc/perf-hp.html
-share/apache/htdocs/manual/misc/perf-tuning.html
-share/apache/htdocs/manual/misc/perf.html
-share/apache/htdocs/manual/misc/rewriteguide.html
-share/apache/htdocs/manual/misc/security_tips.html
-share/apache/htdocs/manual/misc/tutorials.html
-share/apache/htdocs/manual/misc/vif-info.html
-share/apache/htdocs/manual/misc/windoz_keepalive.html
-share/apache/htdocs/manual/mod/core.html
-share/apache/htdocs/manual/mod/directive-dict.html
-share/apache/htdocs/manual/mod/directives.html
-share/apache/htdocs/manual/mod/footer.html
-share/apache/htdocs/manual/mod/header.html
-share/apache/htdocs/manual/mod/index.html
-share/apache/htdocs/manual/mod/index-bytype.html
-share/apache/htdocs/manual/mod/module-dict.html
-share/apache/htdocs/manual/mod/mod_define.html
-share/apache/htdocs/manual/mod/mod_access.html
-share/apache/htdocs/manual/mod/mod_actions.html
-share/apache/htdocs/manual/mod/mod_alias.html
-share/apache/htdocs/manual/mod/mod_asis.html
-share/apache/htdocs/manual/mod/mod_auth.html
-share/apache/htdocs/manual/mod/mod_auth_anon.html
-share/apache/htdocs/manual/mod/mod_auth_db.html
-share/apache/htdocs/manual/mod/mod_auth_dbm.html
-share/apache/htdocs/manual/mod/mod_autoindex.html
-share/apache/htdocs/manual/mod/mod_browser.html
-share/apache/htdocs/manual/mod/mod_cern_meta.html
-share/apache/htdocs/manual/mod/mod_cgi.html
-share/apache/htdocs/manual/mod/mod_cookies.html
-share/apache/htdocs/manual/mod/mod_digest.html
-share/apache/htdocs/manual/mod/mod_dir.html
-share/apache/htdocs/manual/mod/mod_dld.html
-share/apache/htdocs/manual/mod/mod_dll.html
-share/apache/htdocs/manual/mod/mod_env.html
-share/apache/htdocs/manual/mod/mod_example.html
-share/apache/htdocs/manual/mod/mod_expires.html
-share/apache/htdocs/manual/mod/mod_headers.html
-share/apache/htdocs/manual/mod/mod_imap.html
-share/apache/htdocs/manual/mod/mod_include.html
-share/apache/htdocs/manual/mod/mod_info.html
-share/apache/htdocs/manual/mod/mod_isapi.html
-share/apache/htdocs/manual/mod/mod_log_agent.html
-share/apache/htdocs/manual/mod/mod_log_common.html
-share/apache/htdocs/manual/mod/mod_log_config.html
-share/apache/htdocs/manual/mod/mod_log_referer.html
-share/apache/htdocs/manual/mod/mod_mime.html
-share/apache/htdocs/manual/mod/mod_mime_magic.html
-share/apache/htdocs/manual/mod/mod_mmap_static.html
-share/apache/htdocs/manual/mod/mod_negotiation.html
-share/apache/htdocs/manual/mod/mod_proxy.html
-share/apache/htdocs/manual/mod/mod_rewrite.html
-share/apache/htdocs/manual/mod/mod_setenvif.html
-share/apache/htdocs/manual/mod/mod_so.html
-share/apache/htdocs/manual/mod/mod_speling.html
-share/apache/htdocs/manual/mod/mod_status.html
-share/apache/htdocs/manual/mod/mod_unique_id.html
-share/apache/htdocs/manual/mod/mod_userdir.html
-share/apache/htdocs/manual/mod/mod_usertrack.html
-share/apache/htdocs/manual/mod/mod_auth_digest.html
-share/apache/htdocs/manual/mod/mod_vhost_alias.html
-share/apache/htdocs/manual/mod/mod_ssl/index.html
-share/apache/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_compat.html
-share/apache/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg
-share/apache/htdocs/manual/mod/mod_ssl/ssl_cover_title.jpg
-share/apache/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_faq.html
-share/apache/htdocs/manual/mod/mod_ssl/ssl_glossary.html
-share/apache/htdocs/manual/mod/mod_ssl/ssl_howto.gfont000.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_howto.html
-share/apache/htdocs/manual/mod/mod_ssl/ssl_intro.gfont000.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_intro.html
-share/apache/htdocs/manual/mod/mod_ssl/ssl_intro_fig1.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_intro_fig2.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_intro_fig3.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_overview.gfont000.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_overview.html
-share/apache/htdocs/manual/mod/mod_ssl/ssl_overview_fig1.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_reference.gfont000.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_reference.html
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-chapter.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-1.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-2.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-3.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-4.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-5.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-6.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.head-num-7.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-n.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.navbut-next-s.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-n.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.navbut-prev-s.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-abstract.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-compat.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-faq.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-gloss.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-howto.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-intro.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-over.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif
-share/apache/htdocs/manual/mod/mod_ssl/ssl_template.inc
-share/apache/htdocs/manual/mod/mod_ssl/ssl_compat.wml
-share/apache/htdocs/manual/mod/mod_ssl/ssl_cover.wml
-share/apache/htdocs/manual/mod/mod_ssl/ssl_faq.wml
-share/apache/htdocs/manual/mod/mod_ssl/ssl_glossary.wml
-share/apache/htdocs/manual/mod/mod_ssl/ssl_howto.wml
-share/apache/htdocs/manual/mod/mod_ssl/ssl_intro.wml
-share/apache/htdocs/manual/mod/mod_ssl/ssl_overview.wml
-share/apache/htdocs/manual/mod/mod_ssl/ssl_reference.wml
-share/apache/htdocs/manual/multilogs.html
-share/apache/htdocs/manual/new_features_1_0.html
-share/apache/htdocs/manual/new_features_1_1.html
-share/apache/htdocs/manual/new_features_1_2.html
-share/apache/htdocs/manual/new_features_1_3.html
-share/apache/htdocs/manual/process-model.html
-share/apache/htdocs/manual/search/manual-index.cgi
-share/apache/htdocs/manual/sections.html
-share/apache/htdocs/manual/sourcereorg.html
-share/apache/htdocs/manual/stopping.html
-share/apache/htdocs/manual/suexec.html
-share/apache/htdocs/manual/suexec_1_2.html
-share/apache/htdocs/manual/unixware.html
-share/apache/htdocs/manual/upgrading_to_1_3.html
-share/apache/htdocs/manual/vhosts/details.html
-share/apache/htdocs/manual/vhosts/details_1_2.html
-share/apache/htdocs/manual/vhosts/examples.html
-share/apache/htdocs/manual/vhosts/fd-limits.html
-share/apache/htdocs/manual/vhosts/footer.html
-share/apache/htdocs/manual/vhosts/header.html
-share/apache/htdocs/manual/vhosts/host.html
-share/apache/htdocs/manual/vhosts/index.html
-share/apache/htdocs/manual/vhosts/ip-based.html
-share/apache/htdocs/manual/vhosts/mass.html
-share/apache/htdocs/manual/vhosts/name-based.html
-share/apache/htdocs/manual/vhosts/vhosts-in-depth.html
-share/apache/htdocs/manual/vhosts/virtual-host.html
-share/apache/htdocs/manual/windows.html
-share/apache/icons/README
-share/apache/icons/a.gif
-share/apache/icons/alert.black.gif
-share/apache/icons/alert.red.gif
-share/apache/icons/apache_pb.gif
-share/apache/icons/back.gif
-share/apache/icons/ball.gray.gif
-share/apache/icons/ball.red.gif
-share/apache/icons/binary.gif
-share/apache/icons/binhex.gif
-share/apache/icons/blank.gif
-share/apache/icons/bomb.gif
-share/apache/icons/box1.gif
-share/apache/icons/box2.gif
-share/apache/icons/broken.gif
-share/apache/icons/burst.gif
-share/apache/icons/c.gif
-share/apache/icons/comp.blue.gif
-share/apache/icons/comp.gray.gif
-share/apache/icons/compressed.gif
-share/apache/icons/continued.gif
-share/apache/icons/dir.gif
-share/apache/icons/down.gif
-share/apache/icons/dvi.gif
-share/apache/icons/f.gif
-share/apache/icons/folder.gif
-share/apache/icons/folder.open.gif
-share/apache/icons/folder.sec.gif
-share/apache/icons/forward.gif
-share/apache/icons/generic.gif
-share/apache/icons/generic.red.gif
-share/apache/icons/generic.sec.gif
-share/apache/icons/hand.right.gif
-share/apache/icons/hand.up.gif
-share/apache/icons/icon.sheet.gif
-share/apache/icons/image1.gif
-share/apache/icons/image2.gif
-share/apache/icons/image3.gif
-share/apache/icons/index.gif
-share/apache/icons/layout.gif
-share/apache/icons/left.gif
-share/apache/icons/link.gif
-share/apache/icons/movie.gif
-share/apache/icons/p.gif
-share/apache/icons/patch.gif
-share/apache/icons/pdf.gif
-share/apache/icons/pie0.gif
-share/apache/icons/pie1.gif
-share/apache/icons/pie2.gif
-share/apache/icons/pie3.gif
-share/apache/icons/pie4.gif
-share/apache/icons/pie5.gif
-share/apache/icons/pie6.gif
-share/apache/icons/pie7.gif
-share/apache/icons/pie8.gif
-share/apache/icons/portal.gif
-share/apache/icons/ps.gif
-share/apache/icons/quill.gif
-share/apache/icons/right.gif
-share/apache/icons/screw1.gif
-share/apache/icons/screw2.gif
-share/apache/icons/script.gif
-share/apache/icons/sound1.gif
-share/apache/icons/sound2.gif
-share/apache/icons/sphere1.gif
-share/apache/icons/sphere2.gif
-share/apache/icons/tar.gif
-share/apache/icons/tex.gif
-share/apache/icons/text.gif
-share/apache/icons/transfer.gif
-share/apache/icons/unknown.gif
-share/apache/icons/up.gif
-share/apache/icons/uu.gif
-share/apache/icons/uuencoded.gif
-share/apache/icons/world1.gif
-share/apache/icons/world2.gif
-share/apache/icons/small/README.txt
-share/apache/icons/small/back.gif
-share/apache/icons/small/binary.gif
-share/apache/icons/small/binhex.gif
-share/apache/icons/small/blank.gif
-share/apache/icons/small/broken.gif
-share/apache/icons/small/burst.gif
-share/apache/icons/small/comp1.gif
-share/apache/icons/small/comp2.gif
-share/apache/icons/small/compressed.gif
-share/apache/icons/small/continued.gif
-share/apache/icons/small/dir.gif
-share/apache/icons/small/dir2.gif
-share/apache/icons/small/doc.gif
-share/apache/icons/small/forward.gif
-share/apache/icons/small/generic.gif
-share/apache/icons/small/generic2.gif
-share/apache/icons/small/generic3.gif
-share/apache/icons/small/image.gif
-share/apache/icons/small/image2.gif
-share/apache/icons/small/index.gif
-share/apache/icons/small/key.gif
-share/apache/icons/small/movie.gif
-share/apache/icons/small/patch.gif
-share/apache/icons/small/ps.gif
-share/apache/icons/small/rainbow.gif
-share/apache/icons/small/sound.gif
-share/apache/icons/small/sound2.gif
-share/apache/icons/small/tar.gif
-share/apache/icons/small/text.gif
-share/apache/icons/small/transfer.gif
-share/apache/icons/small/unknown.gif
-share/apache/icons/small/uu.gif
+sbin/ab
+sbin/apachectl
+sbin/apxs
+sbin/httpd
+sbin/logresolve
+sbin/rotatelogs
+share/doc/apache/README.rus
+@exec mkdir -p %D/www
+@exec ln -fs %B %D/www/data.default
+@unexec rm -f %D/www/data.default
+@exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
+@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
+share/doc/apache/apache_pb.gif
+share/doc/apache/index.html.ca
+share/doc/apache/index.html.cz
+share/doc/apache/index.html.de
+share/doc/apache/index.html.dk
+share/doc/apache/index.html.ee
+share/doc/apache/index.html.en
+share/doc/apache/index.html.es
+share/doc/apache/index.html.fr
+share/doc/apache/index.html.he.iso8859-8
+share/doc/apache/index.html.it
+share/doc/apache/index.html.ja.jis
+share/doc/apache/index.html.kr.iso-kr
+share/doc/apache/index.html.lu
+share/doc/apache/index.html.nl
+share/doc/apache/index.html.no
+share/doc/apache/index.html.po.iso-pl
+share/doc/apache/index.html.pt
+share/doc/apache/index.html.pt-br
+share/doc/apache/index.html.ru.cp-1251
+share/doc/apache/index.html.ru.cp866
+share/doc/apache/index.html.ru.iso-ru
+share/doc/apache/index.html.ru.koi8-r
+share/doc/apache/index.html.ru.ucs2
+share/doc/apache/index.html.ru.ucs4
+share/doc/apache/index.html.ru.utf8
+share/doc/apache/index.html.se
+share/doc/apache/index.html.tw.Big5
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/bind.html
+share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/configuring.html
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/dns-caveats.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/ebcdic.html
+share/doc/apache/manual/env.html
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/handler.html
+share/doc/apache/manual/header.html
+share/doc/apache/manual/images/apache_pb.gif
+share/doc/apache/manual/images/custom_errordocs.gif
+share/doc/apache/manual/images/feather.jpg
+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/mod_ssl_sb.gif
+share/doc/apache/manual/images/openssl_ics.gif
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/index.html
+share/doc/apache/manual/install-tpf.html
+share/doc/apache/manual/install.html
+share/doc/apache/manual/invoking.html
+share/doc/apache/manual/keepalive.html
+share/doc/apache/manual/location.html
+share/doc/apache/manual/man-template.html
+share/doc/apache/manual/misc/API.html
+share/doc/apache/manual/misc/FAQ.html
+share/doc/apache/manual/misc/HTTP_Features.tsv
+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/known_client_problems.html
+share/doc/apache/manual/misc/nopgp.html
+share/doc/apache/manual/misc/perf-bsd44.html
+share/doc/apache/manual/misc/perf-dec.html
+share/doc/apache/manual/misc/perf-hp.html
+share/doc/apache/manual/misc/perf-tuning.html
+share/doc/apache/manual/misc/perf.html
+share/doc/apache/manual/misc/rewriteguide.html
+share/doc/apache/manual/misc/security_tips.html
+share/doc/apache/manual/misc/tutorials.html
+share/doc/apache/manual/misc/vif-info.html
+share/doc/apache/manual/misc/windoz_keepalive.html
+share/doc/apache/manual/mod/core.html
+share/doc/apache/manual/mod/directive-dict.html
+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_browser.html
+share/doc/apache/manual/mod/mod_cern_meta.html
+share/doc/apache/manual/mod/mod_cgi.html
+share/doc/apache/manual/mod/mod_cookies.html
+share/doc/apache/manual/mod/mod_define.html
+share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_dir.html
+share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_dll.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_headers.html
+share/doc/apache/manual/mod/mod_imap.html
+share/doc/apache/manual/mod/mod_include.html
+share/doc/apache/manual/mod/mod_info.html
+share/doc/apache/manual/mod/mod_isapi.html
+share/doc/apache/manual/mod/mod_log_agent.html
+share/doc/apache/manual/mod/mod_log_common.html
+share/doc/apache/manual/mod/mod_log_config.html
+share/doc/apache/manual/mod/mod_log_referer.html
+share/doc/apache/manual/mod/mod_mime.html
+share/doc/apache/manual/mod/mod_mime_magic.html
+share/doc/apache/manual/mod/mod_mmap_static.html
+share/doc/apache/manual/mod/mod_negotiation.html
+share/doc/apache/manual/mod/mod_proxy.html
+share/doc/apache/manual/mod/mod_rewrite.html
+share/doc/apache/manual/mod/mod_setenvif.html
+share/doc/apache/manual/mod/mod_so.html
+share/doc/apache/manual/mod/mod_speling.html
+share/doc/apache/manual/mod/mod_ssl/index.html
+share/doc/apache/manual/mod/mod_ssl/ssl_compat.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_compat.html
+share/doc/apache/manual/mod/mod_ssl/ssl_compat.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_cover.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_cover_logo.jpg
+share/doc/apache/manual/mod/mod_ssl/ssl_cover_title.jpg
+share/doc/apache/manual/mod/mod_ssl/ssl_faq.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_faq.html
+share/doc/apache/manual/mod/mod_ssl/ssl_faq.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_glossary.html
+share/doc/apache/manual/mod/mod_ssl/ssl_glossary.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_howto.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_howto.html
+share/doc/apache/manual/mod/mod_ssl/ssl_howto.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_intro.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_intro.html
+share/doc/apache/manual/mod/mod_ssl/ssl_intro.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig1.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig2.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_intro_fig3.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_overview.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_overview.html
+share/doc/apache/manual/mod/mod_ssl/ssl_overview.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_overview_fig1.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_reference.gfont000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_reference.html
+share/doc/apache/manual/mod/mod_ssl/ssl_reference.wml
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-chapter.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-1.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-2.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-3.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-4.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-5.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-6.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.head-num-7.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.inc
+share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-next-n.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-next-s.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-prev-n.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.navbut-prev-s.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-abstract.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-compat.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-faq.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-gloss.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-howto.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-intro.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-over.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-preface.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-ref.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-toc.gif
+share/doc/apache/manual/mod/mod_ssl/ssl_template.title-tutor.gif
+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/mpeix.html
+share/doc/apache/manual/multilogs.html
+share/doc/apache/manual/netware.html
+share/doc/apache/manual/new_features_1_0.html
+share/doc/apache/manual/new_features_1_1.html
+share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/new_features_1_3.html
+share/doc/apache/manual/new_features_2_0.html
+share/doc/apache/manual/process-model.html
+share/doc/apache/manual/readme-tpf.html
+share/doc/apache/manual/search/manual-index.cgi
+share/doc/apache/manual/sections.html
+share/doc/apache/manual/sourcereorg.html
+share/doc/apache/manual/stopping.html
+share/doc/apache/manual/suexec.html
+share/doc/apache/manual/suexec_1_2.html
+share/doc/apache/manual/unixware.html
+share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/vhosts/details_1_2.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/virtual-host.html
+share/doc/apache/manual/win_compiling.html
+share/doc/apache/manual/win_service.html
+share/doc/apache/manual/windows.html
+www/cgi-bin.default/printenv
+www/cgi-bin.default/test-cgi
+www/icons/README
+www/icons/a.gif
+www/icons/alert.black.gif
+www/icons/alert.red.gif
+www/icons/apache_pb.gif
+www/icons/back.gif
+www/icons/ball.gray.gif
+www/icons/ball.red.gif
+www/icons/binary.gif
+www/icons/binhex.gif
+www/icons/blank.gif
+www/icons/bomb.gif
+www/icons/box1.gif
+www/icons/box2.gif
+www/icons/broken.gif
+www/icons/burst.gif
+www/icons/c.gif
+www/icons/comp.blue.gif
+www/icons/comp.gray.gif
+www/icons/compressed.gif
+www/icons/continued.gif
+www/icons/dir.gif
+www/icons/down.gif
+www/icons/dvi.gif
+www/icons/f.gif
+www/icons/folder.gif
+www/icons/folder.open.gif
+www/icons/folder.sec.gif
+www/icons/forward.gif
+www/icons/generic.gif
+www/icons/generic.red.gif
+www/icons/generic.sec.gif
+www/icons/hand.right.gif
+www/icons/hand.up.gif
+www/icons/icon.sheet.gif
+www/icons/image1.gif
+www/icons/image2.gif
+www/icons/image3.gif
+www/icons/index.gif
+www/icons/layout.gif
+www/icons/left.gif
+www/icons/link.gif
+www/icons/movie.gif
+www/icons/p.gif
+www/icons/patch.gif
+www/icons/pdf.gif
+www/icons/pie0.gif
+www/icons/pie1.gif
+www/icons/pie2.gif
+www/icons/pie3.gif
+www/icons/pie4.gif
+www/icons/pie5.gif
+www/icons/pie6.gif
+www/icons/pie7.gif
+www/icons/pie8.gif
+www/icons/portal.gif
+www/icons/ps.gif
+www/icons/quill.gif
+www/icons/right.gif
+www/icons/screw1.gif
+www/icons/screw2.gif
+www/icons/script.gif
+www/icons/small/README.txt
+www/icons/small/back.gif
+www/icons/small/binary.gif
+www/icons/small/binhex.gif
+www/icons/small/blank.gif
+www/icons/small/broken.gif
+www/icons/small/burst.gif
+www/icons/small/comp1.gif
+www/icons/small/comp2.gif
+www/icons/small/compressed.gif
+www/icons/small/continued.gif
+www/icons/small/dir.gif
+www/icons/small/dir2.gif
+www/icons/small/doc.gif
+www/icons/small/forward.gif
+www/icons/small/generic.gif
+www/icons/small/generic2.gif
+www/icons/small/generic3.gif
+www/icons/small/image.gif
+www/icons/small/image2.gif
+www/icons/small/index.gif
+www/icons/small/key.gif
+www/icons/small/movie.gif
+www/icons/small/patch.gif
+www/icons/small/ps.gif
+www/icons/small/rainbow.gif
+www/icons/small/sound.gif
+www/icons/small/sound2.gif
+www/icons/small/tar.gif
+www/icons/small/text.gif
+www/icons/small/transfer.gif
+www/icons/small/unknown.gif
+www/icons/small/uu.gif
+www/icons/sound1.gif
+www/icons/sound2.gif
+www/icons/sphere1.gif
+www/icons/sphere2.gif
+www/icons/tar.gif
+www/icons/tex.gif
+www/icons/text.gif
+www/icons/transfer.gif
+www/icons/unknown.gif
+www/icons/up.gif
+www/icons/uu.gif
+www/icons/uuencoded.gif
+www/icons/world1.gif
+www/icons/world2.gif
+@exec mkdir -p %D/www/proxy
+@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
 @exec cd %D/etc/apache/ssl.crt && make >/dev/null 2>&1
 @unexec rm -f %D/etc/apache/ssl.crt/[0-9a-fA-F]*.[0-9]*
 @dirrm etc/apache/ssl.crt
@@ -463,18 +479,19 @@ share/apache/icons/small/uu.gif
 @dirrm etc/apache/ssl.prm
 @dirrm etc/apache/ssl.key
 @dirrm etc/apache
-@dirrm include/apache/xml/
+@dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/apache/cgi-bin
-@dirrm share/apache/htdocs/manual/images
-@dirrm share/apache/htdocs/manual/misc
-@dirrm share/apache/htdocs/manual/mod/mod_ssl
-@dirrm share/apache/htdocs/manual/mod
-@dirrm share/apache/htdocs/manual/search
-@dirrm share/apache/htdocs/manual/vhosts
-@dirrm share/apache/htdocs/manual
-@dirrm share/apache/htdocs
-@dirrm share/apache/icons/small
-@dirrm share/apache/icons
-@dirrm share/apache
+@dirrm share/doc/apache/manual/vhosts
+@dirrm share/doc/apache/manual/search
+@dirrm share/doc/apache/manual/mod/mod_ssl
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual
+@dirrm share/doc/apache
+@dirrm www/cgi-bin.default
+@dirrm www/icons/small
+@dirrm www/icons
+@dirrm www/proxy
+@dirrm www