Update Apache and mod_ssl using new build layout (see post to tech-pkg for

details).  No security fixes in Apache 1.3.3, so immediate upgrade from
1.3.2 is not necessary.

13 files changed, 676 insertions, 315 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 9cf596d24e9..aaef885333e 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,65 +1,83 @@
-# $NetBSD: Makefile,v 1.24 1998/11/12 23:54:33 frueauf Exp $
+# $NetBSD: Makefile,v 1.25 1998/12/03 17:23:52 tv Exp $
 #
-# The apache-modssl pkg .include's us, so that pkg tuning rules work for
-# both without a major duplication of Makefiles.  So we use ?= and += in
-# many of the constructs up here at top.
+# 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
+# EAPI when there has been no change to the Apache version number).
 #
+# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
+# code hooks that allow mod_ssl to be compiled separately later, if desired).
+#
+
+DISTNAME=		apache_1.3.3
+PKGNAME=		apache-1.3.3.0
+CATEGORIES=		www
+MASTER_SITES=		http://www.apache.org/dist/ \
+			http://www.engelschall.com/sw/mod_ssl/distrib/ \
+			http://www.netbsd.org/images/logos/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
+			${SSL_DISTNAME}${EXTRACT_SUFX} \
+			sitedrivenby.gif
 
-DISTNAME=	apache_1.3.2
-PKGNAME=	apache-1.3.2
-CATEGORIES=	www
-MASTER_SITES+=	http://www.apache.org/dist/ \
-		http://www.netbsd.org/images/logos/
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} \
-		sitedrivenby.gif
+MAINTAINER=		cjs@netbsd.org
+HOMEPAGE=		http://www.apache.org/
 
-MAINTAINER=	cjs@netbsd.org
-HOMEPAGE=	http://www.apache.org/
+CONFLICTS=		apache-1.3.[012] apache-*modssl-*
 
-EXTRACT_ONLY+=	${DISTNAME}${EXTRACT_SUFX}
-CONFLICTS?=	apache-1.3.0 apache-1.3.1 apache-modssl-1.3.1 apache-modssl-1.3.2.2012
-HAS_CONFIGURE=	YES
-CONFIGURE_ARGS+=--compat --prefix=${PREFIX}/http --exec-prefix=${PREFIX} \
-		--mandir=${PREFIX}/man --libexecdir=${PREFIX}/lib/apache \
-		--sbindir=${PREFIX}/sbin --runtimedir=/var/run \
-		--enable-module=most --enable-module=auth_db \
-		--disable-module=auth_dbm --with-perl=${PREFIX}/bin/perl
-CONFIGURE_ENV+=	OPTIM='${OPTIM}'
-OPTIM=		-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin\\"
+SSL_DISTNAME=		mod_ssl-2.1.2-1.3.3
+
+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 \
+			--enable-rule=EAPI --enable-module=most \
+			--disable-module=ssl --enable-module=auth_db \
+			--disable-module=auth_dbm \
+			--with-perl=${PREFIX}/bin/perl
+CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 
 .if defined(APACHE_SUEXEC)
-CONFIGURE_ARGS+=--enable-suexec --suexec-caller=www \
-		--suexec-userdir=WWW \
-		--suexec-safepath='${PREFIX}/bin:/usr/local/bin:/usr/bin:/bin'
+CONFIGURE_ARGS+=	--enable-suexec --suexec-caller=www \
+			--suexec-userdir=WWW \
+			--suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin'
 .endif
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-CONFIGURE_ARGS+=--disable-rule=STATUS
-OPTIM+=		-DBUFFERED_LOGS
-CFLAGS+=	-O6 -fomit-frame-pointer -fexpensive-optimizations
+CONFIGURE_ARGS+=	--disable-rule=STATUS
+OPTIM+=			-DBUFFERED_LOGS
+CFLAGS+=		-O6 -fomit-frame-pointer -fexpensive-optimizations
 .endif
 
 # 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}
 post-patch:
+	@cd ${WRKSRC}/src/include && \
+		${SED} -e s,@@PREFIX@@,${PREFIX}, ap_config.h >tmp && \
+		${MV} -f tmp ap_config.h
 	@find ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM}
 
 post-install:
-	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/http/htdocs
+	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/httpd
 
 .include "../../mk/bsd.pkg.mk"
 
-# Define some modules that are often replaced as shared modules that can be
-# changed at runtime.  This allows an apxs-compiled .so to be "dropped in"
-# without even changing httpd.conf.
-# Only those defined here should be in PLIST-mi.shared.
-
 .if !defined(NOPIC)
-CONFIGURE_ARGS+=--enable-module=so --enable-shared=include
-.endif
-
-.if (${SHLIB_TYPE} == "ELF")
-CONFIGURE_ENV+=	LDFLAGS_SHLIB_EXPORT=-Wl,--export-dynamic
+CONFIGURE_ARGS+=	--enable-module=so
 .endif
