--------------------------------------------------------------------------------

Update www/apache2 to 2.0.35, the first stable release of Apache 2.x.
Pkgsrc changes include:

  *) Compiling the included modules statically.  Add-ons will be built
     dynamically.
  *) Match improvements to www/apache rc.d script.
  *) Automatically add "Listen 0.0.0.0:80" to the sample config files as the
     default install of NetBSD is IPv4/IPv6 and we want the default install of
     Apache to work out-of-the-box.
  *) Automatically reset the User and Group directives to match the ones for
     suEXEC in the config files to ease the use of suEXEC in Apache.

Changes from version 2.0.32 beta include:

  *) Small bug fixes across the board.
  *) Bug fixes to the various MPMs.
  *) Performance improvements.
  *) Fixes for mod_include errors on boundary conditions
  *) Bug fixes for mod_proxy to prevent hangs and for RFC2616 compliance.
  *) Improvements to mod_dav for improved API and for RFC 3253 compliance
  *) Improvemants to mod_ssl to support SSL proxy and RSA SSLC 1.x/2.x
  *) Greatly improve mod_cache (disk/mem) [this is disabled in pkgsrc]
  *) New scoreboard file implementation that is readable by 3rd-party apps.
  *) Allow all Perchild directives to accept either numerical UID/GID
     or logical user/group names.
  *) Add support for macro expansion within the variable names in
     <!--#echo--> and <!--#set--> directives
  *) Implement SSLSessionCache shmht and shmcb.
  *) New directive ProxyIOBufferSize. Sets the size of the buffer used
     when reading from a remote HTTP server in proxy.
  *) Scrap CacheMaxExpireMin and CacheDefaultExpireMin. Change
     CacheMaxExpire and CacheDefaultExpire to use seconds rather than
     hours.
  *) New Directive SSIUndefinedEcho. to change the '(none)' echoed
     for a undefined variable.
  *) Introduce PassPhraseDialog "|/path/to/pipe" mechanism to mod_ssl.
  *) New Directive for mod_proxy: ProxyRemoteMatch.
  *) Fix IPv6 name-based virtual hosts.
  *) Introduce AddOutputFilterByType directive.

20 files changed, 375 insertions, 358 deletions

diff --git a/www/apache2/DESCR b/www/apache2/DESCR
index 15f559a5b89..529e64429cd 100644
--- a/www/apache2/DESCR
+++ b/www/apache2/DESCR
@@ -1,6 +1,5 @@
-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.
-
-*NOTE:	This package installs a beta release of Apache 2.0.  For a stable
-	release, please install Apache1.3.x (www/apache).
+The Apache HTTP Server Project is an effort to develop and maintain an
+open-source HTTP server for various modern desktop and server operating
+systems, such as UNIX and Windows NT.  The goal of this project is to
+provide a secure, efficient and extensible server which provides HTTP
+services in sync with the current HTTP standards.
diff --git a/www/apache2/MESSAGE b/www/apache2/MESSAGE
deleted file mode 100644
index edafa1fa48f..00000000000
--- a/www/apache2/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-=============================================================================
-$NetBSD: MESSAGE,v 1.1 2002/03/06 20:19:57 jlam Exp $
-
-If you have a kernel with both IPv4 and IPv6 enabled (options INET + INET6),
-then in order to have httpd listen on IPv4 addresses as well as on IPv6
-addresses, you will need to add the following line to httpd.conf:
-
-	Listen 0.0.0.0:80
-=============================================================================
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index a8c46511226..13d29f087c3 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/03/05 23:56:22 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/04/13 21:35:50 jlam Exp $
 
-DISTNAME=		httpd-2.0.32-beta
-PKGNAME=		apache-2.0.32
-WRKSRC=			${WRKDIR}/httpd-2.0.32
+DISTNAME=		httpd-2.0.35
+PKGNAME=		apache-2.0.35
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://httpd.apache.org/dist/httpd/old/ \
@@ -22,10 +21,10 @@ REPLACE_BUILDLINK=	config_vars.mk
 REPLACE_BUILDLINK_SED=	-e "s|${BUILDLINK_DIR}|${LOCALBASE}|g"
 
 USE_GMAKE=		YES
-PLIST_SRC=		# empty
 
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/srclib/apr/libtool
+LIBTOOL_OVERRIDE=	${WRKSRC}/shlibtool
+LIBTOOL_OVERRIDE+=	${WRKSRC}/srclib/apr/libtool
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-layout=NetBSD
@@ -43,17 +42,11 @@ CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_DIR}
 .include "../../mk/bsd.prefs.mk"
 
 APACHE_MODULES=		all
-APACHE_MODULES+=	proxy proxy-connect proxy-ftp proxy-http
+APACHE_MODULES+=	proxy proxy_connect proxy_ftp proxy_http
 APACHE_MODULES+=	ssl
 
-.if defined(NOPIC) || (defined(MKPIC) && (${MKPIC} == "no"))
 CONFIGURE_ARGS+=	--enable-modules="${APACHE_MODULES}"
-CONFIGURE_ARGS+=	--disable-so
-.else
-CONFIGURE_ARGS+=	--enable-mods-shared="${APACHE_MODULES}"
 CONFIGURE_ARGS+=	--enable-so
-PLIST_SRC+=		${.CURDIR}/PLIST.shared
-.endif
 
 SUEXEC_COMMENT?=	"@comment "
 .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
@@ -75,7 +68,6 @@ PKG_GROUPS=		${APACHE_SUEXEC_GROUP}
 PKG_USERS=		${APACHE_SUEXEC_USER}:${APACHE_SUEXEC_GROUP}::Apache\\ suEXEC\\ user
 .endif
 
-PLIST_SRC+=		${.CURDIR}/PLIST
 PLIST_SUBST+=		SUEXEC_COMMENT=${SUEXEC_COMMENT}
 
 PKG_SYSCONFVAR=		apache
@@ -89,45 +81,15 @@ SUPPORT_FILES+=		${EGDIR}/magic ${PKG_SYSCONFDIR}/magic
 SUPPORT_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 RCD_SCRIPTS=		apache
 
