10 files changed, 609 insertions, 597 deletions

diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index 4824fdc85432..8653d1c6e62e 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -6,38 +6,56 @@
 #
 
 PORTNAME=	apache+mod_ssl
-PORTVERSION=	${VERSION_APACHE}+${RA_VERSION}+${VERSION_MODSSL}
+PORTVERSION=	${VERSION_APACHE}.${VERSION_RA}.${VERSION_MODSSL}
 CATEGORIES=	russian www security
-MASTER_SITES=	ftp://ftp.lexa.ru/pub/apache-rus/ \
-		ftp://ftp.lexa.ru/pub/apache-rus/old-versions/ \
-		ftp://ftp.chg.ru/pub/WWW/httpd/apache-rus/ \
-		http://www.modssl.org/source/ \
-		ftp://ftp.modssl.org/source/ \
-		ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/ \
-		ftp://ftp.ecrc.net/pub/security/mod_ssl/ \
-		ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \
-		ftp://ftp.ulpgc.es/pub/mod_ssl/ \
-		ftp://glock.missouri.edu/pub/mod_ssl/ \
-		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \
-		ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
-DISTNAME=	apache_${VERSION_APACHE}rusPL${RA_VERSION}
+MASTER_SITES=	http://www.apache.org/dist/httpd/ \
+		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
+		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
+		ftp://apache.compuex.com/pub/apache/dist/httpd/ \
+		ftp://apache.arctic.org/pub/apache/dist/httpd/ \
+		ftp://ftp.epix.net/pub/apache/dist/httpd/ \
+		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
+		ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
+		ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
+		ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
+		ftp://www3.service.digital.com/apache/dist/httpd/ \
+		ftp://galileo.galilei.com/pub/apache/httpd/ \
+		ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
+		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
+		ftp://apache.nextpath.com/pub/apache/dist/httpd/ \
+		${MASTER_SITES_MODSSL:S/$/:modssl/} \
+		${MASTER_SITES_RA:S/$/:rapatches/}
+
+MASTER_SITES_MODSSL=	http://www.modssl.org/source/ \
+			ftp://ftp.modssl.org/source/ \
+			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/ \
+			ftp://ftp.ecrc.net/pub/security/mod_ssl/ \
+			ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \
+			ftp://ftp.ulpgc.es/pub/mod_ssl/ \
+			ftp://glock.missouri.edu/pub/mod_ssl/ \
+			ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \
+			ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/
+
+MASTER_SITES_RA=	ftp://ftp.lexa.ru/pub/apache-rus/ \
+			ftp://ftp.lexa.ru/pub/apache-rus/old-versions/
+
+
+DISTNAME=	apache_${VERSION_APACHE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
+		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl \
+		patches_${VERSION_APACHE}rusPL${VERSION_RA}.tar.gz:rapatches
 
 MAINTAINER=	lev@serebryakov.spb.ru
 
-FORBIDDEN=	"Vulnerable to denial-of-service.  See" \
-		"http://httpd.apache.org/info/security_bulletin_20020617.txt"
-
 USE_OPENSSL=	YES
 
 .include <bsd.port.pre.mk>
 
 LIB_DEPENDS=	mm.11:${PORTSDIR}/devel/mm
 
-VERSION_APACHE=	1.3.22
-VERSION_MODSSL=	2.8.5
-RA_VERSION=	30.9
+VERSION_APACHE=	1.3.26
+VERSION_MODSSL=	2.8.10
+VERSION_RA=	30.14
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
@@ -48,13 +66,14 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
 		--suexec-docroot=${PREFIX}/www/data \
 		--without-confadjust \
+		--enable-shared=remain \
 		--enable-module=most \
 		--enable-module=auth_db \
-		--enable-module=mmap_static \
-		--disable-module=auth_dbm \
-		--enable-shared=max \
 		--enable-module=ssl \
-		--enable-module=define
+		--disable-shared=ssl \
+		--enable-module=define \
+		--disable-shared=define \
+		--disable-module=auth_dbm
 
 OPTIM=		-DHARD_SERVER_LIMIT=512 \
 		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
@@ -100,6 +119,11 @@ CONFIGURE_ARGS+=	${APACHE_CONFIGURE_ARGS}
 .endif
 
 pre-patch:
+	@cd ${WRKDIR}/apache_${VERSION_APACHE} \
+	&& ${ECHO_MSG} "===>  Applying Russian Apache extension" \
+	&& ${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/RA-1.3rusPL${VERSION_RA}.patch
+	@cd ${WRKDIR} \
+	&& tar cf - src conf htdocs | tar xf - -C ${WRKDIR}/apache_${VERSION_APACHE}
 	@cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
 	&& ${ECHO_MSG} "===>  Applying mod_ssl-${VERSION_MODSSL} extension" \
 	&& ./configure --with-apache=../${DISTNAME} --expert
@@ -125,7 +149,7 @@ pre-install:
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/rc.apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 .if defined(WITH_SUEXEC)
 	@${ECHO_CMD} "sbin/suexec" >> ${TMPPLIST}
diff --git a/russian/apache13-modssl/distinfo b/russian/apache13-modssl/distinfo
index 0529626c5a51..a6fb6190669e 100644
--- a/russian/apache13-modssl/distinfo
+++ b/russian/apache13-modssl/distinfo
@@ -1,2 +1,3 @@
-MD5 (apache_1.3.22rusPL30.9.tar.gz) = 9c76252ae3a97227364a027acdff6c51
-MD5 (mod_ssl-2.8.5-1.3.22.tar.gz) = 5139c874e759b8410a29f9dcb4b578e5
+MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
+MD5 (mod_ssl-2.8.10-1.3.26.tar.gz) = 11260700ab52fb7ff54a25f14052eed4
+MD5 (patches_1.3.26rusPL30.14.tar.gz) = 6fbe1a4dc2b14911dc1bbe9b22e639bd
diff --git a/russian/apache13-modssl/files/FreeBSD.layout b/russian/apache13-modssl/files/FreeBSD.layout
index b73ee2ae1484..29ec00a18559 100644
--- a/russian/apache13-modssl/files/FreeBSD.layout
+++ b/russian/apache13-modssl/files/FreeBSD.layout
@@ -10,7 +10,7 @@
     datadir:       $prefix/www
     iconsdir:      $datadir/icons
     htdocsdir:     $datadir/data
-    manualdir:     $prefix/share/doc/apache
+    manualdir:     $prefix/share/doc/apache/manual
     cgidir:        $datadir/cgi-bin
     includedir:    $prefix/include/apache
     localstatedir: /var
diff --git a/russian/apache13-modssl/files/apache.sh b/russian/apache13-modssl/files/apache.sh
new file mode 100644
index 000000000000..8e6e38810fa8
--- /dev/null
+++ b/russian/apache13-modssl/files/apache.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl startssl > /dev/null && echo -n ' apache'
+	;;
+stop)
+	[ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/russian/apache13-modssl/files/patch-aa b/russian/apache13-modssl/files/patch-aa
index b98495c3de49..ce76c9b28d92 100644
--- a/russian/apache13-modssl/files/patch-aa
+++ b/russian/apache13-modssl/files/patch-aa
@@ -1,23 +1,19 @@
---- configure.orig	Tue Nov  6 11:37:00 2001
-+++ configure	Tue Nov  6 11:41:25 2001
-@@ -1275,8 +1275,8 @@
+--- configure.orig	Mon Jun 24 17:04:22 2002
++++ configure	Mon Jun 24 17:04:51 2002
+@@ -1263,7 +1263,7 @@
      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"
-@@ -1377,8 +1377,8 @@
+@@ -1361,7 +1361,7 @@
  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
diff --git a/russian/apache13-modssl/files/patch-ab b/russian/apache13-modssl/files/patch-ab
index 672f23479f33..490640587ec0 100644
--- a/russian/apache13-modssl/files/patch-ab
+++ b/russian/apache13-modssl/files/patch-ab
@@ -1,21 +1,27 @@
---- Makefile.tmpl.orig	Tue Nov  6 11:37:00 2001
-+++ Makefile.tmpl	Tue Nov  6 11:39:12 2001
-@@ -329,10 +329,12 @@
+--- Makefile.tmpl.orig	Mon Jun 24 17:29:52 2002
++++ Makefile.tmpl	Mon Jun 24 17:41:53 2002
+@@ -127,6 +127,7 @@
+ runtimedir      = @runtimedir@
+ logfiledir      = @logfiledir@
+ proxycachedir   = @proxycachedir@
++doc_prefix	= $(prefix)/share/doc/apache
+ 
+ libexecdir_relative   = @libexecdir_relative@
+ 
+@@ -329,10 +330,10 @@
  	$(MKDIR) $(root)$(sysconfdir)/ssl.csr
  	$(MKDIR) $(root)$(sysconfdir)/ssl.key
  	$(MKDIR) $(root)$(sysconfdir)/ssl.prm
 -	$(MKDIR) $(root)$(htdocsdir)
-+	$(RM) -rf $(root)$(htdocsdir).default
-+	$(MKDIR) $(root)$(htdocsdir).default
++	$(MKDIR) $(root)$(doc_prefix)
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
 -	$(MKDIR) $(root)$(cgidir)
-+	$(RM) -rf $(root)$(cgidir).default
 +	$(MKDIR) $(root)$(cgidir).default
  	$(MKDIR) $(root)$(includedir)
  	$(MKDIR) $(root)$(includedir)/xml
  	$(MKDIR) $(root)$(sysconfdir)/tables
-@@ -532,33 +534,40 @@
+@@ -534,32 +535,38 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -23,37 +29,37 @@
 -		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
 -	else \
 -		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-+#        -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+#                echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
-+#        else \
-+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir).default/"; \
++#	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
++#		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
++#	else \
++		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
  		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* ra-powered.* apache_pb.* ) |\
 -		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
 -		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
 -		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
 -	fi
 -	-@if [ -d $(TOP)/htdocs/manual ]; then \
