Upgrade of apache13-fp to 1.3.17 and fix formating bug in

mod_frontpage.c. This corrects the formating bug reported in PR 24912. The port will create a user/group apache (uid/gid 80), and set the Apache Server to run as this user. This can be changed by specifying -DHTTPD_USER=<user> when configuring/building the port. The suexec executable is now installed by default. To disable suexec use -DNO_SUEXEC when configuring/building the port. PR: 24980 Submitted by: Scot W. Hetzel <hetzels@westbend.net> MAINTAINER
svn path=/head/; revision=38210
2001-02-11 16:43:53 +00:00 · 2001-02-11 16:43:53 +00:00 · e1d12a671c · 2021-03-31 03:12:20 +00:00
commit e1d12a671c
parent 94483d88dd
21 changed files with 180 additions and 477 deletions
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	apache_fp
-PORTVERSION=	1.3.14
+PORTVERSION=	1.3.17
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.microsoft.com/products/frontpage/ \
@ -62,6 +62,9 @@ PLIST_SUB=	FP_REV=${FP_REV}
 #
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
+HTTPD_USER?=	apache
+HTTPD_GROUP?=	apache
+USER_WEB_DIR?=	public_html

 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	 \
@ -69,6 +72,8 @@ CONFIGURE_ARGS=	 \
 		  --server-gid=nogroup \
 		  --with-perl=${PERL} \
 		  --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
+		  --server-uid=${HTTPD_USER} \
+		  --server-gid=${HTTPD_GROUP} \
 		  --without-confadjust \
 		  --enable-shared=max \
 		  --enable-module=most \
@ -102,14 +107,12 @@ CONFIGURE_ENV=	CFLAGS='${CFLAGS}' \
 MAN1=	dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=	ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8

-.if defined(SUEXEC)
-HTTPD_USER?=www
-USER_DIR?=public_html
+.ifndef NO_SUEXEC
 CONFIGURE_ARGS+=	--enable-suexec \
 			--suexec-caller=${HTTPD_USER} \
 			--suexec-docroot=${PREFIX}/www/data \
 			--suexec-logfile=/var/log/httpd-suexec.log \
-			--suexec-userdir=${USER_DIR} \
+			--suexec-userdir=${USER_WEB_DIR} \
 			--suexec-safepath='/bin:/usr/bin:${PREFIX}/bin'
 MAN8+=	suexec.8
 .endif
@ -142,7 +145,7 @@ post-patch:
 .endif

 post-configure:
-.if defined(SUEXEC)
+.ifndef NO_SUEXEC
 	${CP} ${PKGDIR}/pkg-plist ${PLIST}
 .else
 	${CAT} ${PKGDIR}/pkg-plist | ${GREP} -v sbin/suexec > ${PLIST}
@ -150,6 +153,11 @@ post-configure:

 IMAGES=		apache_pb.gif fplogo.gif powerlogo.gif