-# Fix problems with the Apache configure process.  It's still in flux in
-# moving over to a GNU autoconf framework, and is missing some of the
-# flexibility of the way it used to be done via APACI.
-#
-# We override preprocessor definitions that are used in Apache sources.
-# The values we use are derived from the NetBSD layout of the
-# config.layout file.
-#
-CONFIGURE_ENV+=		NOTEST_CPPFLAGS="${NOTEST_CPPFLAGS}"
-
-# Override values in server/mpm/<MPM>/mpm_default.h.
-NOTEST_CPPFLAGS=							\
-	-DDEFAULT_ERRORLOG=\\\"\$$(logfiledir)/error_log\\\"		\
-	-DDEFAULT_LOCKFILE=\\\"\$$(runtimedir)/accept.lock\\\"		\
-	-DDEFAULT_PIDLOG=\\\"\$$(runtimedir)/httpd.pid\\\"		\
-	-DDEFAULT_SCOREBOARD=\\\"\$$(runtimedir)/apache_runtime_status\\\"
-
-# Used in server/config.c and server/main.c to locate default config file.
-NOTEST_CPPFLAGS+=							\
-	-DSERVER_CONFIG_FILE=\\\"\$$(sysconfdir)/httpd.conf\\\"
-
-# Override value in include/httpd.h and used in modules/http/mod_mime.c
-# to locate default MIME types file.
-#
-NOTEST_CPPFLAGS+=							\
-	-DAP_TYPES_CONFIG_FILE=\\\"\$$(sysconfdir)/mime.types\\\"
-
-post-extract:
-	cd ${WRKSRC}/support;						\
-	${MV} apxs.in apxs.pl.in;					\
-	${MV} apachectl.in apachectl.sh.in;				\
-	${MV} dbmmanage.in dbmmanage.pl.in
-
-post-configure:
-	cd ${WRKSRC}; for file in config_vars.mk; do			\
-		${SED} -e "s|^\(sysconfdir\)[ 	]*=.*|\1 = ${PKG_SYSCONFDIR}|g" \
-			$${file} > $${file}.new;			\
-		${MV} -f $${file}.new $${file};				\
-	done
+MAKE_DIRS=		${PREFIX}/share/httpd
+MAKE_DIRS+=		${PREFIX}/share/httpd/htdocs
+OWN_DIRS= 		/var/log/httpd
+OWN_DIRS+=		/var/db/httpd
+.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
+OWN_DIRS_PERMS+=	/var/db/httpd/proxy ${APACHE_SUEXEC_USER} ${APACHE_SUEXEC_GROUP} 0755
+.else
+OWN_DIRS_PERMS+=	/var/db/httpd/proxy nobody nobody 0755
+.endif
 
 post-build:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
@@ -141,14 +103,34 @@ post-install:
 		httpd-std.conf						\
 		ssl-std.conf;						\
 	do								\
-		${SED}	-e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"		\
+		(${SED} -e "/^Listen[	 ]/q"				\
+			-e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"		\
+			$${file};					\
+		 ${ECHO} "Listen 0.0.0.0:80";				\
+		 ${SED} -e "1,/^Listen[	 ]/d"				\
+			-e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"		\
+			$${file};					\
+		) >> $${file}.new;					\
+		${MV} -f $${file}.new $${file};				\
+	done
+.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
+	cd ${EGDIR};							\
+	for file in							\
+		highperformance-std.conf				\
+		httpd-std.conf						\
+		ssl-std.conf;						\
+	do								\
+		${SED}	-e "s|^\(User[	 ]\).*|\1${APACHE_SUEXEC_USER}|g" \
+			-e "s|^\(Group[	 ]\).*|\1${APACHE_SUEXEC_GROUP}|g" \
 			$${file} >> $${file}.new;			\
 		${MV} -f $${file}.new $${file};				\
 	done
+.endif
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 
 .include "../../lang/perl5/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
 .include "../../textproc/expat/buildlink.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index e92d6f716d2..0962d328773 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/05 23:56:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/04/13 21:35:50 jlam Exp $
 bin/apr-config
 bin/apu-config
 etc/rc.d/apache
 include/apr.h
+include/apr_allocator.h
 include/apr_anylock.h
+include/apr_atomic.h
 include/apr_base64.h
 include/apr_buckets.h
 include/apr_compat.h
@@ -16,6 +18,7 @@ include/apr_file_io.h
 include/apr_fnmatch.h
 include/apr_general.h
 include/apr_getopt.h
+include/apr_global_mutex.h
 include/apr_hash.h
 include/apr_hooks.h
 include/apr_inherit.h
@@ -56,12 +59,15 @@ include/apu_compat.h
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
+include/httpd/ap_config_layout.h
 include/httpd/ap_listen.h
 include/httpd/ap_mmn.h
 include/httpd/ap_mpm.h
 include/httpd/ap_release.h
 include/httpd/apr.h
+include/httpd/apr_allocator.h
 include/httpd/apr_anylock.h
+include/httpd/apr_atomic.h
 include/httpd/apr_base64.h
 include/httpd/apr_buckets.h
 include/httpd/apr_compat.h
@@ -74,6 +80,7 @@ include/httpd/apr_file_io.h
 include/httpd/apr_fnmatch.h
 include/httpd/apr_general.h
 include/httpd/apr_getopt.h
+include/httpd/apr_global_mutex.h
 include/httpd/apr_hash.h
 include/httpd/apr_hooks.h
 include/httpd/apr_inherit.h
@@ -124,6 +131,7 @@ include/httpd/mod_cgi.h
 include/httpd/mod_core.h
 include/httpd/mod_dav.h
 include/httpd/mod_include.h
+include/httpd/mod_log_config.h
 include/httpd/mod_proxy.h
 include/httpd/mod_ssl.h
 include/httpd/mpm.h
@@ -136,6 +144,7 @@ include/httpd/rfc1413.h
 include/httpd/scoreboard.h
 include/httpd/ssl_expr.h
 include/httpd/ssl_expr_parse.h
+include/httpd/ssl_toolkit_compat.h
 include/httpd/ssl_util_ssl.h
 include/httpd/ssl_util_table.h
 include/httpd/unixd.h
@@ -162,6 +171,8 @@ lib/libaprutil.la
 lib/libaprutil.so
 lib/libaprutil.so.0
 lib/libaprutil.so.0.0
+libexec/cgi-bin/printenv
+libexec/cgi-bin/test-cgi
 man/man1/dbmmanage.1
 man/man1/htdigest.1
 man/man1/htpasswd.1
@@ -487,6 +498,7 @@ share/httpd/manual/custom-error.html
 share/httpd/manual/developer/API.html
 share/httpd/manual/developer/debugging.html
 share/httpd/manual/developer/documenting.html
+share/httpd/manual/developer/filters.html
 share/httpd/manual/developer/footer.html
 share/httpd/manual/developer/header.html
 share/httpd/manual/developer/hooks.html