-+		(cd $(root)$(htdocsdir).default/ && $(TAR) -xf -); \
-+		find $(root)$(htdocsdir).default/ -type d -exec chmod a+rx {} \; ; \
-+		find $(root)$(htdocsdir).default/ -type f -print | xargs chmod a+r ; \
-+#        fi
-+#        -@if [ -d $(TOP)/htdocs/manual ]; then \
++		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
++		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
++		find $(root)$(doc_prefix)/ -type f -print | xargs chmod a+r ; \
++#	fi
++#	-@if [ -d $(TOP)/htdocs/manual ]; then \
  		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
  		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
  		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
  		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
-+#        fi
-+	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
-+	if [ ! -d $(root)$(htdocsdir)/ ]; then \
-+		$(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \
- 	fi
+-	fi
 -	-@if [ -f $(root)$(cgidir)/printenv ]; then \
 -		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
 -	else \
-+#        -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+#                echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
-+#        else \
++#	fi
++	if [ ! -d $(root)$(htdocsdir) ]; then \
++		$(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
++	fi
++#	-@if [ -f $(root)$(cgidir)/printenv ]; then \
++#		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
++#	else \
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
@@ -63,15 +69,13 @@
 +			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
 +			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
  		done; \
--	fi
-+#        fi
-+	if [ ! -d $(root)$(cgidir)/ ]; then \
++#	fi
++	if [ ! -d $(root)$(cgidir) ]; then \
 +		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
-+  	fi
+ 	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
- 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -608,15 +617,15 @@
+@@ -610,10 +617,10 @@
  			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
  			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
  			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
@@ -86,9 +90,3 @@
  			-e 's;conf/magic;$(sysconfdir)/magic;' \
  			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
  			-e 's;conf/tables;$(sysconfdir)/tables;g' \
- 			-e 's;User nobody;User $(conf_user);' \
--			-e 's;Group #-1;Group $(conf_group);' \
-+			-e 's;Group "#-1";Group $(conf_group);' \
- 			-e 's;Port 80;Port $(conf_port);' \
- 			-e 's;Listen 80;Listen $(conf_port);' \
- 			-e 's;Listen 443;Listen $(conf_port_ssl);' \
diff --git a/russian/apache13-modssl/files/patch-ag b/russian/apache13-modssl/files/patch-ag
index 16218769bf35..e068c75b04a4 100644
--- a/russian/apache13-modssl/files/patch-ag
+++ b/russian/apache13-modssl/files/patch-ag
@@ -1,17 +1,6 @@
---- conf/httpd.conf-dist.orig	Tue Nov  6 11:37:00 2001
-+++ conf/httpd.conf-dist	Tue Nov  6 11:37:59 2001
-@@ -92,8 +92,8 @@
- # server ignore these files altogether by using "/dev/null" (for Unix) or
- # "nul" (for Win32) for the arguments to the directives.
- #
--#ResourceConfig conf/srm.conf
--#AccessConfig conf/access.conf
-+ResourceConfig /dev/null
-+AccessConfig   /dev/null
- 
- #
- # Timeout: The number of seconds before receives and sends time out.
-@@ -383,7 +383,22 @@
+--- conf/httpd.conf-dist.orig	Mon Feb 21 08:30:46 2000
++++ conf/httpd.conf-dist	Mon May 29 16:48:49 2000
+@@ -354,7 +354,22 @@
  # directory index.  Separate multiple entries with spaces.
  #
  <IfModule mod_dir.c>
@@ -35,7 +24,7 @@
  </IfModule>
  
  #
-@@ -503,7 +518,7 @@
+@@ -473,7 +488,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -44,7 +33,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -516,7 +531,7 @@
+@@ -486,7 +501,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -53,25 +42,4 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -793,13 +808,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/russian/apache13-modssl/files/rc.apache.sh b/russian/apache13-modssl/files/rc.apache.sh
deleted file mode 100644
index d8dc42ae1d5f..000000000000
--- a/russian/apache13-modssl/files/rc.apache.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case $1 in
-start)
-	!!PREFIX!!/sbin/apachectl startssl > /dev/null && echo -n ' apache'
-    ;;
-
-stop)
-	!!PREFIX!!/sbin/apachectl stop > /dev/null
-    ;;
-
-*)
-    echo "usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
diff --git a/russian/apache13-modssl/pkg-deinstall b/russian/apache13-modssl/pkg-deinstall
index d2e1679f1abd..3cb094797a99 100644
--- a/russian/apache13-modssl/pkg-deinstall
+++ b/russian/apache13-modssl/pkg-deinstall
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/russian/apache13-modssl/Attic/pkg-deinstall,v 1.1 2001-11-08 11:23:21 demon Exp $
+# $FreeBSD: /tmp/pcvs/ports/russian/apache13-modssl/Attic/pkg-deinstall,v 1.2 2002-07-02 08:44:07 demon Exp $
 #
 
 if [ "$2" != "POST-DEINSTALL" ]; then
