upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to

pksrc/www/apache.  see pkgsrc/www/apache changelog for full changelog.

23 files changed, 561 insertions, 297 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index e658cc9cdfa..d35cd58d2dc 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/01/15 11:43:59 itojun Exp $
+# $NetBSD: Makefile,v 1.21 2001/02/06 10:58:18 itojun Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -10,41 +10,42 @@
 # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
 #
 
-DISTNAME=		apache_1.3.14
-PKGNAME=		apache6-1.3.14
+DISTNAME=		apache_1.3.17
+PKGNAME=		apache-1.3.17
 CATEGORIES=		www
-MASTER_SITES=		http://www.apache.org/dist/ \
-			ftp://ftp.modssl.org/source/ \
+MASTER_SITES=		http://httpd.apache.org/dist/ \
 			http://www.netbsd.org/images/logos/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			sitedrivenby.gif
-#			${SSL_DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=		apache-1.3.14-v6-20010115a.diff.gz
+PATCHFILES=		apache-1.3.17-v6-20010206a.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=		itojun@itojun.org
-HOMEPAGE=		http://www.apache.org/
+MAINTAINER=		jlam@netbsd.org
+HOMEPAGE=		http://httpd.apache.org/
 
-CONFLICTS=		apache-*modssl-* apache-*
-
-#SSL_DISTNAME=		mod_ssl-2.6.3-1.3.12
+CONFLICTS=		apache-*modssl-* apache6-*
+CONFLICTS=		apache-*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
-HAS_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
-			--runtimedir=/var/run --datadir=${PREFIX}/share/httpd \
-			--logfiledir=/var/log/httpd --sysconfdir=${PREFIX}/etc/httpd \
-			--proxycachedir=/var/spool/httpd/proxy \
-			--includedir=${PREFIX}/include/httpd \
-			--sbindir=${PREFIX}/sbin \
-			--enable-module=most \
-			--enable-module=auth_db \
-			--disable-module=auth_dbm \
-			--with-perl=${PERL5}
-#			--enable-rule=EAPI --disable-module=ssl 
+HAS_CONFIGURE=		# defined
 CONFIGURE_SCRIPT=	${WRKSRC}/configure.v6
+CONFIGURE_ARGS+=	--prefix=${PREFIX}				\
+			--sbindir=${PREFIX}/sbin			\
+			--libexecdir=${PREFIX}/lib/httpd		\
+			--sysconfdir=${PREFIX}/etc/httpd		\
+			--datadir=${PREFIX}/share/httpd			\
+			--cgidir=${PREFIX}/libexec/cgi-bin		\
+			--includedir=${PREFIX}/include/httpd		\
+			--runtimedir=/var/run				\
+			--logfiledir=/var/log/httpd			\
+			--proxycachedir=/var/spool/httpd/proxy
+CONFIGURE_ARGS+=	--enable-module=most				\
+			--enable-module=auth_db				\
+			--disable-module=auth_dbm
+CONFIGURE_ARGS+=	--with-perl=${PERL5}
+CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 
 BUILD_DEFS+=		USE_INET6
@@ -56,73 +57,77 @@ IGNORE=			"IPv6 only build"
 .endif
 
 .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
-CONFIGURE_ARGS+=	--enable-suexec --suexec-caller=www \
-			--suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin'
+APACHE_USER?=		www
+SUEXEC_PATH=		/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
+CONFIGURE_ARGS+=	--enable-suexec 				\
+			--suexec-caller=${APACHE_USER}			\
+			--suexec-safepath='${SUEXEC_PATH}'
+PLIST_SRC=		${PKGDIR}/PLIST.suexec
+BUILD_DEFS+=		APACHE_USER
 .endif
 
+.if !defined(NOPIC)
+CONFIGURE_ARGS+=	--enable-module=so	# requires dlopen()
+CONFIGURE_ARGS+=	--enable-shared=proxy
+PLIST_SRC+=		${PKGDIR}/PLIST.shared
+.else
+CONFIGURE_ARGS+=	--disable-module=proxy
+.endif
+
+PLIST_SRC+=		${PKGDIR}/PLIST
+
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-CONFIGURE_ARGS+=	--disable-rule=STATUS
 OPTIM+=			-DBUFFERED_LOGS
 CFLAGS+=		-O6 -fomit-frame-pointer -fexpensive-optimizations
 .endif
 
 .if (${OPSYS} == "SunOS")
 DEPENDS+=		db-2.7.7:../../databases/db
-LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib			\
+			-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 CONFIGURE_ENV+=		INCLUDES="-I${LOCALBASE}/include/db2"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
 .endif
 
-PLIST_SRC=		${WRKDIR}/PLIST
+BUILD_DEFS+=		APACHE_PERF_TUNING APACHE_SUEXEC
 
-BUILD_DEFS+=		APACHE_PERF_TUNING APACHE_SUEXEC USE_INET6
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
+INSTALL_FILE=		${WRKDIR}/INSTALL
 
 # Note that there is NO static compile module hook here.  This is intentional.
 # Under Apache 1.3, modules can be compiled to link dynamically to the server
 # using the "apxs" program.  See apxs(8).
 
-#post-extract:
-#	@${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include/
-#	@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.c ${WRKSRC}/src/ap/
-#	@${CP} ${WRKDIR}/${SSL_DISTNAME}/pkg.eapi/*.h ${WRKSRC}/src/include/
-
-#pre-patch:
-#	@cd ${WRKSRC} && ${CAT} \
-#		../${SSL_DISTNAME}/pkg.eapi/eapi.patch \
-#		../${SSL_DISTNAME}/pkg.sslcfg/sslcfg.patch \
-#		../${SSL_DISTNAME}/pkg.sslmod/sslmod.patch \
-#		../${SSL_DISTNAME}/pkg.sslsup/sslsup.patch \
-#		| ${PATCH} ${PATCH_ARGS}
-#	@cd ${WRKSRC} && ${TAIL} +129 \
-#		../${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
-#		| ${PATCH} ${PATCH_ARGS}
+pre-patch:
+	${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
 
 post-patch:
-	@${FIND} ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM} -f
-	@${CHMOD} +x ${CONFIGURE_SCRIPT}
+	${CHMOD} +x ${CONFIGURE_SCRIPT}
 
 post-build:
-	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/apache.sh \
-	  >${WRKDIR}/apache.sh
+	${SED}	-e "s,@PREFIX@,${PREFIX},g"				\
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
+
+pre-install:
+	${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
+	${SED}	-e "s|@CAT@|${CAT}|g"					\
+		-e "s|@RM@|${RM}|g"					\
+		-e "s|@RMDIR@|${RMDIR}|g"				\
+		-e "s|@TRUE@|${TRUE}|g"					\
+		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED}	-e "s|@CAT@|${CAT}|g"					\
+		-e "s|@CHMOD@|${CHMOD}|g"				\
+		-e "s|@CHOWN@|${CHOWN}|g"				\
+		-e "s|@CP@|${CP}|g"					\
+		-e "s|@MKDIR@|${MKDIR}|g"				\
+		${PKGDIR}/INSTALL > ${INSTALL_FILE}
 
 post-install:
-	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \
-	  ${PREFIX}/share/httpd/htdocs
+.if !defined(NOPIC)
+	cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so
+.endif
+	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
-	@${MV} ${PREFIX}/lib/httpd/libproxy.so \
-	  ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || \
-	  ${MKDIR} ${PREFIX}/lib/httpd
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-.for FILE in man/man8/suexec.8 sbin/suexec
-	@if ${TEST} -e ${PREFIX}/${FILE} ; then \
-	  ${ECHO} ${FILE} >>${PLIST_SRC}; \
-	fi
-.endfor
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
-
-.if !defined(NOPIC)
-CONFIGURE_ARGS+=	--enable-module=so --enable-shared=proxy
-.else
-CONFIGURE_ARGS+=	--disable-module=proxy
-.endif
diff --git a/www/apache6/files/ap_include_extern.h b/www/apache6/files/ap_include_extern.h
index 02ff7fac6b3..d962c66a2e3 100644
--- a/www/apache6/files/ap_include_extern.h
+++ b/www/apache6/files/ap_include_extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ap_include_extern.h,v 1.1.1.1 1999/07/23 17:53:29 itojun Exp $ */
+/* $NetBSD: ap_include_extern.h,v 1.2 2001/02/06 10:58:18 itojun Exp $ */
 /* ====================================================================
  * Copyright (c) 1998 The Apache Group.  All rights reserved.
  *
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
index 8a55af11815..50d85d89081 100644
--- a/www/apache6/files/apache.sh
+++ b/www/apache6/files/apache.sh
@@ -1,47 +1,56 @@
 #! /bin/sh
 #
-# $NetBSD: apache.sh,v 1.4 2000/11/14 19:58:05 itojun Exp $
+# $NetBSD: apache.sh,v 1.5 2001/02/06 10:58:18 itojun Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
 
 name="apache"
-command="@PREFIX@/sbin/apachectl"
+ctl_command="@PREFIX@/sbin/apachectl"
+command="@PREFIX@/sbin/httpd"
 pidfile="/var/run/httpd.pid"
 conffile="@PREFIX@/etc/httpd/httpd.conf"
 
 apache_start="start"
 
-if [ -f @PREFIX@/etc/httpd/mod_ssl.conf ]
+if [ -f @PREFIX@/etc/httpd/apache_start.conf ]
 then
 	# This file can reset apache_start to "startssl"
-	. @PREFIX@/etc/httpd/mod_ssl.conf
+	. @PREFIX@/etc/httpd/apache_start.conf
 fi
 
 cmd=${1:-start}
 
-case ${cmd} in
-start)
-	if [ -x ${command} -a -f ${conffile} ]; then
+if [ -x ${ctl_command} -a -x ${command} ]
+then
+	case ${cmd} in
+	start)
 		echo "Starting ${name}."
-		${command} ${apache_start} > /dev/null
-	fi
-	;;
-stop)
-	if [ -x ${command} -a -f ${pidfile} ]; then
-		echo "Stopping ${name}."
-		${command} stop > /dev/null
-	fi
-	;;
-restart)
-	( $0 stop )
-	sleep 5
-	$0 start
-	;;
-*)
-	if [ -x ${command} ]; then
-		${command} ${cmd}
-	fi
-	;;
-esac
+		${ctl_command} ${apache_start} > /dev/null
+		;;
+
+	stop)
+		if [ -a -f ${pidfile} ]
+		then
+			echo "Stopping ${name}."
+			${ctl_command} ${cmd} > /dev/null
+		fi
+		;;
+
+	restart)
+		( $0 stop )
+		sleep 5
+		$0 start
+		;;
+
+	status)
+		${ctl_command} ${cmd}
+		;;
+
+	*)
+		echo 1>&2 "Usage: $0 [restart|start|stop|status]"
+		exit 1
+		;;
+	esac
+fi
 exit 0
diff --git a/www/apache6/files/md5 b/www/apache6/files/md5
index 8f52c3577d5..69a1fddaf6b 100644
--- a/www/apache6/files/md5
+++ b/www/apache6/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.8 2001/01/15 11:43:59 itojun Exp $
+$NetBSD: md5,v 1.9 2001/02/06 10:58:18 itojun Exp $
 
-MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
+MD5 (apache_1.3.17.tar.gz) = bcb3c0db956709ad8f04655fd75621e6
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
-MD5 (apache-1.3.14-v6-20010115a.diff.gz) = 35cbb3b115f061bc2d596726a442ce4e
+MD5 (apache-1.3.17-v6-20010206a.diff.gz) = ca39f4d1238ff2a499367c9d2e79b524
diff --git a/www/apache6/files/patch-sum b/www/apache6/files/patch-sum
index 6cae61118e6..b4452d9aa3a 100644
--- a/www/apache6/files/patch-sum
+++ b/www/apache6/files/patch-sum
@@ -1,10 +1,9 @@
-$NetBSD: patch-sum,v 1.8 2000/09/06 05:52:49 jlam Exp $
+$NetBSD: patch-sum,v 1.9 2001/02/06 10:58:18 itojun Exp $
 
-MD5 (patch-aa) = 9289ac3db45bab5d9623aeddcca6c2eb
-MD5 (patch-ab) = e69e8ebe30b31b5f5846123dc7d8c035
-MD5 (patch-ae) = 2cd742f756f4cf2b9aa420ece607b069
-MD5 (patch-ah) = a061ce5b33a2e5253616ab0859575ace
-MD5 (patch-aj) = d19617784c340408a3615175e4fc7f20
-MD5 (patch-ak) = 9b89c40d08bf281bb1da13a555fd8730
-MD5 (patch-al) = baf65c7700c9de46db906e38df2a36a6
-MD5 (patch-am) = fd4d430a5dab5ff28ed5bd041a1abf48
+MD5 (patch-aa) = 35913f4bcf5ddf8d3dc1bb3a55af1650
+MD5 (patch-ab) = e22465215ebdcbfa0591c1a506398276
+MD5 (patch-ac) = afd85e3188013fa46392ccaa3727d09d
+MD5 (patch-ae) = 40f7dff6c36a1a294a2c255dd2acc75a
+MD5 (patch-af) = 1977c701df330324858e593c85d56de2
+MD5 (patch-ah) = e27e529142e5ee6fc1be0f965e5510e0
+MD5 (patch-ai) = 57b95d04f0ed35252b8ead041017feac
diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa
index 3bc1d500390..dd32c4a98ac 100644
--- a/www/apache6/patches/patch-aa
+++ b/www/apache6/patches/patch-aa
@@ -1,8 +1,29 @@
-$NetBSD: patch-aa,v 1.3 1999/09/01 07:41:03 itojun Exp $
+$NetBSD: patch-aa,v 1.4 2001/02/06 10:58:18 itojun Exp $
 
---- Makefile.tmpl.orig	Thu Aug 12 23:58:18 1999
-+++ Makefile.tmpl	Wed Sep  1 00:08:27 1999
-@@ -450,12 +450,13 @@
+--- Makefile.tmpl.orig	Tue Jan 16 01:26:17 2001
++++ Makefile.tmpl	Tue Feb  6 19:41:48 2001
+@@ -326,20 +326,7 @@
+ 			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
+ 			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}`; \
+-			echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
+-			modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
+ 		done; \
+-		echo "" >>$(SRC)/.apaci.install.conf; \
+-		echo "#  Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
+-		echo "#  (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \
+-		echo "#  [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
+-		echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
+-		egrep "^[ 	]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
+-		sed	-e 's:SharedModule:AddModule:' \
+-			-e 's:modules/[^/]*/::' \
+-			-e 's:[ 	]lib: mod_:' \
+-			-e 's:\.[soam].*$$:.c:' >>$(SRC)/.apaci.install.conf; \
+ 	fi
+ 	@echo "<=== [programs]"
+ 
+@@ -464,15 +451,16 @@
  		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
  	fi