@@ -546,65 +558,120 @@ share/httpd/manual/misc/perf-tuning.html
 share/httpd/manual/misc/rewriteguide.html
 share/httpd/manual/misc/security_tips.html
 share/httpd/manual/misc/tutorials.html
+share/httpd/manual/mod/allmodules.xml
 share/httpd/manual/mod/core.html
+share/httpd/manual/mod/core.xml
 share/httpd/manual/mod/directive-dict.html
 share/httpd/manual/mod/directives.html
+share/httpd/manual/mod/directives.xml
 share/httpd/manual/mod/footer.html
 share/httpd/manual/mod/header.html
 share/httpd/manual/mod/index-bytype.html
 share/httpd/manual/mod/index.html
+share/httpd/manual/mod/index.xml
 share/httpd/manual/mod/mod_TEMPLATE.html
 share/httpd/manual/mod/mod_access.html
+share/httpd/manual/mod/mod_access.xml
 share/httpd/manual/mod/mod_actions.html
+share/httpd/manual/mod/mod_actions.xml
 share/httpd/manual/mod/mod_alias.html
+share/httpd/manual/mod/mod_alias.xml
 share/httpd/manual/mod/mod_asis.html
+share/httpd/manual/mod/mod_asis.xml
 share/httpd/manual/mod/mod_auth.html
+share/httpd/manual/mod/mod_auth.xml
 share/httpd/manual/mod/mod_auth_anon.html
+share/httpd/manual/mod/mod_auth_anon.xml
 share/httpd/manual/mod/mod_auth_dbm.html
+share/httpd/manual/mod/mod_auth_dbm.xml
 share/httpd/manual/mod/mod_auth_digest.html
+share/httpd/manual/mod/mod_auth_digest.xml
 share/httpd/manual/mod/mod_auth_ldap.html
 share/httpd/manual/mod/mod_autoindex.html
+share/httpd/manual/mod/mod_autoindex.xml
+share/httpd/manual/mod/mod_cache.html
+share/httpd/manual/mod/mod_cache.xml
 share/httpd/manual/mod/mod_cern_meta.html
+share/httpd/manual/mod/mod_cern_meta.xml
 share/httpd/manual/mod/mod_cgi.html
+share/httpd/manual/mod/mod_cgi.xml
 share/httpd/manual/mod/mod_cgid.html
+share/httpd/manual/mod/mod_cgid.xml
 share/httpd/manual/mod/mod_charset_lite.html
+share/httpd/manual/mod/mod_charset_lite.xml
 share/httpd/manual/mod/mod_dav.html
+share/httpd/manual/mod/mod_dav.xml
+share/httpd/manual/mod/mod_deflate.html
+share/httpd/manual/mod/mod_deflate.xml
 share/httpd/manual/mod/mod_dir.html
+share/httpd/manual/mod/mod_dir.xml
 share/httpd/manual/mod/mod_env.html
+share/httpd/manual/mod/mod_env.xml
 share/httpd/manual/mod/mod_example.html
+share/httpd/manual/mod/mod_example.xml
 share/httpd/manual/mod/mod_expires.html
+share/httpd/manual/mod/mod_expires.xml
 share/httpd/manual/mod/mod_ext_filter.html
+share/httpd/manual/mod/mod_ext_filter.xml
 share/httpd/manual/mod/mod_file_cache.html
+share/httpd/manual/mod/mod_file_cache.xml
 share/httpd/manual/mod/mod_headers.html
+share/httpd/manual/mod/mod_headers.xml
 share/httpd/manual/mod/mod_imap.html
+share/httpd/manual/mod/mod_imap.xml
 share/httpd/manual/mod/mod_include.html
+share/httpd/manual/mod/mod_include.xml
 share/httpd/manual/mod/mod_info.html
+share/httpd/manual/mod/mod_info.xml
 share/httpd/manual/mod/mod_isapi.html
+share/httpd/manual/mod/mod_isapi.xml
 share/httpd/manual/mod/mod_ldap.html
 share/httpd/manual/mod/mod_log_config.html
+share/httpd/manual/mod/mod_log_config.xml
 share/httpd/manual/mod/mod_mime.html
+share/httpd/manual/mod/mod_mime.xml
 share/httpd/manual/mod/mod_mime_magic.html
+share/httpd/manual/mod/mod_mime_magic.xml
 share/httpd/manual/mod/mod_mmap_static.html
 share/httpd/manual/mod/mod_negotiation.html
+share/httpd/manual/mod/mod_negotiation.xml
 share/httpd/manual/mod/mod_proxy.html
+share/httpd/manual/mod/mod_proxy.xml
 share/httpd/manual/mod/mod_rewrite.html
+share/httpd/manual/mod/mod_rewrite.xml
 share/httpd/manual/mod/mod_setenvif.html
+share/httpd/manual/mod/mod_setenvif.xml
 share/httpd/manual/mod/mod_so.html
+share/httpd/manual/mod/mod_so.xml
 share/httpd/manual/mod/mod_speling.html
+share/httpd/manual/mod/mod_speling.xml
 share/httpd/manual/mod/mod_ssl.html
+share/httpd/manual/mod/mod_ssl.xml
 share/httpd/manual/mod/mod_status.html
+share/httpd/manual/mod/mod_status.xml
 share/httpd/manual/mod/mod_suexec.html
+share/httpd/manual/mod/mod_suexec.xml
 share/httpd/manual/mod/mod_unique_id.html
+share/httpd/manual/mod/mod_unique_id.xml
 share/httpd/manual/mod/mod_userdir.html
+share/httpd/manual/mod/mod_userdir.xml
 share/httpd/manual/mod/mod_usertrack.html
+share/httpd/manual/mod/mod_usertrack.xml
 share/httpd/manual/mod/mod_vhost_alias.html
+share/httpd/manual/mod/mod_vhost_alias.xml
 share/httpd/manual/mod/module-dict.html
 share/httpd/manual/mod/mpm_common.html
+share/httpd/manual/mod/mpm_common.xml
 share/httpd/manual/mod/mpm_netware.html
+share/httpd/manual/mod/mpm_netware.xml
 share/httpd/manual/mod/mpm_winnt.html
+share/httpd/manual/mod/mpm_winnt.xml
 share/httpd/manual/mod/perchild.html
+share/httpd/manual/mod/perchild.xml
 share/httpd/manual/mod/prefork.html
+share/httpd/manual/mod/prefork.xml
 share/httpd/manual/mod/worker.html