@@ -9,12 +9,7 @@ fi
 USER=www
 
 if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	if pw userdel ${USER}; then
-		echo "Delete user/group \"${USER}\"."
-	else
-		echo "Deleting user/group \"${USER}\" failed..."
-		exit 1
-	fi
+	echo "To delete Apache user permanently, use 'pw userdel ${USER}'"
 fi
 
 exit 0
diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist
index f2bce4d4c764..fbc05efaa58f 100644
--- a/russian/apache13-modssl/pkg-plist
+++ b/russian/apache13-modssl/pkg-plist
@@ -1,4 +1,5 @@
 bin/dbmmanage
+bin/checkgid
 bin/htdigest
 bin/htpasswd
 @unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf.default; then rm -f %D/etc/apache/access.conf; fi
@@ -236,37 +237,17 @@ 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_access.so
-libexec/apache/mod_actions.so
-libexec/apache/mod_alias.so
-libexec/apache/mod_asis.so
-libexec/apache/mod_auth.so
 libexec/apache/mod_auth_anon.so
 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
 libexec/apache/mod_expires.so
 libexec/apache/mod_headers.so
-libexec/apache/mod_imap.so
-libexec/apache/mod_include.so
 libexec/apache/mod_info.so
-libexec/apache/mod_log_config.so
-libexec/apache/mod_mime.so
 libexec/apache/mod_mime_magic.so
-libexec/apache/mod_mmap_static.so
-libexec/apache/mod_negotiation.so
 libexec/apache/mod_rewrite.so
-libexec/apache/mod_setenvif.so
 libexec/apache/mod_speling.so
-libexec/apache/mod_status.so
 libexec/apache/mod_unique_id.so
-libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
 libexec/apache/mod_vhost_alias.so
 sbin/ab
@@ -275,556 +256,601 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-www/data.default/apache_pb.gif
-www/data.default/ra-powered.gif
-@exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
-www/data.default/index.html
-www/data.default/index.html.ca
-www/data.default/index.html.cz
-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.fr
-www/data.default/index.html.he.iso8859-8
-www/data.default/index.html.it
-www/data.default/index.html.ja.jis
-www/data.default/index.html.kr.iso-kr
-www/data.default/index.html.lu
-www/data.default/index.html.nl
-www/data.default/index.html.nn
-www/data.default/index.html.no
-www/data.default/index.html.po.iso-pl
-www/data.default/index.html.pt
-www/data.default/index.html.pt-br
-www/data.default/index.html.ru
-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.ucs2
-www/data.default/index.html.ru.ucs4
-www/data.default/index.html.ru.utf8
-www/data.default/index.html.se
-www/data.default/index.html.zh.Big5
-share/doc/apache/LICENSE
-@exec [ -e %D/www/data.default/manual ] || ln -fs %B %D/www/data.default/manual
-share/doc/apache/bind.html.en
-share/doc/apache/bind.html.fr
-share/doc/apache/bind.html.html
-share/doc/apache/cgi_path.html.en
-share/doc/apache/cgi_path.html.fr
-share/doc/apache/cgi_path.html.html
-share/doc/apache/configuring.html.fr
-share/doc/apache/configuring.html.en
-share/doc/apache/configuring.html.ja.jis
-share/doc/apache/content-negotiation.html
-share/doc/apache/custom-error.html.en
-share/doc/apache/custom-error.html.ja.jis
-share/doc/apache/cygwin.html
-share/doc/apache/dns-caveats.html.en
-share/doc/apache/dns-caveats.html.fr
-share/doc/apache/dns-caveats.html.html
-share/doc/apache/dso.html
-share/doc/apache/ebcdic.html
-share/doc/apache/env.html.en
-share/doc/apache/env.html.html
-share/doc/apache/env.html.ja.jis
-share/doc/apache/footer.html
-share/doc/apache/handler.html.en
-share/doc/apache/handler.html.ja.jis
-share/doc/apache/header.html
-share/doc/apache/howto/cgi.html.en
-share/doc/apache/howto/cgi.html.ja.jis
-share/doc/apache/howto/footer.html
-share/doc/apache/howto/header.html
-share/doc/apache/images/apache_pb.gif
-share/doc/apache/images/apache_header.gif
-share/doc/apache/images/custom_errordocs.gif
-share/doc/apache/images/feather.jpg
-share/doc/apache/images/home.gif
-share/doc/apache/images/index.gif
-share/doc/apache/images/mod_rewrite_fig1.fig
-share/doc/apache/images/mod_rewrite_fig1.gif
-share/doc/apache/images/mod_rewrite_fig2.fig
-share/doc/apache/images/mod_rewrite_fig2.gif
-share/doc/apache/images/mod_ssl_sb.gif
-share/doc/apache/images/openssl_ics.gif
-share/doc/apache/images/pixel.gif
-share/doc/apache/images/sub.gif
+share/doc/apache/apache_pb.gif
+share/doc/apache/ra-powered.gif
+@exec mkdir -p %D/www
+@exec echo "Make link %B -> %D/www/data.default" && 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
+share/doc/apache/index.html.ca
+share/doc/apache/index.html.cz
+share/doc/apache/index.html.de
+share/doc/apache/index.html.dk
+share/doc/apache/index.html.ee
+share/doc/apache/index.html.el
 share/doc/apache/index.html.en
