12 files changed, 1038 insertions, 0 deletions
diff --git a/www/apache2/DESCR b/www/apache2/DESCR
new file mode 100644
index 00000000000..464fae3b2de
--- /dev/null
+++ b/www/apache2/DESCR
@@ -0,0 +1,8 @@
+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.
+
+Note that the pkgsrc directory builds and installs an alpha version of
+Apache.
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
new file mode 100644
index 00000000000..395c3a2b77c
--- /dev/null
+++ b/www/apache2/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/03/05 23:24:06 jlam Exp $
+
+DISTNAME=		httpd-2_0_28-beta
+PKGNAME=		apache-2.0.28
+CATEGORIES=		www
+MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
+			http://www.netbsd.org/images/logos/
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.apache.org/
+COMMENT=		HTTP (Web) server, version 2
+
+CONFLICTS=		apache-*modssl-[0-9]* apache-[0-9]*
+CONFLICTS+=		apache6-[0-9]* ap-[0-9]*
+
+# autodetect
+BUILD_DEFS+=		USE_INET6
+
+USE_BUILDLINK_ONLY=	YES
+HAS_CONFIGURE=		YES
+USE_GMAKE=		YES
+USE_SSL=		YES
+CONFIGURE_ARGS+=	--enable-layout=NetBSD
+CONFIGURE_ARGS+=	--with-port=80
+.if exists(${LOCALBASE}/include/openssl/ssl.h)
+CONFIGURE_ARGS+=	--with-ssl=${LOCALBASE}/include --enable-tls
+.else
+CONFIGURE_ARGS+=	--with-ssl=/usr/include --enable-tls
+.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
+
+.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
new file mode 100644
index 00000000000..df97ea38b79
--- /dev/null
+++ b/www/apache2/PLIST
@@ -0,0 +1,722 @@
+@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
+include/apr.h
+include/apr_base64.h
+include/apr_buckets.h
+include/apr_compat.h
+include/apr_date.h
+include/apr_dbm.h
+include/apr_dso.h
+include/apr_errno.h
+include/apr_file_info.h
+include/apr_file_io.h
+include/apr_fnmatch.h
+include/apr_general.h
+include/apr_getopt.h
+include/apr_hash.h
+include/apr_hooks.h
+include/apr_inherit.h
+include/apr_ldap.h
+include/apr_lib.h
+include/apr_lock.h
+include/apr_md4.h
+include/apr_md5.h
+include/apr_mmap.h
+include/apr_network_io.h
+include/apr_optional.h
+include/apr_optional_hooks.h
+include/apr_pools.h
+include/apr_portable.h
+include/apr_proc_mutex.h
+include/apr_ring.h
+include/apr_sdbm.h
+include/apr_sha1.h
+include/apr_shmem.h
+include/apr_signal.h
+include/apr_strings.h
+include/apr_tables.h
+include/apr_thread_cond.h
+include/apr_thread_mutex.h
+include/apr_thread_proc.h
+include/apr_thread_rwlock.h
+include/apr_time.h
+include/apr_uri.h
+include/apr_user.h
+include/apr_uuid.h
+include/apr_want.h
+include/apr_xlate.h
+include/apr_xml.h
+include/apu.h
+include/apu_compat.h
+include/httpd/ap_compat.h
+include/httpd/ap_config.h
+include/httpd/ap_config_auto.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_base64.h
+include/httpd/apr_buckets.h
+include/httpd/apr_compat.h
+include/httpd/apr_date.h
+include/httpd/apr_dbm.h
+include/httpd/apr_dso.h
+include/httpd/apr_errno.h
+include/httpd/apr_file_info.h
+include/httpd/apr_file_io.h
+include/httpd/apr_fnmatch.h
+include/httpd/apr_general.h
+include/httpd/apr_getopt.h
+include/httpd/apr_hash.h
+include/httpd/apr_hooks.h
+include/httpd/apr_inherit.h
+include/httpd/apr_ldap.h
+include/httpd/apr_lib.h
+include/httpd/apr_lock.h
+include/httpd/apr_md4.h
+include/httpd/apr_md5.h
+include/httpd/apr_mmap.h
+include/httpd/apr_network_io.h
+include/httpd/apr_optional.h
+include/httpd/apr_optional_hooks.h
+include/httpd/apr_pools.h
+include/httpd/apr_portable.h
+include/httpd/apr_proc_mutex.h
+include/httpd/apr_ring.h
+include/httpd/apr_sdbm.h
+include/httpd/apr_sha1.h
+include/httpd/apr_shmem.h
+include/httpd/apr_signal.h
+include/httpd/apr_strings.h
+include/httpd/apr_tables.h
+include/httpd/apr_thread_cond.h
+include/httpd/apr_thread_mutex.h
+include/httpd/apr_thread_proc.h
+include/httpd/apr_thread_rwlock.h
+include/httpd/apr_time.h
+include/httpd/apr_uri.h
+include/httpd/apr_user.h
+include/httpd/apr_uuid.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
+include/httpd/http_log.h
+include/httpd/http_main.h
+include/httpd/http_protocol.h
+include/httpd/http_request.h
+include/httpd/http_vhost.h
+include/httpd/httpd.h
+include/httpd/internal.h
+include/httpd/mod_cgi.h
+include/httpd/mod_core.h
+include/httpd/mod_dav.h
+include/httpd/mod_include.h
+include/httpd/mod_proxy.h
+include/httpd/mod_ssl.h
+include/httpd/mpm.h
+include/httpd/mpm_common.h
+include/httpd/mpm_default.h
+include/httpd/os.h
+include/httpd/pcre.h
+include/httpd/pcreposix.h
+include/httpd/rfc1413.h
+include/httpd/scoreboard.h
+include/httpd/ssl_expr.h
+include/httpd/ssl_expr_parse.h
+include/httpd/ssl_util_ssl.h
+include/httpd/ssl_util_table.h
+include/httpd/unixd.h
+include/httpd/util_cfgtree.h
+include/httpd/util_charset.h
+include/httpd/util_ebcdic.h
+include/httpd/util_filter.h
+include/httpd/util_ldap.h
+include/httpd/util_md5.h
+include/httpd/util_script.h
+include/httpd/util_time.h
+include/httpd/util_xml.h
+lib/APRVARS
+lib/httpd/httpd.exp
+lib/libapr.a
+lib/libapr.la
+lib/libapr.so
+lib/libapr.so.0
+lib/libapr.so.0.0
+lib/libaprutil.a
+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
+man/man8/ab.8
+man/man8/apachectl.8
+man/man8/apxs.8
+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
+share/httpd/build/config_vars.mk
+share/httpd/build/library.mk
+share/httpd/build/libtool
+share/httpd/build/ltlib.mk
+share/httpd/build/program.mk
+share/httpd/build/rules.mk
+share/httpd/build/special.mk
+share/httpd/error/HTTP_BAD_GATEWAY.html.var
+share/httpd/error/HTTP_BAD_REQUEST.html.var
+share/httpd/error/HTTP_FORBIDDEN.html.var
+share/httpd/error/HTTP_GONE.html.var
+share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
+share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
+share/httpd/error/HTTP_METHOD_NOT_ALLOWED.html.var
+share/httpd/error/HTTP_NOT_ACCEPTABLE.html.var
+share/httpd/error/HTTP_NOT_FOUND.html.var
+share/httpd/error/HTTP_NOT_IMPLEMENTED.html.var
+share/httpd/error/HTTP_PRECONDITION_FAILED.html.var
+share/httpd/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+share/httpd/error/HTTP_REQUEST_TIME_OUT.html.var
+share/httpd/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+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/contact.html.var
+share/httpd/error/include/bottom.html
+share/httpd/error/include/spacer.html
+share/httpd/error/include/top.html
+share/httpd/htdocs/apache_pb.gif
+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
+share/httpd/htdocs/index.html.dk
+share/httpd/htdocs/index.html.ee
+share/httpd/htdocs/index.html.el
+share/httpd/htdocs/index.html.en
+share/httpd/htdocs/index.html.es
+share/httpd/htdocs/index.html.et
+share/httpd/htdocs/index.html.fr
+share/httpd/htdocs/index.html.he.iso8859-8
+share/httpd/htdocs/index.html.hr.iso8859-2
+share/httpd/htdocs/index.html.it
+share/httpd/htdocs/index.html.ja.iso2022-jp
+share/httpd/htdocs/index.html.kr.iso2022-kr
+share/httpd/htdocs/index.html.ltz.utf8
+share/httpd/htdocs/index.html.lu.utf8
+share/httpd/htdocs/index.html.nl
+share/httpd/htdocs/index.html.nn
+share/httpd/htdocs/index.html.no
+share/httpd/htdocs/index.html.po.iso8859-2
+share/httpd/htdocs/index.html.pt
+share/httpd/htdocs/index.html.pt-br
+share/httpd/htdocs/index.html.ru.cp-1251
+share/httpd/htdocs/index.html.ru.cp866
+share/httpd/htdocs/index.html.ru.iso-ru
+share/httpd/htdocs/index.html.ru.koi8-r
+share/httpd/htdocs/index.html.ru.utf8
+share/httpd/htdocs/index.html.se
+share/httpd/htdocs/index.html.tw
+share/httpd/htdocs/index.html.tw.Big5
+share/httpd/htdocs/index.html.var
+share/httpd/icons/README
+share/httpd/icons/a.gif
+share/httpd/icons/a.png
+share/httpd/icons/alert.black.gif
+share/httpd/icons/alert.black.png
+share/httpd/icons/alert.red.gif
+share/httpd/icons/alert.red.png
+share/httpd/icons/apache_pb.gif
+share/httpd/icons/apache_pb.png
+share/httpd/icons/apache_pb2.gif
+share/httpd/icons/apache_pb2.png
+share/httpd/icons/apache_pb2_ani.gif
+share/httpd/icons/back.gif
+share/httpd/icons/back.png
+share/httpd/icons/ball.gray.gif
+share/httpd/icons/ball.gray.png
+share/httpd/icons/ball.red.gif
+share/httpd/icons/ball.red.png
+share/httpd/icons/binary.gif
+share/httpd/icons/binary.png
+share/httpd/icons/binhex.gif
+share/httpd/icons/binhex.png
+share/httpd/icons/blank.gif
+share/httpd/icons/blank.png
+share/httpd/icons/bomb.gif
+share/httpd/icons/bomb.png
+share/httpd/icons/box1.gif
+share/httpd/icons/box1.png
+share/httpd/icons/box2.gif
+share/httpd/icons/box2.png
+share/httpd/icons/broken.gif
+share/httpd/icons/broken.png
+share/httpd/icons/burst.gif
+share/httpd/icons/burst.png
+share/httpd/icons/c.gif
+share/httpd/icons/c.png
+share/httpd/icons/comp.blue.gif
+share/httpd/icons/comp.blue.png
+share/httpd/icons/comp.gray.gif
+share/httpd/icons/comp.gray.png
+share/httpd/icons/compressed.gif
+share/httpd/icons/compressed.png
+share/httpd/icons/continued.gif
+share/httpd/icons/continued.png
+share/httpd/icons/dir.gif
+share/httpd/icons/dir.png
+share/httpd/icons/down.gif
+share/httpd/icons/down.png
+share/httpd/icons/dvi.gif
+share/httpd/icons/dvi.png
+share/httpd/icons/f.gif
+share/httpd/icons/f.png
+share/httpd/icons/folder.gif
+share/httpd/icons/folder.open.gif
+share/httpd/icons/folder.open.png
+share/httpd/icons/folder.png
+share/httpd/icons/folder.sec.gif
+share/httpd/icons/folder.sec.png
+share/httpd/icons/forward.gif
+share/httpd/icons/forward.png
+share/httpd/icons/generic.gif
+share/httpd/icons/generic.png
+share/httpd/icons/generic.red.gif
+share/httpd/icons/generic.red.png
+share/httpd/icons/generic.sec.gif
+share/httpd/icons/generic.sec.png
+share/httpd/icons/hand.right.gif
+share/httpd/icons/hand.right.png
+share/httpd/icons/hand.up.gif
+share/httpd/icons/hand.up.png
+share/httpd/icons/icon.sheet.gif
+share/httpd/icons/icon.sheet.png
+share/httpd/icons/image1.gif
+share/httpd/icons/image1.png
+share/httpd/icons/image2.gif
+share/httpd/icons/image2.png
+share/httpd/icons/image3.gif
+share/httpd/icons/image3.png
+share/httpd/icons/index.gif
+share/httpd/icons/index.png
+share/httpd/icons/layout.gif
+share/httpd/icons/layout.png
+share/httpd/icons/left.gif
+share/httpd/icons/left.png
+share/httpd/icons/link.gif
+share/httpd/icons/link.png
+share/httpd/icons/movie.gif
+share/httpd/icons/movie.png
+share/httpd/icons/p.gif
+share/httpd/icons/p.png
+share/httpd/icons/patch.gif
+share/httpd/icons/patch.png
+share/httpd/icons/pdf.gif
+share/httpd/icons/pdf.png
+share/httpd/icons/pie0.gif
+share/httpd/icons/pie0.png
+share/httpd/icons/pie1.gif
+share/httpd/icons/pie1.png
+share/httpd/icons/pie2.gif
+share/httpd/icons/pie2.png
+share/httpd/icons/pie3.gif
+share/httpd/icons/pie3.png
+share/httpd/icons/pie4.gif
+share/httpd/icons/pie4.png
+share/httpd/icons/pie5.gif
+share/httpd/icons/pie5.png
+share/httpd/icons/pie6.gif
+share/httpd/icons/pie6.png
+share/httpd/icons/pie7.gif
+share/httpd/icons/pie7.png
+share/httpd/icons/pie8.gif
+share/httpd/icons/pie8.png
+share/httpd/icons/portal.gif
+share/httpd/icons/portal.png
+share/httpd/icons/ps.gif
+share/httpd/icons/ps.png
+share/httpd/icons/quill.gif
+share/httpd/icons/quill.png
+share/httpd/icons/right.gif
+share/httpd/icons/right.png
+share/httpd/icons/screw1.gif
+share/httpd/icons/screw1.png
+share/httpd/icons/screw2.gif
+share/httpd/icons/screw2.png
+share/httpd/icons/script.gif
+share/httpd/icons/script.png
+share/httpd/icons/small/README.txt
+share/httpd/icons/small/back.gif
+share/httpd/icons/small/back.png
+share/httpd/icons/small/binary.gif
+share/httpd/icons/small/binary.png
+share/httpd/icons/small/binhex.gif
+share/httpd/icons/small/binhex.png
+share/httpd/icons/small/blank.gif
+share/httpd/icons/small/blank.png
+share/httpd/icons/small/broken.gif
+share/httpd/icons/small/broken.png
+share/httpd/icons/small/burst.gif
+share/httpd/icons/small/burst.png
+share/httpd/icons/small/comp1.gif
+share/httpd/icons/small/comp1.png
+share/httpd/icons/small/comp2.gif
+share/httpd/icons/small/comp2.png
+share/httpd/icons/small/compressed.gif
+share/httpd/icons/small/compressed.png
+share/httpd/icons/small/continued.gif
+share/httpd/icons/small/continued.png
+share/httpd/icons/small/dir.gif
+share/httpd/icons/small/dir.png
+share/httpd/icons/small/dir2.gif
+share/httpd/icons/small/dir2.png
+share/httpd/icons/small/doc.gif
+share/httpd/icons/small/doc.png
+share/httpd/icons/small/forward.gif
+share/httpd/icons/small/forward.png
+share/httpd/icons/small/generic.gif
+share/httpd/icons/small/generic.png
+share/httpd/icons/small/generic2.gif
+share/httpd/icons/small/generic2.png
+share/httpd/icons/small/generic3.gif
+share/httpd/icons/small/generic3.png
+share/httpd/icons/small/image.gif
+share/httpd/icons/small/image.png
+share/httpd/icons/small/image2.gif
+share/httpd/icons/small/image2.png
+share/httpd/icons/small/index.gif
+share/httpd/icons/small/index.png
+share/httpd/icons/small/key.gif
+share/httpd/icons/small/key.png
+share/httpd/icons/small/movie.gif
+share/httpd/icons/small/movie.png
+share/httpd/icons/small/patch.gif
+share/httpd/icons/small/patch.png
+share/httpd/icons/small/ps.gif
+share/httpd/icons/small/ps.png
+share/httpd/icons/small/rainbow.gif
+share/httpd/icons/small/rainbow.png
+share/httpd/icons/small/sound.gif
+share/httpd/icons/small/sound.png
+share/httpd/icons/small/sound2.gif
+share/httpd/icons/small/sound2.png
+share/httpd/icons/small/tar.gif
+share/httpd/icons/small/tar.png
+share/httpd/icons/small/text.gif
+share/httpd/icons/small/text.png
+share/httpd/icons/small/transfer.gif
+share/httpd/icons/small/transfer.png
+share/httpd/icons/small/unknown.gif
+share/httpd/icons/small/unknown.png
+share/httpd/icons/small/uu.gif
+share/httpd/icons/small/uu.png
+share/httpd/icons/sound1.gif
+share/httpd/icons/sound1.png
+share/httpd/icons/sound2.gif
+share/httpd/icons/sound2.png
+share/httpd/icons/sphere1.gif
+share/httpd/icons/sphere1.png
+share/httpd/icons/sphere2.gif
+share/httpd/icons/sphere2.png
+share/httpd/icons/tar.gif
+share/httpd/icons/tar.png
+share/httpd/icons/tex.gif
+share/httpd/icons/tex.png
+share/httpd/icons/text.gif
+share/httpd/icons/text.png
+share/httpd/icons/transfer.gif
+share/httpd/icons/transfer.png
+share/httpd/icons/unknown.gif
+share/httpd/icons/unknown.png
+share/httpd/icons/up.gif
+share/httpd/icons/up.png
+share/httpd/icons/uu.gif
+share/httpd/icons/uu.png
+share/httpd/icons/uuencoded.gif
+share/httpd/icons/uuencoded.png
+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
+@dirrm share/httpd/manual/vhosts
+@dirrm share/httpd/manual
+@dirrm share/httpd
+@unexec ${RMDIR} %D/etc/httpd 2>/dev/null || true
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
new file mode 100644
index 00000000000..ca27c04a772
--- /dev/null
+++ b/www/apache2/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/03/05 23:24:06 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
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
new file mode 100644
index 00000000000..8b66ee667b7
--- /dev/null
+++ b/www/apache2/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/03/05 23:24:07 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>
diff --git a/www/apache2/patches/patch-ac b/www/apache2/patches/patch-ac
new file mode 100644
index 00000000000..63b211c963f
--- /dev/null
+++ b/www/apache2/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/03/05 23:24:07 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"
diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad
new file mode 100644
index 00000000000..886b5fdeb0c
--- /dev/null
+++ b/www/apache2/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/03/05 23:24:07 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"
diff --git a/www/apache2/patches/patch-ae b/www/apache2/patches/patch-ae
new file mode 100644
index 00000000000..158fef612e4
--- /dev/null
+++ b/www/apache2/patches/patch-ae
@@ -0,0 +1,92 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/03/05 23:24:07 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>
+ 
+ #
+@@ -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>
+ 
+@@ -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
new file mode 100644
index 00000000000..31fcb8850fd
--- /dev/null
+++ b/www/apache2/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/03/05 23:24:07 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:
diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag
new file mode 100644
index 00000000000..68f7bdf0ab0
--- /dev/null
+++ b/www/apache2/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1.1.1 2002/03/05 23:24:07 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 @@
+ 
+ #include "apu_config.h"
+ 
+-#ifdef APR_HAVE_OLD_EXPAT
+-#include "xmlparse.h"
+-#else
+ #include "expat.h"
+-#endif
+ 
+ #define DEBUG_CR "\r\n"
+ 
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
new file mode 100644
index 00000000000..ab88bd45fa0
--- /dev/null
+++ b/www/apache2/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1.1.1 2002/03/05 23:24:07 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
diff --git a/www/apache2/patches/patch-ai b/www/apache2/patches/patch-ai
new file mode 100644
index 00000000000..0dca0f0ddbe
--- /dev/null
+++ b/www/apache2/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2002/03/05 23:24:07 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
+       *+)