+share/httpd/manual/mod/worker.xml
 share/httpd/manual/mpm.html
 share/httpd/manual/new_features_2_0.html.de
 share/httpd/manual/new_features_2_0.html.en
@@ -695,6 +762,14 @@ share/httpd/manual/ssl/ssl_template.title-ref.gif
 share/httpd/manual/ssl/ssl_template.title-toc.gif
 share/httpd/manual/ssl/ssl_template.title-tutor.gif
 share/httpd/manual/stopping.html
+share/httpd/manual/style/build.sh
+share/httpd/manual/style/build.xml
+share/httpd/manual/style/en.xml
+share/httpd/manual/style/manual.css
+share/httpd/manual/style/manual.xsl
+share/httpd/manual/style/modulesynopsis.dtd
+share/httpd/manual/style/settings.xsl
+share/httpd/manual/style/sv.xml
 share/httpd/manual/suexec.html
 share/httpd/manual/upgrading.html.en
 share/httpd/manual/upgrading.html.fr
@@ -709,6 +784,7 @@ share/httpd/manual/vhosts/ip-based.html
 share/httpd/manual/vhosts/mass.html
 share/httpd/manual/vhosts/name-based.html
 @dirrm share/httpd/manual/vhosts
+@dirrm share/httpd/manual/style
 @dirrm share/httpd/manual/ssl
 @dirrm share/httpd/manual/search
 @dirrm share/httpd/manual/programs
diff --git a/www/apache2/PLIST.shared b/www/apache2/PLIST.shared
deleted file mode 100644
index ed504406e48..00000000000
--- a/www/apache2/PLIST.shared
+++ /dev/null
@@ -1,39 +0,0 @@
-@comment $NetBSD: PLIST.shared,v 1.1 2002/03/05 23:56:22 jlam Exp $
-lib/httpd/mod_access.so
-lib/httpd/mod_actions.so
-lib/httpd/mod_alias.so
-lib/httpd/mod_asis.so
-lib/httpd/mod_auth.so
-lib/httpd/mod_auth_anon.so
-lib/httpd/mod_auth_dbm.so
-lib/httpd/mod_auth_digest.so
-lib/httpd/mod_autoindex.so
-lib/httpd/mod_cern_meta.so
-lib/httpd/mod_cgi.so
-lib/httpd/mod_dav.so
-lib/httpd/mod_dav_fs.so
-lib/httpd/mod_dir.so
-lib/httpd/mod_env.so
-lib/httpd/mod_expires.so
-lib/httpd/mod_headers.so
-lib/httpd/mod_imap.so
-lib/httpd/mod_include.so
-lib/httpd/mod_info.so
-lib/httpd/mod_log_config.so
-lib/httpd/mod_mime.so
-lib/httpd/mod_mime_magic.so
-lib/httpd/mod_negotiation.so
-lib/httpd/mod_proxy.so
-lib/httpd/mod_proxy_connect.so
-lib/httpd/mod_proxy_ftp.so
-lib/httpd/mod_proxy_http.so
-lib/httpd/mod_rewrite.so
-lib/httpd/mod_setenvif.so
-lib/httpd/mod_speling.so
-lib/httpd/mod_ssl.so
-lib/httpd/mod_status.so
-${SUEXEC_COMMENT}lib/httpd/mod_suexec.so
-lib/httpd/mod_unique_id.so
-lib/httpd/mod_userdir.so
-lib/httpd/mod_usertrack.so
-lib/httpd/mod_vhost_alias.so
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 0eb2fff146e..d00b9755bda 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.4 2002/03/06 19:52:49 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/04/13 21:35:51 jlam Exp $
 
-SHA1 (httpd-2.0.32-beta.tar.gz) = 0adf90d3d292bd8f2c343c9bce591bb7d100e38e
-Size (httpd-2.0.32-beta.tar.gz) = 3901686 bytes
-SHA1 (patch-aa) = 294bf6a0600c3215b0c9e0ada66573e0bfb0375d
-SHA1 (patch-ab) = 30826b128c4578fdeb914e1bd6952586e099d973
-SHA1 (patch-ac) = f72f7093f7f1b6553212b7265f6518dd42c9a2ae
-SHA1 (patch-ad) = 59799e6471c073f6ecfca3565d4f9ed2644f8ef8
-SHA1 (patch-ae) = d983643f2719c03819fccf0fd4171c77aeb7f9b6
-SHA1 (patch-af) = d21dfcae2158353aeab5c62206d4e8668b888d10
-SHA1 (patch-ag) = 32aa50334f8146c43dfdfa36bea901d426fac5af
-SHA1 (patch-ah) = bf00adbfe32c9322bde130089baf004dda7acb03
-SHA1 (patch-ai) = 36d8e13103418daf2d9f0c3a49e84ca906796858
-SHA1 (patch-aj) = 43af1d030eb29fc13f99498729472af6901034e5
+SHA1 (httpd-2.0.35.tar.gz) = 242c44445270f9f2a674ec5c6ad646aa449fc76a
+Size (httpd-2.0.35.tar.gz) = 4124937 bytes
+SHA1 (patch-aa) = 8c29506b6bcf12eb0ee939e789b6d499dc38ca6d
+SHA1 (patch-ad) = 139c2eed9b0b74323cb7ad88324ca968defff6d6
+SHA1 (patch-ag) = d3fe2a5f066353c64649c3efa76855ffd3d75111
+SHA1 (patch-ah) = d2192ec1e6f658440f2e6a14cfa57a8d9807243b
+SHA1 (patch-ai) = 54207ba83f626834ab12a2f8aab2faa6eef50169
+SHA1 (patch-ak) = ee60c5d0d0a57f880a23bbe5cb2b7ecb2998960c
+SHA1 (patch-al) = 0dcba1455b4fa3fc40fbd488813608b7e2350309
+SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
index e7dfe82b1ef..22b785949d8 100644
--- a/www/apache2/files/apache.sh
+++ b/www/apache2/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.2 2002/03/06 20:21:38 jlam Exp $
+# $NetBSD: apache.sh,v 1.3 2002/04/13 21:35:51 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -48,5 +48,5 @@ then
 	load_rc_config $name
 	run_rc_command "$1"
 else
-	eval ${start_cmd}
+	apache_doit "$1"
 fi
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index 4105a5bee45..1177c738451 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2002/03/05 23:56:22 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/04/13 21:35:52 jlam Exp $
 