diff --git a/www/apache/files/ap_include_extern.h b/www/apache/files/ap_include_extern.h
new file mode 100644
index 00000000000..b7a36b2b8c7
--- /dev/null
+++ b/www/apache/files/ap_include_extern.h
@@ -0,0 +1,78 @@
+/* $NetBSD: ap_include_extern.h,v 1.1 1998/12/03 17:23:52 tv Exp $ */
+/* ====================================================================
+ * Copyright (c) 1998 The Apache Group.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the Apache Group
+ *    for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the Apache Group
+ *    for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+
+#ifndef AP_INCLUDE_EXTERN_H
+#define AP_INCLUDE_EXTERN_H
+
+/*
+ * XSSI extensibility hooks.
+ *
+ * This allows other modules to "hook" themselves into the Apache XSSI
+ * (mod_include) handler list without requiring modification to the
+ * mod_include source code.
+ */
+
+typedef int (*ap_include_extern_func)(FILE *, request_rec *, const char *);
+
+/* The const char * argument is the command word used to find this hook. */
+API_EXPORT(int) ap_register_include_extern(const char *, ap_include_extern_func);
+
+/* Formerly a static "get_tag()" in mod_include.c */
+API_EXPORT(char *) ap_include_get_tag(pool *, FILE *, char *, int, int);
+
+#endif
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index cbc0a28ba21..5c1cf827900 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1,4 +1,5 @@
-$NetBSD: md5,v 1.8 1998/10/03 22:00:22 tv Exp $
+$NetBSD: md5,v 1.9 1998/12/03 17:23:52 tv Exp $
 
-MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f
+MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
+MD5 (mod_ssl-2.1.2-1.3.3.tar.gz) = a054804ba2a895b1fc53727c9b52ce54
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
new file mode 100644
index 00000000000..5b2b98df384
--- /dev/null
+++ b/www/apache/patches/patch-aa
@@ -0,0 +1,50 @@
+$NetBSD: patch-aa,v 1.6 1998/12/03 17:23:52 tv Exp $
+
+--- Makefile.tmpl.orig	Thu Dec  3 07:42:35 1998
++++ Makefile.tmpl	Thu Dec  3 08:22:10 1998
+@@ -275,7 +275,7 @@
+ 	$(MKDIR) $(root)$(sysconfdir)/ssl.key
+ 	$(MKDIR) $(root)$(datadir)/htdocs
+ 	$(MKDIR) $(root)$(datadir)/icons
+-	$(MKDIR) $(root)$(datadir)/cgi-bin
++	$(MKDIR) $(root)$(prefix)/libexec/cgi-bin
+ 	$(MKDIR) $(root)$(includedir)
+ 	$(MKDIR) $(root)$(runtimedir)
+ 	$(MKDIR) $(root)$(logfiledir)
+@@ -352,6 +352,7 @@
+ 	@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl"; \
+ 	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/httpd.pid;' \
+ 		-e 's;HTTPD=.*;HTTPD=$(sbindir)/httpd;' \
++		-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
+ 		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ 		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
+ 	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1
+@@ -413,15 +414,15 @@
+ 		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
+ 		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
+ 	fi
+-	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
+-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
++	-@if [ -f $(root)$(prefix)/libexec/cgi-bin/printenv ]; then \
++		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(prefix)/libexec/cgi-bin/]"; \
+ 	else \
+ 		for script in printenv test-cgi; do \
+ 			cat $(TOP)/cgi-bin/$${script} |\
+ 			sed -e 's;^#!/.*perl;#!$(PERL);' \
+         		> $(TOP)/$(SRC)/.apaci.install.tmp; \
+-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}"; \
+-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script}; \
++			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(prefix)/libexec/cgi-bin/$${script}"; \
++			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(prefix)/libexec/cgi-bin/$${script}; \
+ 		done; \
+ 	fi
+ 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+@@ -450,7 +451,7 @@
+ 			-e 's;@@ServerRoot@@/conf/ssl.key;$(sysconfdir)/ssl.key;' \
+ 			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ 			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+-			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
++			-e 's;@@ServerRoot@@/cgi-bin;$(prefix)/libexec/cgi-bin;' \
+ 			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+ 			-e 's;@@ServerRoot@@;$(prefix);' \
+ 			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab
index 19c65dc043b..d39ff875340 100644
--- a/www/apache/patches/patch-ab
+++ b/www/apache/patches/patch-ab
@@ -1,17 +1,26 @@
-$NetBSD: patch-ab,v 1.4 1998/11/12 23:54:33 frueauf Exp $
+$NetBSD: patch-ab,v 1.5 1998/12/03 17:23:52 tv Exp $
 
---- htdocs/index.html.orig	Sat Sep  5 22:09:30 1998
-+++ htdocs/index.html	Sat Sep  5 22:37:43 1998
-@@ -39,13 +39,18 @@
+--- htdocs/index.html.orig	Wed May 20 10:59:42 1998
++++ htdocs/index.html	Thu Dec  3 09:48:59 1998
+@@ -38,14 +38,26 @@
+   <A
     HREF="manual/index.html"
    >documentation</A>
-   has been included with this distribution.
-+  Information on the NetBSD multiplatform operating system can be found
-+  at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
+-  has been included with this distribution.
++  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>
 -  The Webmaster of this site is free to use the image below on
 -  an Apache-powered Web server.  Thanks for using Apache!
++  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>
 +  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>
