Pullup ticket 160 - requested by Thomas Klausner

remove apache6 package

removed from -current because of too many vulnerabilities and no newer
version available (people are expected to switch to apache2).

18 files changed, 1 insertions, 1264 deletions

diff --git a/www/Makefile b/www/Makefile
index 5d5373d93dd..8995c0b1385 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.344 2004/09/19 04:08:17 markd Exp $
+# $NetBSD: Makefile,v 1.344.2.1 2004/11/27 16:51:05 salo Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -43,7 +43,6 @@ SUBDIR+=	ap2-subversion
 SUBDIR+=	ap2-transform
 SUBDIR+=	apache
 SUBDIR+=	apache2
-SUBDIR+=	apache6
 SUBDIR+=	apachetop
 SUBDIR+=	apc-gui
 SUBDIR+=	asWedit
diff --git a/www/apache6/DESCR b/www/apache6/DESCR
deleted file mode 100644
index 26ec3e1be49..00000000000
--- a/www/apache6/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-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.
-
-This package is IPv6 ready.  The Apache module API is slightly modified,
-so some third-party modules may not work.
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
deleted file mode 100644
index 3b3d48340ad..00000000000
--- a/www/apache6/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-# $NetBSD: Makefile,v 1.90 2004/08/27 06:29:11 jlam Exp $
-#
-# This package does not compile in mod_ssl support hooks, as it conflicts
-# with IPv6-enable patch.
-#
-# IPv6-enable patch conflicts with third-party modules anyway, due to
-# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
-
-DISTNAME=		apache_${APACHE_VERSION}
-PKGNAME=		apache6-${APACHE_VERSION}
-APACHE_VERSION=		1.3.29
-PKGREVISION=		#
-CATEGORIES=		www
-MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
-			${MASTER_SITE_APACHE:=httpd/old/}
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO}
-
-PATCH_SITES+=		http://www.tendra.org/~asmodai/ipv6/
-PATCHFILES+=		apache-1.3.29-v6-20031028.diff.gz
-
-NETBSD_LOGO=		sitedrivenby.gif
-SITES_${NETBSD_LOGO}=	# defined
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://httpd.apache.org/
-COMMENT=		Apache HTTP (Web) server with IPv6 support
-
-CONFLICTS=		apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
-
-EXTRACT_ONLY=		${DISTFILES:N*.gif:N*.diff.gz}
-USE_BUILDLINK3=		YES
-USE_PKGINSTALL=		YES
-HAS_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
-CONFIGURE_ARGS+=	--enable-module=most \
-			--enable-module=auth_db \
-			--enable-module=so \
-			--disable-module=auth_dbm \
-			--enable-rule=INET6
-# proxy module is broken with the IPv6 patch
-CONFIGURE_ARGS+=	--disable-module=proxy
-CONFIGURE_ARGS+=	--without-confadjust
-CONFIGURE_ARGS+=	--with-perl=${PERL5}
-CONFIGURE_ARGS+=	--with-port=80
-CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
-CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_PREFIX.libmm}"
-
-BUILD_DEFS+=		USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(USE_INET6) || ${USE_INET6} != YES
-PKG_FAIL_REASON=	"IPv6 only build"
-.endif
-
-.if empty(STRIPFLAG)
-CONFIGURE_ARGS+=	--without-execstrip
-.endif
-
-PKG_SYSCONFSUBDIR?=	httpd
-
-APACHE_USER?=		www
-APACHE_GROUP?=		www
-BUILD_DEFS+=		APACHE_USER
-BUILD_DEFS+=		APACHE_GROUP
-
-CONFIGURE_ARGS+=	--server-uid=${APACHE_USER}
-CONFIGURE_ARGS+=	--server-gid=${APACHE_GROUP}
-
-.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
-APACHE_SUEXEC_DOCROOT?=	${PREFIX}/share/httpd/htdocs
-APACHE_SUEXEC_PATH=	/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
-APACHE_SUEXEC_CONFIGURE_ARGS+=						\
-			--suexec-caller=${APACHE_USER}			\
-			--suexec-safepath='${APACHE_SUEXEC_PATH}'	\
-			--suexec-docroot=${APACHE_SUEXEC_DOCROOT}
-CONFIGURE_ARGS+=	--enable-suexec 				\
-			${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*}
-PLIST_SRC=		${PKGDIR}/PLIST.suexec
-BUILD_DEFS+=		APACHE_SUEXEC_CONFIGURE_ARGS
-.endif
-
-# Note that there is NO static compile module hook here.  This is intentional.
-# Under Apache 1.3, modules can be compiled to link dynamically to the server
-# using the "apxs" program.  See apxs(8).
-
-PLIST_SRC+=		${PKGDIR}/PLIST
-
-.if defined(NOPIC)
-PLIST_SUBST+=		SHLIBS="@comment "
-.else
-PLIST_SUBST+=		SHLIBS=""
-.endif
-
-APACHE_CUSTOM_CFLAGS?=	# empty
-
-.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-APACHE_CUSTOM_CFLAGS+=	-DBUFFERED_LOGS
-APACHE_CUSTOM_CFLAGS+=	-O6 -fomit-frame-pointer -fexpensive-optimizations
-.endif
-
-# Explicitly turn on large file support
-APACHE_CUSTOM_CFLAGS+=	-D_LARGEFILE_SOURCE
-APACHE_CUSTOM_CFLAGS+=	-D_FILE_OFFSET_BITS=64
-
-.include "../../mk/compiler.mk"
-
-# On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
-# certain symbols from the C++ implementation (__get_eh_context, etc.)
-# referenced by DSOs written in C++ will resolve correctly.
-#
-.if ${OPSYS} == "NetBSD"
-.  if ${OBJECT_FMT} == "ELF"
-LINK_LIBGCC_LDFLAGS=	${LINK_ALL_LIBGCC_HACK}
-MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
-# if we are using gcc3, we need to link against libgcc_s, too. This
-# ensures modules can resolve symbols they require from gcc.
-.    if !empty(CC_VERSION:Mgcc-3*)
-USE_GCC_SHLIB=		# defined
-LINK_LIBGCC_LDFLAGS+=	-lgcc_s
-.    endif
-.  endif
-.endif
-
-# Use operating system's db1 functions (where available)
-USE_DB185=		# defined
-
-.include "../../databases/db/buildlink3.mk"
-BUILDLINK_DEPENDS.db=	db>=2.7.7
-
-.if defined(BUILDLINK_PREFIX.db_DEFAULT)
-CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"
-
-# on Solaris, we also need libdbm
-.  if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
-LDFLAGS+=		${COMPILER_RPATH_FLAG}/usr/ucblib -L/usr/ucblib
-.  else
-CONFIGURE_ENV+=		LIBS="-ldb2"
-.  endif
-.endif
-
-BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
-BUILD_DEFS+=		APACHE_PERF_TUNING
-BUILD_DEFS+=		APACHE_SUEXEC
-
-PKG_GROUPS=		${APACHE_GROUP}
-PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
-
-EGDIR=		${PREFIX}/share/examples/httpd
-
-CONF_FILES=	${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf
-SUPPORT_FILES=	${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
-SUPPORT_FILES+=	${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
-RCD_SCRIPTS=	apache
-
-OWN_DIRS+=		${PREFIX}/lib/httpd
-OWN_DIRS+=		/var/httpd
-OWN_DIRS+=		/var/log/httpd
-
-pre-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
-
-post-patch:
-	@cd ${WRKSRC}/src/support;					\
-	${SED}	-e "s|@INSTALL@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \
-		apxs.pl > apxs.pl.sed;					\
-	${MV} apxs.pl.sed apxs.pl
-	@cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist-
-	@${SED}	-e "s|#Listen ::|Listen ::|"				\
-		-e "s|#Listen 0.0.0.0|Listen 0.0.0.0|"			\
-		${WRKSRC}/conf/httpd.conf-dist-				\
-		> ${WRKSRC}/conf/httpd.conf-dist
-
-pre-configure:
-	@${SED} ${FILES_SUBST_SED}					\
-		${FILESDIR}/config.layout > ${WRKDIR}/config.layout
-
-pre-install:
-	@${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
-	for file in httpd.conf magic mime.types; do			\
-		${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default	\
-			${PREFIX}/share/examples/httpd;			\
-		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
-	done
-	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
-	${CHMOD} ${NONBINMODE} ${PREFIX}/libexec/cgi-bin/printenv \
-	  ${PREFIX}/libexec/cgi-bin/test-cgi
-
-.include "../../devel/libmm/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/apache6/PLIST b/www/apache6/PLIST
deleted file mode 100644
index a32e041db3c..00000000000
--- a/www/apache6/PLIST
+++ /dev/null
@@ -1,626 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/23 22:07:59 reed Exp $
-bin/checkgid
-bin/dbmmanage
-bin/htdigest
-bin/htpasswd
-include/httpd/ap.h
-include/httpd/ap_alloc.h
-include/httpd/ap_compat.h
-include/httpd/ap_config.h
-include/httpd/ap_config_auto.h
-include/httpd/ap_ctype.h
-include/httpd/ap_ebcdic.h
-include/httpd/ap_md5.h
-include/httpd/ap_mmn.h
-include/httpd/ap_sha1.h
-include/httpd/buff.h
-include/httpd/compat.h
-include/httpd/conf.h
-include/httpd/explain.h
-include/httpd/fnmatch.h
-include/httpd/hsregex.h
-include/httpd/http_conf_globals.h
-include/httpd/http_config.h
-include/httpd/http_core.h
-include/httpd/http_log.h
-include/httpd/http_main.h
-include/httpd/http_protocol.h
-include/httpd/http_request.h
-include/httpd/http_vhost.h
-include/httpd/httpd.h
-include/httpd/multithread.h
-include/httpd/os-inline.c
-include/httpd/os.h
-include/httpd/rfc1413.h
-include/httpd/sa_len.h
-include/httpd/sockaddr_storage.h
-include/httpd/scoreboard.h
-include/httpd/util_date.h
-include/httpd/util_md5.h
-include/httpd/util_script.h
-include/httpd/util_uri.h
-include/httpd/xml/asciitab.h
-include/httpd/xml/hashtable.h
-include/httpd/xml/iasciitab.h
-include/httpd/xml/latin1tab.h
-include/httpd/xml/nametab.h
-include/httpd/xml/utf8tab.h
-include/httpd/xml/xmldef.h
-include/httpd/xml/xmlparse.h
-include/httpd/xml/xmlrole.h
-include/httpd/xml/xmltok.h
-include/httpd/xml/xmltok_impl.h
-${SHLIBS}lib/httpd/httpd.exp
-libexec/cgi-bin/printenv
-libexec/cgi-bin/test-cgi
-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
-sbin/ab
-sbin/apachectl
-sbin/apxs
-sbin/httpd
-sbin/logresolve
-sbin/rotatelogs
-share/examples/httpd/httpd.conf.default
-share/examples/httpd/magic.default
-share/examples/httpd/mime.types.default
-share/httpd/htdocs/apache_pb.gif
-share/httpd/htdocs/index.html.ca
-share/httpd/htdocs/index.html.cz
-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.fr
-share/httpd/htdocs/index.html.he.iso8859-8
-share/httpd/htdocs/index.html.it
-share/httpd/htdocs/index.html.ja.jis
-share/httpd/htdocs/index.html.kr.iso-kr
-share/httpd/htdocs/index.html.lb.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.iso-pl
-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.ucs2
-share/httpd/htdocs/index.html.ru.ucs4
-share/httpd/htdocs/index.html.ru.utf8
-share/httpd/htdocs/index.html.se
-share/httpd/htdocs/index.html.zh-tw.big5
-share/httpd/htdocs/manual/FAQ.html
-share/httpd/htdocs/manual/LICENSE
-share/httpd/htdocs/manual/bind.html.en
-share/httpd/htdocs/manual/bind.html.fr
-share/httpd/htdocs/manual/bind.html.html
-share/httpd/htdocs/manual/bind.html.ja.jis
-share/httpd/htdocs/manual/cgi_path.html.en
-share/httpd/htdocs/manual/cgi_path.html.fr
-share/httpd/htdocs/manual/cgi_path.html.html
-share/httpd/htdocs/manual/cgi_path.html.ja.jis
-share/httpd/htdocs/manual/configuring.html.en
-share/httpd/htdocs/manual/configuring.html.fr
-share/httpd/htdocs/manual/configuring.html.html
-share/httpd/htdocs/manual/configuring.html.ja.jis
-share/httpd/htdocs/manual/content-negotiation.html.en
-share/httpd/htdocs/manual/content-negotiation.html.html
-share/httpd/htdocs/manual/content-negotiation.html.ja.jis
-share/httpd/htdocs/manual/custom-error.html.en
-share/httpd/htdocs/manual/custom-error.html.fr
-share/httpd/htdocs/manual/custom-error.html.html
-share/httpd/htdocs/manual/custom-error.html.ja.jis
-share/httpd/htdocs/manual/cygwin.html
-share/httpd/htdocs/manual/dns-caveats.html.en
-share/httpd/htdocs/manual/dns-caveats.html.fr
-share/httpd/htdocs/manual/dns-caveats.html.html
-share/httpd/htdocs/manual/dso.html
-share/httpd/htdocs/manual/ebcdic.html
-share/httpd/htdocs/manual/env.html.en
-share/httpd/htdocs/manual/env.html.html
-share/httpd/htdocs/manual/env.html.ja.jis
-share/httpd/htdocs/manual/footer.html
-share/httpd/htdocs/manual/handler.html.en
-share/httpd/htdocs/manual/handler.html.html
-share/httpd/htdocs/manual/handler.html.ja.jis
-share/httpd/htdocs/manual/header.html
-share/httpd/htdocs/manual/howto/auth.html
-share/httpd/htdocs/manual/howto/cgi.html.en
-share/httpd/htdocs/manual/howto/cgi.html.html
-share/httpd/htdocs/manual/howto/cgi.html.ja.jis
-share/httpd/htdocs/manual/howto/footer.html
-share/httpd/htdocs/manual/howto/header.html
-share/httpd/htdocs/manual/howto/htaccess.html
-share/httpd/htdocs/manual/howto/ssi.html.en
-share/httpd/htdocs/manual/howto/ssi.html.html
-share/httpd/htdocs/manual/howto/ssi.html.ja.jis
-share/httpd/htdocs/manual/images/apache_header.gif
-share/httpd/htdocs/manual/images/custom_errordocs.gif
-share/httpd/htdocs/manual/images/home.gif
-share/httpd/htdocs/manual/images/index.gif
-share/httpd/htdocs/manual/images/mod_rewrite_fig1.fig
-share/httpd/htdocs/manual/images/mod_rewrite_fig1.gif
-share/httpd/htdocs/manual/images/mod_rewrite_fig2.fig
-share/httpd/htdocs/manual/images/mod_rewrite_fig2.gif
-share/httpd/htdocs/manual/images/pixel.gif
-share/httpd/htdocs/manual/images/sub.gif
-share/httpd/htdocs/manual/index.html.en
-share/httpd/htdocs/manual/index.html.fr
-share/httpd/htdocs/manual/index.html.html
-share/httpd/htdocs/manual/index.html.ja.jis
-share/httpd/htdocs/manual/install-tpf.html
-share/httpd/htdocs/manual/install.html.en
-share/httpd/htdocs/manual/install.html.es
-share/httpd/htdocs/manual/install.html.fr
-share/httpd/htdocs/manual/install.html.html
-share/httpd/htdocs/manual/install.html.ja.jis
-share/httpd/htdocs/manual/invoking.html.en
-share/httpd/htdocs/manual/invoking.html.fr
-share/httpd/htdocs/manual/invoking.html.html
-share/httpd/htdocs/manual/keepalive.html.en
-share/httpd/htdocs/manual/keepalive.html.html
-share/httpd/htdocs/manual/keepalive.html.ja.jis
-share/httpd/htdocs/manual/location.html
-share/httpd/htdocs/manual/logs.html
-share/httpd/htdocs/manual/man-template.html
-share/httpd/htdocs/manual/misc/API.html
-share/httpd/htdocs/manual/misc/FAQ.html
-share/httpd/htdocs/manual/misc/HTTP_Features.tsv
-share/httpd/htdocs/manual/misc/client_block_api.html
-share/httpd/htdocs/manual/misc/compat_notes.html
-share/httpd/htdocs/manual/misc/custom_errordocs.html
-share/httpd/htdocs/manual/misc/descriptors.html
-share/httpd/htdocs/manual/misc/fin_wait_2.html
-share/httpd/htdocs/manual/misc/footer.html
-share/httpd/htdocs/manual/misc/header.html
-share/httpd/htdocs/manual/misc/howto.html
-share/httpd/htdocs/manual/misc/index.html
-share/httpd/htdocs/manual/misc/known_client_problems.html
-share/httpd/htdocs/manual/misc/nopgp.html
-share/httpd/htdocs/manual/misc/perf-bsd44.html
-share/httpd/htdocs/manual/misc/perf-dec.html
-share/httpd/htdocs/manual/misc/perf-hp.html
-share/httpd/htdocs/manual/misc/perf-tuning.html
-share/httpd/htdocs/manual/misc/perf.html
-share/httpd/htdocs/manual/misc/rewriteguide.html
-share/httpd/htdocs/manual/misc/security_tips.html
-share/httpd/htdocs/manual/misc/tutorials.html
-share/httpd/htdocs/manual/misc/vif-info.html
-share/httpd/htdocs/manual/misc/windoz_keepalive.html
-share/httpd/htdocs/manual/mod/core.html.en
-share/httpd/htdocs/manual/mod/core.html.fr
-share/httpd/htdocs/manual/mod/core.html.html
-share/httpd/htdocs/manual/mod/core.html.ja.jis
-share/httpd/htdocs/manual/mod/directive-dict.html.en
-share/httpd/htdocs/manual/mod/directive-dict.html.fr
-share/httpd/htdocs/manual/mod/directive-dict.html.html
-share/httpd/htdocs/manual/mod/directive-dict.html.ja.jis
-share/httpd/htdocs/manual/mod/directives.html.de
-share/httpd/htdocs/manual/mod/directives.html.en
-share/httpd/htdocs/manual/mod/directives.html.fr
-share/httpd/htdocs/manual/mod/directives.html.html
-share/httpd/htdocs/manual/mod/directives.html.ja.jis
-share/httpd/htdocs/manual/mod/footer.html
-share/httpd/htdocs/manual/mod/header.html
-share/httpd/htdocs/manual/mod/index-bytype.html.en
-share/httpd/htdocs/manual/mod/index-bytype.html.fr
-share/httpd/htdocs/manual/mod/index-bytype.html.html
-share/httpd/htdocs/manual/mod/index-bytype.html.ja.jis
-share/httpd/htdocs/manual/mod/index.html.en
-share/httpd/htdocs/manual/mod/index.html.fr
-share/httpd/htdocs/manual/mod/index.html.html
-share/httpd/htdocs/manual/mod/index.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_access.html.en
-share/httpd/htdocs/manual/mod/mod_access.html.html
-share/httpd/htdocs/manual/mod/mod_access.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_actions.html.en
-share/httpd/htdocs/manual/mod/mod_actions.html.html
-share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_alias.html.en
-share/httpd/htdocs/manual/mod/mod_alias.html.html
-share/httpd/htdocs/manual/mod/mod_alias.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_asis.html.en
-share/httpd/htdocs/manual/mod/mod_asis.html.html
-share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_auth.html.en
-share/httpd/htdocs/manual/mod/mod_auth.html.html
-share/httpd/htdocs/manual/mod/mod_auth.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_auth_anon.html
-share/httpd/htdocs/manual/mod/mod_auth_db.html
-share/httpd/htdocs/manual/mod/mod_auth_dbm.html
-share/httpd/htdocs/manual/mod/mod_auth_digest.html
-share/httpd/htdocs/manual/mod/mod_autoindex.html
-share/httpd/htdocs/manual/mod/mod_browser.html
-share/httpd/htdocs/manual/mod/mod_cern_meta.html
-share/httpd/htdocs/manual/mod/mod_cgi.html.en
-share/httpd/htdocs/manual/mod/mod_cgi.html.html
-share/httpd/htdocs/manual/mod/mod_cgi.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_cookies.html
-share/httpd/htdocs/manual/mod/mod_digest.html
-share/httpd/htdocs/manual/mod/mod_dir.html.en
-share/httpd/htdocs/manual/mod/mod_dir.html.html
-share/httpd/htdocs/manual/mod/mod_dir.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_dld.html
-share/httpd/htdocs/manual/mod/mod_env.html.en
-share/httpd/htdocs/manual/mod/mod_env.html.html
-share/httpd/htdocs/manual/mod/mod_env.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_example.html
-share/httpd/htdocs/manual/mod/mod_expires.html
-share/httpd/htdocs/manual/mod/mod_headers.html
-share/httpd/htdocs/manual/mod/mod_imap.html
-share/httpd/htdocs/manual/mod/mod_include.html
-share/httpd/htdocs/manual/mod/mod_info.html.en
-share/httpd/htdocs/manual/mod/mod_info.html.html
-share/httpd/htdocs/manual/mod/mod_info.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_isapi.html
-share/httpd/htdocs/manual/mod/mod_log_agent.html
-share/httpd/htdocs/manual/mod/mod_log_common.html
-share/httpd/htdocs/manual/mod/mod_log_config.html.en
-share/httpd/htdocs/manual/mod/mod_log_config.html.html
-share/httpd/htdocs/manual/mod/mod_log_config.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_log_referer.html
-share/httpd/htdocs/manual/mod/mod_mime.html.en
-share/httpd/htdocs/manual/mod/mod_mime.html.html
-share/httpd/htdocs/manual/mod/mod_mime.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_mime_magic.html
-share/httpd/htdocs/manual/mod/mod_mmap_static.html
-share/httpd/htdocs/manual/mod/mod_negotiation.html.en
-share/httpd/htdocs/manual/mod/mod_negotiation.html.html
-share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_proxy.html
-share/httpd/htdocs/manual/mod/mod_rewrite.html.en
-share/httpd/htdocs/manual/mod/mod_rewrite.html.html
-share/httpd/htdocs/manual/mod/mod_rewrite.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_setenvif.html.en
-share/httpd/htdocs/manual/mod/mod_setenvif.html.html
-share/httpd/htdocs/manual/mod/mod_setenvif.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_so.html.en
-share/httpd/htdocs/manual/mod/mod_so.html.html
-share/httpd/htdocs/manual/mod/mod_so.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_speling.html.en
-share/httpd/htdocs/manual/mod/mod_speling.html.html
-share/httpd/htdocs/manual/mod/mod_speling.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_status.html
-share/httpd/htdocs/manual/mod/mod_unique_id.html.en
-share/httpd/htdocs/manual/mod/mod_unique_id.html.html
-share/httpd/htdocs/manual/mod/mod_unique_id.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_userdir.html.en
-share/httpd/htdocs/manual/mod/mod_userdir.html.html
-share/httpd/htdocs/manual/mod/mod_userdir.html.ja.jis
-share/httpd/htdocs/manual/mod/mod_usertrack.html
-share/httpd/htdocs/manual/mod/mod_vhost_alias.html
-share/httpd/htdocs/manual/mod/module-dict.html.en
-share/httpd/htdocs/manual/mod/module-dict.html.html
-share/httpd/htdocs/manual/mod/module-dict.html.ja.jis
-share/httpd/htdocs/manual/mpeix.html
-share/httpd/htdocs/manual/multilogs.html
-share/httpd/htdocs/manual/netware.html
-share/httpd/htdocs/manual/new_features_1_0.html
-share/httpd/htdocs/manual/new_features_1_1.html
-share/httpd/htdocs/manual/new_features_1_2.html
-share/httpd/htdocs/manual/new_features_1_3.html.en
-share/httpd/htdocs/manual/new_features_1_3.html.html
-share/httpd/htdocs/manual/new_features_1_3.html.ja.jis
-share/httpd/htdocs/manual/new_features_2_0.html
-share/httpd/htdocs/manual/process-model.html.en
-share/httpd/htdocs/manual/process-model.html.html
-share/httpd/htdocs/manual/process-model.html.ja.jis
-share/httpd/htdocs/manual/programs/ab.html
-share/httpd/htdocs/manual/programs/apachectl.html.en
-share/httpd/htdocs/manual/programs/apachectl.html.html
-share/httpd/htdocs/manual/programs/apachectl.html.ja.jis
-share/httpd/htdocs/manual/programs/apxs.html
-share/httpd/htdocs/manual/programs/dbmmanage.html
-share/httpd/htdocs/manual/programs/footer.html
-share/httpd/htdocs/manual/programs/header.html
-share/httpd/htdocs/manual/programs/htdigest.html
-share/httpd/htdocs/manual/programs/htpasswd.html.en
-share/httpd/htdocs/manual/programs/htpasswd.html.html
-share/httpd/htdocs/manual/programs/htpasswd.html.ja.jis
-share/httpd/htdocs/manual/programs/httpd.html.en
-share/httpd/htdocs/manual/programs/httpd.html.html
-share/httpd/htdocs/manual/programs/httpd.html.ja.jis
-share/httpd/htdocs/manual/programs/index.html.en
-share/httpd/htdocs/manual/programs/index.html.html
-share/httpd/htdocs/manual/programs/index.html.ja.jis
-share/httpd/htdocs/manual/programs/logresolve.html
-share/httpd/htdocs/manual/programs/other.html
-share/httpd/htdocs/manual/programs/rotatelogs.html
-share/httpd/htdocs/manual/programs/suexec.html.en
-share/httpd/htdocs/manual/programs/suexec.html.html
-share/httpd/htdocs/manual/programs/suexec.html.ja.jis
-share/httpd/htdocs/manual/readme-tpf.html
-share/httpd/htdocs/manual/search/manual-index.cgi
-share/httpd/htdocs/manual/sections.html.en
-share/httpd/htdocs/manual/sections.html.html
-share/httpd/htdocs/manual/sections.html.ja.jis
-share/httpd/htdocs/manual/server-wide.html.en
-share/httpd/htdocs/manual/server-wide.html.fr
-share/httpd/htdocs/manual/server-wide.html.html
-share/httpd/htdocs/manual/server-wide.html.ja.jis
-share/httpd/htdocs/manual/sitemap.html
-share/httpd/htdocs/manual/sourcereorg.html
-share/httpd/htdocs/manual/stopping.html.en
-share/httpd/htdocs/manual/stopping.html.fr
-share/httpd/htdocs/manual/stopping.html.html
-share/httpd/htdocs/manual/suexec.html.en
-share/httpd/htdocs/manual/suexec.html.html
-share/httpd/htdocs/manual/suexec.html.ja.jis
-share/httpd/htdocs/manual/suexec_1_2.html
-share/httpd/htdocs/manual/unixware.html
-share/httpd/htdocs/manual/upgrading_to_1_3.html
-share/httpd/htdocs/manual/urlmapping.html
-share/httpd/htdocs/manual/vhosts/details.html
-share/httpd/htdocs/manual/vhosts/details_1_2.html
-share/httpd/htdocs/manual/vhosts/examples.html
-share/httpd/htdocs/manual/vhosts/fd-limits.html.en
-share/httpd/htdocs/manual/vhosts/fd-limits.html.html
-share/httpd/htdocs/manual/vhosts/fd-limits.html.ja.jis
-share/httpd/htdocs/manual/vhosts/footer.html
-share/httpd/htdocs/manual/vhosts/header.html
-share/httpd/htdocs/manual/vhosts/host.html
-share/httpd/htdocs/manual/vhosts/index.html.en
-share/httpd/htdocs/manual/vhosts/index.html.html
-share/httpd/htdocs/manual/vhosts/index.html.ja.jis
-share/httpd/htdocs/manual/vhosts/ip-based.html
-share/httpd/htdocs/manual/vhosts/mass.html
-share/httpd/htdocs/manual/vhosts/name-based.html.en
-share/httpd/htdocs/manual/vhosts/name-based.html.html
-share/httpd/htdocs/manual/vhosts/name-based.html.ja.jis
-share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html
-share/httpd/htdocs/manual/vhosts/virtual-host.html
-share/httpd/htdocs/manual/win_compiling.html.en
-share/httpd/htdocs/manual/win_compiling.html.html
-share/httpd/htdocs/manual/win_compiling.html.ja.jis
-share/httpd/htdocs/manual/win_service.html.en
-share/httpd/htdocs/manual/win_service.html.html
-share/httpd/htdocs/manual/win_service.html.ja.jis
-share/httpd/htdocs/manual/windows.html.en
-share/httpd/htdocs/manual/windows.html.ja.jis
-share/httpd/htdocs/sitedrivenby.gif
-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/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/diskimg.gif
-share/httpd/icons/diskimg.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 share/httpd/icons/small
-@dirrm share/httpd/icons
-@dirrm share/httpd/htdocs/manual/vhosts
-@dirrm share/httpd/htdocs/manual/search
-@dirrm share/httpd/htdocs/manual/programs
-@dirrm share/httpd/htdocs/manual/mod
-@dirrm share/httpd/htdocs/manual/misc
-@dirrm share/httpd/htdocs/manual/images
-@dirrm share/httpd/htdocs/manual/howto
-@dirrm share/httpd/htdocs/manual
-@unexec ${RMDIR} %D/share/httpd/htdocs 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/httpd 2>/dev/null || ${TRUE}
-@dirrm share/examples/httpd
-@unexec ${RMDIR} %D/lib/httpd 2>/dev/null || ${TRUE}
-@dirrm include/httpd/xml
-@dirrm include/httpd
diff --git a/www/apache6/PLIST.suexec b/www/apache6/PLIST.suexec
deleted file mode 100644
index 0fa01a812f7..00000000000
--- a/www/apache6/PLIST.suexec
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.suexec,v 1.1 2001/11/01 02:23:26 zuntum Exp $
-sbin/suexec
-man/man8/suexec.8
diff --git a/www/apache6/distinfo b/www/apache6/distinfo
deleted file mode 100644
index 8e9c97696ea..00000000000
--- a/www/apache6/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.18 2003/11/02 09:35:12 cube Exp $
-
-SHA1 (apache_1.3.29.tar.gz) = 0fb055dfd8c86457996edb36f19fb66f09dccd6a
-Size (apache_1.3.29.tar.gz) = 2435809 bytes
-SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
-Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (apache-1.3.29-v6-20031028.diff.gz) = 13ceac2dfce9d66f3089667f1ec5e1ec30961621
-Size (apache-1.3.29-v6-20031028.diff.gz) = 36988 bytes
-SHA1 (patch-aa) = 6388498d251bb4bde65954803ff0b0bce21b27f8
-SHA1 (patch-ab) = 7619dbf1cf584f9e92998fe25de0860bfbeb277e
-SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f
-SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0
-SHA1 (patch-af) = 8115ea5b59fc86e7354effd25dc22525e7627802
-SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
-SHA1 (patch-ai) = 46d9a97fbc248a2bea97943b9f3b2f9f693f3695
-SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100
-SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
diff --git a/www/apache6/files/ap_include_extern.h b/www/apache6/files/ap_include_extern.h
deleted file mode 100644
index d962c66a2e3..00000000000
--- a/www/apache6/files/ap_include_extern.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $NetBSD: ap_include_extern.h,v 1.2 2001/02/06 10:58:18 itojun Exp $ */
-/* ====================================================================
- * Copyright (c) 1998 The Apache Group.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Apache Group
- *    for use in the Apache HTTP server project (http://www.apache.org/)."
- *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
- * on public domain software written at the National Center for
- * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
- * project, please see <http://www.apache.org/>.
- *
- */
-
-#ifndef AP_INCLUDE_EXTERN_H
-#define AP_INCLUDE_EXTERN_H
-
-/*
- * XSSI extensibility hooks.
- *
- * This allows other modules to "hook" themselves into the Apache XSSI
- * (mod_include) handler list without requiring modification to the
- * mod_include source code.
- */
-
-typedef int (*ap_include_extern_func)(FILE *fp, request_rec *r,
-				      const char *error, const char *timefmt);
-
-/* The const char * argument is the command word used to find this hook. */
-API_EXPORT(int) ap_include_register_extern(const char *, ap_include_extern_func);
-
-/* Formerly a static "get_tag()" in mod_include.c */
-API_EXPORT(char *) ap_include_get_tag(pool *, FILE *, char *, int, int);
-
-/* Formerly a static "parse_string()" in mod_include.c */
-API_EXPORT(void) ap_include_parse_string(request_rec *, const char *,
-					 char *, size_t, int);
-
-#endif
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
deleted file mode 100644
index 2663e152749..00000000000
--- a/www/apache6/files/apache.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: apache.sh,v 1.18 2002/11/19 23:08:47 jlam Exp $
-#
-# PROVIDE: apache
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start Apache:
-#
-# apache=YES 
-
-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"
-extra_commands="reload"
-start_cmd="apache_doit start"
-stop_cmd="apache_doit stop"
-restart_cmd="apache_doit restart"
-reload_cmd="apache_doit reload"
-
-apache_doit ()
-{
-	: ${apache_start:=start}
-
-	case $1 in
-	start)	action=${apache_start} ;;
-	reload)	action=graceful ;;
-	*)	action=$1 ;;
-	esac
-	${ctl_command} ${action}
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
-then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	apache_doit "$1"
-fi
diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout
deleted file mode 100644
index a425fdf3a53..00000000000
--- a/www/apache6/files/config.layout
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: config.layout,v 1.5 2002/08/25 21:52:00 jlam Exp $
-
-<Layout pkgsrc>
-prefix: @PREFIX@
-exec_prefix: @PREFIX@
-bindir: ${exec_prefix}/bin
-sbindir: ${exec_prefix}/sbin
-libexecdir: ${exec_prefix}/lib/httpd
-mandir: ${prefix}/man
-sysconfdir: @PKG_SYSCONFDIR@
-datadir: ${prefix}/share/httpd
-iconsdir: ${prefix}/share/httpd/icons
-htdocsdir: ${prefix}/share/httpd/htdocs
-manualdir: ${prefix}/share/httpd/htdocs/manual
-cgidir: ${exec_prefix}/libexec/cgi-bin
-includedir: ${prefix}/include/httpd
-localstatedir: /var/httpd
-runtimedir: /var/run
-logfiledir: /var/log/httpd
-proxycachedir: /var/httpd/proxy
-</Layout>
diff --git a/www/apache6/patches/patch-aa b/www/apache6/patches/patch-aa
deleted file mode 100644
index 6ea0f149a6f..00000000000
--- a/www/apache6/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2003/09/12 08:26:46 itojun Exp $
-
---- Makefile.tmpl.orig	2003-04-28 22:32:12.000000000 +0900
-+++ Makefile.tmpl	2003-09-12 17:20:50.000000000 +0900
-@@ -328,20 +328,7 @@
- 			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
- 			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
- 			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
--			name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
--			echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
--			modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
- 		done; \
--		echo "" >>$(SRC)/.apaci.install.conf; \
--		echo "#  Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
--		echo "#  (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \
--		echo "#  [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
--		echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
--		egrep "^[ 	]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
--		sed	-e 's:SharedModule:AddModule:' \
--			-e 's:modules/[^/]*/::' \
--			-e 's:[ 	]lib: mod_:' \
--			-e 's:\.[dsoam].*$$:.c:' >>$(SRC)/.apaci.install.conf; \
- 	fi
- 	@echo "<=== [programs]"
- 
-@@ -459,7 +446,7 @@
- #   icons and distributed CGI scripts.
- install-data:
- 	@echo "===> [data: Installing initial data files]"
--	-@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
-+	-@if false; then \
- 		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
- 	else \
- 		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-@@ -481,9 +468,10 @@
- 		for script in printenv test-cgi; do \
- 			cat $(TOP)/cgi-bin/$${script} |\
- 			sed -e 's;^#!/.*perl;#!$(PERL);' \
-+			-e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib:$(prefix)/lib:/usr/local/lib;' \
- 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
--			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
--			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
-+			echo "$(INSTALL_SCRIPT) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
-+			$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
- 		done; \
- 	fi
- 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -497,7 +485,7 @@
- #   and initial config files while preserving existing ones.
- install-config:
- 	@echo "===> [config: Installing Apache configuration files]"
--	-@for conf in httpd.conf access.conf srm.conf; do \
-+	-@for conf in httpd.conf; do \
- 		if [ .$$conf = .httpd.conf ]; then \
- 			target_conf="$(TARGET).conf"; \
- 		else \
diff --git a/www/apache6/patches/patch-ab b/www/apache6/patches/patch-ab
deleted file mode 100644
index 1ace2958e90..00000000000
--- a/www/apache6/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/10/08 13:23:37 martti Exp $
-
---- conf/httpd.conf-dist.orig	Sun May 13 19:59:49 2001
-+++ conf/httpd.conf-dist	Mon Oct  8 14:28:52 2001
-@@ -197,7 +197,12 @@
- # the order below without expert advice.
- #
- # Example:
--# LoadModule foo_module libexec/mod_foo.so
-+# LoadModule foo_module lib/httpd/mod_foo.so
-+
-+<IfDefine SSL>
-+LoadModule ssl_module lib/httpd/mod_ssl.so
-+AddModule mod_ssl.c
-+</IfDefine>
- 
- #
- # ExtendedStatus controls whether Apache will generate "full" status
diff --git a/www/apache6/patches/patch-ac b/www/apache6/patches/patch-ac
deleted file mode 100644
index 67a2aac8c55..00000000000
--- a/www/apache6/patches/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/10/08 13:23:37 martti Exp $
-
---- htdocs/index.html.en.orig	Fri May  4 02:00:38 2001
-+++ htdocs/index.html.en	Mon Oct  8 14:33:54 2001
-@@ -27,12 +27,31 @@
- 
- <hr width="50%" size="8" />
- <p>The Apache <a href="manual/">documentation</a> has been included
-+this distribution. If the <STRONG>mod_ssl</STRONG> SSL extension has
-+been installed, then please carefully read the
-+<a href="manual/mod/mod_ssl/index.html">SSL documentation</a>.</p>
- with this distribution.</p>
- 
-+<p>Information on the NetBSD multi-platform operating system can be found at
-+<a href="http://www.netbsd.org/">The NetBSD Project homepage</a></p>
-+
- <p>You are free to use the image below on an Apache-powered web
- server. Thanks for using Apache!</p>
- 
--<div align="center"><img src="apache_pb.gif" alt="" /></div>
-+<p>Please feel free to use the images below on an Apache/NetBSD-powered web
-+server. Thanks for using
-+<a href="http://www.apache.org/">Apache</a> on
-+<a href="http://www.netbsd.org/">NetBSD</a>!</p>
-+
-+<div align="CENTER">
-+ <a href="http://www.apache.org/">
-+  <img src="apache_pb.gif" border=0 alt="Powered by Apache">
-+ </a>
-+ <a href="http://www.netbsd.org/">
-+  <img src="sitedrivenby.gif" border=0 alt="Site driven by NetBSD">
-+ </a>
-+</div>
-+
- </body>
- </html>
- 
diff --git a/www/apache6/patches/patch-ae b/www/apache6/patches/patch-ae
deleted file mode 100644
index a5e0becf241..00000000000
--- a/www/apache6/patches/patch-ae
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/02/06 10:58:18 itojun Exp $
-
---- src/modules/standard/mod_include.c.orig	Tue Jan 16 02:05:42 2001
-+++ src/modules/standard/mod_include.c	Tue Feb  6 19:49:25 2001
-@@ -94,6 +94,8 @@
- #include "http_main.h"
- #include "util_script.h"
- #endif
-+#define get_tag ap_include_get_tag
-+#define parse_string ap_include_parse_string
- 
- #define STARTING_SEQUENCE "<!--#"
- #define ENDING_SEQUENCE "-->"
-@@ -352,7 +354,8 @@
-  * the tag value is html decoded if dodecode is non-zero
-  */
- 
--static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
-+API_EXPORT(char *)
-+ap_include_get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
- {
-     char *t = tag, *tag_val, c, term;
- 
-@@ -471,7 +474,8 @@
- /*
-  * Do variable substitution on strings
-  */
--static void parse_string(request_rec *r, const char *in, char *out,
-+API_EXPORT(void)
-+ap_include_parse_string(request_rec *r, const char *in, char *out,
- 			size_t length, int leave_name)
- {
-     char ch;
-@@ -669,7 +673,8 @@
-             parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
-             if (tag[0] == 'f') {
-                 /* be safe; only files in this directory or below allowed */
--		if (!is_only_below(parsed_string)) {
-+		if ((ap_allow_options(r) & OPT_INCNOEXEC) &&
-+		    !is_only_below(parsed_string)) {
-                     error_fmt = "unable to include file \"%s\" "
-                         "in parsed file %s";
-                 }
-@@ -1081,7 +1086,8 @@
-                         "in parsed file %s";
-         }
-         else {
--            ap_getparents(tag_val);    /* get rid of any nasties */
-+	    if (ap_allow_options(r) & OPT_INCNOEXEC)
-+                ap_getparents(tag_val);    /* get rid of any nasties */
-             rr = ap_sub_req_lookup_file(tag_val, r);
- 
-             if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
diff --git a/www/apache6/patches/patch-af b/www/apache6/patches/patch-af
deleted file mode 100644
index 015ef18c00c..00000000000
--- a/www/apache6/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/10/08 13:23:37 martti Exp $
-
---- src/modules/standard/mod_so.c.orig	Tue Feb 27 04:59:53 2001
-+++ src/modules/standard/mod_so.c	Mon Oct  8 14:34:14 2001
-@@ -308,7 +308,15 @@
-         return err;
-     }
-     
--    file = ap_server_root_relative(cmd->pool, filename);
-+    /*
-+     * If the filename starts with '!', then just dlopen() it without
-+     * translating it to a pathname relative to ServerRoot.
-+     */
-+    if (filename[0] == '!') {
-+	file = filename + 1;
-+    } else {
-+	file = ap_server_root_relative(cmd->pool, filename);
-+    }
-     
-     if (!(handle = ap_os_dso_load(file))) {
- 	const char *my_error = ap_os_dso_error();
diff --git a/www/apache6/patches/patch-ah b/www/apache6/patches/patch-ah
deleted file mode 100644
index 2b01bb66249..00000000000
--- a/www/apache6/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2001/02/06 10:58:19 itojun Exp $
-
---- src/support/apachectl.orig	Thu Sep  7 01:19:50 2000
-+++ src/support/apachectl
-@@ -27,6 +27,9 @@
- # the path to your httpd binary, including options if necessary
- HTTPD='/usr/local/apache/src/httpd'
- #
-+# shared object search path
-+LD_LIBRARY_PATH=
-+export LD_LIBRARY_PATH
- # a command that outputs a formatted text version of the HTML at the
- # url given on the command line.  Designed for lynx, however other
- # programs may work.  
diff --git a/www/apache6/patches/patch-ai b/www/apache6/patches/patch-ai
deleted file mode 100644
index 96acd7c90ae..00000000000
--- a/www/apache6/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2001/10/22 18:10:29 jlam Exp $
-
---- src/support/apxs.pl.orig	Sat Jun  9 01:06:57 2001
-+++ src/support/apxs.pl	Sat Jun  9 01:11:28 2001
-@@ -459,8 +459,7 @@
-         if ($^O ne "MSWin32") {
-             $t =~ s|^.+/([^/]+)$|$1|;
-             if ($opt_i) {
--                push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
--                push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+                push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t");
-             }
-         }
- 	else {
diff --git a/www/apache6/patches/patch-aj b/www/apache6/patches/patch-aj
deleted file mode 100644
index 00beb943acb..00000000000
--- a/www/apache6/patches/patch-aj
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2001/10/17 07:47:54 martti Exp $
-
---- htdocs/index.html.fr.orig	Wed Jun 27 08:38:39 2001
-+++ htdocs/index.html.fr	Tue Oct 16 22:29:50 2001
-@@ -36,12 +36,28 @@
- <hr width="50%" size="8">
- 
- <p>La <a href="manual/">documentation</a> Apache est incluse dans cette
--distribution.</p>
-+distribution. Si l'extension SSL <STRONG>mod_ssl</STRONG> a \xe9t\xe9
-+install\xe9e, lisez alors attentivement la 
-+<a href="manual/mod/mod_ssl/index.html">documentation SSL</a>.</p>
-+  
-+<p>Des informations sur le syst\xe8me d'exploitation multi-plateforme NetBSD
-+peuvent &ecirc;tre trouv\xe9es sur
-+<a href="http://www.netbsd.org/">la homepage du projet NetBSD</a>.</p> 
-+  
-+<p>Le webmaster de ce site peut librement utiliser les images ci-dessous sur u
- 
--<p>Le webmaster de ce site peut librement utiliser l'image ci-dessous sur un
--site web utilisant le logiciel Apache. Merci d'avoir choisi Apache&nbsp;!</p>
-+site web utilisant les logiciels Apache et NetBSD. Merci d'avoir choisi
-+<a href="http://www.apache.org/">Apache</a> sur
-+<a href="http://www.netbsd.org/">NetBSD</a>&nbsp;!</p>
- 
--<div align="CENTER"><img src="apache_pb.gif" alt=""></div>
-+<div align="CENTER">
-+ <a href="http://www.apache.org/">
-+  <img src="apache_pb.gif" BORDER="0" alt="Powered by Apache">
-+ </a>
-+ <a href="http://www.netbsd.org/">
-+  <img src="sitedrivenby.gif" BORDER="0" alt="Site driven by NetBSD">
-+ </a>
-+</div>
- 
- </body>
- </html>
diff --git a/www/apache6/patches/patch-ak b/www/apache6/patches/patch-ak
deleted file mode 100644
index d4d262229bc..00000000000
--- a/www/apache6/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2001/10/16 04:11:07 jlam Exp $
-
---- src/Makefile.tmpl.orig	Sun Oct 14 22:14:29 2001
-+++ src/Makefile.tmpl
-@@ -2,7 +2,7 @@
- CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
- LIBS=$(EXTRA_LIBS) $(LIBS1)
- INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
--LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-+LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) $(LINK_LIBGCC_LDFLAGS)
- 
- OBJS= \
-   modules.o \