---- Makefile.in.orig	Wed Jan 23 02:10:16 2002
+--- Makefile.in.orig	Fri Apr  5 14:36:06 2002
 +++ Makefile.in
 @@ -16,7 +16,7 @@
  PROGRAMS        = $(PROGRAM_NAME)
@@ -11,35 +11,29 @@ $NetBSD: patch-aa,v 1.2 2002/03/05 23:56:22 jlam Exp $
  	install-other install-cgi install-include install-suexec install-man \
  	install-build
  
-@@ -66,8 +66,22 @@
- 					-e 's#@@Port@@#$(PORT)#g' \
- 					< $$i; \
+@@ -37,7 +37,7 @@
+ 	done; \
+ 	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
+ 		cd $$j ; \
+-	for i in *-std* ssl.conf; do \
++	for i in *-std.conf ssl.conf; do \
+ 		[ -f $$i ] || continue; \
+ 		( \
+ 			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
+@@ -71,6 +71,7 @@
  			fi \
--		) > $(sysconfdir)/$$i; \
-+		) | \
-+		sed -e 's#\([ 	]\)conf/#\1$(sysconfdir)/#g' \
-+			-e 's#\([: 	]\)logs/#\1$(logfiledir)/#g' \
-+			-e 's#\([: 	]\)modules/#\1$(libexecdir)/#g' \
-+			-e 's#$(prefix)/cgi-bin#$(cgidir)#g' \
-+			-e 's#$(prefix)/conf#$(sysconfdir)#g' \
-+			-e 's#$(prefix)/error#$(errordir)#g' \
-+			-e 's#$(prefix)/htdocs#$(htdocsdir)#g' \
-+			-e 's#$(prefix)/icons#$(iconsdir)#g' \
-+			-e 's#$(prefix)/manual#$(manualdir)#g' \
-+			-e 's#$(logfiledir)\(/accept.lock\)#$(runtimedir)\1#g' \
-+			-e 's#$(logfiledir)\(/apache_runtime_status\)#$(runtimedir)\1#g' \
-+			-e 's#$(logfiledir)\(/httpd\.pid\)#$(runtimedir)\1#g' \
-+			> $(sysconfdir)/$$i; \
+ 		) > $(sysconfdir)/$$i; \
  		chmod 0644 $(sysconfdir)/$$i; \
 +		if false; then \
  		file=`echo $$i|sed s/-std//`; \
  		if [ "$$file" = "httpd.conf" ]; then \
  			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
-@@ -75,11 +89,14 @@
+@@ -78,12 +79,15 @@
  		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
  			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
  		fi; \
 +		fi; \
+ 	done ; \
  	done
  	@if test -f "$(builddir)/envvars-std"; then \
  	    cp -p envvars-std $(sbindir); \
diff --git a/www/apache2/patches/patch-ab b/www/apache2/patches/patch-ab
deleted file mode 100644
index 367d2268b02..00000000000
--- a/www/apache2/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/03/05 23:56:23 jlam Exp $
-
---- acinclude.m4.orig	Wed Jan  9 23:55:19 2002
-+++ acinclude.m4
-@@ -55,6 +55,7 @@
-   APACHE_SUBST(iconsdir)
-   APACHE_SUBST(sysconfdir)
-   APACHE_SUBST(installbuilddir)
-+  APACHE_SUBST(runtimedir)
-   APACHE_SUBST(other_targets)
-   APACHE_SUBST(progname)
-   APACHE_SUBST(prefix)
diff --git a/www/apache2/patches/patch-ac b/www/apache2/patches/patch-ac
deleted file mode 100644
index ee8c2b07359..00000000000
--- a/www/apache2/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/03/05 23:56:24 jlam Exp $
-
---- build/rules.mk.in.orig	Sun Dec 30 09:05:55 2001
-+++ build/rules.mk.in
-@@ -93,6 +93,7 @@
- INSTALL = $(LIBTOOL) --mode=install $(abs_srcdir)/build/install.sh -c
- INSTALL_DATA = $(INSTALL) -m 644
- INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
-+INSTALL_SCRIPT = $(INSTALL) -m 755
- 
- #
- # Standard build rules
-@@ -200,6 +201,12 @@
- 	    test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
- 	    list='$(PROGRAMS)'; for i in $$list; do \
- 	        $(INSTALL_PROGRAM) $$i $(sbindir); \
-+	    done; \
-+	fi
-+	@if test -n '$(SCRIPTS)'; then \
-+	    test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
-+	    list='$(SCRIPTS)'; for i in $$list; do \
-+	        $(INSTALL_SCRIPT) $$i $(sbindir); \
- 	    done; \
- 	fi
- 
diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad
index edcc01ca369..28b5801a1f6 100644
--- a/www/apache2/patches/patch-ad
+++ b/www/apache2/patches/patch-ad
@@ -1,31 +1,31 @@
-$NetBSD: patch-ad,v 1.2 2002/03/05 23:56:24 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2002/04/13 21:35:52 jlam Exp $
 
---- config.layout.orig	Sun Nov 11 02:02:37 2001
+--- config.layout.orig	Thu Mar 28 14:04:47 2002
 +++ config.layout
-@@ -307,3 +307,26 @@
-     infodir:       $exec_prefix/share/info
-     installbuilddir: $prefix/etc/apache2/build
+@@ -309,3 +309,26 @@
+     installbuilddir: ${prefix}/etc/apache2/build
+     errordir:      ${datadir}/error
  </Layout>
 +
 +#   NetBSD (pkgsrc) layout
 +<Layout NetBSD>
 +    prefix:        /usr/pkg
-+    exec_prefix:   $prefix
-+    bindir:        $exec_prefix/bin
-+    sbindir:       $exec_prefix/sbin
-+    libexecdir:    $exec_prefix/lib/httpd
-+    mandir:        $prefix/man
-+    sysconfdir:    $prefix/etc/httpd
-+    datadir:       $prefix/share/httpd
-+    installbuilddir: $datadir/build
-+    errordir:      $datadir/error
-+    iconsdir:      $datadir/icons
-+    htdocsdir:     $datadir/htdocs
-+    manualdir:     $datadir/manual
-+    cgidir:        $exec_prefix/libexec/cgi-bin
-+    includedir:    $prefix/include/httpd
++    exec_prefix:   ${prefix}
++    bindir:        ${exec_prefix}/bin
++    sbindir:       ${exec_prefix}/sbin
++    libexecdir:    ${exec_prefix}/lib/httpd
++    mandir:        ${prefix}/man
++    sysconfdir:    ${prefix}/etc/httpd
++    datadir:       ${prefix}/share/httpd
++    installbuilddir: ${datadir}/build
++    errordir:      ${datadir}/error
++    iconsdir:      ${datadir}/icons
++    htdocsdir:     ${datadir}/htdocs
++    manualdir:     ${datadir}/manual
++    cgidir:        ${exec_prefix}/libexec/cgi-bin
++    includedir:    ${prefix}/include/httpd
 +    localstatedir: /var
