summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/apache2/DESCR12
-rw-r--r--www/apache2/Makefile174
-rw-r--r--www/apache2/PLIST558
-rw-r--r--www/apache2/PLIST.shared39
-rw-r--r--www/apache2/distinfo23
-rw-r--r--www/apache2/files/apache.sh50
-rw-r--r--www/apache2/patches/patch-aa81
-rw-r--r--www/apache2/patches/patch-ab12
-rw-r--r--www/apache2/patches/patch-ac39
-rw-r--r--www/apache2/patches/patch-ad44
-rw-r--r--www/apache2/patches/patch-ae99
-rw-r--r--www/apache2/patches/patch-af83
-rw-r--r--www/apache2/patches/patch-ag57
-rw-r--r--www/apache2/patches/patch-ah43
-rw-r--r--www/apache2/patches/patch-ai60
15 files changed, 818 insertions, 556 deletions
diff --git a/www/apache2/DESCR b/www/apache2/DESCR
index 464fae3b2de..15f559a5b89 100644
--- a/www/apache2/DESCR
+++ b/www/apache2/DESCR
@@ -1,8 +1,6 @@
-Apache is an HTTP server designed as a plug-in replacement for
-the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in
-the NCSA server and includes many frequently requested new
-features, and has an API which allows it to be extended to meet
-users' needs more easily.
+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 that the pkgsrc directory builds and installs an alpha version of
-Apache.
+*NOTE: This package installs a beta release of Apache 2.0. For a stable
+ release, please install Apache1.3.x (www/apache).
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 395c3a2b77c..a8c46511226 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,58 +1,154 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/05 23:24:06 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/05 23:56:22 jlam Exp $
-DISTNAME= httpd-2_0_28-beta
-PKGNAME= apache-2.0.28
+DISTNAME= httpd-2.0.32-beta
+PKGNAME= apache-2.0.32
+WRKSRC= ${WRKDIR}/httpd-2.0.32
CATEGORIES= www
MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
+ http://httpd.apache.org/dist/httpd/old/ \
http://www.netbsd.org/images/logos/
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.apache.org/
-COMMENT= HTTP (Web) server, version 2
+MAINTAINER= jlam@netbsd.org
+HOMEPAGE= http://httpd.apache.org/
+COMMENT= HTTP (Web) server, version 2 (BETA)
-CONFLICTS= apache-*modssl-[0-9]* apache-[0-9]*
-CONFLICTS+= apache6-[0-9]* ap-[0-9]*
+CONFLICTS= apache-*modssl-[0-9]* apache-[0-9]* apache6-[0-9]*
+CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs
-# autodetect
BUILD_DEFS+= USE_INET6
USE_BUILDLINK_ONLY= YES
-HAS_CONFIGURE= YES
+REPLACE_BUILDLINK= config_vars.mk
+REPLACE_BUILDLINK_SED= -e "s|${BUILDLINK_DIR}|${LOCALBASE}|g"
+
USE_GMAKE= YES
-USE_SSL= YES
+PLIST_SRC= # empty
+
+USE_LIBTOOL= YES
+LIBTOOL_OVERRIDE= ${WRKSRC}/srclib/apr/libtool
+
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-layout=NetBSD
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-port=80
-.if exists(${LOCALBASE}/include/openssl/ssl.h)
-CONFIGURE_ARGS+= --with-ssl=${LOCALBASE}/include --enable-tls
+CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR}
+
+# Apache Portable Runtime library configure options
+CONFIGURE_ARGS+= --with-mpm=prefork
+
+# Apache Portable Runtime Utility library configure options
+CONFIGURE_ARGS+= --with-dbm=sdbm
+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+= ssl
+
+.if defined(NOPIC) || (defined(MKPIC) && (${MKPIC} == "no"))
+CONFIGURE_ARGS+= --enable-modules="${APACHE_MODULES}"
+CONFIGURE_ARGS+= --disable-so
.else
-CONFIGURE_ARGS+= --with-ssl=/usr/include --enable-tls
+CONFIGURE_ARGS+= --enable-mods-shared="${APACHE_MODULES}"
+CONFIGURE_ARGS+= --enable-so
+PLIST_SRC+= ${.CURDIR}/PLIST.shared
.endif
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= --enable-rewrite
-CONFIGURE_ARGS+= --with-expat=${BUILDLINK_DIR}
-USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/srclib/pcre/ltconfig \
- ${WRKSRC}/srclib/apr/build/ltconfig
-
-WRKSRC= ${WRKDIR}/httpd-2_0_28
-
-post-patch:
- ${RM} ${WRKSRC}/docs/conf/*.orig
- (cd ${WRKSRC} && ${LN} -s ${LOCALBASE}/bin/libtool)
- (cd ${WRKSRC} && ${RM} -rf srclib/apr-util/xml/expat)
-
-pre-configure:
- ${CP} ${WRKSRC}/config.layout ${WRKSRC}/config.layout.bak
- ${SED} -e 's:PKG_PREFIX:${PREFIX}:g' ${WRKSRC}/config.layout.bak \
- > ${WRKSRC}/config.layout
- ${CP} ${WRKSRC}/docs/conf/httpd-std.conf \
- ${WRKSRC}/docs/conf/httpd-std.conf.bak
- ${SED} -e 's:PKG_PREFIX:${PREFIX}:g' \
- ${WRKSRC}/docs/conf/httpd-std.conf.bak \
- > ${WRKSRC}/docs/conf/httpd-std.conf
- ${RM} ${WRKSRC}/docs/conf/httpd-std.conf.bak ${WRKSRC}/config.layout.bak
+SUEXEC_COMMENT?= "@comment "
+.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
+APACHE_SUEXEC_USER?= www
+APACHE_SUEXEC_GROUP?= nogroup
+APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/apache/htdocs
+APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
+APACHE_SUEXEC_CONFIGURE_ARGS+= \
+ --with-suexec-bin=${PREFIX}/sbin/suexec \
+ --with-suexec-caller=${APACHE_SUEXEC_USER} \
+ --with-suexec-safepath='${APACHE_SUEXEC_PATH}' \
+ --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT}
+APACHE_MODULES+= suexec
+CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
+BUILD_DEFS+= APACHE_SUEXEC APACHE_SUEXEC_CONFIGURE_ARGS
+SUEXEC_COMMENT= # empty
+
+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
+PKG_SYSCONFSUBDIR?= httpd
+EGDIR= ${PREFIX}/share/examples/httpd
+SBINDIR= ${PREFIX}/sbin
+CONF_FILES= ${EGDIR}/httpd-std.conf ${PKG_SYSCONFDIR}/httpd.conf
+CONF_FILES+= ${EGDIR}/ssl-std.conf ${PKG_SYSCONFDIR}/ssl.conf
+SUPPORT_FILES= ${SBINDIR}/envvars-std ${SBINDIR}/envvars
+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
+
+post-build:
+ @${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
+
+post-install:
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}"
+ cd ${EGDIR}; \
+ for file in \
+ highperformance-std.conf \
+ httpd-std.conf \
+ ssl-std.conf; \
+ do \
+ ${SED} -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g" \
+ $${file} >> $${file}.new; \
+ ${MV} -f $${file}.new $${file}; \
+ done
+ ${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 df97ea38b79..e92d6f716d2 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,20 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
-bin/ab
-bin/apachectl
-bin/apxs
-bin/checkgid
-bin/dbmmanage
-bin/htdigest
-bin/htpasswd
-bin/httpd
-bin/logresolve
-bin/rotatelogs
-etc/httpd/highperformance-std.conf
-etc/httpd/httpd-std.conf
-etc/httpd/magic
-etc/httpd/mime.types
-etc/httpd/ssl-std.conf
+@comment $NetBSD: PLIST,v 1.2 2002/03/05 23:56:22 jlam Exp $
+bin/apr-config
+bin/apu-config
+etc/rc.d/apache
include/apr.h
+include/apr_anylock.h
include/apr_base64.h
include/apr_buckets.h
include/apr_compat.h
@@ -43,9 +32,10 @@ include/apr_pools.h
include/apr_portable.h
include/apr_proc_mutex.h
include/apr_ring.h
+include/apr_rmm.h
include/apr_sdbm.h
include/apr_sha1.h
-include/apr_shmem.h
+include/apr_shm.h
include/apr_signal.h
include/apr_strings.h
include/apr_tables.h
@@ -57,6 +47,7 @@ include/apr_time.h
include/apr_uri.h
include/apr_user.h
include/apr_uuid.h
+include/apr_version.h
include/apr_want.h
include/apr_xlate.h
include/apr_xml.h
@@ -70,6 +61,7 @@ include/httpd/ap_mmn.h
include/httpd/ap_mpm.h
include/httpd/ap_release.h
include/httpd/apr.h
+include/httpd/apr_anylock.h
include/httpd/apr_base64.h
include/httpd/apr_buckets.h
include/httpd/apr_compat.h
@@ -98,9 +90,10 @@ include/httpd/apr_pools.h
include/httpd/apr_portable.h
include/httpd/apr_proc_mutex.h
include/httpd/apr_ring.h
+include/httpd/apr_rmm.h
include/httpd/apr_sdbm.h
include/httpd/apr_sha1.h
-include/httpd/apr_shmem.h
+include/httpd/apr_shm.h
include/httpd/apr_signal.h
include/httpd/apr_strings.h
include/httpd/apr_tables.h
@@ -112,12 +105,12 @@ include/httpd/apr_time.h
include/httpd/apr_uri.h
include/httpd/apr_user.h
include/httpd/apr_uuid.h
+include/httpd/apr_version.h
include/httpd/apr_want.h
include/httpd/apr_xlate.h
include/httpd/apr_xml.h
include/httpd/apu.h
include/httpd/apu_compat.h
-include/httpd/config.h
include/httpd/http_config.h
include/httpd/http_connection.h
include/httpd/http_core.h
@@ -127,7 +120,6 @@ include/httpd/http_protocol.h
include/httpd/http_request.h
include/httpd/http_vhost.h
include/httpd/httpd.h
-include/httpd/internal.h
include/httpd/mod_cgi.h
include/httpd/mod_core.h
include/httpd/mod_dav.h
@@ -157,6 +149,8 @@ include/httpd/util_script.h
include/httpd/util_time.h
include/httpd/util_xml.h
lib/APRVARS
+lib/apr.exp
+lib/aprutil.exp
lib/httpd/httpd.exp
lib/libapr.a
lib/libapr.la
@@ -168,9 +162,6 @@ lib/libaprutil.la
lib/libaprutil.so
lib/libaprutil.so.0
lib/libaprutil.so.0.0
-libexec/cgi-bin/printenv
-libexec/cgi-bin/test-cgi
-libexec/cgi-bin/test-cgi.bat
man/man1/dbmmanage.1
man/man1/htdigest.1
man/man1/htpasswd.1
@@ -181,238 +172,26 @@ man/man8/httpd.8
man/man8/logresolve.8
man/man8/rotatelogs.8
man/man8/suexec.8
-share/httpd/manual/LICENSE
-share/httpd/manual/bind.html
-share/httpd/manual/cgi_path.html
-share/httpd/manual/configuring.html.en
-share/httpd/manual/configuring.html.ja.jis
-share/httpd/manual/content-negotiation.html
-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/footer.html
-share/httpd/manual/developer/header.html
-share/httpd/manual/developer/hooks.html
-share/httpd/manual/developer/index.html
-share/httpd/manual/developer/layeredio.html
-share/httpd/manual/developer/modules.html
-share/httpd/manual/developer/request.html
-share/httpd/manual/dns-caveats.html
-share/httpd/manual/dso.html
-share/httpd/manual/ebcdic.html
-share/httpd/manual/env.html
-share/httpd/manual/faq/footer.html
-share/httpd/manual/faq/header.html
-share/httpd/manual/faq/index.html
-share/httpd/manual/faq/support.html
-share/httpd/manual/filter.html
-share/httpd/manual/footer.html
-share/httpd/manual/handler.html.en
-share/httpd/manual/handler.html.ja.jis
-share/httpd/manual/header.html
-share/httpd/manual/howto/auth.html
-share/httpd/manual/howto/cgi.html.en
-share/httpd/manual/howto/cgi.html.ja.jis
-share/httpd/manual/howto/footer.html
-share/httpd/manual/howto/header.html
-share/httpd/manual/howto/ssi.html.en
-share/httpd/manual/howto/ssi.html.ja.jis
-share/httpd/manual/images/apache_header.gif
-share/httpd/manual/images/apache_header.png
-share/httpd/manual/images/custom_errordocs.gif
-share/httpd/manual/images/custom_errordocs.png
-share/httpd/manual/images/home.gif
-share/httpd/manual/images/home.png
-share/httpd/manual/images/index.gif
-share/httpd/manual/images/index.png
-share/httpd/manual/images/mod_rewrite_fig1.fig
-share/httpd/manual/images/mod_rewrite_fig1.gif
-share/httpd/manual/images/mod_rewrite_fig1.png
-share/httpd/manual/images/mod_rewrite_fig2.fig
-share/httpd/manual/images/mod_rewrite_fig2.gif
-share/httpd/manual/images/mod_rewrite_fig2.png
-share/httpd/manual/images/pixel.gif
-share/httpd/manual/images/pixel.png
-share/httpd/manual/images/sub.gif
-share/httpd/manual/images/sub.png
-share/httpd/manual/index.html.en
-share/httpd/manual/index.html.fr
-share/httpd/manual/index.html.ja.jis
-share/httpd/manual/install.html
-share/httpd/manual/invoking.html
-share/httpd/manual/logs.html
-share/httpd/manual/misc/custom_errordocs.html
-share/httpd/manual/misc/descriptors.html
-share/httpd/manual/misc/fin_wait_2.html
-share/httpd/manual/misc/footer.html
-share/httpd/manual/misc/header.html
-share/httpd/manual/misc/index.html
-share/httpd/manual/misc/known_client_problems.html
-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/core.html
-share/httpd/manual/mod/directive-dict.html
-share/httpd/manual/mod/directives.html
-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/mod_TEMPLATE.html
-share/httpd/manual/mod/mod_access.html
-share/httpd/manual/mod/mod_actions.html
-share/httpd/manual/mod/mod_alias.html
-share/httpd/manual/mod/mod_asis.html
-share/httpd/manual/mod/mod_auth.html
-share/httpd/manual/mod/mod_auth_anon.html
-share/httpd/manual/mod/mod_auth_db.html
-share/httpd/manual/mod/mod_auth_dbm.html
-share/httpd/manual/mod/mod_auth_digest.html
-share/httpd/manual/mod/mod_auth_ldap.html
-share/httpd/manual/mod/mod_autoindex.html
-share/httpd/manual/mod/mod_cern_meta.html
-share/httpd/manual/mod/mod_cgi.html
-share/httpd/manual/mod/mod_cgid.html
-share/httpd/manual/mod/mod_charset_lite.html
-share/httpd/manual/mod/mod_dav.html
-share/httpd/manual/mod/mod_dir.html
-share/httpd/manual/mod/mod_env.html
-share/httpd/manual/mod/mod_example.html
-share/httpd/manual/mod/mod_expires.html
-share/httpd/manual/mod/mod_ext_filter.html
-share/httpd/manual/mod/mod_file_cache.html
-share/httpd/manual/mod/mod_headers.html
-share/httpd/manual/mod/mod_imap.html
-share/httpd/manual/mod/mod_include.html
-share/httpd/manual/mod/mod_info.html
-share/httpd/manual/mod/mod_isapi.html
-share/httpd/manual/mod/mod_ldap.html
-share/httpd/manual/mod/mod_log_config.html
-share/httpd/manual/mod/mod_mime.html
-share/httpd/manual/mod/mod_mime_magic.html
-share/httpd/manual/mod/mod_mmap_static.html
-share/httpd/manual/mod/mod_negotiation.html
-share/httpd/manual/mod/mod_proxy.html
-share/httpd/manual/mod/mod_rewrite.html
-share/httpd/manual/mod/mod_setenvif.html
-share/httpd/manual/mod/mod_so.html
-share/httpd/manual/mod/mod_speling.html
-share/httpd/manual/mod/mod_ssl.html
-share/httpd/manual/mod/mod_status.html
-share/httpd/manual/mod/mod_suexec.html
-share/httpd/manual/mod/mod_unique_id.html
-share/httpd/manual/mod/mod_userdir.html
-share/httpd/manual/mod/mod_usertrack.html
-share/httpd/manual/mod/mod_vhost_alias.html
-share/httpd/manual/mod/module-dict.html
-share/httpd/manual/mod/mpm_common.html
-share/httpd/manual/mod/mpm_winnt.html
-share/httpd/manual/mod/perchild.html
-share/httpd/manual/mod/prefork.html
-share/httpd/manual/mod/threaded.html
-share/httpd/manual/mpm.html
-share/httpd/manual/new_features_2_0.html.en
-share/httpd/manual/new_features_2_0.html.fr
-share/httpd/manual/platform/footer.html
-share/httpd/manual/platform/header.html
-share/httpd/manual/platform/perf-hp.html
-share/httpd/manual/platform/win_compiling.html
-share/httpd/manual/platform/win_service.html
-share/httpd/manual/platform/windows.html
-share/httpd/manual/programs/ab.html
-share/httpd/manual/programs/apachectl.html
-share/httpd/manual/programs/apxs.html
-share/httpd/manual/programs/dbmmanage.html
-share/httpd/manual/programs/footer.html
-share/httpd/manual/programs/header.html
-share/httpd/manual/programs/htdigest.html
-share/httpd/manual/programs/htpasswd.html
-share/httpd/manual/programs/httpd.html
-share/httpd/manual/programs/index.html
-share/httpd/manual/programs/logresolve.html
-share/httpd/manual/programs/other.html
-share/httpd/manual/programs/rotatelogs.html
-share/httpd/manual/programs/suexec.html
-share/httpd/manual/search/manual-index.cgi
-share/httpd/manual/sections.html
-share/httpd/manual/server-wide.html.en
-share/httpd/manual/server-wide.html.ja.jis
-share/httpd/manual/ssl/Makefile
-share/httpd/manual/ssl/footer.html
-share/httpd/manual/ssl/header.html
-share/httpd/manual/ssl/index.html
-share/httpd/manual/ssl/mod_ssl_sb.gif
-share/httpd/manual/ssl/openssl_ics.gif
-share/httpd/manual/ssl/ssl_compat.gfont000.gif
-share/httpd/manual/ssl/ssl_compat.html
-share/httpd/manual/ssl/ssl_compat.wml
-share/httpd/manual/ssl/ssl_cover.wml
-share/httpd/manual/ssl/ssl_cover_logo.jpg
-share/httpd/manual/ssl/ssl_cover_title.jpg
-share/httpd/manual/ssl/ssl_faq.gfont000.gif
-share/httpd/manual/ssl/ssl_faq.html
-share/httpd/manual/ssl/ssl_faq.wml
-share/httpd/manual/ssl/ssl_glossary.html
-share/httpd/manual/ssl/ssl_glossary.wml
-share/httpd/manual/ssl/ssl_howto.gfont000.gif
-share/httpd/manual/ssl/ssl_howto.html
-share/httpd/manual/ssl/ssl_howto.wml
-share/httpd/manual/ssl/ssl_intro.gfont000.gif
-share/httpd/manual/ssl/ssl_intro.html
-share/httpd/manual/ssl/ssl_intro.wml
-share/httpd/manual/ssl/ssl_intro_fig1.gif
-share/httpd/manual/ssl/ssl_intro_fig2.gif
-share/httpd/manual/ssl/ssl_intro_fig3.gif
-share/httpd/manual/ssl/ssl_overview.gfont000.gif
-share/httpd/manual/ssl/ssl_overview.html
-share/httpd/manual/ssl/ssl_overview.wml
-share/httpd/manual/ssl/ssl_overview_fig1.gif
-share/httpd/manual/ssl/ssl_reference.gfont000.gif
-share/httpd/manual/ssl/ssl_reference.html
-share/httpd/manual/ssl/ssl_reference.wml
-share/httpd/manual/ssl/ssl_template.head-chapter.gif
-share/httpd/manual/ssl/ssl_template.head-num-1.gif
-share/httpd/manual/ssl/ssl_template.head-num-2.gif
-share/httpd/manual/ssl/ssl_template.head-num-3.gif
-share/httpd/manual/ssl/ssl_template.head-num-4.gif
-share/httpd/manual/ssl/ssl_template.head-num-5.gif
-share/httpd/manual/ssl/ssl_template.head-num-6.gif
-share/httpd/manual/ssl/ssl_template.head-num-7.gif
-share/httpd/manual/ssl/ssl_template.imgdot-1x1-000000.gif
-share/httpd/manual/ssl/ssl_template.imgdot-1x1-transp.gif
-share/httpd/manual/ssl/ssl_template.inc
-share/httpd/manual/ssl/ssl_template.navbut-next-n.gif
-share/httpd/manual/ssl/ssl_template.navbut-next-s.gif
-share/httpd/manual/ssl/ssl_template.navbut-prev-n.gif
-share/httpd/manual/ssl/ssl_template.navbut-prev-s.gif
-share/httpd/manual/ssl/ssl_template.title-abstract.gif
-share/httpd/manual/ssl/ssl_template.title-compat.gif
-share/httpd/manual/ssl/ssl_template.title-faq.gif
-share/httpd/manual/ssl/ssl_template.title-gloss.gif
-share/httpd/manual/ssl/ssl_template.title-howto.gif
-share/httpd/manual/ssl/ssl_template.title-intro.gif
-share/httpd/manual/ssl/ssl_template.title-over.gif
-share/httpd/manual/ssl/ssl_template.title-preface.gif
-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/suexec.html
-share/httpd/manual/upgrading.html.en
-share/httpd/manual/upgrading.html.fr
-share/httpd/manual/urlmapping.html
-share/httpd/manual/vhosts/details.html
-share/httpd/manual/vhosts/examples.html
-share/httpd/manual/vhosts/fd-limits.html
-share/httpd/manual/vhosts/footer.html
-share/httpd/manual/vhosts/header.html
-share/httpd/manual/vhosts/index.html
-share/httpd/manual/vhosts/ip-based.html
-share/httpd/manual/vhosts/mass.html
-share/httpd/manual/vhosts/name-based.html
+sbin/ab
+sbin/apachectl
+sbin/apxs
+sbin/checkgid
+sbin/dbmmanage
+sbin/envvars-std
+sbin/htdbm
+sbin/htdigest
+sbin/htpasswd
+sbin/httpd
+sbin/logresolve
+sbin/rotatelogs
+${SUEXEC_COMMENT}sbin/suexec
+share/examples/httpd/highperformance-std.conf
+share/examples/httpd/httpd-std.conf
+share/examples/httpd/magic
+share/examples/httpd/mime.types
+share/examples/httpd/ssl-std.conf
share/httpd/build/config_vars.mk
+share/httpd/build/instdso.sh
share/httpd/build/library.mk
share/httpd/build/libtool
share/httpd/build/ltlib.mk
@@ -437,6 +216,7 @@ share/httpd/error/HTTP_SERVICE_UNAVAILABLE.html.var
share/httpd/error/HTTP_UNAUTHORIZED.html.var
share/httpd/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
share/httpd/error/HTTP_VARIANT_ALSO_VARIES.html.var
+share/httpd/error/README
share/httpd/error/contact.html.var
share/httpd/error/include/bottom.html
share/httpd/error/include/spacer.html
@@ -446,7 +226,6 @@ share/httpd/htdocs/apache_pb.png
share/httpd/htdocs/apache_pb2.gif
share/httpd/htdocs/apache_pb2.png
share/httpd/htdocs/apache_pb2_ani.gif
-share/httpd/htdocs/error.README
share/httpd/htdocs/index.html.ca
share/httpd/htdocs/index.html.cz.iso8859-2
share/httpd/htdocs/index.html.de
@@ -698,25 +477,256 @@ share/httpd/icons/world1.gif
share/httpd/icons/world1.png
share/httpd/icons/world2.gif
share/httpd/icons/world2.png
-@dirrm include/httpd
-@dirrm lib/httpd
-@dirrm share/httpd/build
-@dirrm share/httpd/error/include
-@dirrm share/httpd/error
-@dirrm share/httpd/htdocs
-@dirrm share/httpd/icons/small
-@dirrm share/httpd/icons
-@dirrm share/httpd/manual/developer
-@dirrm share/httpd/manual/faq
-@dirrm share/httpd/manual/howto
-@dirrm share/httpd/manual/images
-@dirrm share/httpd/manual/misc
-@dirrm share/httpd/manual/mod
-@dirrm share/httpd/manual/platform
-@dirrm share/httpd/manual/programs
-@dirrm share/httpd/manual/search
-@dirrm share/httpd/manual/ssl
+share/httpd/manual/LICENSE
+share/httpd/manual/bind.html
+share/httpd/manual/cgi_path.html
+share/httpd/manual/configuring.html.en
+share/httpd/manual/configuring.html.ja.jis
+share/httpd/manual/content-negotiation.html
+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/footer.html
+share/httpd/manual/developer/header.html
+share/httpd/manual/developer/hooks.html
+share/httpd/manual/developer/index.html
+share/httpd/manual/developer/layeredio.html
+share/httpd/manual/developer/modules.html
+share/httpd/manual/developer/request.html
+share/httpd/manual/dns-caveats.html
+share/httpd/manual/dso.html
+share/httpd/manual/ebcdic.html
+share/httpd/manual/env.html
+share/httpd/manual/faq/index.html
+share/httpd/manual/filter.html
+share/httpd/manual/footer.html
+share/httpd/manual/handler.html.en
+share/httpd/manual/handler.html.ja.jis
+share/httpd/manual/header.html
+share/httpd/manual/howto/auth.html
+share/httpd/manual/howto/cgi.html.en
+share/httpd/manual/howto/cgi.html.ja.jis
+share/httpd/manual/howto/footer.html
+share/httpd/manual/howto/header.html
+share/httpd/manual/howto/ssi.html.en
+share/httpd/manual/howto/ssi.html.ja.jis
+share/httpd/manual/images/apache_header.gif
+share/httpd/manual/images/apache_header.png
+share/httpd/manual/images/custom_errordocs.gif
+share/httpd/manual/images/custom_errordocs.png
+share/httpd/manual/images/home.gif
+share/httpd/manual/images/home.png
+share/httpd/manual/images/index.gif
+share/httpd/manual/images/index.png
+share/httpd/manual/images/mod_rewrite_fig1.fig
+share/httpd/manual/images/mod_rewrite_fig1.gif
+share/httpd/manual/images/mod_rewrite_fig1.png
+share/httpd/manual/images/mod_rewrite_fig2.fig
+share/httpd/manual/images/mod_rewrite_fig2.gif
+share/httpd/manual/images/mod_rewrite_fig2.png
+share/httpd/manual/images/pixel.gif
+share/httpd/manual/images/pixel.png
+share/httpd/manual/images/sub.gif
+share/httpd/manual/images/sub.png
+share/httpd/manual/index.html.en
+share/httpd/manual/index.html.fr
+share/httpd/manual/index.html.ja.jis
+share/httpd/manual/install.html
+share/httpd/manual/invoking.html
+share/httpd/manual/logs.html
+share/httpd/manual/misc/custom_errordocs.html
+share/httpd/manual/misc/descriptors.html
+share/httpd/manual/misc/fin_wait_2.html
+share/httpd/manual/misc/footer.html
+share/httpd/manual/misc/header.html
+share/httpd/manual/misc/index.html
+share/httpd/manual/misc/known_client_problems.html
+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/core.html
+share/httpd/manual/mod/directive-dict.html
+share/httpd/manual/mod/directives.html
+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/mod_TEMPLATE.html
+share/httpd/manual/mod/mod_access.html
+share/httpd/manual/mod/mod_actions.html
+share/httpd/manual/mod/mod_alias.html
+share/httpd/manual/mod/mod_asis.html
+share/httpd/manual/mod/mod_auth.html
+share/httpd/manual/mod/mod_auth_anon.html
+share/httpd/manual/mod/mod_auth_dbm.html
+share/httpd/manual/mod/mod_auth_digest.html
+share/httpd/manual/mod/mod_auth_ldap.html
+share/httpd/manual/mod/mod_autoindex.html
+share/httpd/manual/mod/mod_cern_meta.html
+share/httpd/manual/mod/mod_cgi.html
+share/httpd/manual/mod/mod_cgid.html
+share/httpd/manual/mod/mod_charset_lite.html
+share/httpd/manual/mod/mod_dav.html
+share/httpd/manual/mod/mod_dir.html
+share/httpd/manual/mod/mod_env.html
+share/httpd/manual/mod/mod_example.html
+share/httpd/manual/mod/mod_expires.html
+share/httpd/manual/mod/mod_ext_filter.html
+share/httpd/manual/mod/mod_file_cache.html
+share/httpd/manual/mod/mod_headers.html
+share/httpd/manual/mod/mod_imap.html
+share/httpd/manual/mod/mod_include.html
+share/httpd/manual/mod/mod_info.html
+share/httpd/manual/mod/mod_isapi.html
+share/httpd/manual/mod/mod_ldap.html
+share/httpd/manual/mod/mod_log_config.html
+share/httpd/manual/mod/mod_mime.html
+share/httpd/manual/mod/mod_mime_magic.html
+share/httpd/manual/mod/mod_mmap_static.html
+share/httpd/manual/mod/mod_negotiation.html
+share/httpd/manual/mod/mod_proxy.html
+share/httpd/manual/mod/mod_rewrite.html
+share/httpd/manual/mod/mod_setenvif.html
+share/httpd/manual/mod/mod_so.html
+share/httpd/manual/mod/mod_speling.html
+share/httpd/manual/mod/mod_ssl.html
+share/httpd/manual/mod/mod_status.html
+share/httpd/manual/mod/mod_suexec.html
+share/httpd/manual/mod/mod_unique_id.html
+share/httpd/manual/mod/mod_userdir.html
+share/httpd/manual/mod/mod_usertrack.html
+share/httpd/manual/mod/mod_vhost_alias.html
+share/httpd/manual/mod/module-dict.html
+share/httpd/manual/mod/mpm_common.html
+share/httpd/manual/mod/mpm_netware.html
+share/httpd/manual/mod/mpm_winnt.html
+share/httpd/manual/mod/perchild.html
+share/httpd/manual/mod/prefork.html
+share/httpd/manual/mod/worker.html
+share/httpd/manual/mpm.html
+share/httpd/manual/new_features_2_0.html.de
+share/httpd/manual/new_features_2_0.html.en
+share/httpd/manual/new_features_2_0.html.fr
+share/httpd/manual/platform/footer.html
+share/httpd/manual/platform/header.html
+share/httpd/manual/platform/netware.html
+share/httpd/manual/platform/perf-hp.html
+share/httpd/manual/platform/win_compiling.html
+share/httpd/manual/platform/win_service.html
+share/httpd/manual/platform/windows.html
+share/httpd/manual/programs/ab.html
+share/httpd/manual/programs/apachectl.html
+share/httpd/manual/programs/apxs.html
+share/httpd/manual/programs/dbmmanage.html
+share/httpd/manual/programs/footer.html
+share/httpd/manual/programs/header.html
+share/httpd/manual/programs/htdigest.html
+share/httpd/manual/programs/htpasswd.html
+share/httpd/manual/programs/httpd.html
+share/httpd/manual/programs/index.html
+share/httpd/manual/programs/logresolve.html
+share/httpd/manual/programs/other.html
+share/httpd/manual/programs/rotatelogs.html
+share/httpd/manual/programs/suexec.html
+share/httpd/manual/search/manual-index.cgi
+share/httpd/manual/sections.html
+share/httpd/manual/server-wide.html.en
+share/httpd/manual/server-wide.html.ja.jis
+share/httpd/manual/sitemap.html
+share/httpd/manual/ssl/Makefile
+share/httpd/manual/ssl/footer.html
+share/httpd/manual/ssl/header.html
+share/httpd/manual/ssl/index.html
+share/httpd/manual/ssl/mod_ssl_sb.gif
+share/httpd/manual/ssl/openssl_ics.gif
+share/httpd/manual/ssl/ssl_compat.gfont000.gif
+share/httpd/manual/ssl/ssl_compat.html
+share/httpd/manual/ssl/ssl_compat.wml
+share/httpd/manual/ssl/ssl_cover.wml
+share/httpd/manual/ssl/ssl_cover_logo.jpg
+share/httpd/manual/ssl/ssl_cover_title.jpg
+share/httpd/manual/ssl/ssl_faq.gfont000.gif
+share/httpd/manual/ssl/ssl_faq.html
+share/httpd/manual/ssl/ssl_faq.wml
+share/httpd/manual/ssl/ssl_glossary.html
+share/httpd/manual/ssl/ssl_glossary.wml
+share/httpd/manual/ssl/ssl_howto.gfont000.gif
+share/httpd/manual/ssl/ssl_howto.html
+share/httpd/manual/ssl/ssl_howto.wml
+share/httpd/manual/ssl/ssl_intro.gfont000.gif
+share/httpd/manual/ssl/ssl_intro.html
+share/httpd/manual/ssl/ssl_intro.wml
+share/httpd/manual/ssl/ssl_intro_fig1.gif
+share/httpd/manual/ssl/ssl_intro_fig2.gif
+share/httpd/manual/ssl/ssl_intro_fig3.gif
+share/httpd/manual/ssl/ssl_overview.gfont000.gif
+share/httpd/manual/ssl/ssl_overview.html
+share/httpd/manual/ssl/ssl_overview.wml
+share/httpd/manual/ssl/ssl_overview_fig1.gif
+share/httpd/manual/ssl/ssl_reference.gfont000.gif
+share/httpd/manual/ssl/ssl_reference.html
+share/httpd/manual/ssl/ssl_reference.wml
+share/httpd/manual/ssl/ssl_template.head-chapter.gif
+share/httpd/manual/ssl/ssl_template.head-num-1.gif
+share/httpd/manual/ssl/ssl_template.head-num-2.gif
+share/httpd/manual/ssl/ssl_template.head-num-3.gif
+share/httpd/manual/ssl/ssl_template.head-num-4.gif
+share/httpd/manual/ssl/ssl_template.head-num-5.gif
+share/httpd/manual/ssl/ssl_template.head-num-6.gif
+share/httpd/manual/ssl/ssl_template.head-num-7.gif
+share/httpd/manual/ssl/ssl_template.imgdot-1x1-000000.gif
+share/httpd/manual/ssl/ssl_template.imgdot-1x1-transp.gif
+share/httpd/manual/ssl/ssl_template.inc
+share/httpd/manual/ssl/ssl_template.navbut-next-n.gif
+share/httpd/manual/ssl/ssl_template.navbut-next-s.gif
+share/httpd/manual/ssl/ssl_template.navbut-prev-n.gif
+share/httpd/manual/ssl/ssl_template.navbut-prev-s.gif
+share/httpd/manual/ssl/ssl_template.title-abstract.gif
+share/httpd/manual/ssl/ssl_template.title-compat.gif
+share/httpd/manual/ssl/ssl_template.title-faq.gif
+share/httpd/manual/ssl/ssl_template.title-gloss.gif
+share/httpd/manual/ssl/ssl_template.title-howto.gif
+share/httpd/manual/ssl/ssl_template.title-intro.gif
+share/httpd/manual/ssl/ssl_template.title-over.gif
+share/httpd/manual/ssl/ssl_template.title-preface.gif
+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/suexec.html
+share/httpd/manual/upgrading.html.en
+share/httpd/manual/upgrading.html.fr
+share/httpd/manual/urlmapping.html
+share/httpd/manual/vhosts/details.html
+share/httpd/manual/vhosts/examples.html
+share/httpd/manual/vhosts/fd-limits.html
+share/httpd/manual/vhosts/footer.html
+share/httpd/manual/vhosts/header.html
+share/httpd/manual/vhosts/index.html
+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/ssl
+@dirrm share/httpd/manual/search
+@dirrm share/httpd/manual/programs
+@dirrm share/httpd/manual/platform
+@dirrm share/httpd/manual/mod
+@dirrm share/httpd/manual/misc
+@dirrm share/httpd/manual/images
+@dirrm share/httpd/manual/howto
+@dirrm share/httpd/manual/faq
+@dirrm share/httpd/manual/developer
@dirrm share/httpd/manual
+@dirrm share/httpd/icons/small
+@dirrm share/httpd/icons
+@dirrm share/httpd/htdocs
+@dirrm share/httpd/error/include
+@dirrm share/httpd/error
+@dirrm share/httpd/build
@dirrm share/httpd
-@unexec ${RMDIR} %D/etc/httpd 2>/dev/null || true
+@dirrm share/examples/httpd
+@dirrm lib/httpd
+@dirrm include/httpd
diff --git a/www/apache2/PLIST.shared b/www/apache2/PLIST.shared
new file mode 100644
index 00000000000..ed504406e48
--- /dev/null
+++ b/www/apache2/PLIST.shared
@@ -0,0 +1,39 @@
+@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 ca27c04a772..690ab09fe01 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/03/05 23:24:06 jlam Exp $
+$NetBSD: distinfo,v 1.2 2002/03/05 23:56:22 jlam Exp $
-SHA1 (httpd-2_0_28-beta.tar.gz) = b71fbba49868ff3eff617ba7bb841d487a30a19b
-Size (httpd-2_0_28-beta.tar.gz) = 3644979 bytes
-SHA1 (patch-aa) = cd6d76791c934b4e160d31b37eb1eca1968c16b2
-SHA1 (patch-ac) = ef3e92cf357b9be7a521f42028dc0c48d095e258
-SHA1 (patch-ad) = adc737014e565a99ac2b9477a6f73091ac56569a
-SHA1 (patch-ae) = ca009f4b6654f5de765128ed437efffacc372183
-SHA1 (patch-af) = 758d300711afd0b4a312332b65ec2d213f28bc83
-SHA1 (patch-ag) = 44c7dfcd5e2a32872b7896b0b02568880d0e5ed2
-SHA1 (patch-ah) = 26a891fa9350a01f77d14a2dc0aa05cccbdee537
-SHA1 (patch-ai) = d5f60af54338408648c20ae46dc7731b16e7ce6d
+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) = dd938d9ae41fccfd2d302e35ce1cbc7ffd20231c
+SHA1 (patch-ah) = bf00adbfe32c9322bde130089baf004dda7acb03
+SHA1 (patch-ai) = 36d8e13103418daf2d9f0c3a49e84ca906796858
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
new file mode 100644
index 00000000000..ab4773e7dae
--- /dev/null
+++ b/www/apache2/files/apache.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# $NetBSD: apache.sh,v 1.1 2002/03/05 23:56:22 jlam Exp $
+#
+# PROVIDE: apache
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# To start apache at startup, copy this script to /etc/rc.d and set
+# apache=YES in /etc/rc.conf.
+
+if [ -f /etc/rc.subr ]
+then
+ . /etc/rc.subr
+fi
+
+name="apache"
+rcvar=$name
+command="@PREFIX@/sbin/httpd"
+ctl_command="@PREFIX@/sbin/apachectl"
+required_files="@PKG_SYSCONFDIR@/httpd.conf"
+start_cmd="apache_doit start"
+stop_cmd="apache_doit stop"
+restart_cmd="apache_doit restart"
+
+# "${apache_start}" is the subcommand sent to apachectl to control how
+# httpd is started. It's value may be overridden in:
+#
+# /etc/rc.conf
+# /etc/rc.conf.d/apache,
+#
+# in order of increasing precedence. Its possible values are "start"
+# and "startssl", and defaults to "start".
+#
+apache_doit ()
+{
+ case $1 in
+ start) action=${apache_start} ;;
+ *) action=$1 ;;
+ esac
+ ${ctl_command} ${action}
+}
+
+if [ -f /etc/rc.subr ]
+then
+ load_rc_config $name
+ run_rc_command "$1"
+else
+ eval ${start_cmd}
+fi
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index 8b66ee667b7..4105a5bee45 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,31 +1,52 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/03/05 23:56:22 jlam Exp $
---- config.layout.orig Fri Oct 26 02:59:26 2001
-+++ config.layout Thu Jan 3 17:18:55 2002
-@@ -285,3 +285,26 @@
- logfiledir: $prefix/logs
- proxycachedir: $prefix/proxy
- </Layout>
-+
-+# NetBSD Layout
-+<Layout NetBSD>
-+ prefix: PKG_PREFIX
-+ exec_prefix: $prefix
-+ bindir: $prefix/bin
-+ sbindir: $prefix/bin
-+ libexecdir: $prefix/lib/httpd
-+ mandir: $prefix/man
-+ sysconfdir: $prefix/etc/httpd
-+ datadir: $prefix/share/httpd
-+ installbuilddir: $prefix/share/httpd/build
-+ errordir: $prefix/share/httpd/error
-+ iconsdir: $prefix/share/httpd/icons
-+ htdocsdir: $prefix/share/httpd/htdocs
-+ manualdir: $prefix/share/httpd/manual
-+ cgidir: $prefix/libexec/cgi-bin
-+ includedir: $prefix/include/httpd
-+ localstatedir: /var
-+ runtimedir: /var/run
-+ logfiledir: /var/log/httpd
-+ proxycachedir: /var/spool/httpd/proxy
-+</Layout>
+--- Makefile.in.orig Wed Jan 23 02:10:16 2002
++++ Makefile.in
+@@ -16,7 +16,7 @@
+ PROGRAMS = $(PROGRAM_NAME)
+ TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
+ PHONY_TARGETS = $(srcdir)/buildmark.c
+-INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
++INSTALL_TARGETS = install-htdocs install-error install-icons \
+ install-other install-cgi install-include install-suexec install-man \
+ install-build
+
+@@ -66,8 +66,22 @@
+ -e 's#@@Port@@#$(PORT)#g' \
+ < $$i; \
+ 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; \
+ 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 @@
+ if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
+ $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
+ fi; \
++ fi; \
+ 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
+
diff --git a/www/apache2/patches/patch-ab b/www/apache2/patches/patch-ab
new file mode 100644
index 00000000000..367d2268b02
--- /dev/null
+++ b/www/apache2/patches/patch-ab
@@ -0,0 +1,12 @@
+$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
index 63b211c963f..ee8c2b07359 100644
--- a/www/apache2/patches/patch-ac
+++ b/www/apache2/patches/patch-ac
@@ -1,16 +1,25 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2002/03/05 23:56:24 jlam Exp $
---- srclib/apr-util/build/apu-conf.m4.orig Tue Aug 21 20:44:26 2001
-+++ srclib/apr-util/build/apu-conf.m4 Thu Dec 6 17:50:19 2001
-@@ -328,6 +328,11 @@
- expat_include_dir="$1/include/xml"
- expat_libs="-L$1/lib -lexpat"
- expat_old=yes
-+ elif test -r "$1/include/expat.h"; then
-+ dnl previously installed expat
-+ expat_include_dir="$1/include"
-+ expat_libs="-Wl,-R${LOCALBASE}/lib -lexpat"
-+ expat_old=yes
- elif test -r "$1/include/xmltok/xmlparse.h"; then
- dnl Debian distribution
- expat_include_dir="$1/include/xmltok"
+--- 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 886b5fdeb0c..edcc01ca369 100644
--- a/www/apache2/patches/patch-ad
+++ b/www/apache2/patches/patch-ad
@@ -1,15 +1,31 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2002/03/05 23:56:24 jlam Exp $
---- srclib/apr-util/configure.orig Thu Dec 6 17:51:26 2001
-+++ srclib/apr-util/configure Thu Dec 6 17:53:26 2001
-@@ -2909,6 +2909,10 @@
- expat_include_dir="$abs_expatdir/include/xml"
- expat_libs="-L$abs_expatdir/lib -lexpat"
- expat_old=yes
-+ elif test -r "$abs_expatdir/include/expat.h"; then
-+ expat_include_dir="$abs_expatdir/include"
-+ expat_libs="-Wl,-R${LOCALBASE}/lib -lexpat"
-+ expat_old=yes
- elif test -r "$abs_expatdir/include/xmltok/xmlparse.h"; then
- expat_include_dir="$abs_expatdir/include/xmltok"
- expat_libs="-L$abs_expatdir/lib -lxmlparse -lxmltok"
+--- config.layout.orig Sun Nov 11 02:02:37 2001
++++ config.layout
+@@ -307,3 +307,26 @@
+ infodir: $exec_prefix/share/info
+ installbuilddir: $prefix/etc/apache2/build
+ </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
++ localstatedir: /var
++ 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
index 158fef612e4..2c721a4278b 100644
--- a/www/apache2/patches/patch-ae
+++ b/www/apache2/patches/patch-ae
@@ -1,92 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2002/03/05 23:56:24 jlam Exp $
---- docs/conf/httpd-std.conf.orig Thu Nov 8 23:31:28 2001
-+++ docs/conf/httpd-std.conf Thu Dec 6 15:02:14 2001
-@@ -53,7 +53,7 @@
- # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
- #
- <IfModule !mpm_winnt.c>
--#LockFile logs/accept.lock
-+#LockFile /var/log/httpd/accept.lock
- </IfModule>
+--- configure.in.orig Tue Mar 5 14:37:53 2002
++++ configure.in
+@@ -464,7 +464,7 @@
+ ;;
+ esac
- #
-@@ -64,7 +64,7 @@
- #
- <IfModule !mpm_winnt.c>
- <IfModule !perchild.c>
--ScoreBoardFile logs/apache_runtime_status
-+ScoreBoardFile /var/log/httpd/apache_runtime_status
- </IfModule>
- </IfModule>
+-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
+ ])
-@@ -73,7 +73,7 @@
- # PidFile: The file in which the server should record its process
- # identification number when it starts.
- #
--PidFile logs/httpd.pid
-+PidFile /var/log/httpd/httpd.pid
-
- #
- # Timeout: The number of seconds before receives and sends time out.
-@@ -377,7 +377,7 @@
- # TypesConfig describes where the mime.types file (or equivalent) is
- # to be found.
- #
--TypesConfig conf/mime.types
-+TypesConfig PKG_PREFIX/etc/httpd/mime.types
-
- #
- # DefaultType is the default MIME type the server will use for a document
-@@ -396,7 +396,7 @@
- # directive tells the module where the hint definitions are located.
- #
- <IfModule mod_mime_magic.c>
-- MIMEMagicFile conf/magic
-+ MIMEMagicFile PKG_PREFIX/etc/httpd/magic
- </IfModule>
-
- #
-@@ -416,7 +416,7 @@
- # logged here. If you *do* define an error logfile for a <VirtualHost>
- # container, that host's errors will be logged there and not here.
- #
--ErrorLog logs/error_log
-+ErrorLog /var/log/httpd/error_log
-
- #
- # LogLevel: Control the number of messages logged to the error_log.
-@@ -441,20 +441,20 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog logs/access_log common
-+CustomLog /var/log/httpd/access_log common
-
- #
- # If you would like to have agent and referer logfiles, uncomment the
- # following directives.
- #
--#CustomLog logs/referer_log referer
--#CustomLog logs/agent_log agent
-+#CustomLog /var/log/httpd/referer_log referer
-+#CustomLog /var/log/httpd/agent_log agent
-
- #
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog logs/access_log combined
-+#CustomLog /var/log/httpd/access_log combined
-
- #
- # Optionally add a line containing the server version and virtual host
-@@ -997,6 +997,6 @@
- # ServerAdmin webmaster@dummy-host.example.com
- # DocumentRoot /www/docs/dummy-host.example.com
- # ServerName dummy-host.example.com
--# ErrorLog logs/dummy-host.example.com-error_log
--# CustomLog logs/dummy-host.example.com-access_log common
-+# ErrorLog /var/log/httpd/dummy-host.example.com-error_log
-+# CustomLog /var/log/httpd/dummy-host.example.com-access_log common
- #</VirtualHost>
diff --git a/www/apache2/patches/patch-af b/www/apache2/patches/patch-af
index 31fcb8850fd..b65883df195 100644
--- a/www/apache2/patches/patch-af
+++ b/www/apache2/patches/patch-af
@@ -1,33 +1,52 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
+$NetBSD: patch-af,v 1.2 2002/03/05 23:56:24 jlam Exp $
---- Makefile.in.orig Mon Oct 22 12:46:29 2001
-+++ Makefile.in Thu Jan 3 18:19:40 2002
-@@ -39,7 +39,7 @@
- ( \
- n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
- if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
-- sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-+ sed -e 's#@@ServerRoot@@#$(datadir)#g' \
- -e 's#@@Port@@#$(PORT)#g' \
- -e '/@@LoadModule@@/d' \
- < $$i; \
-@@ -67,7 +67,7 @@
- file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
- fi; \
- if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
-- $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
-+ : $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
- fi; \
- done
-
-@@ -95,8 +95,8 @@
- @echo Installing HTML documents
- @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
-- @test -d $(prefix)/manual || $(MKINSTALLDIRS) $(prefix)/manual
-- @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(prefix)/manual)
-+ @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
-+ @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
- @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
-
- install-error:
+--- 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 68f7bdf0ab0..a2d55d6eb78 100644
--- a/www/apache2/patches/patch-ag
+++ b/www/apache2/patches/patch-ag
@@ -1,16 +1,49 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
+$NetBSD: patch-ag,v 1.2 2002/03/05 23:56:24 jlam Exp $
---- srclib/apr-util/xml/apr_xml.c.orig Thu Jan 3 16:34:11 2002
-+++ srclib/apr-util/xml/apr_xml.c Thu Jan 3 16:34:26 2002
-@@ -63,11 +63,7 @@
+--- support/Makefile.in.orig Tue Mar 5 14:37:53 2002
++++ support/Makefile.in
+@@ -2,6 +2,7 @@
+ logresolve.pl phf_abuse_log.cgi split-logfile
- #include "apu_config.h"
+ PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm
++SCRIPTS = apxs apachectl dbmmanage
+ TARGETS = $(PROGRAMS)
--#ifdef APR_HAVE_OLD_EXPAT
--#include "xmlparse.h"
--#else
- #include "expat.h"
--#endif
-
- #define DEBUG_CR "\r\n"
+ PROGRAM_LDADD = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
+@@ -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
+ @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
++
++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 ab88bd45fa0..db051bb24f8 100644
--- a/www/apache2/patches/patch-ah
+++ b/www/apache2/patches/patch-ah
@@ -1,22 +1,23 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2002/03/05 23:56:24 jlam Exp $
---- configure.orig Mon Nov 12 19:07:39 2001
-+++ configure Thu Jan 3 19:24:24 2002
-@@ -2608,7 +2608,7 @@
- for var in prefix exec_prefix bindir sbindir libexecdir mandir \
- sysconfdir datadir errordir iconsdir htdocsdir cgidir \
- includedir localstatedir runtimedir logfiledir \
-- proxycachedir installbuilddir; do
-+ proxycachedir installbuilddir manualdir; do
- eval "val=\"\$$var\""
- case $val in
- *+)
-@@ -10508,7 +10508,7 @@
- EOF
-
- cat >> confdefs.h <<EOF
--#define SERVER_CONFIG_FILE "conf/$progname.conf"
-+#define SERVER_CONFIG_FILE "etc/httpd/$progname.conf"
- EOF
-
- cat >> confdefs.h <<EOF
+--- 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
+ #
+ # the path to your httpd binary, including options if necessary
+-HTTPD='@prefix@/bin/@progname@'
++HTTPD='%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
+ 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 0dca0f0ddbe..25fbcc6c237 100644
--- a/www/apache2/patches/patch-ai
+++ b/www/apache2/patches/patch-ai
@@ -1,13 +1,49 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/03/05 23:24:07 jlam Exp $
+$NetBSD: patch-ai,v 1.2 2002/03/05 23:56:24 jlam Exp $
---- acinclude.m4.orig Thu Jan 3 19:01:01 2002
-+++ acinclude.m4 Thu Jan 3 19:01:41 2002
-@@ -295,7 +295,7 @@
- for var in prefix exec_prefix bindir sbindir libexecdir mandir \
- sysconfdir datadir errordir iconsdir htdocsdir cgidir \
- includedir localstatedir runtimedir logfiledir \
-- proxycachedir installbuilddir; do
-+ proxycachedir installbuilddir manualdir; do
- eval "val=\"\$$var\""
- case $val in
- *+)
+--- support/apxs.pl.in.orig Fri Feb 1 14:25:14 2002
++++ support/apxs.pl.in
+@@ -61,12 +61,13 @@
+ ## Configuration
+ ##
+
+-my $prefix = "@prefix@";
++my $prefix = "%prefix%";
+ my $CFG_PREFIX = $prefix;
++my $installbuilddir = "%installbuilddir%";
+
+ # read the configuration variables once
+ my %config_vars = ();
+-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
++get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
+
+ my $exec_prefix = get_vars("exec_prefix");
+ my $CFG_TARGET = get_vars("progname");
+@@ -414,7 +415,7 @@
+ $la =~ s|\.c$|.la|;
+ my $o = $s;
+ $o =~ s|\.c$|.o|;
+- push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
++ push(@cmds, "$installbuilddir/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
+ unshift(@objs, $lo);
+ }
+
+@@ -439,7 +440,7 @@
+ $opt .= " -l$opt_l";
+ }
+
+- push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
++ push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
+
+ # execute the commands
+ &execute_cmds(@cmds);
+@@ -470,8 +471,8 @@
+ $t =~ s|^.+/([^/]+)$|$1|;
+ $t =~ s|\.la$|\.so|;
+ if ($opt_i) {
+- push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
+- "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
++ push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
++ "$installbuilddir/libtool' $f $CFG_LIBEXECDIR");
+ push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+ }
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 20:54:29 +0000