+# Create apache user and group
+pre-install:
+	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} PKG_USER=${HTTPD_USER} \
+	    PKG_GROUP=${HTTPD_GROUP} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh file."; \
--- a/www/apache13-fp/distinfo
+++ b/www/apache13-fp/distinfo
@ -1,4 +1,4 @@
-MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
+MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
 MD5 (fp40.bsdi.tar.z) = f469ea85b69d69f80f32c58fb0d273c4
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
--- a/www/apache13-fp/files/mod_frontpage.c
+++ b/www/apache13-fp/files/mod_frontpage.c
@ -634,7 +634,7 @@ static int FrontPageAlias(
         * the owners and groups of both directories to match, and have both a
         * uid and gid in the allowable range.
         */
-        sprintf(szFormat, "Incorrect permissions on webroot \"\%-.0124s\" and webroot's _vti_pvt directory, the owners and groups must match and have a uid >= %d and gid >= %d", LOWEST_VALID_UID, LOWEST_VALID_GID);
+        sprintf(szFormat, "Incorrect permissions on webroot \"%%-.1024s\" and webroot's _vti_pvt directory, the owners and groups must match and have a uid >= %d and gid >= %d", LOWEST_VALID_UID, LOWEST_VALID_GID);

        LogFrontPageError(r->server, szFormat,
                          szBuf, "FrontPageAlias()", FALSE);
--- a/www/apache13-fp/files/patch-ab
+++ b/www/apache13-fp/files/patch-ab
@ -1,6 +1,6 @@
--- Makefile.tmpl.orig	Tue Jan 11 13:47:41 2000
-+++ Makefile.tmpl	Thu Mar  2 23:00:19 2000
-@@ -123,6 +123,7 @@
+--- Makefile.tmpl.orig	Mon Jan 15 10:26:17 2001
+++ Makefile.tmpl	Thu Feb  8 22:41:43 2001
+@@ -126,6 +126,7 @@
 runtimedir      = @runtimedir@
 logfiledir      = @logfiledir@
 proxycachedir   = @proxycachedir@
@ -8,7 +8,7 @@
 
 libexecdir_relative   = @libexecdir_relative@
 
-@@ -266,9 +267,9 @@
+@@ -269,9 +270,9 @@
 	$(MKDIR) $(root)$(mandir)/man1
 	$(MKDIR) $(root)$(mandir)/man8
 	$(MKDIR) $(root)$(sysconfdir)
@ -20,7 +20,7 @@
 	$(MKDIR) $(root)$(includedir)
 	$(MKDIR) $(root)$(includedir)/xml
 	$(MKDIR) $(root)$(runtimedir)
-@@ -324,19 +325,34 @@
+@@ -327,19 +328,34 @@
 			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
 			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
 			name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
@ -60,7 +60,7 @@
 	fi
 	@echo "<=== [programs]"
 
-@@ -405,6 +421,7 @@
+@@ -408,6 +424,7 @@
 	echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \
 	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
 		-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
@ -68,7 +68,7 @@
 		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
 		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \
 	echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \
-@@ -452,26 +469,30 @@
+@@ -455,26 +472,28 @@
 #   icons and distributed CGI scripts.
 install-data:
 	@echo "===> [data: Installing initial data files]"
@ -89,10 +89,8 @@
 -		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
 -	else \
 +		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
-+		for lang in ca cz de dk ee en es fr it ja.jis lu nl po.iso-pl pt pt-br se; do \
-+			mv $(root)$(doc_prefix)/index.html.$${lang} \
-+			   $(root)$(doc_prefix)/index.html.$${lang}-dist ; \
-+		done; \
+		mv $(root)$(doc_prefix)/index.html.en \
+			   $(root)$(doc_prefix)/index.html.en-dist ; \
 +		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
 +		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
 +#	fi
@ -113,7 +111,7 @@
 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -504,42 +525,47 @@
+@@ -507,42 +526,47 @@
 			-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
 			-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
 			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
--- a/www/apache13-fp/files/patch-lang.ca
+++ b/www/apache13-fp/files/patch-lang.ca
@ -1,29 +0,0 @@
--- htdocs/index.html.ca.orig	Thu Sep  2 06:03:37 1999
-+++ htdocs/index.html.ca	Sun Feb 20 16:58:53 2000
-@@ -36,16 +36,23 @@
-   <HR>
-   <P>
-   La
-  <A HREF="manual/index.html">documentaci&oacute;</A>
-+  <A HREF="http://@@HOSTNAME@@:8080/manual/index.html">documentaci&oacute;</A>
-   d'Apache ha estat inclosa en aquesta distribuci&oacute;.
-   </P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-   <P>
-   L'administrador de web pot utilitzar lliurement la imatge d'aqu&iacute; sota
-   en el servidor web equipat amb el programari Apache.
-  Gr&agrave;cies per utilitzar Apache&nbsp;!
-+  Gr&agrave;cies per utilitzar Apache and FreeBSD!
-   </P>
-   <DIV ALIGN="CENTER">
-   <IMG SRC="apache_pb.gif" ALT="">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-   </DIV>
-  </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.cz
+++ b/www/apache13-fp/files/patch-lang.cz
@ -1,30 +0,0 @@
--- htdocs/index.html.cz.orig	Thu Dec  9 09:56:34 1999
-+++ htdocs/index.html.cz	Sun Feb 20 16:57:23 2000
-@@ -36,16 +36,23 @@
-   <P>
-   Zde najdete
-   <A
-   HREF="manual/index.html"
-+   HREF="http://@@HOSTNAME@@:8080/manual/index.html"
-   >dokumentaci</A>
-   Apache (anglicky) obsa¾enou v této distribuci.
-   </P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-   <P>
-   Následující logo mù¾e být pou¾ito bez omezení na web serveru s
-  programem Apache. Dìkujeme za pou¾ití Apache!
-+  programem Apache. Dìkujeme za pou¾ití Apache and FreeBSD!
-   </P>
-   <DIV ALIGN="CENTER">
-   <IMG SRC="apache_pb.gif" ALT="">
-  </DIV>
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-+</DIV>
-  </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.de
+++ b/www/apache13-fp/files/patch-lang.de
@ -1,32 +0,0 @@
--- htdocs/index.html.de.orig	Wed Aug 18 07:00:56 1999
-+++ htdocs/index.html.de	Sun Feb 20 17:10:32 2000
-@@ -44,10 +44,15 @@
-   <HR>
-   <P>
-    Die englische <A
-   HREF="manual/index.html">Online-Dokumentation</A> f&uuml;r die
-+   HREF="http://@@HOSTNAME@@:8080/manual/index.html">Online-Dokumentation</A> f&uuml;r die
-    Apache Web-Server Software ist Bestandteil dieser
-    Software-Distribution.
-   </P>
-+<!-- translated by bablefish.altavista.com -->
-+<P>Das <STRONG>FrontPage 2000 Extentions (mod_frontpage)<STRONG> ist installiert worden, die Unterlagen
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000</A> sorgfältig las.</P>
-+<P>Informationen über das Betriebssystem FreeBSD können auf dem <A HREF="http://www.freebsd.org/"FreeBSD-Home Page</A> gefunden werden.</P>
-+<!-- translated by bablefish.altavista.com -->
-   <P>
-    Dem <I>WebMaster</I> dieser Web-Site steht es frei, das
-    untenstehende "Powered by Apache"-Logo auf einem Apache-basierten
-@@ -55,7 +60,11 @@
-    Vielen Dank, dass Sie Apache gew&auml;hlt haben!
-   </P>
-   <DIV ALIGN="CENTER">
-   <IMG SRC="apache_pb.gif" ALT="Powered by Apache!">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-   </DIV>
-  </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.dk
+++ b/www/apache13-fp/files/patch-lang.dk
@ -1,29 +0,0 @@
--- htdocs/index.html.dk.orig	Thu Aug 19 04:19:27 1999
-+++ htdocs/index.html.dk	Sun Feb 20 17:12:04 2000
-@@ -32,16 +32,23 @@
-   <P>
-   Apache-
-   <A
-   HREF="manual/index.html"
-+   HREF="http://@@HOSTNAME@@:8080/manual/index.html"
-   >documentationen</A>
-   er inkluderet med denne distribution.
-   </P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-   <P>
-   Webmasteren af denne site m&aring; gerne bruge den f&oslash;lgende grafik
-  p&aring; en Apache-drevet webserver.  Mange tak for at bruge Apache!
-+  p&aring; en Apache-drevet webserver.  Mange tak for at bruge Apache and FreeBSD!
-   </P>
-   <DIV ALIGN="CENTER">
-   <IMG SRC="apache_pb.gif" ALT="">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-   </DIV>
-  </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.ee
+++ b/www/apache13-fp/files/patch-lang.ee
@ -1,28 +0,0 @@
--- htdocs/index.html.ee.orig	Fri Aug 20 15:28:46 1999
-+++ htdocs/index.html.ee	Sun Feb 20 17:13:15 2000
-@@ -38,16 +38,23 @@
-   <P>
-   Ka Apache
-   <A
-   HREF="manual/index.html"
-+   HREF="http://@@HOSTNAME@@:8080/manual/index.html"
-   >dokumentatsioon</A>
-   on selles distributsioonis olemas.
-   </P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-   <P>
-   Kohalik veebmeister v&otilde;ib vabalt kasutada allpool olevat
-   pilti oma Apache veebiserveril. Ait&auml;h Apachet kasutamast!
-   </P>
-   <DIV ALIGN="CENTER">
-   <IMG SRC="apache_pb.gif" ALT="">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-   </DIV>
-  </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.en
+++ b/www/apache13-fp/files/patch-lang.en
@ -1,27 +1,31 @@
--- htdocs/index.html.en.orig	Sat Nov 20 15:29:40 1999
-+++ htdocs/index.html.en	Sun Feb 20 16:57:41 2000
-@@ -27,12 +27,18 @@
- <P><HR WIDTH="50%" SIZE="8">
+--- htdocs/index.html.en.orig	Fri Jan 19 13:39:47 2001
+++ htdocs/index.html.en	Thu Feb  8 22:10:30 2001
+@@ -32,13 +32,25 @@
 
+ <HR WIDTH="50%" SIZE="8">
 
-<P>
-The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
-+<P>The Apache <A HREF="http://@@HOSTNAME@@:8080/manual/index.html">documentation</A> has been included with this distribution.</P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-+<P>You are free to use the images below on an Apache-powered web server.  Thanks for using Apache and FreeBSD!
+-<p>The Apache <A HREF="manual/">documentation</A> has been included with
+<p>The Apache <A HREF="http://@@HOSTNAME@@:8080/manual/">documentation</A> has been included with
+ this distribution.</p>
+ 
+<p>The Microsoft FrontPage 2000 Extentions has been installed with this
+Apache Server.  Read the <A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/">Microsoft FrontPage 2000 documentation</A> carefully.<p>
+
+<p>Information of the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org>FreeBSD</A> web site.<p>
+
+ <p>You are free to use the image below on an Apache-powered web server. 
+-Thanks for using Apache!</p>
+Thanks for using Apache and FreeBSD!</p>
 
-<P>
-You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
-
 -<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
 +<DIV ALIGN="CENTER">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+	<IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
+  <A HREF="http://www.apache.org">
+    <IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
+  <A HREF="http://www.freebsd.org">
+    <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
 +  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+	<IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
+    <IMG SRC="/images/fplogo.gif" ALT="Create with Microsoft Frontpage 2000"></A>
 +</DIV>
+ 
 </BODY>
 </HTML>
--- a/www/apache13-fp/files/patch-lang.es
+++ b/www/apache13-fp/files/patch-lang.es
@ -1,30 +0,0 @@
--- htdocs/index.html.es.orig	Fri Aug 27 06:08:59 1999
-+++ htdocs/index.html.es	Sun Feb 20 17:15:30 2000
-@@ -35,17 +35,24 @@
-   <P>
-   La
-   <A
-   HREF="manual/index.html"
-+   HREF="http://@@HOSTNAME@@:8080/manual/index.html"
-   >documentaci&oacute;n</A>
-   de Apache ha sido incluida en esta distribuci&oacute;n.
-   </P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-   <P>
-   El administrador del sitio esta invitado a usar la siguiente
-   imagen para indicar que su sitio es servido por Apache.
-  &iexcl;Gracias por usar Apache!
-+  &iexcl;Gracias por usar Apachei and FreeBSD!
-   </P>
-   <DIV ALIGN="CENTER">
-   <IMG SRC="apache_pb.gif" ALT="">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-   </DIV>
-  </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.fr
+++ b/www/apache13-fp/files/patch-lang.fr
@ -1,29 +0,0 @@
--- htdocs/index.html.fr.orig	Wed Aug 18 09:46:23 1999
-+++ htdocs/index.html.fr	Sun Feb 20 17:16:43 2000
-@@ -38,16 +38,23 @@
-   <HR>
-   <P>
-   La
-  <A HREF="manual/index.html">documentation</A>
-+  <A HREF="http://@@HOSTNAME@@:8080/manual/index.html">documentation</A>
-   Apache est incluse dans cette distribution.
-   </P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-   <P>
-   Le webmaster de ce site peut librement utiliser l'image ci-dessous
-   sur un site web utilisant le logiciel Apache. Merci d'avoir choisi
-  Apache&nbsp;!
-+  Apache and FreeBSD!
-   </P>
-   <DIV ALIGN="CENTER">
-   <IMG SRC="apache_pb.gif" ALT="">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-   </DIV>
-  </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.it
+++ b/www/apache13-fp/files/patch-lang.it
@ -1,27 +0,0 @@
--- htdocs/index.html.it.orig	Fri Aug 20 04:35:43 1999
-+++ htdocs/index.html.it	Sun Feb 20 17:18:41 2000
-@@ -27,12 +27,20 @@
- <b><font size=+1>ignorato</font></b>.</blockquote>
- 
- <hr>
-<br>La <a href="manual/index.html">documentazione</a> relativa di Apache
-+<br>La <a href="http://@@HOSTNAME@@/manual/index.html">documentazione</a> relativa di Apache
- e' inclusa nella distribuzione.
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
- <p>Il Webmaster di questo sito e' libero di utilizzare l'immagine qui sotto
-su qualsiasi Web server potenziato con Apache. Grazie per aver scelto Apache!
-<center>
-<p><img SRC="apache_pb.gif" ALT="" ></center>
-+su qualsiasi Web server potenziato con Apache. Grazie per aver scelto Apache and FreeBSD!
- 
-+<DIV ALIGN="CENTER">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-+</DIV>
- </body>
- </html>
--- a/www/apache13-fp/files/patch-lang.ja
+++ b/www/apache13-fp/files/patch-lang.ja
@ -1,27 +0,0 @@
--- htdocs/index.html.ja.jis.orig	Sun Jan 30 10:18:35 2000
-+++ htdocs/index.html.ja.jis	Fri Feb 25 19:46:09 2000
-@@ -30,13 +30,20 @@
- 
- 
- <p>
-Apache $B$K4X$9$k(B<A HREF="manual/index.html">$BJ8=q(B</A> $B$O!"$3$N(B web $B%5!<%PG[I[J*$NCf$K4^$^$l$F$$$^$9!#(B
-+Apache $B$K4X$9$k(B<A HREF="http://@@HOSTNAME@@:8080/manual/index.html">$BJ8=q(B</A> $B$O!"$3$N(B web $B%5!<%PG[I[J*$NCf$K4^$^$l$F$$$^$9!#(B
- </p>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
- <p>
- $B0J2<$N2hA|$O!"(BApache $B$rMxMQ$7$F$$$k(B web $B%5!<%P$G<+M3$K;H$&$3$H$,$G$-$^$9!#(BApache $B$r$4MxMQ$$$?$@$-!"$"$j$,$H$&$4$6$$$^$9(B!
- </p>
-  <div align="center">
-   <img src="apache_pb.gif" alt="">
-  </div>
-+<DIV ALIGN="CENTER">
-+   <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+   <A HREF="http://www.freebsd.org/">
-+         <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+   <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+         <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-+       </DIV>
-  </body>
- </html>
--- a/www/apache13-fp/files/patch-lang.lu
+++ b/www/apache13-fp/files/patch-lang.lu
@ -1,27 +0,0 @@
--- htdocs/index.html.lu.orig	Fri Aug 20 15:28:47 1999
-+++ htdocs/index.html.lu	Sun Feb 20 17:20:24 2000
-@@ -27,11 +27,21 @@
- Autoren. Falls Dir d&euml;st awer macht, get &auml;ren message&nbsp; <b><font size=+2>ignoreiert.</font></b></blockquote>
- 
- <hr>
-<p>D'Apache <a href="manual/index.html">documentation</a> ass d&euml;ser Ausgab
-+<p>D'Apache <a href="http://@@HOSTNAME@@/manual/index.html">documentation</a> ass d&euml;ser Ausgab
- beigef&uuml;cht.
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
- <p>Dem Webmaster vun dem heitenen site steht et zou dest Bild ob engem
-Apache-powered Web server ze presenteieren. Merci dat Dir Apache benotzt!
-<center><img SRC="apache_pb.gif" ALT="" ></center>
-+Apache-powered Web server ze presenteieren. Merci dat Dir Apache and FreeBSD benotzt!
-+
-+<DIV ALIGN="CENTER">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-+</DIV>
- 
- </body>
- </html>
--- a/www/apache13-fp/files/patch-lang.nl
+++ b/www/apache13-fp/files/patch-lang.nl
@ -1,29 +0,0 @@
--- htdocs/index.html.nl.orig	Wed Aug 18 09:46:23 1999
-+++ htdocs/index.html.nl	Sun Feb 20 17:21:43 2000
-@@ -39,16 +39,23 @@
-   <HR>
-   <P>
-   De 
-  <A HREF="manual/index.html" >handleiding</A> voor de apache web
-+  <A HREF="http://@@HOSTNAME@@:8080/manual/index.html" >handleiding</A> voor de apache web
-   server software maakt deel uit van deze distributie.
-   </P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-   <P>
-   Als beheerder of <I>webmaster</I> is het u toegestaan het onderstaande 
-   plaatje vrijelijk te gebruiken op uw 'Apache Powered' web site. Bedankt
-  voor het kiezen voor, en gebruiken van, Apache!
-+  voor het kiezen voor, en gebruiken van, Apache and FreeBSD!
-   </P>
-   <DIV ALIGN="CENTER">
-   <IMG SRC="apache_pb.gif" ALT="Klein 'Powered by Apache' Logotje">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Klein 'Powered by Apache' Logotje"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-   </DIV>
-  </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.pt
+++ b/www/apache13-fp/files/patch-lang.pt
@ -1,25 +0,0 @@
--- htdocs/index.html.pt.orig	Mon Jan 31 17:23:27 2000
-+++ htdocs/index.html.pt	Fri Feb 25 19:39:00 2000
-@@ -33,10 +33,19 @@
- <P><HR WIDTH="50%" SIZE="8">
- 
- 
-<P> A <A HREF="manual/index.html">documenta&ccedil;&atilde;o</A> foi inclu&iacute;da 
-+<P> A <A HREF="http://@@HOSTNAME@@:8080/manual/index.html">documenta&ccedil;&atilde;o</A> foi inclu&iacute;da 
-   juntamente com esta distribui&ccedil;&atilde;o. 
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
- <P> A imagem abaixo pode ser usada livremente em qualquer site presente num servidor 
-  com o Apache Web Server instalado. Obrigado por usar o Apache Web Server! 
-<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
-+  com o Apache Web Server instalado. Obrigado por usar o Apache Web Server and FreeBSD! 
-+<DIV ALIGN="CENTER">
-+   <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+   <A HREF="http://www.freebsd.org/">
-+         <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+   <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+         <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-+/DIV>
- </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.pt-br
+++ b/www/apache13-fp/files/patch-lang.pt-br
@ -1,27 +0,0 @@
--- htdocs/index.html.pt-br.orig	Sun Jan 30 13:59:38 2000
-+++ htdocs/index.html.pt-br	Fri Feb 25 19:49:10 2000
-@@ -41,15 +41,22 @@
-      </BLOCKQUOTE>
-      <HR>
-      <P>
-     O Apache <A HREF="manual/index.html" >documentation</A>
-+     O Apache <A HREF="http://@@HOSTNAME@@:8080/manual/index.html" >documentation</A>
-      foi incluido com esta distribuicao.
-      </P>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-      <P>
-      O Webmaster deste site e livre para utilizar a imagem abaixo num
-      Web server instalado com o Apache. Obrigado por utilizar o Apache!
-      </P>
-      <DIV ALIGN="CENTER">
-      <IMG SRC="apache_pb.gif" ALT="">
-+   <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+   <A HREF="http://www.freebsd.org/">
-+         <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+   <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+         <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-      </DIV>
-     </BODY>
- </HTML>
--- a/www/apache13-fp/files/patch-lang.se
+++ b/www/apache13-fp/files/patch-lang.se
@ -1,30 +0,0 @@
--- htdocs/index.html.se.orig	Wed Aug 18 09:44:57 1999
-+++ htdocs/index.html.se	Sun Feb 20 17:24:31 2000
-@@ -30,14 +30,21 @@
-   </blockquote>
-   <hr>
-   <p>
-  Apache-<a href="manual/index.html">dokumentationen</a> &auml;r inkluderad i denna distribution.
-+  Apache-<a href="http://@@HOSTNAME@@:8080/manual/index.html">dokumentationen</a> &auml;r inkluderad i denna distribution.
-   </p>
-+<P>The <STRONG>FrontPage 2000 Extentions (mod_frontpage)</STRONG> has been installed, read the
-+<A HREF="http://@@HOSTNAME@@:8080/manual/mod/mod_frontpage/index.html">FrontPage 2000 documentation</A> carefully.</P>
-+<P>Information on the FreeBSD operating system can be found on the <A HREF="http://www.freebsd.org/">FreeBSD Home Page</A>.</P>
-   <p>
-   Administrat&ouml;ren av denna webbplats f&aring;r g&auml;rna anv&auml;nda f&ouml;ljande bild till en webbplats som anv&auml;nder Apache.<br>
-  Tack f&ouml;r att ni anv&auml;nder Apache!
-+  Tack f&ouml;r att ni anv&auml;nder Apache and FreeBSD!
-   </p>
-  <div align="CENTER">
-   <img src="apache_pb.gif" alt="">
-  </div>
- </body>
-+<DIV ALIGN="CENTER">
-+  <A HREF="http://www.apache.org/"><IMG SRC="/images/apache_pb.gif" ALT="Powered by Apache"></A>
-+  <A HREF="http://www.freebsd.org/">
-+        <IMG SRC="/images/powerlogo.gif" ALT="Site driven by FreeBSD - FreeBSD: The Power to Server!"></A>
-+  <A HREF="http://www.microsoft.com/frontpage/default.htm">
-+        <IMG SRC="/images/fplogo.gif" ALT="Created with Microsoft FrontPage 2000"></A>
-+</DIV>
-+</body>
- </html>
--- a/www/apache13-fp/pkg-install
+++ b/www/apache13-fp/pkg-install
@ -5,6 +5,8 @@
 # Created by: hetzels@westbend.net

 PKG_BATCH=${BATCH:=NO}
+PKG_USER=${PKG_USER:=apache}
+PKG_GROUP=${PKG_GROUP:=apache}

 PKG_PREFIX=${PKG_PREFIX}
 HOST_NAME=`/bin/hostname`
@ -20,14 +22,56 @@ FPDOCDIR=${AP_SHARE}/manual/mod/mod_frontpage
 IMAGES_DIR=${AP_SHARE}/manual/images
 IMAGES_VTI=${PKG_PREFIX}/www/data/images/_vti_cnf

+create_user()
+{
+	if [ ! -x /usr/sbin/pw ]; then
+		echo "*** Please add a user and a group name \`${PKG_GROUP}' before installing this package."
+		exit 69
+	fi
+
+	if ! pw show group ${PKG_GROUP} -q > /dev/null; then
+		gid=80
+		while pw show group -g ${gid} -q > /dev/null; do
+			gid=`expr ${gid} + 1`
+		done
+		if ! pw add group ${PKG_GROUP} -g ${gid}; then
+			e=$?
+			echo "*** Failed to add group \`${PKG_GROUP}'.  Please add it manually."
+			exit ${e}
+		fi
+		echo "*** Added group \`${PKG_GROUP}' (id ${gid})."
+	else
+		gid=`pw show group ${PKG_GROUP} 2> /dev/null | cut -d: -f3`
+	fi
+
+	if [ -x /sbin/nologin ]; then
+		shell="/sbin/nologin"
+	else
+		shell="/nonexistent"
+	fi
+
+	if ! pw show user ${PKG_USER} -q > /dev/null; then
+		uid=80
+		while pw show user -u ${uid} -q > /dev/null; do
+			uid=`expr ${uid} + 1`
+		done
+		if ! pw add user ${PKG_USER} -u ${uid} -g ${gid} \
+				-d "${PKG_PREFIX}/www/data" \
+				-c "The Apache Web Server" \
+				-s "${shell}" -p "*" ; then
+			e=$?
+			echo "*** Failed to add user \`${PKG_USER}'. Please add it manually."
+			exit ${e}
+		fi
+		echo "*** Added user \`${PKG_USER}' (id ${uid})"
+	fi
+}
+		
 create_apache_lang_doc ()
 {
-    for lang in ca cz de dk ee en es fr it ja.jis lu nl po.iso-pl pt pt-br se
-    {
-	/bin/cat ${AP_SHARE}/index.html.${lang}-dist | \
+	/bin/cat ${AP_SHARE}/index.html.en-dist | \
 	   /usr/bin/sed -e 's;@@HOSTNAME@@;'${HOST_NAME}';' \
-	   > ${AP_SHARE}/index.html.${lang}
-    }
+	   > ${AP_SHARE}/index.html.en
 }

 create_apache_doc_root ()
@ -42,12 +86,7 @@ create_apache_doc_root ()
 	{
 	    /bin/cp -rp ${IMAGES_DIR}/${file} ${AP_DATA}/images
 	}
-
-	for lang in ca cz de dk ee en es fr it ja.jis lu nl po.iso-pl pt pt-br se
-	{
-	    /bin/cp -rp ${AP_SHARE}/index.html.${lang} \
-		${AP_DATA}/index.html.${lang}
-	}
+	/bin/cp -rp ${AP_SHARE}/index.html.en ${AP_DATA}/index.html.en
    fi
 }

@ -101,6 +140,7 @@ comment_files ()

 case $2 in
    PRE-INSTALL)
+	create_user
 	;;
    POST-INSTALL)
 	# If we are not in batch mode then run the FP install script.
--- a/www/apache13-fp/pkg-plist
+++ b/www/apache13-fp/pkg-plist
@ -7,8 +7,8 @@ etc/apache/magic.default
 etc/apache/mime.types.default
 etc/apache/srm.conf.default
 etc/rc.d/apache.sh
-include/apache/alloc.h
 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
@ -94,38 +94,58 @@ sbin/suexec
 share/doc/apache/apache_pb.gif
@exec if [ ! -h %B/images ]; then (cd %B ; ln -s manual/images images); fi
@unexec if [ -h %B/images ]; then rm -f %B/images; fi
-share/doc/apache/index.html.ca-dist
-share/doc/apache/index.html.cz-dist
-share/doc/apache/index.html.de-dist
-share/doc/apache/index.html.dk-dist
-share/doc/apache/index.html.ee-dist
+share/doc/apache/README.rus
+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-dist
-share/doc/apache/index.html.es-dist
-share/doc/apache/index.html.fr-dist
-share/doc/apache/index.html.it-dist
-share/doc/apache/index.html.ja.jis-dist
-share/doc/apache/index.html.lu-dist
-share/doc/apache/index.html.nl-dist
-share/doc/apache/index.html.po.iso-pl-dist
-share/doc/apache/index.html.pt-dist
-share/doc/apache/index.html.pt-br-dist
-share/doc/apache/index.html.se-dist
-@unexec rm -rf %B/index.html.??
-@unexec rm -rf %B/index.html.po.iso-pl
-@unexec rm -rf %B/index.html.ja.jis
-@unexec rm -rf %B/index.html.pt-br
+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
+@unexec rm -rf %B/index.html.en
 share/doc/apache/manual/LICENSE
 share/doc/apache/manual/bind.html
 share/doc/apache/manual/cgi_path.html
+share/doc/apache/manual/configuring.html.en
+share/doc/apache/manual/configuring.html.ja.jis
 share/doc/apache/manual/content-negotiation.html
-share/doc/apache/manual/custom-error.html
+share/doc/apache/manual/custom-error.html.en
+share/doc/apache/manual/custom-error.html.ja.jis
 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/handler.html.en
+share/doc/apache/manual/handler.html.ja.jis
 share/doc/apache/manual/header.html
+share/doc/apache/manual/howto/cgi.html.en
+share/doc/apache/manual/howto/cgi.html.ja.jis
+share/doc/apache/manual/howto/footer.html
+share/doc/apache/manual/howto/header.html
+share/doc/apache/manual/howto/ssi.html
+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/fplogo.gif
@ -135,11 +155,14 @@ share/doc/apache/manual/images/mod_rewrite_fig1.fig
 share/doc/apache/manual/images/mod_rewrite_fig1.gif
 share/doc/apache/manual/images/mod_rewrite_fig2.fig
 share/doc/apache/manual/images/mod_rewrite_fig2.gif
+share/doc/apache/manual/images/pixel.gif
 share/doc/apache/manual/images/powerlogo.gif
 share/doc/apache/manual/images/sub.gif
-share/doc/apache/manual/index.html
+share/doc/apache/manual/index.html.en
+share/doc/apache/manual/index.html.ja.jis
 share/doc/apache/manual/install-tpf.html
-share/doc/apache/manual/install.html
+share/doc/apache/manual/install.html.en
+share/doc/apache/manual/install.html.ja.jis
 share/doc/apache/manual/invoking.html
 share/doc/apache/manual/keepalive.html
 share/doc/apache/manual/location.html
@ -165,14 +188,17 @@ 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/directive-dict.html.en
+share/doc/apache/manual/mod/directive-dict.html.ja.jis
 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.html
+share/doc/apache/manual/mod/index-bytype.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
@ -190,7 +216,6 @@ share/doc/apache/manual/mod/mod_cookies.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
@ -209,7 +234,8 @@ 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_negotiation.html.en
+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
@ -220,16 +246,37 @@ 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.en
+share/doc/apache/manual/mod/module-dict.html.ja.jis
+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_1_3.html.en
+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
+share/doc/apache/manual/programs/ab.html
+share/doc/apache/manual/programs/apachectl.html
+share/doc/apache/manual/programs/apxs.html
+share/doc/apache/manual/programs/dbmmanage.html
+share/doc/apache/manual/programs/footer.html
+share/doc/apache/manual/programs/header.html
+share/doc/apache/manual/programs/htdigest.html
+share/doc/apache/manual/programs/htpasswd.html
+share/doc/apache/manual/programs/httpd.html
+share/doc/apache/manual/programs/index.html
+share/doc/apache/manual/programs/logresolve.html
+share/doc/apache/manual/programs/other.html
+share/doc/apache/manual/programs/rotatelogs.html
+share/doc/apache/manual/programs/suexec.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/server-wide.html.en
+share/doc/apache/manual/server-wide.html.ja.jis
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
 share/doc/apache/manual/suexec.html
@ -243,12 +290,15 @@ 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/index.html.en
+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
 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
@ -366,10 +416,12 @@ www/icons/world2.gif
@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
+@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_frontpage
@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