-+    runtimedir:    $localstatedir/run
-+    logfiledir:    $localstatedir/log/httpd
-+    proxycachedir: $localstatedir/db/httpd/proxy
++    runtimedir:    ${localstatedir}/run
++    logfiledir:    ${localstatedir}/log/httpd
++    proxycachedir: ${localstatedir}/db/httpd/proxy
 +</Layout>
diff --git a/www/apache2/patches/patch-ae b/www/apache2/patches/patch-ae
deleted file mode 100644
index 2c721a4278b..00000000000
--- a/www/apache2/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/03/05 23:56:24 jlam Exp $
-
---- configure.in.orig	Tue Mar  5 14:37:53 2002
-+++ configure.in
-@@ -464,7 +464,7 @@
-     ;;
- esac
- 
--AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
-+AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs.pl support/apachectl.sh support/dbmmanage.pl support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
-   APACHE_GEN_MAKEFILES
- ])
- 
diff --git a/www/apache2/patches/patch-af b/www/apache2/patches/patch-af
deleted file mode 100644
index b65883df195..00000000000
--- a/www/apache2/patches/patch-af
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/03/05 23:56:24 jlam Exp $
-
---- configure.orig	Thu Feb 14 03:15:01 2002
-+++ configure
-@@ -10890,6 +10890,10 @@
-   
- 
-   
-+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
-+  
-+
-+  
-   APACHE_VAR_SUBST="$APACHE_VAR_SUBST other_targets"
-   
- 
-@@ -11095,10 +11099,6 @@
- EOF
- 
- cat >> confdefs.h <<EOF
--#define SERVER_CONFIG_FILE "conf/$progname.conf"
--EOF
--
--cat >> confdefs.h <<EOF
- #define APACHE_MPM_DIR "$MPM_DIR"
- EOF
- 
-@@ -11223,7 +11223,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
- 
--trap 'rm -fr `echo "$APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk include/ap_config_auto.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "$APACHE_OUTPUT_FILES support/apxs.pl support/apachectl.sh support/dbmmanage.pl support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk include/ap_config_auto.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
-@@ -11317,6 +11317,7 @@
- s%@errordir@%$errordir%g
- s%@iconsdir@%$iconsdir%g
- s%@installbuilddir@%$installbuilddir%g
-+s%@runtimedir@%$runtimedir%g
- s%@other_targets@%$other_targets%g
- s%@CXX@%$CXX%g
- s%@LTFLAGS@%$LTFLAGS%g
-@@ -11383,7 +11384,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"$APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk"}
-+CONFIG_FILES=\${CONFIG_FILES-"$APACHE_OUTPUT_FILES support/apxs.pl support/apachectl.sh support/dbmmanage.pl support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag
index 119794a99c3..954b2d3adf7 100644
--- a/www/apache2/patches/patch-ag
+++ b/www/apache2/patches/patch-ag
@@ -1,51 +1,15 @@
-$NetBSD: patch-ag,v 1.3 2002/03/06 00:55:34 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2002/04/13 21:35:53 jlam Exp $
 
---- support/Makefile.in.orig	Sat Jan 19 00:44:04 2002
+--- support/Makefile.in.orig	Mon Mar 25 04:50:41 2002
 +++ support/Makefile.in
-@@ -2,7 +2,8 @@
- 	logresolve.pl phf_abuse_log.cgi split-logfile
- 
- PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm
--TARGETS  = $(PROGRAMS)
-+SCRIPTS  = apxs apachectl dbmmanage
-+TARGETS  = $(PROGRAMS) $(SCRIPTS)
- 
- PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
- PROGRAM_DEPENDENCIES = \
-@@ -15,18 +16,30 @@
- 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
- 	@test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir)
- 	@cp -p $(top_builddir)/server/httpd.exp $(libexecdir)
--	@for i in apxs apachectl dbmmanage; do \
--	    if test -f "$(builddir)/$$i"; then \
--	        cp -p $$i $(sbindir); \
--	        chmod 755 $(sbindir)/$$i; \
--	    fi ; \
--	done
+@@ -24,8 +24,10 @@
+ 	done
  	@if test -f "$(builddir)/envvars-std"; then \
  	    cp -p envvars-std $(sbindir); \
 +	    if false; then \
  	    if test ! -f $(sbindir)/envvars; then \
  	        cp -p envvars-std $(sbindir)/envvars ; \
- 	    fi ; \
 +	    fi ; \
+ 	    fi ; \
  	fi
-+
-+apxs: apxs.pl
-+	sed -e "s#%prefix%#$(prefix)#g" \
-+		-e "s#%installbuilddir%#$(installbuilddir)#g" \
-+		< apxs.pl > $@
-+	chmod +x $@
-+
-+apachectl: apachectl.sh
-+	sed -e "s#%runtimedir%#$(runtimedir)#g" \
-+		-e "s#%sbindir%#$(sbindir)#g" \
-+		< apachectl.sh > $@
-+	chmod +x $@
-+
-+dbmmanage: dbmmanage.pl
-+	cp dbmmanage.pl $@
-+	chmod +x $@
  
- htpasswd_OBJECTS = htpasswd.lo
- htpasswd: $(htpasswd_OBJECTS)
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
index db051bb24f8..825862f69a5 100644
--- a/www/apache2/patches/patch-ah
+++ b/www/apache2/patches/patch-ah
@@ -1,23 +1,19 @@
-$NetBSD: patch-ah,v 1.2 2002/03/05 23:56:24 jlam Exp $
+$NetBSD: patch-ah,v 1.3 2002/04/13 21:35:53 jlam Exp $
 
---- support/apachectl.sh.in.orig	Sat Dec 15 08:56:36 2001
-+++ support/apachectl.sh.in
-@@ -26,14 +26,14 @@
- # --------------------                              --------------------
- # 
- # the path to your PID file
--PIDFILE=@prefix@/logs/@progname@.pid
-+PIDFILE=%runtimedir%/@progname@.pid
+--- support/apachectl.in.orig	Thu Apr  4 04:15:44 2002
++++ support/apachectl.in
+@@ -29,11 +29,11 @@
+ PIDFILE=@exp_runtimedir@/@progname@.pid
  #
  # the path to your httpd binary, including options if necessary
