Update to 1.3b7 and rework the Makefile:

- Now uses APACI, Apache's GNU-autoconf-style (but not GNU autoconf)
  configuration system to configure, build, and install
- Enables build and install of all `support' tools
- Enables use of shared modules, and compiles mod_include dynamically
- Installs the Apache user manual by default.

9 files changed, 296 insertions, 265 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index b8bd8c05e49..508e7770e30 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,90 +1,34 @@
-# $NetBSD: Makefile,v 1.9 1998/06/03 14:01:11 agc Exp $
-# FreeBSD Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp
+# $NetBSD: Makefile,v 1.10 1998/06/04 19:38:36 tv Exp $
 #
 
-DISTNAME=       apache_1.3b5
-PKGNAME=        apache-1.3b5
-WRKSRC=         ${WRKROOT}/src
+DISTNAME=       apache_1.3b7
+PKGNAME=        apache-1.3b7
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/
 
 MAINTAINER=	cjs@netbsd.org
 
-WRKROOT=	${WRKDIR}/apache_1.3b5
-
-CONFIGURE_SCRIPT=Configure
 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
 
-HTTP_ROOT=	${PREFIX}/http
-
-CONF_DIR=   ${HTTP_ROOT}/conf
-MAN1=   apachectl.1 htpasswd.1
-MAN8=   httpd.8
+MAN1=	ab.1 apachectl.1 dbmmanage.1 htpasswd.1 htpasswd.1
+MAN8=	apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
-.include "../../mk/bsd.prefs.mk"
+# 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).
 
-# Set this for local-supplied patch, e.g.
-# VERS_ID = mods-1.0/me
+.include "../../mk/bsd.pkg.mk"
 
-post-build:
-	(cd ${WRKSRC}/support && make)
+# 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.
 
-post-patch:
-	@cd ${WRKSRC} && \
-	    ${SED} -e 's#^EXTRA_CFLAGS=#& -DHTTPD_ROOT=\\"${HTTP_ROOT}\\"#' \
-		< Configuration > Configuration.new && \
-		${MV} Configuration.new Configuration
-	@cd ${WRKROOT}/conf && \
-	    for I in httpd.conf-dist access.conf-dist srm.conf-dist; do \
-		${SED} -e 's#@@ServerRoot@@#${HTTP_ROOT}#g' < $${I} > $${I}.new && \
-		${MV} $${I}.new $${I}; \
-	    done
-	@cd ${WRKROOT}/conf && \
-	    ${SED} -e "s#^PidFile .*/#PidFile /var/run/#" < httpd.conf-dist \
-		>httpd.conf-dist.new && \
-	    ${MV} httpd.conf-dist.new httpd.conf-dist
-	@cd ${WRKSRC}/support && \
-	    ${SED} -e 's#/usr/local/apache/logs/#/var/run/#' \
-		-e 's#/usr/local/apache/src/#${PREFIX}/sbin/#' \
-		< apachectl >apachectl.new && \
-	    ${MV} apachectl.new apachectl
-.if defined(VERS_ID)
-	@cd ${WRKSRC} && \
-	    ${MV} Configuration Configuration.old && \
-	    ${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
-	    < Configuration.old > Configuration
+.if !defined(NOPIC)
+CONFIGURE_ARGS+=--enable-module=so --enable-shared=include
 .endif
-
-do-install:
-	${INSTALL} -d -m 755 -o bin -g bin ${CONF_DIR} ${HTTP_ROOT}/htdocs \
-		${HTTP_ROOT}/icons ${HTTP_ROOT}/cgi-bin ${HTTP_ROOT}/logs
-	${INSTALL_PROGRAM} ${WRKSRC}/httpd ${PREFIX}/sbin
-	cd ${WRKSRC}/support && \
-		${INSTALL_PROGRAM} htdigest htpasswd logresolve ${PREFIX}/bin
-	cd ${WRKSRC}/support && \
-		${INSTALL_SCRIPT} dbmmanage ${PREFIX}/bin
-	cd ${WRKSRC}/support && \
-		${INSTALL_SCRIPT} rotatelogs apachectl log_server_status \
-		${PREFIX}/sbin
-	${INSTALL_DATA} -o nobody ${WRKROOT}/icons/* ${HTTP_ROOT}/icons
-	${INSTALL_MAN} ${WRKSRC}/support/httpd.8 \
-		${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/support/htpasswd.1 \
-		       ${WRKSRC}/support/apachectl.1 \
-		${PREFIX}/man/man1
-	cd ${WRKROOT}/conf && \
-	for file in httpd.conf srm.conf access.conf ; do \
-	    if [ ! -f ${CONF_DIR}/$$file ] ; then \
-		${INSTALL_DATA} $$file-dist ${CONF_DIR}/$$file ; \
-	    fi ; \
-	    ${INSTALL_DATA} $$file-dist ${CONF_DIR} ; \
-	done
-	cd ${WRKROOT}/conf && \
-	for file in mime.types magic ; do \
-	    if [ ! -f ${CONF_DIR}/$$file ] ; then \
-		${INSTALL_DATA} $$file ${CONF_DIR} ; \
-	    fi ; \
-	    ${INSTALL_DATA} $$file ${CONF_DIR}/$${file}-dist ; \
-	done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index 47b5c0f31ad..4615f96a261 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1 +1 @@
-MD5 (apache_1.3b5.tar.gz) = d8ce21fe9fda2673fdd749f6281f331d
+MD5 (apache_1.3b7.tar.gz) = 10f06615578483df4a0d8838dfdd77f3
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
deleted file mode 100644
index c7046519914..00000000000
--- a/www/apache/patches/patch-aa
+++ /dev/null
@@ -1,80 +0,0 @@
---- Configuration.orig	Wed Nov 19 16:49:57 1997
-+++ Configuration	Wed Feb 18 15:55:51 1998
-@@ -43,11 +43,11 @@
- #
- EXTRA_CFLAGS=
- EXTRA_LDFLAGS=
--EXTRA_LIBS=
-+EXTRA_LIBS= -lcrypt
- EXTRA_INCLUDES=
- 
- #CC=
--#OPTIM=-O2
-+OPTIM=-O2
- #RANLIB=
- 
- ################################################################
-@@ -181,12 +181,12 @@
- ## STATUS=yes (see the Rules section near the start of this file) to allow
- ## full status information.  Check conf/access.conf on how to enable this.
- 
--# AddModule modules/standard/mod_status.o
-+AddModule modules/standard/mod_status.o
- 
- ## The Info module displays configuration information for the server and 
- ## all included modules. It's very useful for debugging.
- 
--# AddModule         modules/standard/mod_info.o
-+AddModule         modules/standard/mod_info.o
- 
- ## mod_include translates server-side include (SSI) statements in text files.
- ## mod_autoindex handles requests for directories which have no index file
-@@ -230,7 +230,7 @@
- ## NOTE: You do not want this module UNLESS you are running a proxy;
- ##       it is not needed for normal (origin server) operation.
- 
--# AddModule modules/proxy/libproxy.a
-+AddModule modules/proxy/libproxy.a
- 
- ## The Alias module provides simple URL translation and redirection.
- 
-@@ -240,7 +240,7 @@
- ## URI-to-filename mapping using a regular expression based 
- ## rule-controlled rewriting engine.
- 
--# AddModule modules/standard/mod_rewrite.o
-+AddModule modules/standard/mod_rewrite.o
- 
- ##
- ## Access control and authentication modules. 
-@@ -264,7 +264,7 @@
- ## "digest" implements HTTP Digest Authentication rather than the less 
- ## secure Basic Auth used by the other modules.
- 
--# AddModule modules/standard/mod_digest.o
-+AddModule modules/standard/mod_digest.o
- 
- ## Optional response header manipulation modules. 
- ##
-@@ -276,12 +276,12 @@
- ## The expires module can apply Expires: headers to resources,
- ## as a function of access time or modification time.
- 
--# AddModule modules/standard/mod_expires.o
-+AddModule modules/standard/mod_expires.o
- 
- ## The headers module can set arbitrary HTTP response headers,
- ## as configured in server, vhost, access.conf or .htaccess configs
- 
--# AddModule modules/standard/mod_headers.o
-+AddModule modules/standard/mod_headers.o
- 
- ## Miscellaneous modules
- ##
-@@ -313,3 +313,6 @@
- ## systems, hence it is not included by default.
- 
- # AddModule modules/standard/mod_unique_id.o
-+
-+## PHP3
-+#AddModule modules/extra/mod_php3.o
diff --git a/www/apache/pkg/COMMENT b/www/apache/pkg/COMMENT
index cb68c58c9f0..ba3bcc3a11c 100644
--- a/www/apache/pkg/COMMENT
+++ b/www/apache/pkg/COMMENT
@@ -1 +1 @@
-Web server
+The Apache web server (http://www.apache.org/)
diff --git a/www/apache/pkg/DESCR b/www/apache/pkg/DESCR
index 824b3077f0c..8ed3f8420d0 100644
--- a/www/apache/pkg/DESCR
+++ b/www/apache/pkg/DESCR
@@ -4,5 +4,4 @@ well as the ability to add modules that add many other features.
 
 You'll have to edit the configuration files in /usr/pkg/http/conf
 before you start it. The default root directory for documents is
-/usr/pkg/http/htdocs. Start it with `httpd -d /usr/pkg/http' in
-your /etc/rc.local file.
+/usr/pkg/http/htdocs. You can start the server with `apachectl start'.
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
deleted file mode 100644
index 7cb454cab52..00000000000
--- a/www/apache/pkg/PLIST
+++ /dev/null
@@ -1,105 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 1998/05/08 17:18:56 hubertf Exp $
-bin/htdigest
-bin/htpasswd
-bin/dbmmanage
-bin/logresolve
-sbin/httpd
-sbin/apachectl
-sbin/log_server_status
-sbin/rotatelogs
-man/man1/apachectl.1.gz
-man/man1/htpasswd.1.gz
-man/man8/httpd.8.gz
-@exec mkdir -p %D/http/conf %D/http/logs %D/http/cgi-bin %D/http/htdocs
-http/conf/httpd.conf
-http/conf/access.conf
-http/conf/srm.conf
-http/conf/magic
-http/conf/mime.types
-http/conf/httpd.conf-dist
-http/conf/srm.conf-dist
-http/conf/access.conf-dist
-http/conf/mime.types-dist
-http/conf/magic-dist
-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
-@dirrm http/conf
-@dirrm http/icons
-@dirrm http/cgi-bin
-@dirrm http/htdocs
-@dirrm http/logs
-@dirrm http
diff --git a/www/apache/pkg/PLIST-md.shared b/www/apache/pkg/PLIST-md.shared
new file mode 100644
index 00000000000..e3139f9e22e
--- /dev/null
+++ b/www/apache/pkg/PLIST-md.shared
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST-md.shared,v 1.1 1998/06/04 19:38:36 tv Exp $
+lib/apache/mod_include.so
diff --git a/www/apache/pkg/PLIST-md.static b/www/apache/pkg/PLIST-md.static
new file mode 100644
index 00000000000..74cbca0f5c9
--- /dev/null
+++ b/www/apache/pkg/PLIST-md.static
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST-md.static,v 1.1 1998/06/04 19:38:37 tv Exp $
diff --git a/www/apache/pkg/PLIST-mi b/www/apache/pkg/PLIST-mi
new file mode 100644
index 00000000000..2492044c725
--- /dev/null
+++ b/www/apache/pkg/PLIST-mi
@@ -0,0 +1,270 @@
+@comment $NetBSD: PLIST-mi,v 1.1 1998/06/04 19:38:37 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/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/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/md5.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
+man/man1/ab.1
+man/man1/apachectl.1
+man/man1/dbmmanage.1
+man/man1/htdigest.1
+man/man1/htpasswd.1
+man/man8/apxs.8
+man/man8/httpd.8
+man/man8/logresolve.8
+man/man8/rotatelogs.8
+sbin/ab
+sbin/apachectl
+sbin/apxs
+sbin/httpd
+sbin/logresolve
+sbin/rotatelogs
+@dirrm http/cgi-bin
+@dirrm http/conf
+@dirrm http/htdocs
+@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/icons
+@dirrm http/include
+@dirrm http/logs
+@dirrm http
+@dirrm lib/apache