-share/doc/apache/index.html.ja.jis
-share/doc/apache/install-tpf.html
-share/doc/apache/install.html.es
-share/doc/apache/install.html.en
-share/doc/apache/install.html.ja.jis
-share/doc/apache/invoking.html.en
-share/doc/apache/invoking.html.html
-share/doc/apache/keepalive.html.en
-share/doc/apache/keepalive.html.html
-share/doc/apache/keepalive.html.ja.jis
-share/doc/apache/location.html
-share/doc/apache/logs.html
-share/doc/apache/man-template.html
-share/doc/apache/misc/API.html
-share/doc/apache/misc/FAQ.html
-share/doc/apache/misc/HTTP_Features.tsv
-share/doc/apache/misc/client_block_api.html
-share/doc/apache/misc/compat_notes.html
-share/doc/apache/misc/custom_errordocs.html
-share/doc/apache/misc/descriptors.html
-share/doc/apache/misc/fin_wait_2.html
-share/doc/apache/misc/footer.html
-share/doc/apache/misc/header.html
-share/doc/apache/misc/howto.html
-share/doc/apache/misc/index.html
-share/doc/apache/misc/known_client_problems.html
-share/doc/apache/misc/nopgp.html
-share/doc/apache/misc/perf-bsd44.html
-share/doc/apache/misc/perf-dec.html
-share/doc/apache/misc/perf-hp.html
-share/doc/apache/misc/perf-tuning.html
-share/doc/apache/misc/perf.html
-share/doc/apache/misc/rewriteguide.html
-share/doc/apache/misc/security_tips.html
-share/doc/apache/misc/tutorials.html
-share/doc/apache/misc/vif-info.html
-share/doc/apache/misc/windoz_keepalive.html
-share/doc/apache/mod/core.html.en
-share/doc/apache/mod/core.html.fr
-share/doc/apache/mod/core.html.html
-share/doc/apache/mod/directive-dict.html.en
-share/doc/apache/mod/directive-dict.html.fr
-share/doc/apache/mod/directive-dict.html.ja.jis
-share/doc/apache/mod/directives.html.de
-share/doc/apache/mod/directives.html.en
-share/doc/apache/mod/directives.html.fr
-share/doc/apache/mod/directives.html.html
-share/doc/apache/mod/directives.html.ja.jis
-share/doc/apache/mod/footer.html
-share/doc/apache/mod/header.html
-share/doc/apache/mod/index-bytype.html.en
-share/doc/apache/mod/index-bytype.html.fr
-share/doc/apache/mod/index-bytype.html.html
-share/doc/apache/mod/index.html.en
-share/doc/apache/mod/index.html.fr
-share/doc/apache/mod/index.html.html
-share/doc/apache/mod/index.html.ja.jis
-share/doc/apache/mod/mod_access.html
-share/doc/apache/mod/mod_actions.html
-share/doc/apache/mod/mod_alias.html
-share/doc/apache/mod/mod_asis.html
-share/doc/apache/mod/mod_auth.html
-share/doc/apache/mod/mod_auth_anon.html
-share/doc/apache/mod/mod_auth_db.html
-share/doc/apache/mod/mod_auth_dbm.html
-share/doc/apache/mod/mod_auth_digest.html
-share/doc/apache/mod/mod_autoindex.html
-share/doc/apache/mod/mod_browser.html
-share/doc/apache/mod/mod_cern_meta.html
-share/doc/apache/mod/mod_cgi.html
-share/doc/apache/mod/mod_cookies.html
-share/doc/apache/mod/mod_define.html
-share/doc/apache/mod/mod_digest.html
-share/doc/apache/mod/mod_dir.html
-share/doc/apache/mod/mod_dld.html
-share/doc/apache/mod/mod_env.html.en
-share/doc/apache/mod/mod_env.html.html
-share/doc/apache/mod/mod_env.html.ja.jis
-share/doc/apache/mod/mod_example.html
-share/doc/apache/mod/mod_expires.html
-share/doc/apache/mod/mod_headers.html
-share/doc/apache/mod/mod_imap.html
-share/doc/apache/mod/mod_include.html
-share/doc/apache/mod/mod_info.html
-share/doc/apache/mod/mod_isapi.html
-share/doc/apache/mod/mod_log_agent.html
-share/doc/apache/mod/mod_log_common.html
-share/doc/apache/mod/mod_log_config.html
-share/doc/apache/mod/mod_log_referer.html
-share/doc/apache/mod/mod_mime.html.en
-share/doc/apache/mod/mod_mime.html.html
-share/doc/apache/mod/mod_mime.html.ja.jis
-share/doc/apache/mod/mod_mime_magic.html
-share/doc/apache/mod/mod_mmap_static.html
-share/doc/apache/mod/mod_negotiation.html.en
-share/doc/apache/mod/mod_negotiation.html.ja.jis
-share/doc/apache/mod/mod_proxy.html
-share/doc/apache/mod/mod_rewrite.html
-share/doc/apache/mod/mod_setenvif.html.en
-share/doc/apache/mod/mod_setenvif.html.html
-share/doc/apache/mod/mod_setenvif.html.ja.jis
-share/doc/apache/mod/mod_so.html
-share/doc/apache/mod/mod_speling.html
-share/doc/apache/mod/mod_ssl/index.html
-share/doc/apache/mod/mod_ssl/ssl_compat.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_compat.html
-share/doc/apache/mod/mod_ssl/ssl_compat.wml
-share/doc/apache/mod/mod_ssl/ssl_cover.wml
-share/doc/apache/mod/mod_ssl/ssl_cover_logo.jpg
-share/doc/apache/mod/mod_ssl/ssl_cover_title.jpg
-share/doc/apache/mod/mod_ssl/ssl_faq.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_faq.html
-share/doc/apache/mod/mod_ssl/ssl_faq.wml
-share/doc/apache/mod/mod_ssl/ssl_glossary.html
-share/doc/apache/mod/mod_ssl/ssl_glossary.wml
-share/doc/apache/mod/mod_ssl/ssl_howto.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_howto.html
-share/doc/apache/mod/mod_ssl/ssl_howto.wml
-share/doc/apache/mod/mod_ssl/ssl_intro.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_intro.html
-share/doc/apache/mod/mod_ssl/ssl_intro.wml
-share/doc/apache/mod/mod_ssl/ssl_intro_fig1.gif
-share/doc/apache/mod/mod_ssl/ssl_intro_fig2.gif
-share/doc/apache/mod/mod_ssl/ssl_intro_fig3.gif
-share/doc/apache/mod/mod_ssl/ssl_overview.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_overview.html
-share/doc/apache/mod/mod_ssl/ssl_overview.wml
-share/doc/apache/mod/mod_ssl/ssl_overview_fig1.gif
-share/doc/apache/mod/mod_ssl/ssl_reference.gfont000.gif
-share/doc/apache/mod/mod_ssl/ssl_reference.html
-share/doc/apache/mod/mod_ssl/ssl_reference.wml
-share/doc/apache/mod/mod_ssl/ssl_template.head-chapter.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-1.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-2.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-3.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-4.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-5.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-6.gif
-share/doc/apache/mod/mod_ssl/ssl_template.head-num-7.gif
-share/doc/apache/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
-share/doc/apache/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
-share/doc/apache/mod/mod_ssl/ssl_template.inc
-share/doc/apache/mod/mod_ssl/ssl_template.navbut-next-n.gif
-share/doc/apache/mod/mod_ssl/ssl_template.navbut-next-s.gif
-share/doc/apache/mod/mod_ssl/ssl_template.navbut-prev-n.gif
-share/doc/apache/mod/mod_ssl/ssl_template.navbut-prev-s.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-abstract.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-compat.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-faq.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-gloss.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-howto.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-intro.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-over.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-preface.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-ref.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-toc.gif
-share/doc/apache/mod/mod_ssl/ssl_template.title-tutor.gif
-share/doc/apache/mod/mod_status.html
-share/doc/apache/mod/mod_unique_id.html
-share/doc/apache/mod/mod_userdir.html
-share/doc/apache/mod/mod_usertrack.html
-share/doc/apache/mod/mod_vhost_alias.html
-share/doc/apache/mod/module-dict.html.en
-share/doc/apache/mod/module-dict.html.ja.jis
-share/doc/apache/mpeix.html
-share/doc/apache/multilogs.html
-share/doc/apache/netware.html
-share/doc/apache/new_features_1_0.html
-share/doc/apache/new_features_1_1.html
-share/doc/apache/new_features_1_2.html
-share/doc/apache/new_features_1_3.html.en
-share/doc/apache/new_features_1_3.html.ja.jis
-share/doc/apache/new_features_2_0.html
-share/doc/apache/process-model.html
-share/doc/apache/programs/ab.html
-share/doc/apache/programs/apachectl.html
-share/doc/apache/programs/apxs.html
-share/doc/apache/programs/dbmmanage.html
-share/doc/apache/programs/footer.html
-share/doc/apache/programs/header.html
-share/doc/apache/programs/htdigest.html
-share/doc/apache/programs/htpasswd.html
-share/doc/apache/programs/httpd.html
-share/doc/apache/programs/index.html.en
-share/doc/apache/programs/index.html.html
-share/doc/apache/programs/index.html.ja.jis
-share/doc/apache/programs/logresolve.html
-share/doc/apache/programs/other.html
-share/doc/apache/programs/rotatelogs.html
-share/doc/apache/programs/suexec.html
-share/doc/apache/readme-tpf.html
-share/doc/apache/search/manual-index.cgi
-share/doc/apache/server-wide.html.en
-share/doc/apache/server-wide.html.ja.jis
-share/doc/apache/sections.html
-share/doc/apache/sourcereorg.html
-share/doc/apache/stopping.html.en
-share/doc/apache/stopping.html.fr
-share/doc/apache/stopping.html.html
-share/doc/apache/suexec.html.en
-share/doc/apache/suexec.html.html
-share/doc/apache/suexec.html.ja.jis
-share/doc/apache/suexec_1_2.html
-share/doc/apache/unixware.html
-share/doc/apache/upgrading_to_1_3.html
-share/doc/apache/vhosts/details.html
-share/doc/apache/vhosts/details_1_2.html
-share/doc/apache/vhosts/examples.html
-share/doc/apache/vhosts/fd-limits.html
-share/doc/apache/vhosts/footer.html
-share/doc/apache/vhosts/header.html
-share/doc/apache/vhosts/host.html
-share/doc/apache/vhosts/index.html.en
-share/doc/apache/vhosts/index.html.ja.jis
-share/doc/apache/vhosts/ip-based.html
-share/doc/apache/vhosts/mass.html
-share/doc/apache/vhosts/name-based.html.en
-share/doc/apache/vhosts/name-based.html.html
-share/doc/apache/vhosts/name-based.html.ja.jis
-share/doc/apache/vhosts/vhosts-in-depth.html
-share/doc/apache/vhosts/virtual-host.html
-share/doc/apache/win_compiling.html
-share/doc/apache/win_service.html.en
-share/doc/apache/win_service.html.html
-share/doc/apache/win_service.html.ja.jis
-share/doc/apache/windows.html
-share/doc/apache/mod/directive-dict.html.html
-share/doc/apache/mod/mod_negotiation.html.html
-share/doc/apache/mod/module-dict.html.html
-share/doc/apache/configuring.html.html
-share/doc/apache/custom-error.html.fr
-share/doc/apache/custom-error.html.html
-share/doc/apache/handler.html.html
+share/doc/apache/index.html.es
 share/doc/apache/index.html.fr