@@ -15,9 +36,14 @@ $NetBSD: patch-aa,v 1.3 1999/09/01 07:41:03 itojun Exp $
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
 +			-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
  			> $(TOP)/$(SRC)/.apaci.install.tmp; \
- 			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
- 			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-@@ -472,7 +473,7 @@
+-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
+-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
++			echo "$(INSTALL_SCRIPT) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
++			$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
+ 		done; \
+ 	fi
+ 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
+@@ -486,7 +474,7 @@
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache6/patches/patch-ab b/www/apache6/patches/patch-ab
index f880346ec78..9ce3428f8b0 100644
--- a/www/apache6/patches/patch-ab
+++ b/www/apache6/patches/patch-ab
@@ -1,38 +1,20 @@
-$NetBSD: patch-ab,v 1.2 2000/02/21 07:14:45 itojun Exp $
+$NetBSD: patch-ab,v 1.3 2001/02/06 10:58:18 itojun Exp $
 
---- htdocs/index.html.en.orig	Sat Nov 20 16:29:40 1999
-+++ htdocs/index.html.en	Sun Jan 30 17:00:58 2000
-@@ -28,11 +28,29 @@
+--- conf/httpd.conf-dist.orig	Tue Feb  6 19:40:11 2001
++++ conf/httpd.conf-dist	Tue Feb  6 19:42:15 2001
+@@ -204,7 +204,14 @@
+ # the order below without expert advice.
+ #
+ # Example:
+-# LoadModule foo_module libexec/mod_foo.so
++# LoadModule foo_module lib/httpd/mod_foo.so
++
++<IfDefine SSL>
++LoadFile !libcrypto.so
++LoadFile !libssl.so
++LoadModule ssl_module lib/httpd/mod_ssl.so
++AddModule mod_ssl.c
++</IfDefine>
  