diff --git a/www/apache/patches/patch-ad b/www/apache/patches/patch-ad
index ce47debd6d0..e5ab86e7208 100644
--- a/www/apache/patches/patch-ad
+++ b/www/apache/patches/patch-ad
@@ -1,10 +1,16 @@
-$NetBSD: patch-ad,v 1.2 1998/11/12 23:54:33 frueauf Exp $
+$NetBSD: patch-ad,v 1.3 1998/12/03 17:23:52 tv Exp $
 
-This patch is necessary for listening on multiple ports safely. It has
-been submitted to the apache group, the gnats ID is os-netbsd/3120.
-
---- src/include/ap_config.h~	Thu Sep 17 23:49:12 1998
-+++ src/include/ap_config.h	Mon Oct  5 09:41:28 1998
+--- src/include/ap_config.h.orig	Sat Oct  3 11:33:35 1998
++++ src/include/ap_config.h	Wed Dec  2 11:18:59 1998
+@@ -398,7 +398,7 @@
+ #define DEFAULT_USER_DIR        "Library/Web Documents"
+ #define DEFAULT_USER            "nobody"
+ #define DEFAULT_GROUP           "nogroup"
+-#define DEFAULT_PATH            "/bin:/usr/bin:/usr/local/bin"
++#define DEFAULT_PATH            "/bin:/usr/bin:@@PREFIX@@/bin:/usr/local/bin"
+ #endif
+ 
+ #elif defined(LINUX)
 @@ -592,6 +592,7 @@
  #define HAVE_MMAP 1
  #define USE_MMAP_SCOREBOARD
diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae
new file mode 100644
index 00000000000..c62896b6ab3
--- /dev/null
+++ b/www/apache/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 1998/12/03 17:23:53 tv 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.  
diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af
new file mode 100644
index 00000000000..e702eea2084
--- /dev/null
+++ b/www/apache/patches/patch-af
@@ -0,0 +1,105 @@
+$NetBSD: patch-af,v 1.1 1998/12/03 17:23:53 tv Exp $
+
+--- src/modules/standard/mod_include.c.orig	Thu Sep 24 10:06:42 1998
++++ src/modules/standard/mod_include.c	Wed Dec  2 10:36:06 1998
+@@ -92,7 +92,9 @@
+ #include "http_log.h"
+ #include "http_main.h"
+ #include "util_script.h"
++#include "ap_include_extern.h"
+ #endif
++#define get_tag ap_include_get_tag
+ 
+ #define STARTING_SEQUENCE "<!--#"
+ #define ENDING_SEQUENCE "-->"
+@@ -111,6 +113,12 @@
+ /* just need some arbitrary non-NULL pointer which can't also be a request_rec */
+ #define NESTED_INCLUDE_MAGIC	(&includes_module)
+ 
++static struct extern_handler {
++    struct extern_handler *next;
++    char cmd[20];
++    ap_include_extern_func func;
++} *extern_handlers;
++
+ /* ------------------------ Environment function -------------------------- */
+ 
+ /* XXX: could use ap_table_overlap here */
+@@ -354,7 +362,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;
+ 
+@@ -2090,6 +2099,50 @@
+     }
+ }
+ 
++API_EXPORT(int)
++ap_register_include_extern(const char *cmd, ap_include_extern_func func) {
++    struct extern_handler *h;
++
++    for (h = extern_handlers; h; h = h->next)
++	if (!strncmp(h->cmd, cmd, 20))
++	    return -1;
++    if (!(h = calloc(1, sizeof(*h))))
++	return -1;
++
++    h->next = extern_handlers;
++    strncpy(h->cmd, cmd, 20);
++    h->func = func;
++    extern_handlers = h;
++    return 0;
++}
++
++/*
++ * Since we should be compiled in, dynamic modules will all initialize
++ * _after_ us.  This assumption breaks if mod_includes is made dynamic,
++ * or if modules using ap_register_include_extern() are compiled in.
++ */
++static void includes_init(server_rec *s, pool *p) {
++    struct extern_handler *h, *n;
++
++    for (h = extern_handlers; h; h = n) {
++	n = h->next;
++	free(h);
++    }
++    extern_handlers = NULL;
++}
++
++static int do_externs(FILE *in, request_rec *r, const char *error,
++		      const char *cmd, int *ret) {
++    struct extern_handler *h;
++
++    for (h = extern_handlers; h; h = h->next)
++	if (!strncmp(h->cmd, cmd, 20)) {
++	    *ret = (*h->func)(in, r, error);
++	    return 0;
++	}
++    return -1;
++}
++
+ 
+ 
+ /* -------------------------- The main function --------------------------- */
+@@ -2213,6 +2266,7 @@
+                 ret = handle_perl(f, r, error);
+             }
+ #endif
++	    else if (!do_externs(f, r, error, directive, &ret)) {}
+             else {
+                 ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+                             "httpd: unknown directive \"%s\" "
+@@ -2420,7 +2474,7 @@
+ module MODULE_VAR_EXPORT includes_module =
+ {
+     STANDARD_MODULE_STUFF,
+-    NULL,                       /* initializer */
++    includes_init,              /* initializer */
+     create_includes_dir_config, /* dir config creater */
+     NULL,                       /* dir merger --- default is to override */
+     NULL,                       /* server config */
diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag
new file mode 100644
index 00000000000..c865314e7d8
--- /dev/null
+++ b/www/apache/patches/patch-ag
@@ -0,0 +1,27 @@
+$NetBSD: patch-ag,v 1.1 1998/12/03 17:23:53 tv Exp $
+
+--- src/Configure.orig	Wed Oct  7 05:19:30 1998
++++ src/Configure	Wed Dec  2 11:49:22 1998
+@@ -913,16 +914,15 @@
+             LDFLAGS_SHLIB_EXPORT=""
+             SHLIB_SUFFIX_DEPTH=2
+             ;;
+-        alpha-*-netbsd*|mips-*-netbsd*|powerpc-*-netbsd*)
+-            CFLAGS_SHLIB="-fpic -DPIC"
+-            LDFLAGS_SHLIB="-shared"
+-            LDFLAGS_SHLIB_EXPORT=""
+-            SHLIB_SUFFIX_DEPTH=2
+-            ;;
+         *-netbsd*)
+-            CFLAGS_SHLIB="-fpic -DPIC"
++            CFLAGS_SHLIB="-fPIC -DPIC"
++if echo __ELF__ | ${CC} -E - | grep -q __ELF__; then
+             LDFLAGS_SHLIB="-Bshareable"
+             LDFLAGS_SHLIB_EXPORT=""
++else
++            LDFLAGS_SHLIB="-shared"
++            LDFLAGS_SHLIB_EXPORT="-Wl,-E"
++fi
+             SHLIB_SUFFIX_DEPTH=2
+             ;;
+         *-apple-rhapsody*)
diff --git a/www/apache/patches/patch-ah b/www/apache/patches/patch-ah
new file mode 100644
index 00000000000..eb8516f607d
--- /dev/null
+++ b/www/apache/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 1998/12/03 17:23:53 tv Exp $
+
+--- src/modules/standard/mod_so.c.orig	Sat Sep 19 08:27:24 1998
++++ src/modules/standard/mod_so.c	Thu Dec  3 07:59:19 1998
+@@ -289,6 +296,9 @@
+     void *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))) {
diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai
new file mode 100644
index 00000000000..e3d3e794fc6
--- /dev/null
+++ b/www/apache/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 1998/12/03 17:23:54 tv Exp $
+
+--- htdocs/manual/mod/index.html.orig	Thu Dec  3 10:16:58 1998
++++ htdocs/manual/mod/index.html	Thu Dec  3 10:17:57 1998
+@@ -111,6 +111,8 @@
+ <DD>Experimental support for loading modules (DLLs on Windows) at runtime
+ <DT><A HREF="mod_speling.html">mod_speling</A> Apache 1.3 and up
+ <DD>Automatically correct minor typos in URLs
++<DT><A HREF="mod_ssl/index.html">mod_ssl</A> Apache 1.3 with mod_ssl applied
++<DD>Apache SSL interface to SSLeay
+ <DT><A HREF="mod_status.html">mod_status</A>
+ <DD>Server status display
+ <DT><A HREF="mod_userdir.html">mod_userdir</A>
diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj
new file mode 100644
index 00000000000..fb982398e78
--- /dev/null
+++ b/www/apache/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 1998/12/03 17:23:54 tv Exp $
+
+--- conf/httpd.conf-dist.orig	Thu Dec  3 11:05:29 1998
++++ conf/httpd.conf-dist	Thu Dec  3 11:07:26 1998
+@@ -18,7 +18,16 @@
+ # binary.
+ #
+ # 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.2
++LoadFile !libcrypto.so.0
++LoadFile !libssl.so.0
++LoadModule ssl_module lib/httpd/mod_ssl.so
++AddModule mod_ssl.c
++</IfDefine>
+ 
+ # ServerType is either inetd, or standalone.
+ 
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
index e060651cc54..0632fa34389 100644
--- a/www/apache/pkg/PLIST
+++ b/www/apache/pkg/PLIST
@@ -1,252 +1,53 @@
-@comment $NetBSD: PLIST,v 1.5 1998/10/03 22:00:23 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/12/03 17:23:54 tv Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
-http/cgi-bin/printenv
-http/cgi-bin/test-cgi
-http/conf/access.conf
-http/conf/access.conf.default
-http/conf/httpd.conf
-http/conf/httpd.conf.default
-http/conf/magic
-http/conf/magic.default
-http/conf/mime.types
-http/conf/mime.types.default
-http/conf/srm.conf
-http/conf/srm.conf.default
-http/htdocs/apache_pb.gif
-http/htdocs/sitedrivenby.gif
-http/htdocs/index.html
-http/htdocs/manual/LICENSE
-http/htdocs/manual/bind.html
-http/htdocs/manual/cgi_path.html
-http/htdocs/manual/content-negotiation.html
-http/htdocs/manual/custom-error.html
-http/htdocs/manual/dns-caveats.html
-http/htdocs/manual/dso.html
-http/htdocs/manual/ebcdic.html
-http/htdocs/manual/env.html
-http/htdocs/manual/footer.html
-http/htdocs/manual/handler.html
-http/htdocs/manual/header.html
-http/htdocs/manual/images/custom_errordocs.gif
-http/htdocs/manual/images/home.gif
-http/htdocs/manual/images/index.gif
-http/htdocs/manual/images/mod_rewrite_fig1.fig
-http/htdocs/manual/images/mod_rewrite_fig1.gif
-http/htdocs/manual/images/mod_rewrite_fig2.fig
-http/htdocs/manual/images/mod_rewrite_fig2.gif
-http/htdocs/manual/images/sub.gif
-http/htdocs/manual/index.html
-http/htdocs/manual/install.html
-http/htdocs/manual/invoking.html
-http/htdocs/manual/keepalive.html
-http/htdocs/manual/location.html
-http/htdocs/manual/man-template.html
-http/htdocs/manual/misc/API.html
-http/htdocs/manual/misc/FAQ.html
-http/htdocs/manual/misc/HTTP_Features.tsv
-http/htdocs/manual/misc/client_block_api.html
-http/htdocs/manual/misc/compat_notes.html
-http/htdocs/manual/misc/custom_errordocs.html
-http/htdocs/manual/misc/descriptors.html
-http/htdocs/manual/misc/fin_wait_2.html
-http/htdocs/manual/misc/footer.html
-http/htdocs/manual/misc/header.html
-http/htdocs/manual/misc/howto.html
-http/htdocs/manual/misc/index.html
-http/htdocs/manual/misc/known_client_problems.html
-http/htdocs/manual/misc/nopgp.html
-http/htdocs/manual/misc/perf-bsd44.html
-http/htdocs/manual/misc/perf-dec.html
-http/htdocs/manual/misc/perf-hp.html
-http/htdocs/manual/misc/perf-tuning.html
-http/htdocs/manual/misc/perf.html
-http/htdocs/manual/misc/security_tips.html
-http/htdocs/manual/misc/vif-info.html
-http/htdocs/manual/misc/windoz_keepalive.html
-http/htdocs/manual/mod/core.html
-http/htdocs/manual/mod/directive-dict.html
-http/htdocs/manual/mod/directives.html
-http/htdocs/manual/mod/footer.html
-http/htdocs/manual/mod/header.html
-http/htdocs/manual/mod/index.html
-http/htdocs/manual/mod/mod_access.html
-http/htdocs/manual/mod/mod_actions.html
-http/htdocs/manual/mod/mod_alias.html
-http/htdocs/manual/mod/mod_asis.html
-http/htdocs/manual/mod/mod_auth.html
-http/htdocs/manual/mod/mod_auth_anon.html
-http/htdocs/manual/mod/mod_auth_db.html
-http/htdocs/manual/mod/mod_auth_dbm.html
-http/htdocs/manual/mod/mod_autoindex.html
-http/htdocs/manual/mod/mod_browser.html
-http/htdocs/manual/mod/mod_cern_meta.html
-http/htdocs/manual/mod/mod_cgi.html
-http/htdocs/manual/mod/mod_cookies.html
-http/htdocs/manual/mod/mod_digest.html
-http/htdocs/manual/mod/mod_dir.html
-http/htdocs/manual/mod/mod_dld.html
-http/htdocs/manual/mod/mod_dll.html
-http/htdocs/manual/mod/mod_env.html
-http/htdocs/manual/mod/mod_example.html
-http/htdocs/manual/mod/mod_expires.html
-http/htdocs/manual/mod/mod_headers.html
-http/htdocs/manual/mod/mod_imap.html
-http/htdocs/manual/mod/mod_include.html
-http/htdocs/manual/mod/mod_info.html
-http/htdocs/manual/mod/mod_isapi.html
-http/htdocs/manual/mod/mod_log_agent.html
-http/htdocs/manual/mod/mod_log_common.html
-http/htdocs/manual/mod/mod_log_config.html
-http/htdocs/manual/mod/mod_log_referer.html
-http/htdocs/manual/mod/mod_mime.html
-http/htdocs/manual/mod/mod_mime_magic.html
-http/htdocs/manual/mod/mod_mmap_static.html
-http/htdocs/manual/mod/mod_negotiation.html
-http/htdocs/manual/mod/mod_proxy.html
-http/htdocs/manual/mod/mod_rewrite.html
-http/htdocs/manual/mod/mod_setenvif.html
-http/htdocs/manual/mod/mod_so.html
-http/htdocs/manual/mod/mod_speling.html
-http/htdocs/manual/mod/mod_status.html
-http/htdocs/manual/mod/mod_unique_id.html
-http/htdocs/manual/mod/mod_userdir.html
-http/htdocs/manual/mod/mod_usertrack.html
-http/htdocs/manual/multilogs.html
-http/htdocs/manual/new_features_1_0.html
-http/htdocs/manual/new_features_1_1.html
-http/htdocs/manual/new_features_1_2.html
-http/htdocs/manual/new_features_1_3.html
-http/htdocs/manual/process-model.html
-http/htdocs/manual/sections.html
-http/htdocs/manual/sourcereorg.html
-http/htdocs/manual/stopping.html
-http/htdocs/manual/suexec.html
-http/htdocs/manual/unixware.html
-http/htdocs/manual/upgrading_to_1_3.html
-http/htdocs/manual/vhosts/details.html
-http/htdocs/manual/vhosts/details_1_2.html
-http/htdocs/manual/vhosts/examples.html
-http/htdocs/manual/vhosts/fd-limits.html
-http/htdocs/manual/vhosts/footer.html
-http/htdocs/manual/vhosts/header.html
-http/htdocs/manual/vhosts/host.html
-http/htdocs/manual/vhosts/index.html
-http/htdocs/manual/vhosts/ip-based.html
-http/htdocs/manual/vhosts/name-based.html
-http/htdocs/manual/vhosts/vhosts-in-depth.html
-http/htdocs/manual/vhosts/virtual-host.html
-http/htdocs/manual/windows.html
-http/icons/README
-http/icons/a.gif
-http/icons/alert.black.gif
-http/icons/alert.red.gif
-http/icons/apache_pb.gif
-http/icons/back.gif
-http/icons/ball.gray.gif
-http/icons/ball.red.gif
-http/icons/binary.gif
-http/icons/binhex.gif
-http/icons/blank.gif
-http/icons/bomb.gif
-http/icons/box1.gif
-http/icons/box2.gif
-http/icons/broken.gif
-http/icons/burst.gif
-http/icons/c.gif
-http/icons/comp.blue.gif
-http/icons/comp.gray.gif
-http/icons/compressed.gif
-http/icons/continued.gif
-http/icons/dir.gif
-http/icons/down.gif
-http/icons/dvi.gif
-http/icons/f.gif
-http/icons/folder.gif
-http/icons/folder.open.gif
-http/icons/folder.sec.gif
-http/icons/forward.gif
-http/icons/generic.gif
-http/icons/generic.red.gif
-http/icons/generic.sec.gif
-http/icons/hand.right.gif
-http/icons/hand.up.gif
-http/icons/icon.sheet.gif
-http/icons/image1.gif
-http/icons/image2.gif
-http/icons/image3.gif
-http/icons/index.gif
-http/icons/layout.gif
-http/icons/left.gif
-http/icons/link.gif
-http/icons/movie.gif
-http/icons/p.gif
-http/icons/patch.gif
-http/icons/pdf.gif
-http/icons/pie0.gif
-http/icons/pie1.gif
-http/icons/pie2.gif
-http/icons/pie3.gif
-http/icons/pie4.gif
-http/icons/pie5.gif
-http/icons/pie6.gif
-http/icons/pie7.gif
-http/icons/pie8.gif
-http/icons/portal.gif
-http/icons/ps.gif
-http/icons/quill.gif
-http/icons/right.gif
-http/icons/screw1.gif
-http/icons/screw2.gif
-http/icons/script.gif
-http/icons/sound1.gif
-http/icons/sound2.gif
-http/icons/sphere1.gif
-http/icons/sphere2.gif
-http/icons/tar.gif
-http/icons/tex.gif
-http/icons/text.gif
-http/icons/transfer.gif
-http/icons/unknown.gif
-http/icons/up.gif
-http/icons/uu.gif
-http/icons/uuencoded.gif
-http/icons/world1.gif
-http/icons/world2.gif
-http/include/alloc.h
-http/include/ap.h
-http/include/ap_config.h
-http/include/ap_config_auto.h
-http/include/ap_compat.h
-http/include/ap_ctype.h
-http/include/ap_md5.h
-http/include/ap_mmn.h
-http/include/buff.h
-http/include/compat.h
-http/include/conf.h
-http/include/explain.h
-http/include/fnmatch.h
-http/include/hsregex.h
-http/include/http_conf_globals.h
-http/include/http_config.h
-http/include/http_core.h
-http/include/http_log.h
-http/include/http_main.h
-http/include/http_protocol.h
-http/include/http_request.h
-http/include/http_vhost.h
-http/include/httpd.h
-http/include/multithread.h
-http/include/os.h
-http/include/rfc1413.h
-http/include/scoreboard.h
-http/include/util_date.h
-http/include/util_md5.h
-http/include/util_script.h
-http/include/util_uri.h
-lib/apache/mod_include.so
-@exec mkdir -p %D/http/logs %D/http/proxy %D/lib/apache
+etc/httpd/access.conf.default
+@exec if [ ! -f %D/etc/httpd/access.conf ]; cp -p %D/etc/httpd/access.conf.default %D/etc/httpd/access.conf; fi
+etc/httpd/httpd.conf.default
+@exec if [ ! -f %D/etc/httpd/httpd.conf ]; 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 ]; 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 ]; cp -p %D/etc/httpd/mime.types.default %D/etc/httpd/mime.types; fi
+etc/httpd/srm.conf.default
+@exec if [ ! -f %D/etc/httpd/srm.conf ]; cp -p %D/etc/httpd/srm.conf.default %D/etc/httpd/srm.conf; fi
+include/httpd/alloc.h
+include/httpd/ap.h
+include/httpd/ap_compat.h
+include/httpd/ap_config.h
+include/httpd/ap_config_auto.h
+include/httpd/ap_ctx.h
+include/httpd/ap_ctype.h
+include/httpd/ap_hook.h
+include/httpd/ap_include_extern.h
+include/httpd/ap_md5.h
+include/httpd/ap_mmn.h
+include/httpd/buff.h
+include/httpd/compat.h
+include/httpd/conf.h
+include/httpd/explain.h
+include/httpd/fnmatch.h
+include/httpd/hsregex.h
+include/httpd/http_conf_globals.h
+include/httpd/http_config.h
+include/httpd/http_core.h
+include/httpd/http_log.h
+include/httpd/http_main.h
+include/httpd/http_protocol.h
+include/httpd/http_request.h
+include/httpd/http_vhost.h
+include/httpd/httpd.h
+include/httpd/multithread.h
+include/httpd/os.h
+include/httpd/rfc1413.h
+include/httpd/scoreboard.h
+include/httpd/util_date.h
+include/httpd/util_md5.h
+include/httpd/util_script.h
+include/httpd/util_uri.h
+libexec/cgi-bin/printenv
+libexec/cgi-bin/test-cgi
 man/man1/ab.1
 man/man1/apachectl.1
 man/man1/dbmmanage.1