-share/doc/apache/index.html.html
-share/doc/apache/install.html.fr
-share/doc/apache/install.html.html
-share/doc/apache/invoking.html.fr
-share/doc/apache/new_features_1_3.html.html
-share/doc/apache/server-wide.html.fr
-share/doc/apache/server-wide.html.html
-share/doc/apache/howto/cgi.html.html
-share/doc/apache/howto/ssi.html.en
-share/doc/apache/howto/ssi.html.html
-share/doc/apache/howto/ssi.html.ja.jis
-share/doc/apache/urlmapping.html
-share/doc/apache/vhosts/index.html.html
+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.lb.utf8
+share/doc/apache/index.html.nl
+share/doc/apache/index.html.nn
+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
+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.zh
+share/doc/apache/manual/LICENSE
+share/doc/apache/manual/bind.html.en
+share/doc/apache/manual/bind.html.fr
+share/doc/apache/manual/bind.html.html
+share/doc/apache/manual/bind.html.ja.jis
+share/doc/apache/manual/cgi_path.html.en
+share/doc/apache/manual/cgi_path.html.fr
+share/doc/apache/manual/cgi_path.html.html
+share/doc/apache/manual/cgi_path.html.ja.jis
+share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.fr
+share/doc/apache/manual/configuring.html.html
+share/doc/apache/manual/configuring.html.ja.jis
+share/doc/apache/manual/content-negotiation.html
+share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.fr
+share/doc/apache/manual/custom-error.html.html
+share/doc/apache/manual/custom-error.html.ja.jis
+share/doc/apache/manual/cygwin.html
+share/doc/apache/manual/dns-caveats.html.en
+share/doc/apache/manual/dns-caveats.html.fr
+share/doc/apache/manual/dns-caveats.html.html
+share/doc/apache/manual/dso.html
+share/doc/apache/manual/ebcdic.html
+share/doc/apache/manual/env.html.en
+share/doc/apache/manual/env.html.html
+share/doc/apache/manual/env.html.ja.jis
+share/doc/apache/manual/footer.html
+share/doc/apache/manual/handler.html.en
+share/doc/apache/manual/handler.html.html
+share/doc/apache/manual/handler.html.ja.jis
+share/doc/apache/manual/header.html
+share/doc/apache/manual/howto/auth.html
+share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.html
+share/doc/apache/manual/howto/cgi.html.ja.jis
+share/doc/apache/manual/howto/footer.html
+share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/ssi.html.en
+share/doc/apache/manual/howto/ssi.html.html
+share/doc/apache/manual/howto/ssi.html.ja.jis
+share/doc/apache/manual/images/apache_header.gif
+share/doc/apache/manual/images/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/pixel.gif
+share/doc/apache/manual/images/sub.gif
+share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.fr
+share/doc/apache/manual/index.html.html
+share/doc/apache/manual/index.html.ja.jis
+share/doc/apache/manual/install-tpf.html
+share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.es
+share/doc/apache/manual/install.html.fr
+share/doc/apache/manual/install.html.html
+share/doc/apache/manual/install.html.ja.jis
+share/doc/apache/manual/invoking.html.en
+share/doc/apache/manual/invoking.html.fr
+share/doc/apache/manual/invoking.html.html
+share/doc/apache/manual/keepalive.html.en
+share/doc/apache/manual/keepalive.html.html
+share/doc/apache/manual/keepalive.html.ja.jis
+share/doc/apache/manual/location.html
+share/doc/apache/manual/logs.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.en
+share/doc/apache/manual/mod/core.html.fr
+share/doc/apache/manual/mod/core.html.html
+share/doc/apache/manual/mod/mod_define.html
+share/doc/apache/manual/mod/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.fr
+share/doc/apache/manual/mod/directive-dict.html.html
+share/doc/apache/manual/mod/directive-dict.html.ja.jis
+share/doc/apache/manual/mod/directives.html.de
+share/doc/apache/manual/mod/directives.html.en
+share/doc/apache/manual/mod/directives.html.fr
+share/doc/apache/manual/mod/directives.html.html
+share/doc/apache/manual/mod/directives.html.ja.jis
+share/doc/apache/manual/mod/footer.html
+share/doc/apache/manual/mod/header.html
+share/doc/apache/manual/mod/index-bytype.html.en
+share/doc/apache/manual/mod/index-bytype.html.fr
+share/doc/apache/manual/mod/index-bytype.html.html
+share/doc/apache/manual/mod/index-bytype.html.ja.jis
+share/doc/apache/manual/mod/index.html.en
+share/doc/apache/manual/mod/index.html.fr
+share/doc/apache/manual/mod/index.html.html
+share/doc/apache/manual/mod/index.html.ja.jis
+share/doc/apache/manual/mod/mod_access.html.en
+share/doc/apache/manual/mod/mod_access.html.html
+share/doc/apache/manual/mod/mod_access.html.ja.jis
+share/doc/apache/manual/mod/mod_actions.html.en
+share/doc/apache/manual/mod/mod_actions.html.html
+share/doc/apache/manual/mod/mod_actions.html.ja.jis
+share/doc/apache/manual/mod/mod_alias.html
+share/doc/apache/manual/mod/mod_asis.html.en
+share/doc/apache/manual/mod/mod_asis.html.html
+share/doc/apache/manual/mod/mod_asis.html.ja.jis
+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.en
+share/doc/apache/manual/mod/mod_cgi.html.html
+share/doc/apache/manual/mod/mod_cgi.html.ja.jis
+share/doc/apache/manual/mod/mod_cookies.html
+share/doc/apache/manual/mod/mod_digest.html
+share/doc/apache/manual/mod/mod_dir.html.en
+share/doc/apache/manual/mod/mod_dir.html.html
+share/doc/apache/manual/mod/mod_dir.html.ja.jis
+share/doc/apache/manual/mod/mod_dld.html
+share/doc/apache/manual/mod/mod_env.html.en
+share/doc/apache/manual/mod/mod_env.html.html
+share/doc/apache/manual/mod/mod_env.html.ja.jis
+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.en
+share/doc/apache/manual/mod/mod_info.html.html
+share/doc/apache/manual/mod/mod_info.html.ja.jis
+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.en
+share/doc/apache/manual/mod/mod_mime.html.html
+share/doc/apache/manual/mod/mod_mime.html.ja.jis
+share/doc/apache/manual/mod/mod_mime_magic.html
+share/doc/apache/manual/mod/mod_mmap_static.html
+share/doc/apache/manual/mod/mod_negotiation.html.en
+share/doc/apache/manual/mod/mod_negotiation.html.html
+share/doc/apache/manual/mod/mod_negotiation.html.ja.jis
+share/doc/apache/manual/mod/mod_proxy.html
+share/doc/apache/manual/mod/mod_rewrite.html
+share/doc/apache/manual/mod/mod_setenvif.html.en
+share/doc/apache/manual/mod/mod_setenvif.html.html
+share/doc/apache/manual/mod/mod_setenvif.html.ja.jis
+share/doc/apache/manual/mod/mod_so.html.en
+share/doc/apache/manual/mod/mod_so.html.html
+share/doc/apache/manual/mod/mod_so.html.ja.jis
+share/doc/apache/manual/mod/mod_speling.html.en
+share/doc/apache/manual/mod/mod_speling.html.html
+share/doc/apache/manual/mod/mod_speling.html.ja.jis
+share/doc/apache/manual/mod/mod_status.html
+share/doc/apache/manual/mod/mod_unique_id.html.en
+share/doc/apache/manual/mod/mod_unique_id.html.html
+share/doc/apache/manual/mod/mod_unique_id.html.ja.jis
+share/doc/apache/manual/mod/mod_userdir.html.en
+share/doc/apache/manual/mod/mod_userdir.html.html
+share/doc/apache/manual/mod/mod_userdir.html.ja.jis
+share/doc/apache/manual/mod/mod_usertrack.html
+share/doc/apache/manual/mod/mod_vhost_alias.html
+share/doc/apache/manual/mod/module-dict.html.en
+share/doc/apache/manual/mod/module-dict.html.html
+share/doc/apache/manual/mod/module-dict.html.ja.jis
+share/doc/apache/manual/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/mpeix.html
+share/doc/apache/manual/multilogs.html
+share/doc/apache/manual/netware.html
+share/doc/apache/manual/new_features_1_0.html
+share/doc/apache/manual/new_features_1_1.html
+share/doc/apache/manual/new_features_1_2.html
+share/doc/apache/manual/new_features_1_3.html.en
+share/doc/apache/manual/new_features_1_3.html.html
+share/doc/apache/manual/new_features_1_3.html.ja.jis
+share/doc/apache/manual/new_features_2_0.html
+share/doc/apache/manual/process-model.html.en
+share/doc/apache/manual/process-model.html.html
+share/doc/apache/manual/process-model.html.ja.jis
+share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/programs/apachectl.html.en
+share/doc/apache/manual/programs/apachectl.html.html
+share/doc/apache/manual/programs/apachectl.html.ja.jis
+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.en
+share/doc/apache/manual/programs/htpasswd.html.html
+share/doc/apache/manual/programs/htpasswd.html.ja.jis
+share/doc/apache/manual/programs/httpd.html.en
+share/doc/apache/manual/programs/httpd.html.html
+share/doc/apache/manual/programs/httpd.html.ja.jis
+share/doc/apache/manual/programs/index.html.en
+share/doc/apache/manual/programs/index.html.html
+share/doc/apache/manual/programs/index.html.ja.jis
+share/doc/apache/manual/programs/logresolve.html
+share/doc/apache/manual/programs/other.html
+share/doc/apache/manual/programs/rotatelogs.html
+share/doc/apache/manual/programs/suexec.html.en
+share/doc/apache/manual/programs/suexec.html.html
+share/doc/apache/manual/programs/suexec.html.ja.jis
+share/doc/apache/manual/readme-tpf.html
+share/doc/apache/manual/search/manual-index.cgi
+share/doc/apache/manual/sections.html.en
+share/doc/apache/manual/sections.html.html
+share/doc/apache/manual/sections.html.ja.jis
+share/doc/apache/manual/server-wide.html.en
+share/doc/apache/manual/server-wide.html.fr
+share/doc/apache/manual/server-wide.html.html
+share/doc/apache/manual/server-wide.html.ja.jis
+share/doc/apache/manual/sitemap.html
+share/doc/apache/manual/sourcereorg.html
+share/doc/apache/manual/stopping.html.en
+share/doc/apache/manual/stopping.html.fr
+share/doc/apache/manual/stopping.html.html
+share/doc/apache/manual/suexec.html.en
+share/doc/apache/manual/suexec.html.html
+share/doc/apache/manual/suexec.html.ja.jis
+share/doc/apache/manual/suexec_1_2.html
+share/doc/apache/manual/unixware.html
+share/doc/apache/manual/upgrading_to_1_3.html
+share/doc/apache/manual/urlmapping.html
+share/doc/apache/manual/vhosts/details.html
+share/doc/apache/manual/vhosts/details_1_2.html
+share/doc/apache/manual/vhosts/examples.html
+share/doc/apache/manual/vhosts/fd-limits.html.en
+share/doc/apache/manual/vhosts/fd-limits.html.html
+share/doc/apache/manual/vhosts/fd-limits.html.ja.jis
+share/doc/apache/manual/vhosts/footer.html
+share/doc/apache/manual/vhosts/header.html
+share/doc/apache/manual/vhosts/host.html
+share/doc/apache/manual/vhosts/index.html.en
+share/doc/apache/manual/vhosts/index.html.html
+share/doc/apache/manual/vhosts/index.html.ja.jis
+share/doc/apache/manual/vhosts/ip-based.html
+share/doc/apache/manual/vhosts/mass.html
+share/doc/apache/manual/vhosts/name-based.html.en
+share/doc/apache/manual/vhosts/name-based.html.html
+share/doc/apache/manual/vhosts/name-based.html.ja.jis
+share/doc/apache/manual/vhosts/vhosts-in-depth.html
+share/doc/apache/manual/vhosts/virtual-host.html
+share/doc/apache/manual/win_compiling.html.en
+share/doc/apache/manual/win_compiling.html.html
+share/doc/apache/manual/win_compiling.html.ja.jis
+share/doc/apache/manual/win_service.html.en
+share/doc/apache/manual/win_service.html.html
+share/doc/apache/manual/win_service.html.ja.jis
+share/doc/apache/manual/windows.html.en
+share/doc/apache/manual/windows.html.ja.jis
 www/cgi-bin.default/printenv