- 
- <P>
--The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
--
-+The Apache <A HREF="manual/index.html">documentation</A>
-+has been included with this distribution.<BR>
-+If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
-+<A
-+ HREF="manual/mod/mod_ssl/index.html"
-+>SSL documentation</A>
-+carefully.
-+</P>
-+<P>
-+Information on the NetBSD multiplatform operating system can be found
-+at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
-+</P>
- <P>
--You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
-+The Webmaster of this site is free to use the images below on
-+an Apache/NetBSD-powered Web server.  Thanks for using
-+<A HREF="http://www.apache.org/">Apache</A> on
-+<A HREF="http://www.netbsd.org/">NetBSD</A>!
-+</P>
- 
--<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
-+<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT="">
-+<A HREF="http://www.netbsd.org/">
-+<IMG SRC="sitedrivenby.gif" border=0 
-+ ALT="Site driven by NetBSD - NetBSD rocks!"></A>
-+</DIV>
- </BODY>
- </HTML>
+ #
+ # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/www/apache6/patches/patch-ac b/www/apache6/patches/patch-ac
new file mode 100644
index 00000000000..bd8404f2167
--- /dev/null
+++ b/www/apache6/patches/patch-ac
@@ -0,0 +1,35 @@
+$NetBSD: patch-ac,v 1.1 2001/02/06 10:58:18 itojun Exp $
+
+--- htdocs/index.html.en.orig	Fri Jan 19 14:39:47 2001
++++ htdocs/index.html.en
+@@ -33,12 +33,26 @@
+ <HR WIDTH="50%" SIZE="8">
+ 
+ <p>The Apache <A HREF="manual/">documentation</A> has been included with
+-this distribution.</p>
++this distribution.  If the <STRONG>mod_ssl</STRONG> SSL extension has
++been installed, then please carefully read the
++<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A>.</p>
+ 
+-<p>You are free to use the image below on an Apache-powered web server. 
+-Thanks for using Apache!</p>
++<p>Information on the NetBSD multi-platform operating system can be found at
++<A HREF="http://www.netbsd.org/">The NetBSD Project homepage</A></p>
+ 
+-<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
++<p>Please feel free to use the images below on an Apache/NetBSD-powered web
++server.  Thanks for using
++<A HREF="http://www.apache.org/">Apache</A> on
++<A HREF="http://www.netbsd.org/">NetBSD</A>!</p>
++
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/">
++  <IMG SRC="apache_pb.gif" BORDER=0 ALT="Powered by Apache">
++ </A>
++ <A HREF="http://www.netbsd.org/">
++  <IMG SRC="sitedrivenby.gif" BORDER=0 ALT="Site driven by NetBSD">
++ </A>
++</DIV>
+ 
+ </BODY>
+ </HTML>
diff --git a/www/apache6/patches/patch-ae b/www/apache6/patches/patch-ae
index 9332e5b2307..a5e0becf241 100644
--- a/www/apache6/patches/patch-ae
+++ b/www/apache6/patches/patch-ae
@@ -1,14 +1,53 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/07/23 17:53:30 itojun Exp $
+$NetBSD: patch-ae,v 1.2 2001/02/06 10:58:18 itojun Exp $
 