@@ -262,17 +63,220 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-@dirrm lib/apache
-@dirrm http/cgi-bin
-@dirrm http/conf
-@dirrm http/htdocs/manual/images
-@dirrm http/htdocs/manual/misc
-@dirrm http/htdocs/manual/mod
-@dirrm http/htdocs/manual/vhosts
-@dirrm http/htdocs/manual
-@dirrm http/htdocs
-@dirrm http/icons
-@dirrm http/include
-@dirrm http/logs
-@dirrm http/proxy
-@dirrm http
+share/httpd/htdocs/apache_pb.gif
+share/httpd/htdocs/index.html
+share/httpd/htdocs/manual/LICENSE
+share/httpd/htdocs/manual/bind.html
+share/httpd/htdocs/manual/cgi_path.html
+share/httpd/htdocs/manual/content-negotiation.html
+share/httpd/htdocs/manual/custom-error.html
+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/header.html
+share/httpd/htdocs/manual/images/custom_errordocs.gif
+share/httpd/htdocs/manual/images/home.gif
+share/httpd/htdocs/manual/images/index.gif
+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/sub.gif
+share/httpd/htdocs/manual/index.html
+share/httpd/htdocs/manual/install.html
+share/httpd/htdocs/manual/invoking.html
+share/httpd/htdocs/manual/keepalive.html
+share/httpd/htdocs/manual/location.html
+share/httpd/htdocs/manual/man-template.html
+share/httpd/htdocs/manual/misc/API.html
+share/httpd/htdocs/manual/misc/FAQ.html
+share/httpd/htdocs/manual/misc/HTTP_Features.tsv
+share/httpd/htdocs/manual/misc/client_block_api.html
+share/httpd/htdocs/manual/misc/compat_notes.html
+share/httpd/htdocs/manual/misc/custom_errordocs.html
+share/httpd/htdocs/manual/misc/descriptors.html
+share/httpd/htdocs/manual/misc/fin_wait_2.html
+share/httpd/htdocs/manual/misc/footer.html
+share/httpd/htdocs/manual/misc/header.html
+share/httpd/htdocs/manual/misc/howto.html
+share/httpd/htdocs/manual/misc/index.html
+share/httpd/htdocs/manual/misc/known_client_problems.html
+share/httpd/htdocs/manual/misc/nopgp.html
+share/httpd/htdocs/manual/misc/perf-bsd44.html
+share/httpd/htdocs/manual/misc/perf-dec.html
+share/httpd/htdocs/manual/misc/perf-hp.html
+share/httpd/htdocs/manual/misc/perf-tuning.html
+share/httpd/htdocs/manual/misc/perf.html
+share/httpd/htdocs/manual/misc/security_tips.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/directives.html
+share/httpd/htdocs/manual/mod/footer.html
+share/httpd/htdocs/manual/mod/header.html
+share/httpd/htdocs/manual/mod/index.html
+share/httpd/htdocs/manual/mod/mod_access.html
+share/httpd/htdocs/manual/mod/mod_actions.html
+share/httpd/htdocs/manual/mod/mod_alias.html
+share/httpd/htdocs/manual/mod/mod_asis.html
+share/httpd/htdocs/manual/mod/mod_auth.html
+share/httpd/htdocs/manual/mod/mod_auth_anon.html
+share/httpd/htdocs/manual/mod/mod_auth_db.html
+share/httpd/htdocs/manual/mod/mod_auth_dbm.html
+share/httpd/htdocs/manual/mod/mod_autoindex.html
+share/httpd/htdocs/manual/mod/mod_browser.html
+share/httpd/htdocs/manual/mod/mod_cern_meta.html
+share/httpd/htdocs/manual/mod/mod_cgi.html
+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
+share/httpd/htdocs/manual/mod/mod_headers.html
+share/httpd/htdocs/manual/mod/mod_imap.html
+share/httpd/htdocs/manual/mod/mod_include.html
+share/httpd/htdocs/manual/mod/mod_info.html
+share/httpd/htdocs/manual/mod/mod_isapi.html
+share/httpd/htdocs/manual/mod/mod_log_agent.html
+share/httpd/htdocs/manual/mod/mod_log_common.html
+share/httpd/htdocs/manual/mod/mod_log_config.html
+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_proxy.html
+share/httpd/htdocs/manual/mod/mod_rewrite.html
+share/httpd/htdocs/manual/mod/mod_setenvif.html
+share/httpd/htdocs/manual/mod/mod_so.html
+share/httpd/htdocs/manual/mod/mod_speling.html
+share/httpd/htdocs/manual/mod/mod_status.html
+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/multilogs.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/process-model.html
+share/httpd/htdocs/manual/sections.html
+share/httpd/htdocs/manual/sourcereorg.html
+share/httpd/htdocs/manual/stopping.html
+share/httpd/htdocs/manual/suexec.html
+share/httpd/htdocs/manual/unixware.html
+share/httpd/htdocs/manual/upgrading_to_1_3.html
+share/httpd/htdocs/manual/vhosts/details.html
+share/httpd/htdocs/manual/vhosts/details_1_2.html
+share/httpd/htdocs/manual/vhosts/examples.html
+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/ip-based.html
+share/httpd/htdocs/manual/vhosts/name-based.html
+share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
+share/httpd/htdocs/manual/vhosts/virtual-host.html
+share/httpd/htdocs/manual/windows.html
+share/httpd/htdocs/sitedrivenby.gif
+share/httpd/icons/README
+share/httpd/icons/a.gif
+share/httpd/icons/alert.black.gif
+share/httpd/icons/alert.red.gif
+share/httpd/icons/apache_pb.gif
+share/httpd/icons/back.gif
+share/httpd/icons/ball.gray.gif
+share/httpd/icons/ball.red.gif
+share/httpd/icons/binary.gif
+share/httpd/icons/binhex.gif
+share/httpd/icons/blank.gif
+share/httpd/icons/bomb.gif
+share/httpd/icons/box1.gif
+share/httpd/icons/box2.gif
+share/httpd/icons/broken.gif
+share/httpd/icons/burst.gif
+share/httpd/icons/c.gif
+share/httpd/icons/comp.blue.gif
+share/httpd/icons/comp.gray.gif
+share/httpd/icons/compressed.gif
+share/httpd/icons/continued.gif
+share/httpd/icons/dir.gif
+share/httpd/icons/down.gif
+share/httpd/icons/dvi.gif
+share/httpd/icons/f.gif
+share/httpd/icons/folder.gif
+share/httpd/icons/folder.open.gif
+share/httpd/icons/folder.sec.gif
+share/httpd/icons/forward.gif
+share/httpd/icons/generic.gif
+share/httpd/icons/generic.red.gif
+share/httpd/icons/generic.sec.gif
+share/httpd/icons/hand.right.gif
+share/httpd/icons/hand.up.gif
+share/httpd/icons/icon.sheet.gif
+share/httpd/icons/image1.gif
+share/httpd/icons/image2.gif
+share/httpd/icons/image3.gif
+share/httpd/icons/index.gif
+share/httpd/icons/layout.gif
+share/httpd/icons/left.gif
+share/httpd/icons/link.gif
+share/httpd/icons/movie.gif
+share/httpd/icons/p.gif
+share/httpd/icons/patch.gif
+share/httpd/icons/pdf.gif
+share/httpd/icons/pie0.gif
+share/httpd/icons/pie1.gif
+share/httpd/icons/pie2.gif
+share/httpd/icons/pie3.gif
+share/httpd/icons/pie4.gif
+share/httpd/icons/pie5.gif
+share/httpd/icons/pie6.gif
+share/httpd/icons/pie7.gif
+share/httpd/icons/pie8.gif
+share/httpd/icons/portal.gif
+share/httpd/icons/ps.gif
+share/httpd/icons/quill.gif
+share/httpd/icons/right.gif
+share/httpd/icons/screw1.gif
+share/httpd/icons/screw2.gif
+share/httpd/icons/script.gif
+share/httpd/icons/sound1.gif
+share/httpd/icons/sound2.gif
+share/httpd/icons/sphere1.gif
+share/httpd/icons/sphere2.gif
+share/httpd/icons/tar.gif
+share/httpd/icons/tex.gif
+share/httpd/icons/text.gif
+share/httpd/icons/transfer.gif
+share/httpd/icons/unknown.gif
+share/httpd/icons/up.gif
+share/httpd/icons/uu.gif
+share/httpd/icons/uuencoded.gif
+share/httpd/icons/world1.gif
+share/httpd/icons/world2.gif
+@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
+@unexec rmdir /var/log/httpd /var/spool/httpd/proxy /var/spool/httpd 2>/dev/null || true
+@dirrm etc/httpd/ssl.crt
+@dirrm etc/httpd/ssl.csr
+@dirrm etc/httpd/ssl.key
+@dirrm etc/httpd
+@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/vhosts
+@dirrm share/httpd/htdocs/manual
+@dirrm share/httpd/htdocs
+@dirrm share/httpd/icons
+@dirrm share/httpd