-@exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
 www/cgi-bin.default/test-cgi
 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/back.gif
+www/icons/back.png
 www/icons/ball.gray.gif
+www/icons/ball.gray.png
 www/icons/ball.red.gif
+www/icons/ball.red.png
 www/icons/binary.gif
+www/icons/binary.png
 www/icons/binhex.gif
+www/icons/binhex.png
 www/icons/blank.gif
+www/icons/blank.png
 www/icons/bomb.gif
+www/icons/bomb.png
 www/icons/box1.gif
+www/icons/box1.png
 www/icons/box2.gif
+www/icons/box2.png
 www/icons/broken.gif
+www/icons/broken.png
 www/icons/burst.gif
+www/icons/burst.png
 www/icons/c.gif
+www/icons/c.png
 www/icons/comp.blue.gif
+www/icons/comp.blue.png
 www/icons/comp.gray.gif
+www/icons/comp.gray.png
 www/icons/compressed.gif
+www/icons/compressed.png
 www/icons/continued.gif
+www/icons/continued.png
 www/icons/dir.gif
+www/icons/dir.png
+www/icons/diskimg.gif
+www/icons/diskimg.png
 www/icons/down.gif
+www/icons/down.png
 www/icons/dvi.gif
+www/icons/dvi.png
 www/icons/f.gif