---- src/support/apachectl.orig	Thu Dec  3 08:23:16 1998
-+++ src/support/apachectl	Thu Dec  3 08:23:49 1998
-@@ -27,6 +27,9 @@
- # the path to your httpd binary, including options if necessary
- HTTPD='/usr/local/apache/src/httpd'
- #
-+# shared object search path
-+LD_LIBRARY_PATH=
-+export LD_LIBRARY_PATH
- # a command that outputs a formatted text version of the HTML at the
- # url given on the command line.  Designed for lynx, however other
- # programs may work.  
+--- src/modules/standard/mod_include.c.orig	Tue Jan 16 02:05:42 2001
++++ src/modules/standard/mod_include.c	Tue Feb  6 19:49:25 2001
+@@ -94,6 +94,8 @@
+ #include "http_main.h"
+ #include "util_script.h"
+ #endif
++#define get_tag ap_include_get_tag
++#define parse_string ap_include_parse_string
+ 
+ #define STARTING_SEQUENCE "<!--#"
+ #define ENDING_SEQUENCE "-->"
+@@ -352,7 +354,8 @@
+  * the tag value is html decoded if dodecode is non-zero
+  */
+ 
+-static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
++API_EXPORT(char *)
++ap_include_get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
+ {
+     char *t = tag, *tag_val, c, term;
+ 
+@@ -471,7 +474,8 @@
+ /*
+  * Do variable substitution on strings
+  */
+-static void parse_string(request_rec *r, const char *in, char *out,
++API_EXPORT(void)
++ap_include_parse_string(request_rec *r, const char *in, char *out,
+ 			size_t length, int leave_name)
+ {
+     char ch;
+@@ -669,7 +673,8 @@
+             parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
+             if (tag[0] == 'f') {
+                 /* be safe; only files in this directory or below allowed */
+-		if (!is_only_below(parsed_string)) {
++		if ((ap_allow_options(r) & OPT_INCNOEXEC) &&
++		    !is_only_below(parsed_string)) {
+                     error_fmt = "unable to include file \"%s\" "
+                         "in parsed file %s";
+                 }
+@@ -1081,7 +1086,8 @@
+                         "in parsed file %s";
+         }
+         else {
+-            ap_getparents(tag_val);    /* get rid of any nasties */
++	    if (ap_allow_options(r) & OPT_INCNOEXEC)
++                ap_getparents(tag_val);    /* get rid of any nasties */
+             rr = ap_sub_req_lookup_file(tag_val, r);
+ 
+             if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
diff --git a/www/apache6/patches/patch-af b/www/apache6/patches/patch-af
new file mode 100644
index 00000000000..1baf2de093a
--- /dev/null
+++ b/www/apache6/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.3 2001/02/06 10:58:18 itojun Exp $
+
+--- src/modules/standard/mod_so.c.orig	Tue Jan 16 02:05:49 2001
++++ src/modules/standard/mod_so.c	Tue Feb  6 19:42:56 2001
+@@ -305,7 +305,15 @@
+         return err;
+     }
+     
+-    file = ap_server_root_relative(cmd->pool, filename);
++    /*
++     * If the filename starts with '!', then just dlopen() it without
++     * translating it to a pathname relative to ServerRoot.
++     */
++    if (filename[0] == '!') {
++	file = filename + 1;
++    } else {
++	file = ap_server_root_relative(cmd->pool, filename);
++    }
+     
+     if (!(handle = ap_os_dso_load(file))) {
+ 	const char *my_error = ap_os_dso_error();
diff --git a/www/apache6/patches/patch-ah b/www/apache6/patches/patch-ah
index 4f531218ec4..2b01bb66249 100644
--- a/www/apache6/patches/patch-ah
+++ b/www/apache6/patches/patch-ah
@@ -1,14 +1,14 @@
-$NetBSD: patch-ah,v 1.2 2000/04/26 03:30:27 hubertf Exp $
+$NetBSD: patch-ah,v 1.3 2001/02/06 10:58:19 itojun Exp $
 
---- src/modules/standard/mod_so.c.orig	Tue Apr 25 21:22:13 2000
-+++ src/modules/standard/mod_so.c	Tue Apr 25 21:22:34 2000
-@@ -294,6 +294,9 @@
-     ap_os_dso_handle_t handle;
-     char *file;
- 
-+/* XXX Hack: ask dlopen() without translating for ServerRoot. */
-+    if (filename[0] == '!') file = filename + 1;
-+    else
-     file = ap_server_root_relative(cmd->pool, filename);
-     
-     if (!(handle = ap_os_dso_load(file))) {
+--- src/support/apachectl.orig	Thu Sep  7 01:19:50 2000
++++ src/support/apachectl
+@@ -27,6 +27,9 @@
+ # the path to your httpd binary, including options if necessary
+ HTTPD='/usr/local/apache/src/httpd'
+ #
++# shared object search path
++LD_LIBRARY_PATH=
++export LD_LIBRARY_PATH
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line.  Designed for lynx, however other
+ # programs may work.  
diff --git a/www/apache6/patches/patch-ai b/www/apache6/patches/patch-ai
new file mode 100644
index 00000000000..d84737343cc
--- /dev/null
+++ b/www/apache6/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2001/02/06 10:58:19 itojun Exp $
+
+--- src/support/apxs.pl.orig	Fri Feb  2 00:42:14 2001
++++ src/support/apxs.pl
+@@ -427,8 +427,7 @@
+         my $t = $f;
+         $t =~ s|^.+/([^/]+)$|$1|;
+         if ($opt_i) {
+-            push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+-            push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++            push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
+         }
+ 
+         #   determine module symbolname and filename
diff --git a/www/apache6/patches/patch-aj b/www/apache6/patches/patch-aj
deleted file mode 100644
index 4fbf043244a..00000000000
--- a/www/apache6/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2000/09/06 05:52:49 jlam Exp $
-
---- conf/httpd.conf-dist.orig	Tue Apr 25 21:23:43 2000
-+++ conf/httpd.conf-dist	Tue Apr 25 21:24:00 2000
-@@ -204,7 +204,16 @@
- # the order below without expert advice.
- #
- # Example:
--# LoadModule foo_module libexec/mod_foo.so
-+# LoadModule foo_module lib/httpd/mod_foo.so
-+
-+<IfDefine SSL>
-+### Uncomment the following if you wish to use SSL and you need RSAREF: ###
-+#LoadFile !librsaref.so
-+LoadFile !libcrypto.so
-+LoadFile !libssl.so
-+LoadModule ssl_module lib/httpd/mod_ssl.so
-+AddModule mod_ssl.c
-+</IfDefine>
- 
- #
- # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/www/apache6/patches/patch-ak b/www/apache6/patches/patch-ak
deleted file mode 100644
index 6715644245c..00000000000
--- a/www/apache6/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2000/02/21 07:14:45 itojun Exp $
---- src/support/apxs.pl.orig	Thu Dec 16 08:10:30 1999
-+++ src/support/apxs.pl	Sun Feb 20 22:14:55 2000
-@@ -424,8 +424,9 @@
-         my $t = $f;
-         $t =~ s|^.+/([^/]+)$|$1|;
-         if ($opt_i) {
--            push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
--            push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+#           push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
-+#           push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+	    push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
-         }
- 
-         #   determine module symbolname and filename
diff --git a/www/apache6/patches/patch-al b/www/apache6/patches/patch-al
deleted file mode 100644
index a573b606c51..00000000000
--- a/www/apache6/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2000/04/26 03:30:28 hubertf Exp $
-
---- src/os/unix/os.c.orig	Sat Jan 15 08:01:09 2000
-+++ src/os/unix/os.c	Tue Apr 25 21:24:31 2000
-@@ -129,7 +129,7 @@
- #elif defined(HAVE_DYLD)
-     NSUnLinkModule(handle,FALSE);
- 
--#else
-+#elif 0
-     dlclose(handle);
- #endif
- 
diff --git a/www/apache6/patches/patch-am b/www/apache6/patches/patch-am
deleted file mode 100644
index 71a3fb0ecde..00000000000
--- a/www/apache6/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.3 1999/09/01 07:41:03 itojun Exp $
-
---- config.layout.orig	Thu Jul 29 11:12:43 1999
-+++ config.layout	Wed Sep  1 00:21:55 1999
-@@ -21,7 +21,7 @@
-     datadir:       $prefix
-     iconsdir:      $datadir/icons
-     htdocsdir:     $datadir/htdocs
--    cgidir:        $datadir/cgi-bin
-+    cgidir:        $prefix/libexec/cgi-bin
-     includedir:    $prefix/include
-     localstatedir: $prefix
-     runtimedir:    $localstatedir/logs
-@@ -42,7 +42,7 @@
-     datadir:       $prefix/share+
-     iconsdir:      $datadir/icons
-     htdocsdir:     $datadir/htdocs
--    cgidir:        $datadir/cgi-bin
-+    cgidir:        $prefix/libexec/cgi-bin
-     includedir:    $prefix/include+
-     localstatedir: $prefix/var+
-     runtimedir:    $localstatedir/run
diff --git a/www/apache6/pkg/COMMENT b/www/apache6/pkg/COMMENT
index d1274545568..512b2379dc6 100644
--- a/www/apache6/pkg/COMMENT
+++ b/www/apache6/pkg/COMMENT
@@ -1 +1 @@
-The Apache web server (http://www.apache.org/), with IPv6 support
+HTTP (Web) server, with IPv6 support
diff --git a/www/apache6/pkg/DEINSTALL b/www/apache6/pkg/DEINSTALL
new file mode 100644
index 00000000000..d69468b9744
--- /dev/null
+++ b/www/apache6/pkg/DEINSTALL
@@ -0,0 +1,113 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2001/02/06 10:58:20 itojun Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CAT="@CAT@"
+RM="@RM@"
+RMDIR="@RMDIR@"
+TRUE="@TRUE@"
+
+SERVERROOT=${PKG_PREFIX}/etc/httpd
+CGIBINDIR=${PKG_PREFIX}/libexec/cgi-bin
+DATADIR=${PKG_PREFIX}/share/httpd
+LOGDIR=/var/log/httpd
+SPOOLDIR=/var/spool/httpd
+SAMPLECONFDIR=${SERVERROOT}
+CONFDIR=${SERVERROOT}
+CONFFILES="httpd.conf"
+NONCONFFILES="magic mime.types"
+
+case ${STAGE} in
+DEINSTALL)
+	# Remove configuration files if they don't differ from the default
+	# config file.
+	#
+	for file in ${CONFFILES} ${NONCONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}.default
+		if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
+		then
+			${RM} -f ${FILE}
+		fi
+	done
+	;;
+
+POST-DEINSTALL)
+	modified_files=''
+	for file in ${CONFFILES} ${NONCONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		if [ -f ${FILE} ]
+		then
+			modified_files="${modified_files} ${FILE}"
+		fi
+	done
+
+	${RMDIR} ${SPOOLDIR}/proxy 2>/dev/null || ${TRUE}
+	${RMDIR} ${SPOOLDIR} 2>/dev/null || ${TRUE}
+	${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE}
+	${RMDIR} ${DATADIR}/htdocs 2>/dev/null || ${TRUE}
+	${RMDIR} ${DATADIR} 2>/dev/null || ${TRUE}
+	${RMDIR} ${CGIBINDIR} 2>/dev/null || ${TRUE}
+	${RMDIR} ${SERVERROOT}/ssl.prm 2>/dev/null || ${TRUE}
+	${RMDIR} ${SERVERROOT}/ssl.key 2>/dev/null || ${TRUE}
+	${RMDIR} ${SERVERROOT}/ssl.csr 2>/dev/null || ${TRUE}
+	${RMDIR} ${SERVERROOT}/ssl.crt 2>/dev/null || ${TRUE}
+	${RMDIR} ${SERVERROOT}/ssl.crl 2>/dev/null || ${TRUE}
+	${RMDIR} ${SERVERROOT} 2>/dev/null || ${TRUE}
+
+	existing_dirs=''
+	for dir in ${CONFDIR} ${LOGDIR} ${REQUESTDIR} ${DATADIR}
+	do
+		if [ -d ${dir} ]
+		then
+			existing_dirs="${existing_dirs} ${dir}"
+		fi
+	done
+
+	if [ -n "${modified_files}" -o -n "${existing_dirs}" ]
+	then
+        	${CAT} << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to remove:
+EOF
+		if [ -n "${modified_files}" ]
+		then
+			${CAT} << EOF
+
+  * the following files:
+
+EOF
+			for file in ${modified_files}
+			do
+				echo "  ${file}"
+			done
+		fi
+		if [ -n "${existing_dirs}" ]
+		then
+			${CAT} << EOF
+
+  * the following directories:
+
+EOF
+			for dir in ${existing_dirs}
+			do
+				echo "  ${dir}"
+			done
+		fi
+		${CAT} << EOF
+===========================================================================
+EOF
+	fi
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/apache6/pkg/DESCR b/www/apache6/pkg/DESCR
index e1058c6a7b4..31caded3fc1 100644
--- a/www/apache6/pkg/DESCR
+++ b/www/apache6/pkg/DESCR
@@ -1,11 +1,6 @@
-The latest version of the most popular web server on the 'net.
-This compile includes proxy server support, as well as the ability
-to add modules that add many other features.
-
-You'll have to edit the configuration files in /usr/pkg/etc/httpd
-before you start it. The default root directory for documents is
-/usr/pkg/share/httpd/htdocs. You can start the server with `apachectl
-start'.
+The Apache HTTP Server Project is a collaborative software development
+effort aimed at creating a robust, commercial-grade, featureful, and
+freely-available source code implementation of an HTTP (Web) server.
 
 This package is IPv6 ready.  Apache module API is slightly modified
 so some of third-party modules may not work.
diff --git a/www/apache6/pkg/INSTALL b/www/apache6/pkg/INSTALL
new file mode 100644
index 00000000000..2b03117eaea
--- /dev/null
+++ b/www/apache6/pkg/INSTALL
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2001/02/06 10:58:20 itojun Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+CHOWN="@CHOWN@"
+CP="@CP@"
+MKDIR="@MKDIR@"
+
+SERVERROOT=${PKG_PREFIX}/etc/httpd
+LOGDIR=/var/log/httpd
+SPOOLDIR=/var/spool/httpd
+SAMPLECONFDIR=${SERVERROOT}
+CONFDIR=${SERVERROOT}
+CONFFILES="httpd.conf"
+NONCONFFILES="magic mime.types"
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+
+POST-INSTALL)
+	${MKDIR} ${SERVERROOT}
+	${MKDIR} ${SERVERROOT}/ssl.crl
+	${MKDIR} ${SERVERROOT}/ssl.crt
+	${MKDIR} ${SERVERROOT}/ssl.csr
+	${MKDIR} ${SERVERROOT}/ssl.key
+	${MKDIR} ${SERVERROOT}/ssl.prm
+	${MKDIR} ${LOGDIR}
+	${MKDIR} ${SPOOLDIR}
+	${MKDIR} ${SPOOLDIR}/proxy
+	${CHOWN} nobody:nobody ${SPOOLDIR}/proxy
+
+	echo "Installing configuration files:"
+	for file in ${CONFFILES} ${NONCONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}.default
+		if [ -f ${FILE} ]
+		then
+			echo "    ${FILE} already exists"
+		else
+			echo "    ${FILE}"
+			${CP} ${SAMPLEFILE} ${FILE}
+			${CHMOD} 644 ${FILE}
+		fi
+	done
+	${CAT} << EOF
+
+===========================================================================
+Some files you might need to customize include the following:
+
+EOF
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		echo "	${FILE}"
+	done
+        ${CAT} << EOF
+===========================================================================
+EOF
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST
index f4628517319..c38f4d3aa71 100644
--- a/www/apache6/pkg/PLIST
+++ b/www/apache6/pkg/PLIST
@@ -1,23 +1,19 @@
-@comment $NetBSD: PLIST,v 1.7 2000/11/14 19:58:06 itojun Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/02/06 10:58:20 itojun Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
 etc/httpd/httpd.conf.default
-@exec if [ ! -f %D/etc/httpd/httpd.conf ]; then cp -p %D/etc/httpd/httpd.conf.default %D/etc/httpd/httpd.conf; fi
 etc/httpd/magic.default
-@exec if [ ! -f %D/etc/httpd/magic ]; then cp -p %D/etc/httpd/magic.default %D/etc/httpd/magic; fi
 etc/httpd/mime.types.default
-@exec if [ ! -f %D/etc/httpd/mime.types ]; then cp -p %D/etc/httpd/mime.types.default %D/etc/httpd/mime.types; fi
 etc/rc.d/apache
-include/httpd/ap_alloc.h
 include/httpd/ap.h
+include/httpd/ap_alloc.h
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
-@comment include/httpd/ap_ctx.h
+include/httpd/sa_len.h
+include/httpd/sockaddr_storage.h  
 include/httpd/ap_ctype.h
-@comment include/httpd/ap_hook.h
-@comment include/httpd/ap_include_extern.h
 include/httpd/ap_md5.h
 include/httpd/ap_mmn.h
 include/httpd/ap_sha1.h
@@ -40,9 +36,7 @@ include/httpd/multithread.h
 include/httpd/os-inline.c
 include/httpd/os.h
 include/httpd/rfc1413.h
-include/httpd/sa_len.h
 include/httpd/scoreboard.h
-include/httpd/sockaddr_storage.h
 include/httpd/util_date.h
 include/httpd/util_md5.h
 include/httpd/util_script.h
@@ -58,8 +52,6 @@ include/httpd/xml/xmlparse.h
 include/httpd/xml/xmlrole.h
 include/httpd/xml/xmltok.h
 include/httpd/xml/xmltok_impl.h
-lib/httpd/httpd.exp
-lib/httpd/mod_proxy.so
 libexec/cgi-bin/printenv
 libexec/cgi-bin/test-cgi
 man/man1/dbmmanage.1
@@ -84,6 +76,7 @@ share/httpd/htdocs/index.html.cz
 share/httpd/htdocs/index.html.de
 share/httpd/htdocs/index.html.dk
 share/httpd/htdocs/index.html.ee
+share/httpd/htdocs/index.html.el
 share/httpd/htdocs/index.html.en
 share/httpd/htdocs/index.html.es
 share/httpd/htdocs/index.html.fr
@@ -109,16 +102,25 @@ share/httpd/htdocs/index.html.tw.Big5
 share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html
 share/httpd/htdocs/manual/cgi_path.html
-share/httpd/htdocs/manual/configuring.html
+share/httpd/htdocs/manual/configuring.html.en
+share/httpd/htdocs/manual/configuring.html.ja.jis
 share/httpd/htdocs/manual/content-negotiation.html
-share/httpd/htdocs/manual/custom-error.html
+share/httpd/htdocs/manual/custom-error.html.en
+share/httpd/htdocs/manual/custom-error.html.ja.jis
 share/httpd/htdocs/manual/dns-caveats.html
 share/httpd/htdocs/manual/dso.html
 share/httpd/htdocs/manual/ebcdic.html
 share/httpd/htdocs/manual/env.html
 share/httpd/htdocs/manual/footer.html
-share/httpd/htdocs/manual/handler.html
+share/httpd/htdocs/manual/handler.html.en
+share/httpd/htdocs/manual/handler.html.ja.jis
 share/httpd/htdocs/manual/header.html
+share/httpd/htdocs/manual/howto/cgi.html.en
+share/httpd/htdocs/manual/howto/cgi.html.ja.jis
+share/httpd/htdocs/manual/howto/footer.html
+share/httpd/htdocs/manual/howto/header.html
+share/httpd/htdocs/manual/howto/ssi.html
+share/httpd/htdocs/manual/images/apache_header.gif
 share/httpd/htdocs/manual/images/custom_errordocs.gif
 share/httpd/htdocs/manual/images/home.gif
 share/httpd/htdocs/manual/images/index.gif
@@ -126,10 +128,13 @@ share/httpd/htdocs/manual/images/mod_rewrite_fig1.fig
 share/httpd/htdocs/manual/images/mod_rewrite_fig1.gif
 share/httpd/htdocs/manual/images/mod_rewrite_fig2.fig
 share/httpd/htdocs/manual/images/mod_rewrite_fig2.gif
+share/httpd/htdocs/manual/images/pixel.gif
 share/httpd/htdocs/manual/images/sub.gif
-share/httpd/htdocs/manual/index.html
+share/httpd/htdocs/manual/index.html.en
+share/httpd/htdocs/manual/index.html.ja.jis
 share/httpd/htdocs/manual/install-tpf.html
-share/httpd/htdocs/manual/install.html
+share/httpd/htdocs/manual/install.html.en
+share/httpd/htdocs/manual/install.html.ja.jis
 share/httpd/htdocs/manual/invoking.html
 share/httpd/htdocs/manual/keepalive.html
 share/httpd/htdocs/manual/location.html
@@ -159,7 +164,8 @@ share/httpd/htdocs/manual/misc/tutorials.html
 share/httpd/htdocs/manual/misc/vif-info.html
 share/httpd/htdocs/manual/misc/windoz_keepalive.html
 share/httpd/htdocs/manual/mod/core.html
-share/httpd/htdocs/manual/mod/directive-dict.html
+share/httpd/htdocs/manual/mod/directive-dict.html.en
+share/httpd/htdocs/manual/mod/directive-dict.html.ja.jis
 share/httpd/htdocs/manual/mod/directives.html
 share/httpd/htdocs/manual/mod/footer.html
 share/httpd/htdocs/manual/mod/header.html
@@ -182,7 +188,6 @@ share/httpd/htdocs/manual/mod/mod_cookies.html
 share/httpd/htdocs/manual/mod/mod_digest.html
 share/httpd/htdocs/manual/mod/mod_dir.html
 share/httpd/htdocs/manual/mod/mod_dld.html
-share/httpd/htdocs/manual/mod/mod_dll.html
 share/httpd/htdocs/manual/mod/mod_env.html
 share/httpd/htdocs/manual/mod/mod_example.html
 share/httpd/htdocs/manual/mod/mod_expires.html
@@ -198,7 +203,8 @@ share/httpd/htdocs/manual/mod/mod_log_referer.html
 share/httpd/htdocs/manual/mod/mod_mime.html
 share/httpd/htdocs/manual/mod/mod_mime_magic.html
 share/httpd/htdocs/manual/mod/mod_mmap_static.html
-share/httpd/htdocs/manual/mod/mod_negotiation.html
+share/httpd/htdocs/manual/mod/mod_negotiation.html.en
+share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis
 share/httpd/htdocs/manual/mod/mod_proxy.html
 share/httpd/htdocs/manual/mod/mod_rewrite.html
 share/httpd/htdocs/manual/mod/mod_setenvif.html
@@ -209,19 +215,37 @@ share/httpd/htdocs/manual/mod/mod_unique_id.html
 share/httpd/htdocs/manual/mod/mod_userdir.html
 share/httpd/htdocs/manual/mod/mod_usertrack.html
 share/httpd/htdocs/manual/mod/mod_vhost_alias.html
-share/httpd/htdocs/manual/mod/module-dict.html
+share/httpd/htdocs/manual/mod/module-dict.html.en
+share/httpd/htdocs/manual/mod/module-dict.html.ja.jis
 share/httpd/htdocs/manual/mpeix.html
 share/httpd/htdocs/manual/multilogs.html
 share/httpd/htdocs/manual/netware.html
 share/httpd/htdocs/manual/new_features_1_0.html
 share/httpd/htdocs/manual/new_features_1_1.html
 share/httpd/htdocs/manual/new_features_1_2.html
-share/httpd/htdocs/manual/new_features_1_3.html
+share/httpd/htdocs/manual/new_features_1_3.html.en
+share/httpd/htdocs/manual/new_features_1_3.html.ja.jis
 share/httpd/htdocs/manual/new_features_2_0.html
 share/httpd/htdocs/manual/process-model.html
+share/httpd/htdocs/manual/programs/ab.html
+share/httpd/htdocs/manual/programs/apachectl.html
+share/httpd/htdocs/manual/programs/apxs.html
+share/httpd/htdocs/manual/programs/dbmmanage.html
+share/httpd/htdocs/manual/programs/footer.html
+share/httpd/htdocs/manual/programs/header.html
+share/httpd/htdocs/manual/programs/htdigest.html
+share/httpd/htdocs/manual/programs/htpasswd.html
+share/httpd/htdocs/manual/programs/httpd.html
+share/httpd/htdocs/manual/programs/index.html
+share/httpd/htdocs/manual/programs/logresolve.html
+share/httpd/htdocs/manual/programs/other.html
+share/httpd/htdocs/manual/programs/rotatelogs.html
+share/httpd/htdocs/manual/programs/suexec.html
 share/httpd/htdocs/manual/readme-tpf.html
 share/httpd/htdocs/manual/search/manual-index.cgi
 share/httpd/htdocs/manual/sections.html
+share/httpd/htdocs/manual/server-wide.html.en
+share/httpd/htdocs/manual/server-wide.html.ja.jis
 share/httpd/htdocs/manual/sourcereorg.html
 share/httpd/htdocs/manual/stopping.html
 share/httpd/htdocs/manual/suexec.html
@@ -235,7 +259,8 @@ share/httpd/htdocs/manual/vhosts/fd-limits.html
 share/httpd/htdocs/manual/vhosts/footer.html
 share/httpd/htdocs/manual/vhosts/header.html
 share/httpd/htdocs/manual/vhosts/host.html
-share/httpd/htdocs/manual/vhosts/index.html
+share/httpd/htdocs/manual/vhosts/index.html.en
+share/httpd/htdocs/manual/vhosts/index.html.ja.jis
 share/httpd/htdocs/manual/vhosts/ip-based.html
 share/httpd/htdocs/manual/vhosts/mass.html
 share/httpd/htdocs/manual/vhosts/name-based.html
@@ -354,23 +379,16 @@ share/httpd/icons/uu.gif
 share/httpd/icons/uuencoded.gif
 share/httpd/icons/world1.gif
 share/httpd/icons/world2.gif
-@comment @exec mkdir -p /var/log/httpd /var/spool/httpd/proxy %D/lib/httpd %D/etc/httpd/ssl.crt %D/etc/httpd/ssl.csr %D/etc/httpd/ssl.key
-@comment @unexec rmdir /var/log/httpd /var/spool/httpd/proxy /var/spool/httpd 2>/dev/null || true
-@comment @dirrm etc/httpd/ssl.crt
-@comment @dirrm etc/httpd/ssl.csr
-@comment @dirrm etc/httpd/ssl.key
-@unexec rmdir %D/etc/httpd 2>/dev/null || true
-@dirrm include/httpd/xml
-@dirrm include/httpd
-@dirrm lib/httpd
-@dirrm libexec/cgi-bin
-@dirrm share/httpd/htdocs/manual/images
-@dirrm share/httpd/htdocs/manual/misc
-@dirrm share/httpd/htdocs/manual/mod
-@dirrm share/httpd/htdocs/manual/search
-@dirrm share/httpd/htdocs/manual/vhosts
-@dirrm share/httpd/htdocs/manual
-@dirrm share/httpd/htdocs
 @dirrm share/httpd/icons/small
 @dirrm share/httpd/icons
-@dirrm share/httpd
+@dirrm share/httpd/htdocs/manual/vhosts
+@dirrm share/httpd/htdocs/manual/search
+@dirrm share/httpd/htdocs/manual/programs
+@dirrm share/httpd/htdocs/manual/mod
+@dirrm share/httpd/htdocs/manual/misc
+@dirrm share/httpd/htdocs/manual/images
+@dirrm share/httpd/htdocs/manual/howto
+@dirrm share/httpd/htdocs/manual
+@dirrm include/httpd/xml
+@dirrm include/httpd
+@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true
diff --git a/www/apache6/pkg/PLIST.shared b/www/apache6/pkg/PLIST.shared
new file mode 100644
index 00000000000..a334834a580
--- /dev/null
+++ b/www/apache6/pkg/PLIST.shared
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.shared,v 1.1 2001/02/06 10:58:20 itojun Exp $
+lib/httpd/mod_proxy.so
+lib/httpd/httpd.exp
+@dirrm lib/httpd
diff --git a/www/apache6/pkg/PLIST.suexec b/www/apache6/pkg/PLIST.suexec
new file mode 100644
index 00000000000..d03c453a860
--- /dev/null
+++ b/www/apache6/pkg/PLIST.suexec
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.suexec,v 1.1 2001/02/06 10:58:20 itojun Exp $
+sbin/suexec
+man/man8/suexec.8