--HTTPD='@prefix@/bin/@progname@'
-+HTTPD='%sbindir%/@progname@'
+-HTTPD='@exp_bindir@/@progname@'
++HTTPD='@exp_sbindir@/@progname@'
  #
  # pick up any necessary environment variables
--if test -f @prefix@/bin/envvars; then
--  . @prefix@/bin/envvars
-+if test -f %sbindir%/envvars; then
-+  . %sbindir%/envvars
+-if test -f @exp_bindir@/envvars; then
+-  . @exp_bindir@/envvars
++if test -f @exp_sbindir@/envvars; then
++  . @exp_sbindir@/envvars
  fi
  #
  # a command that outputs a formatted text version of the HTML at the
diff --git a/www/apache2/patches/patch-ai b/www/apache2/patches/patch-ai
index 25fbcc6c237..d4193dd2d08 100644
--- a/www/apache2/patches/patch-ai
+++ b/www/apache2/patches/patch-ai
@@ -1,15 +1,12 @@
-$NetBSD: patch-ai,v 1.2 2002/03/05 23:56:24 jlam Exp $
+$NetBSD: patch-ai,v 1.3 2002/04/13 21:35:53 jlam Exp $
 
---- support/apxs.pl.in.orig	Fri Feb  1 14:25:14 2002
-+++ support/apxs.pl.in
-@@ -61,12 +61,13 @@
- ##  Configuration
- ##
+--- support/apxs.in.orig	Wed Mar 13 15:48:05 2002
++++ support/apxs.in
+@@ -63,10 +63,11 @@
  
--my $prefix         = "@prefix@";
-+my $prefix         = "%prefix%";
+ my $prefix         = "@prefix@";
  my $CFG_PREFIX     = $prefix;
-+my $installbuilddir = "%installbuilddir%";
++my $installbuilddir = "@exp_installbuilddir@"
  
  # read the configuration variables once
  my %config_vars = ();
@@ -18,7 +15,7 @@ $NetBSD: patch-ai,v 1.2 2002/03/05 23:56:24 jlam Exp $
  
  my $exec_prefix    = get_vars("exec_prefix");
  my $CFG_TARGET     = get_vars("progname");
-@@ -414,7 +415,7 @@
+@@ -415,7 +416,7 @@
          $la =~ s|\.c$|.la|;
          my $o = $s;
          $o =~ s|\.c$|.o|;
@@ -27,7 +24,7 @@ $NetBSD: patch-ai,v 1.2 2002/03/05 23:56:24 jlam Exp $
          unshift(@objs, $lo);
      }
  
-@@ -439,7 +440,7 @@
+@@ -440,7 +441,7 @@
          $opt .= " -l$opt_l";
      }
  
@@ -36,7 +33,7 @@ $NetBSD: patch-ai,v 1.2 2002/03/05 23:56:24 jlam Exp $
  
      #   execute the commands
      &execute_cmds(@cmds);