+www/icons/f.png
 www/icons/folder.gif
 www/icons/folder.open.gif
+www/icons/folder.open.png
+www/icons/folder.png
 www/icons/folder.sec.gif
+www/icons/folder.sec.png
 www/icons/forward.gif
+www/icons/forward.png
 www/icons/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/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
-www/icons/a.png
-www/icons/alert.black.png
-www/icons/alert.red.png
-www/icons/apache_pb.png
-www/icons/back.png
-www/icons/ball.gray.png
-www/icons/ball.red.png
-www/icons/binary.png
-www/icons/binhex.png
-www/icons/blank.png
-www/icons/bomb.png
-www/icons/box1.png
-www/icons/box2.png
-www/icons/broken.png
-www/icons/burst.png
-www/icons/c.png
-www/icons/comp.blue.png
-www/icons/comp.gray.png
-www/icons/compressed.png
-www/icons/continued.png
-www/icons/dir.png
-www/icons/down.png
-www/icons/dvi.png
-www/icons/f.png
-www/icons/folder.png
-www/icons/folder.open.png
-www/icons/folder.sec.png
-www/icons/forward.png
-www/icons/generic.png
-www/icons/generic.red.png
-www/icons/generic.sec.png
-www/icons/hand.right.png
-www/icons/hand.up.png
-www/icons/icon.sheet.png
-www/icons/image1.png
-www/icons/image2.png
-www/icons/image3.png
-www/icons/index.png
-www/icons/layout.png
-www/icons/left.png
-www/icons/link.png
-www/icons/movie.png
-www/icons/p.png
-www/icons/patch.png
-www/icons/pdf.png
-www/icons/pie0.png
-www/icons/pie1.png
-www/icons/pie2.png
-www/icons/pie3.png
-www/icons/pie4.png
-www/icons/pie5.png
-www/icons/pie6.png
-www/icons/pie7.png
-www/icons/pie8.png
-www/icons/portal.png
-www/icons/ps.png
-www/icons/quill.png
-www/icons/right.png
-www/icons/screw1.png
-www/icons/screw2.png
-www/icons/script.png
 www/icons/small/back.png