-@@ -470,8 +471,8 @@
+@@ -471,8 +472,8 @@
          $t =~ s|^.+/([^/]+)$|$1|;
          $t =~ s|\.la$|\.so|;
          if ($opt_i) {
diff --git a/www/apache2/patches/patch-aj b/www/apache2/patches/patch-aj
deleted file mode 100644
index a75814b310b..00000000000
--- a/www/apache2/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/03/06 19:52:50 jlam Exp $
-
---- srclib/apr-util/configure.orig	Thu Feb 14 03:14:58 2002
-+++ srclib/apr-util/configure
-@@ -5727,13 +5727,13 @@
- 
-   if test -r "$abs_expatdir/lib/expat.h.in"; then
-         expat_include_dir="$abs_expatdir/lib"
--    expat_libs="$abs_expatdir/lib/libexpat.la"
-+    expat_libs="-L$abs_expatdir/lib -lexpat"
-   elif test -r "$abs_expatdir/include/expat.h"; then
-         expat_include_dir="$abs_expatdir/include"
--    expat_libs="$abs_expatdir/lib/libexpat.la"
-+    expat_libs="-L$abs_expatdir/lib -lexpat"
-   elif test -r "$abs_expatdir/xmlparse.h"; then
-         expat_include_dir="$abs_expatdir"
--    expat_libs="$abs_expatdir/libexpat.la"
-+    expat_libs="-L$abs_expatdir -lexpat"
-     expat_old=yes
-   elif test -r "$abs_expatdir/include/xmlparse.h" -a \
-        -r "$abs_expatdir/lib/libexpat.a"; then
diff --git a/www/apache2/patches/patch-ak b/www/apache2/patches/patch-ak
new file mode 100644
index 00000000000..87918ebb951
--- /dev/null
+++ b/www/apache2/patches/patch-ak
@@ -0,0 +1,135 @@
+$NetBSD: patch-ak,v 1.1 2002/04/13 21:35:54 jlam Exp $
+
+--- docs/conf/httpd-std.conf.in.orig	Thu Apr  4 04:15:43 2002
++++ docs/conf/httpd-std.conf.in
+@@ -24,9 +24,9 @@
+ # Configuration and logfile names: If the filenames you specify for many
+ # of the server's control files begin with "/" (or "drive:/" for Win32), the
+ # server will use that explicit path.  If the filenames do *not* begin
+-# with "/", the value of ServerRoot is prepended -- so "@rel_logfiledir@/foo.log"
++# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
+ # with ServerRoot set to "@@ServerRoot@@" will be interpreted by the
+-# server as "@@ServerRoot@@/@rel_logfiledir@/foo.log".
++# server as "@@ServerRoot@@/logs/foo.log".
+ #
+ 
+ ### Section 1: Global Environment
+@@ -54,7 +54,7 @@
+ #
+ <IfModule !mpm_winnt.c>
+ <IfModule !mpm_netware.c>
+-#LockFile @rel_logfiledir@/accept.lock
++#LockFile @rel_runtimedir@/accept.lock
+ </IfModule>
+ </IfModule>
+ 
+@@ -68,7 +68,7 @@
+ #
+ <IfModule !mpm_netware.c>
+ <IfModule !perchild.c>
+-#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
++#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
+ </IfModule>
+ </IfModule>
+ 
+@@ -78,7 +78,7 @@
+ # identification number when it starts.
+ #
+ <IfModule !mpm_netware.c>
+-PidFile @rel_logfiledir@/httpd.pid
++PidFile @rel_runtimedir@/httpd.pid
+ </IfModule>
+ 
+ #
+@@ -290,7 +290,7 @@
+ # documents. By default, all requests are taken from this directory, but
+ # symbolic links and aliases may be used to point to other locations.
+ #
+-DocumentRoot "@@ServerRoot@@/@rel_htdocsdir@"
++DocumentRoot "@exp_htdocsdir@"
+ 
+ #
+ # Each directory to which Apache has access can be configured with respect
+@@ -315,7 +315,7 @@
+ #
+ # This should be changed to whatever you set DocumentRoot to.
+ #
+-<Directory "@@ServerRoot@@/@rel_htdocsdir@">
++<Directory "@exp_htdocsdir@">
+ 
+ #
+ # Possible values for the Options directive are "None", "All",
+@@ -499,9 +499,9 @@
+ # We include the /icons/ alias for FancyIndexed directory listings.  If you
+ # do not use FancyIndexing, you may comment this out.
+ #
+-Alias /icons/ "@@ServerRoot@@/@rel_iconsdir@/"
++Alias /icons/ "@exp_iconsdir@/"
+ 
+-<Directory "@@ServerRoot@@/@rel_iconsdir@">
++<Directory "@exp_iconsdir@">
+     Options Indexes MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -513,9 +513,9 @@
+ # the manual, even if you choose to move your DocumentRoot.  You may comment
+ # this out if you do not care for the documentation.
+ #
+-Alias /manual "@@ServerRoot@@/@rel_manualdir@"
++Alias /manual "@exp_manualdir@"
+ 
+-<Directory "@@ServerRoot@@/@rel_manualdir@">
++<Directory "@exp_manualdir@">
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride None
+     Order allow,deny
+@@ -530,7 +530,7 @@
+ # The same rules about trailing "/" apply to ScriptAlias directives as to
+ # Alias.
+ #
+-ScriptAlias /cgi-bin/ "@@ServerRoot@@/@rel_cgidir@/"
++ScriptAlias /cgi-bin/ "@exp_cgidir@/"
+ 
+ <IfModule mod_cgid.c>
+ #
+@@ -541,10 +541,10 @@
+ </IfModule>
+ 
+ #
+-# "@@ServerRoot@@/@rel_cgidir@" should be changed to whatever your ScriptAliased
++# "@exp_cgidir@" should be changed to whatever your ScriptAliased
+ # CGI directory exists, if you have that configured.
+ #
+-<Directory "@@ServerRoot@@/@rel_cgidir@">
++<Directory "@exp_cgidir@">
+     AllowOverride None
+     Options None
+     Order allow,deny
+@@ -854,15 +854,15 @@
+ #   Alias /error/include/ "/your/include/path/"
+ #
+ # which allows you to create your own set of files by starting with the
+-# @@ServerRoot@@/@rel_errordir@/include/ files and
++# @exp_errordir@/include/ files and
+ # copying them to /your/include/path/, even on a per-VirtualHost basis.
+ #
+ 
+ <IfModule mod_negotiation.c>
+ <IfModule mod_include.c>
+-    Alias /error/ "@@ServerRoot@@/@rel_errordir@/"
++    Alias /error/ "@exp_errordir@/"
+ 
+-    <Directory "@@ServerRoot@@/@rel_errordir@">
++    <Directory "@exp_errordir@">
+         AllowOverride None
+         Options IncludesNoExec
+         AddOutputFilter Includes html
+@@ -960,7 +960,7 @@
+ # To enable the cache as well, edit and uncomment the following lines:
+ # (no cacheing without CacheRoot)
+ #
+-#CacheRoot "@@ServerRoot@@/@rel_proxycachedir@"
++#CacheRoot "@exp_proxycachedir@"
+ #CacheSize 5
+ #CacheGcInterval 4
+ #CacheMaxExpire 24
diff --git a/www/apache2/patches/patch-al b/www/apache2/patches/patch-al
new file mode 100644
index 00000000000..3e16dd083af
--- /dev/null
+++ b/www/apache2/patches/patch-al
@@ -0,0 +1,34 @@
+$NetBSD: patch-al,v 1.1 2002/04/13 21:35:54 jlam Exp $
+
+--- include/httpd.h.orig	Fri Mar 29 03:17:19 2002
++++ include/httpd.h
+@@ -146,9 +146,9 @@
+ /* The name of the log files */
+ #ifndef DEFAULT_ERRORLOG
+ #if defined(OS2) || defined(WIN32)
+-#define DEFAULT_ERRORLOG "logs/error.log"
++#define DEFAULT_ERRORLOG DEFAULT_REL_LOGFILEDIR "/error.log"
+ #else
+-#define DEFAULT_ERRORLOG "logs/error_log"
++#define DEFAULT_ERRORLOG DEFAULT_REL_LOGFILEDIR "/error.log"
+ #endif
+ #endif /* DEFAULT_ERRORLOG */
+ 
+@@ -164,7 +164,7 @@
+ 
+ /* The name of the server config file */
+ #ifndef SERVER_CONFIG_FILE
+-#define SERVER_CONFIG_FILE "conf/httpd.conf"
++#define SERVER_CONFIG_FILE DEFAULT_REL_SYSCONFDIR "/httpd.conf"
+ #endif
+ 
+ /* Whether we should enable rfc1413 identity checking */
+@@ -255,7 +255,7 @@
+ 
+ /** The name of the MIME types file */
+ #ifndef AP_TYPES_CONFIG_FILE
+-#define AP_TYPES_CONFIG_FILE "conf/mime.types"
++#define AP_TYPES_CONFIG_FILE DEFAULT_REL_SYSCONFDIR "/mime.types"
+ #endif
+ 
+ /*
diff --git a/www/apache2/patches/patch-am b/www/apache2/patches/patch-am
new file mode 100644
index 00000000000..fed751ec3f2
--- /dev/null
+++ b/www/apache2/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2002/04/13 21:35:54 jlam Exp $
+
+--- include/scoreboard.h.orig	Fri Mar 29 11:21:48 2002
++++ include/scoreboard.h
+@@ -78,7 +78,7 @@
+ 
+ /* Scoreboard file, if there is one */
+ #ifndef DEFAULT_SCOREBOARD
+-#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
++#define DEFAULT_SCOREBOARD DEFAULT_REL_RUNTIMEDIR "/apache_runtime_status"
+ #endif
+ 
+ /* Scoreboard info on a process is, for now, kept very brief ---