+www/icons/small/binary.gif
 www/icons/small/binary.png
+www/icons/small/binhex.gif
 www/icons/small/binhex.png
+www/icons/small/blank.gif
 www/icons/small/blank.png
+www/icons/small/broken.gif
 www/icons/small/broken.png
+www/icons/small/burst.gif
 www/icons/small/burst.png
+www/icons/small/comp1.gif
 www/icons/small/comp1.png
+www/icons/small/comp2.gif
 www/icons/small/comp2.png
+www/icons/small/compressed.gif
 www/icons/small/compressed.png
+www/icons/small/continued.gif
 www/icons/small/continued.png
+www/icons/small/dir.gif
 www/icons/small/dir.png
+www/icons/small/dir2.gif
 www/icons/small/dir2.png
+www/icons/small/doc.gif
 www/icons/small/doc.png
+www/icons/small/forward.gif
 www/icons/small/forward.png
+www/icons/small/generic.gif
 www/icons/small/generic.png
+www/icons/small/generic2.gif
 www/icons/small/generic2.png
+www/icons/small/generic3.gif
 www/icons/small/generic3.png
+www/icons/small/image.gif
 www/icons/small/image.png
+www/icons/small/image2.gif
 www/icons/small/image2.png
+www/icons/small/index.gif
 www/icons/small/index.png
+www/icons/small/key.gif
 www/icons/small/key.png
+www/icons/small/movie.gif
 www/icons/small/movie.png
+www/icons/small/patch.gif
 www/icons/small/patch.png
+www/icons/small/ps.gif
 www/icons/small/ps.png
+www/icons/small/rainbow.gif
 www/icons/small/rainbow.png
+www/icons/small/sound.gif
 www/icons/small/sound.png
+www/icons/small/sound2.gif
 www/icons/small/sound2.png
+www/icons/small/tar.gif
 www/icons/small/tar.png
+www/icons/small/text.gif
 www/icons/small/text.png
+www/icons/small/transfer.gif
 www/icons/small/transfer.png
+www/icons/small/unknown.gif
 www/icons/small/unknown.png
+www/icons/small/uu.gif
 www/icons/small/uu.png
+www/icons/sound1.gif
 www/icons/sound1.png
+www/icons/sound2.gif
 www/icons/sound2.png
+www/icons/sphere1.gif
 www/icons/sphere1.png
+www/icons/sphere2.gif
 www/icons/sphere2.png
+www/icons/tar.gif
 www/icons/tar.png
+www/icons/tex.gif
 www/icons/tex.png
+www/icons/text.gif
 www/icons/text.png
+www/icons/transfer.gif
 www/icons/transfer.png
+www/icons/unknown.gif
 www/icons/unknown.png
+www/icons/up.gif
 www/icons/up.png
+www/icons/uu.gif
 www/icons/uu.png
+www/icons/uuencoded.gif
 www/icons/uuencoded.png
+www/icons/world1.gif
 www/icons/world1.png
+www/icons/world2.gif
 www/icons/world2.png
 @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
-@unexec if [ -L %D/www/data.default/manual ]; then rm -f %D/www/data.default/manual; 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
@@ -833,9 +859,9 @@ www/icons/world2.png
 @dirrm etc/apache/ssl.prm
 @dirrm etc/apache/ssl.key
 @dirrm etc/apache/tables/cyrillic
-@dirrm etc/apache/tables/czech
 @dirrm etc/apache/tables/russian
 @dirrm etc/apache/tables/russian2
+@dirrm etc/apache/tables/czech
 @dirrm etc/apache/tables/ukrainian
 @dirrm etc/apache/tables/ukrainian2
 @dirrm etc/apache/tables
@@ -843,16 +869,16 @@ www/icons/world2.png
 @dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
-@dirrm share/doc/apache/vhosts
-@dirrm share/doc/apache/search
-@dirrm share/doc/apache/mod/mod_ssl
-@dirrm share/doc/apache/mod
-@dirrm share/doc/apache/misc
-@dirrm share/doc/apache/images
-@dirrm share/doc/apache/howto
-@dirrm share/doc/apache/programs
+@dirrm share/doc/apache/manual/howto
+@dirrm share/doc/apache/manual/images
+@dirrm share/doc/apache/manual/misc
+@dirrm share/doc/apache/manual/mod/mod_ssl
+@dirrm share/doc/apache/manual/mod
+@dirrm share/doc/apache/manual/programs
+@dirrm share/doc/apache/manual/search
+@dirrm share/doc/apache/manual/vhosts
+@dirrm share/doc/apache/manual
 @dirrm share/doc/apache
-@dirrm www/data.default
 @dirrm www/cgi-bin.default
 @dirrm www/icons/small
 @dirrm www/icons