- retire www/apache2

author: clement <clement@FreeBSD.org> 2005-12-04 08:27:20 +0800
committer: clement <clement@FreeBSD.org> 2005-12-04 08:27:20 +0800
commit: fa91c6edbb430e83f931b5027c7713474ce4684d (patch)
tree: 5dfc51cb4c69d8b94739f3db8ff19e33c3834eea /www
parent: 1d6508069b0bf57147e20c471f349d8f22204837 (diff)
download: freebsd-ports-gnome-fa91c6edbb430e83f931b5027c7713474ce4684d.tar.gz
freebsd-ports-gnome-fa91c6edbb430e83f931b5027c7713474ce4684d.tar.zst
freebsd-ports-gnome-fa91c6edbb430e83f931b5027c7713474ce4684d.zip
32 files changed, 0 insertions, 2753 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
deleted file mode 100644
index 3baad1ee2316..000000000000
--- a/www/apache2/Makefile
+++ /dev/null
@@ -1,268 +0,0 @@
-# New ports collection makefile for:	apache2
-# Date created:				7 April 2001
-# Whom:					Hye-Shik Chang <perky@fallin.lv>
-#
-# $FreeBSD$
-#
-# For more information, please read Makefile.doc
-#
-
-PORTNAME=	apache
-PORTVERSION=	2.0.55
-CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
-		${MASTER_SITE_LOCAL:S/$/:powerlogo/}
-MASTER_SITE_SUBDIR=	clement/:powerlogo
-DISTNAME=	httpd-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.bz2 powerlogo.gif:powerlogo
-DIST_SUBDIR=	apache2
-EXTRACT_ONLY=	${DISTNAME}.tar.bz2
-
-MAINTAINER?=	clement@FreeBSD.org
-COMMENT?=	Version 2 of Apache web server with ${WITH_MPM:L} MPM.
-
-LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
-
-LATEST_LINK=	apache2
-
-CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \
-		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
-		apache+mod_ssl+mod_snmp+mod_accel-1.* \
-		apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
-		caudium-devel-1.* caudium10-1.* caudium12-* \
-		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
-
-# patch files
-EXTRA_PATCHES+=		${FILESDIR}/build-fix-openssl_beta
-
-.if defined (WITH_WINDOWSUPDATEFIX)
-EXTRA_PATCHES+=		${FILESDIR}/exp-windowsupdate.patch
-.endif
-
-.if defined(WITH_EXPERIMENTAL_PATCHES)
-IGNORE=		: Please define WITH_KQUEUE_SUPPORT instead
-.endif
-
-.if defined(WITH_KQUEUE_SUPPORT)
-EXTRA_PATCHES+=		${FILESDIR}/exp-apr-kqueue.patch
-.endif
-
-SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
-			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
-			AUTOHEADER=${AUTOHEADER}
-USE_ICONV=		yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
-USE_PERL5=		yes
-USE_RC_SUBR=		yes
-USE_REINPLACE=		yes
-LIBTOOLFILES=		configure
-INSTALLS_SHLIB=		yes
-LDCONFIG_DIRS=		${PREFIX}/lib/apache2
-USE_BZIP2=		yes
-
-CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
-		--enable-layout=FreeBSD \
-		--with-perl=${PERL5} \
-		--with-port=${WITH_HTTP_PORT} \
-		--with-expat=${LOCALBASE} \
-		--with-iconv=${LOCALBASE} \
-		--libdir=${PREFIX_RELDEST}/lib/apache2 \
-		--includedir=${PREFIX_RELDEST}/include/apache2
-
-CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \
-		LOCALBASE="${LOCALBASE}"
-
-PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-
-MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
-
-WITH_MPM?=	prefork # or worker, perchild, threadpool
-
-WITH_HTTP_PORT?=	80
-
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--disable-ipv6
-.else
-CATEGORIES+=		ipv6
-.   if defined(WITH_IPV6_V6ONLY) && defined(WITHOUT_V4MAPPED)
-CONFIGURE_ARGS+=	--disable-v4-mapped
-.   else
-CONFIGURE_ARGS+=	--enable-v4-mapped
-.   endif
-.endif
-
-#backward compatibility
-.if defined(WITHOUT_SSL)
-WITHOUT_SSL_MODULES=	YES
-.endif
-
-.if !defined(WITHOUT_SSL_MODULES)
-USE_OPENSSL=	yes
-.endif
-
-.if defined(WITH_STATIC_SUPPORT)
-CONFIGURE_ARGS+=	--enable-static-support
-.endif
-
-.if defined(WITH_SSL_EXPERIMENTAL_ENGINE)
-CFLAGS+=	-DSSL_EXPERIMENTAL_ENGINE
-.endif
-
-# debug overrides CFLAGS
-.if defined(WITH_DEBUG)
-DEBUG_FLAGS?=	-O0 -g -ggdb3
-CFLAGS=		${DEBUG_FLAGS}
-CONFIGURE_ARGS+=	--enable-maintainer-mode
-WITH_EXCEPTION_HOOK=	YES
-.endif
-
-.if defined(WITH_EXCEPTION_HOOK)
-CONFIGURE_ARGS+=	--enable-exception-hook
-.endif
-
-# for slave ports
-.if !defined(MASTERDIR)
-APACHEDIR=	${.CURDIR}
-.else
-APACHEDIR=	${MASTERDIR}
-.endif
-
-.if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES)
-USE_OPENLDAP=		YES
-CONFIGURE_ARGS+=	--with-ldap \
-			--with-ldap-lib="${LOCALBASE}/lib" \
-			--with-ldap-include="${LOCALBASE}/include"
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libapr-0.so) || defined(WITH_APR_FROM_PORTS)
-IGNORE=	: apr from ports (WITH_APR_FROM_PORTS) is no longer supported
-.endif
-
-WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//:S/-//}
-WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
-
-.include "${APACHEDIR}/Makefile.doc"
-.include "${APACHEDIR}/Makefile.modules"
-WANT_APACHE=	common2
-.include "${APACHEDIR}/Makefile.modules.3rd"
-
-CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
-
-show-options:
-	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
-
-show-categories:
-.for category in ${ALL_MODULES_CATEGORIES}
-	@${ECHO_MSG} "${category} contains these modules:"
-	@${ECHO_MSG} "  ${${category}_MODULES}"
-.endfor
-
-show-modules:
-	@for module in ${AVAILABLE_MODULES} ; do \
-	${ECHO_MSG} -n "$${module}: ";\
-	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
-			${ECHO_CMD} -n "enabled "; \
-				if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
-					${ECHO_CMD} "(static)" ; \
-				else \
-					${ECHO_CMD} "(shared)" ;\
-				fi;\
-			else\
-			${ECHO_CMD} disabled ;\
-		fi;\
-	done
-
-pre-everything::
-	@${ECHO_MSG}	""
-	@${ECHO_MSG}	" To enable a module category: WITH_<CATEGORY>_MODULES"
-	@${ECHO_MSG}	" To disable a module category: WITHOUT_<CATEGORY>_MODULES"
-	@${ECHO_MSG}	""
-	@${ECHO_MSG}	" Per default categories are:"
-	@${ECHO_MSG}	"  ${DEFAULT_MODULES_CATEGORIES}"
-	@${ECHO_MSG}	" Categories available:"
-	@${ECHO_MSG}	"  ${ALL_MODULES_CATEGORIES}"
-	@${ECHO_MSG}	""
-	@${ECHO_MSG}	"  To see all available knobs, type make show-options"
-	@${ECHO_MSG}	"  To see all modules in different categories, type make show-categories"
-	@${ECHO_MSG}    "  You can check your modules configuration by using make show-modules"
-	@${ECHO_MSG}	""
-	@${ECHO_MSG}    "To save apache.org bandwidth, please use the closest"
-	@${ECHO_MSG}    "mirror. Hit Ctrl+C now and do a "make print-closest-mirrors."
-	@${ECHO_MSG}	"To automatically update /etc/make.conf do:"
-	@${ECHO_MSG}	"make print-closest-mirrors >> /etc/make.conf"
-	@${ECHO_MSG}	""
-
-print-closest-mirrors:
-	@${ECHO_MSG} -n "Fetching list of nearest mirror: " >&2
-	@MIRRORS=`${FETCH_CMD} -T 30 -qo - http://www.apache.org/dyn/closer.cgi/httpd/ 2> /dev/null\
-	| ${GREP} /httpd/ | ${SED} 's/.*href="\(.*\)"><str.*/\1/g' | \
-	${HEAD} -7 | ${TAIL} -6` ; \
-	${ECHO_MSG} done >&2; if [ "x$$MIRRORS" != "x" ]; then \
-	${ECHO_MSG} -n "MASTER_SITE_APACHE_HTTPD?= ";\
-	${ECHO_MSG} $$MIRRORS; else \
-	${ECHO_MSG} "No mirrors found!">&2 ; fi
-
-post-extract:
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
-
-post-patch:
-	@cd ${WRKSRC}/docs/docroot && \
-	 for f in index.html.*; do (\
-	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
-		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
-	 ); done
-	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
-	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
-	@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
-	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
-			${WRKSRC}/server/core.c
-	@${REINPLACE_CMD} -e 's,freebsd\[2345\],freebsd\[23456\],' \
-			${WRKSRC}/srclib/apr/build/apr_hints.m4
-	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
-
-pre-configure:
-	@cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
-
-post-configure:
-	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
-	${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS, ; \
-			s,%%WWWOWN%%,${WWWOWN}, ; \
-			s,%%WWWGRP%%,${WWWGRP}, ; \
-			s,%%WWWBASEDIR%%,${PREFIX}/www," \
-			${WRKSRC}/docs/conf/httpd-std.conf
-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
-			${WRKSRC}/support/envvars-std
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-install-startup-script:
-.if !exists(${WRKDIR}/apache2libs.sh) || !exists(${WRKDIR}/apache2.sh)
-	@${MKDIR} ${WRKDIR}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh
-.endif
-	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
-	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
-
-post-install: install-startup-script
-	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
-	@${MKDIR} ${PREFIX}/etc/apache2/Includes
-	@${ECHO_CMD} ""
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/www/apache2/Makefile.doc b/www/apache2/Makefile.doc
deleted file mode 100644
index fe76b6f60bd2..000000000000
--- a/www/apache2/Makefile.doc
+++ /dev/null
@@ -1,157 +0,0 @@
-# Makefile.doc
-# Author:				Clement Laforet <clement@FreeBSD.org>
-#
-# This files contains:
-#      - make options output
-#      - apache2 man/docs routines
-#
-# $FreeBSD$
-#
-
-## Available knobs:
-## By default, modules are compiled as dynamically loadable (DSO) modules.
-##
-## Modules knobs philosophy:
-## Modules are split in categories, "make show-categories" shows you 
-## which modules they contain. You can enable/disable/customize a category:
-## - To enable a category: WITH_<CATEGORY>_MODULES=yes
-##                            [WITH_PROXY_MODULES=yes]
-## - To disable a category: WITHOUT_<CATEGORY>_MODULES=yes 
-##                            [WITHOUT_DAV_MODULES=yes]
-## - To customize a category: WITH_CUSTOM_<CATEGORY>
-##                            [WITH_CUSTOM_PROXY="proxy proxy_http"]
-##
-##   Apache-related
-##      WITH_MPM:                 prefork (default)
-##                                worker
-##                                perchild (deprecated)
-##                                threadpool (testing purpose only)
-##      WITH_HTTP_PORT:           default: 80
-##      WITH_LDAP:                Enable LDAP support (mod_auth_ldap) (implies WITH_LDAP_MODULES)
-##      WITHOUT_V4MAPPED
-##      WITH_IPV6_V6ONLY:         Don't allow IPv6 sockets to handle IPv4 
-##                                connections
-##      WITHOUT_SSL:              Disable SSL support
-##      WITH_THREADS:             Enable threads support !! USE IT WITH CARE !!
-##      WITH_DBM:                 Choose your DBM: bdb (Berkeley DB), gdbm or
-##                                ndbm (default)
-##          WITH_BERKELEYDB:      Choose your BerkeleyDB version: db2, db3,
-##                                db4, db41, db42, db43 or FreeBSD (1.85)
-##                                (default)
-##      WITH_STATIC_SUPPORT:      Build statically linked support binaries
-##      WITH_STATIC_APACHE:       Build a static version of httpd (implies 
-##                                WITH_STATIC_MODULES)
-##      WITH_ALL_STATIC_MODULES:  All modules will be statically linked.
-##      WITH_STATIC_MODULES:      List of modules to build modules statics
-##                                (usefull for slave ports)
-##                                (They must be already enabled (i.e.
-##                                WITH_MODULES or with default configuration
-##                                use 'make show-modules', to check if they are
-##                                enabled)
-##      WITH_MODULES:             List of modules you choose
-##      WITHOUT_MODULES:          Disable selected modules
-##      WITH_SUEXEC:              Enable suExec support
-##            SUEXEC_DOCROOT:     SuExec root directory
-##            SUEXEC_USERDIR:     User subdirectory (default public_html)
-##            SUEXEC_SAFEPATH:    Set the safepath
-##            SUEXEC_LOGFILE:     Set log file for suexec (default: /var/log/httpd-suexec.log)
-##            SUEXEC_UIDMIN:      Minimal allowed UID (default 1000)
-##            SUEXEC_GIDMIN:      Minimal allowed GID (default 1000)
-##            SUEXEC_CALLER:      User allowed to call SuExec (default
-##                                ${WWWOWN} (www))
-##            SUEXEC_UMASK:       Defines umask for suexec'd process(default:
-##                                unset)
-##	WITH_DEBUG:               Build a debug versoin of apache (set CFLAGS
-##                                to "-O0 -g -ggdb3" or ${DEBUG_FLAGS} and
-##                                defines WITH_EXCEPTION_HOOK too)
-##      WITH_EXCEPTION_HOOK:      Enable fatal exception hook
-##
-##   Port-related:
-##      WITHOUT_WWW:              Implies NO_CGI, NO_WWWDATA, NO_ICONS and
-##                                NO_ERROR
-##           WITH_CUSTOM_WWW:     Let you choose your ${PREFIX}/www components
-##                                [cgi|errordocs|icons|wwwdata]
-##
-##  Optionnal patches:  
-#      WITH_EXPERIMENTAL_PATCHES Add performance patches (generally backported
-#                                from apr/httpd CVS)
-#
-##      WITH_KQUEUE_SUPPORT       Add kqueue support to apr/httpd
-##      WITH_WINDOWSUPDATEFIX     Add a fix to use apache as proxy with 
-##                                Windows Update service.
-##
-## Available make targets:
-##      show-options:             prints this message
-##      show-modules:             prints list of available modules
-##      show-categories:          prints list of modules sorted by category
-##
-## Examples:
-##      make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL_MODULES=yes \
-##           WITH_CUSTOM_AUTH="auth auth_dbm"
-##      make WITHOUT_MODULES="access speling status" WITH_PROXY_MODULES=yes
-##      make WITH_MODULES="include rewrite auth"
-##
-##      Note: If you define your custom options in /etc/make.conf, don't forget
-##            to do not use quotes.
-##
-
-DOCSDIR=	${PREFIX}/share/doc/apache2
-EXAMPLESDIR=	${PREFIX}/share/examples/apache2
-MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
-
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	NOPORTDOCS=yes
-.endif
-
-MAN1=		dbmmanage.1 htdigest.1 htpasswd.1 htdbm.1
-MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8
-
-.if defined(WITHOUT_WWW)
-NO_CGI=		YES
-NO_WWWDATA=	YES
-NO_ICONS=	YES
-NO_ERROR=	YES
-.elif defined(WITH_CUSTOM_WWW)
-.    if ${WITH_CUSTOM_WWW:Mcgi} == ""
-NO_CGI=		YES
-.    endif
-.    if ${WITH_CUSTOM_WWW:Mwwwdata} == ""
-NO_WWWDATA=		YES
-.    endif
-.    if ${WITH_CUSTOM_WWW:Merrordocs} == ""
-NO_ERROR=		YES
-.    endif
-.    if ${WITH_CUSTOM_WWW:Micons} == ""
-NO_ICONS=		YES
-.    endif
-.endif
-
-.if defined(NO_CGI)
-MAKE_ENV+=	NO_CGI=yes
-PLIST_SUB+=	CGI="@comment "
-.else
-PLIST_SUB+=	CGI=""
-.endif
-
-.if defined(NO_ICONS)
-MAKE_ENV+=	NO_ICONS=yes
-PLIST_SUB+=	ICONS="@comment "
-.else
-PLIST_SUB+=	ICONS=""
-.endif
-
-.if defined(NO_WWWDATA)
-MAKE_ENV+=	NO_WWWDATA=yes
-PLIST_SUB+=	WWWDATA="@comment "
-.else
-PLIST_SUB+=	WWWDATA=""
-.endif
-
-.if defined(NO_ERROR)
-MAKE_ENV+=	NO_ERROR=yes
-PLIST_SUB+=	ERROR="@comment "
-.else
-PLIST_SUB+=	ERROR=""
-.endif
-
-PORTDOCS=	* #don't blame me ;-)
diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules
deleted file mode 100644
index 0ee7a75ed386..000000000000
--- a/www/apache2/Makefile.modules
+++ /dev/null
@@ -1,134 +0,0 @@
-# Makefile.modules
-# Author:			Clement Laforet <clement@FreeBSD.org>
-#
-# This file is used to build modules list, DBM dependencies and MPM selection.
-# I hope it can easily handle external modules (such as mod_perl) or MPMs, like
-# muxmpm.
-#
-# Note to myself: (to generate PLIST_SUB entries for modules)
-#	gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp
-#	mv tmp pkg-plist
-#
-# $FreeBSD$
-#
-
-# MPM section:
-# << TO BE WRITTEN >>
-.if defined (SLAVE_PORT_MPM)
-PLIST_SUB+=	PREFORK="@comment " WORKER="@comment "
-PKGNAMESUFFIX=	-${SLAVE_PORT_MPM}
-.else
-.   if ${WITH_MPM} != "prefork"
-PKGNAMESUFFIX=		-${WITH_MPM:L}
-WITH_THREADS=		yes
-WITH_THREADS_MODULES=	yes
-WITHOUT_MODULES+=	cgi
-.      if ${WITH_MPM:L} == "worker"
-PLIST_SUB+=	PREFORK="@comment " WORKER="" THREADPOOL="@comment "
-.      elif  ${WITH_MPM:L} == "perchild"
-PLIST_SUB+=	PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment "
-.      elif  ${WITH_MPM:L} == "threadpool"
-PLIST_SUB+=	PREFORK="@comment " WORKER="@comment " THREADPOOL=""
-.      else
-IGNORE=		"Unknown MPM: ${WITH_MPM}"
-.      endif
-.   else
-PLIST_SUB+=	PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment "
-.   endif
-.else
-PLIST_SUB+=	PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment "
-.endif
-
-# xDBM section
-#
-.if !defined(WITH_DBM) && defined(WITH_BERKELEYDB)
-WITH_DBM=bdb
-.endif
-.if defined(WITH_DBM) && !defined(WITH_BERKELEYDB)
-WITH_BERKELEYDB=	FreeBSD
-.endif
-
-.if defined(WITH_DBM)
-.   if ${WITH_DBM:L} == "sdbm"
-CONFIGURE_ARGS+=	--with-dbm=sdbm
-.   elif ${WITH_DBM:L} == "gdbm"
-LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
-.   elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb"
-.       if ${WITH_BERKELEYDB} == "FreeBSD"
-CONFIGURE_ARGS+=	--with-dbm=db185 \
-			--with-berkeley-db=/usr
-.       elif ${WITH_BERKELEYDB} == "db2"
-LIB_DEPENDS+=		db2:${PORTSDIR}/databases/db2
-CONFIGURE_ARGS+=	--with-dbm=db2 \
-			--with-berkeley-db=${LOCALBASE}
-.       elif ${WITH_BERKELEYDB} == "db3"
-LIB_DEPENDS+=		db3:${PORTSDIR}/databases/db3
-CONFIGURE_ARGS+=	--with-dbm=db3 \
-			--with-berkeley-db=${LOCALBASE}
-.       elif ${WITH_BERKELEYDB} == "db4"
-LIB_DEPENDS+=		db4:${PORTSDIR}/databases/db4
-CONFIGURE_ARGS+=	--with-dbm=db4 \
-			--with-berkeley-db=${LOCALBASE}
-.       elif ${WITH_BERKELEYDB} == "db41"
-LIB_DEPENDS+=		db41:${PORTSDIR}/databases/db41
-CONFIGURE_ARGS+=	--with-dbm=db41 \
-			--with-berkeley-db=${LOCALBASE}
-.       elif ${WITH_BERKELEYDB} == "db42"
-LIB_DEPENDS+=		db-4.2:${PORTSDIR}/databases/db42
-CONFIGURE_ARGS+=	--with-dbm=db42 \
-			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
-.       elif ${WITH_BERKELEYDB} == "db43"
-LIB_DEPENDS+=		db-4.3:${PORTSDIR}/databases/db43
-CONFIGURE_ARGS+=	--with-dbm=db43 \
-			--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db43
-.       else
-IGNORE=		"Unknown Berkeley DB version"
-.       endif
-.   else
-IGNORE=		"Unknown DBM"
-.   endif
-.else
-CONFIGURE_ARGS+=	--with-dbm=sdbm
-.endif
-
-.if defined(WITH_THREADS)
-CONFIGURE_ARGS+=	--enable-threads
-.   if ${WITH_PTHREAD_LIBS} != "c_r" && ${OSVERSION} > 500023
-CONFIGURE_ENV+=		apr_cv_pthreads_lib=-l${WITH_PTHREAD_LIBS} \
-			apr_cv_pthreads_cflags=${WITH_PTHREAD_CFLAGS}
-.     if ${ARCH} == i386
-CONFIGURE_ARGS+=	--enable-nonportable-atomics
-.     endif
-.  else
-CFLAGS+=		-DFREEBSD_THREAD_HACK
-.   endif
-.endif
-
-.if !defined(WITHOUT_SSL)
-WITH_SSL_MODULES=	yes
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.endif
-
-AUTH_MODULES=		access auth auth_anon auth_dbm auth_digest
-DAV_MODULES=		dav dav_fs
-EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter charset_lite \
-			optional_hook_export optional_hook_import \
-			optional_fn_import optional_fn_export \
-			cache file_cache disk_cache mem_cache
-LDAP_MODULES=		ldap auth_ldap
-MISC_MODULES=		actions alias asis autoindex cache cern_meta \
-			cgi charset_lite deflate dir disk_cache env expires \
-			file_cache headers imap include info log_config logio mime \
-			mime_magic negotiation rewrite setenvif speling status \
-			unique_id userdir usertrack vhost_alias
-PROXY_MODULES=		proxy proxy_connect proxy_ftp proxy_http
-SSL_MODULES=		ssl
-SUEXEC_MODULES=		suexec
-THREADS_MODULES=	cgid
-
-DEFAULT_MODULES_CATEGORIES= \
-			AUTH DAV MISC
-
-ALL_MODULES_CATEGORIES=	AUTH DAV EXPERIMENTAL LDAP MISC PROXY SSL \
-			SUEXEC THREADS
diff --git a/www/apache2/Makefile.modules.3rd b/www/apache2/Makefile.modules.3rd
deleted file mode 100644
index 48a9aa53b1d4..000000000000
--- a/www/apache2/Makefile.modules.3rd
+++ /dev/null
@@ -1,305 +0,0 @@
-# Makefile.modules.3rd
-#
-# $FreeBSD$
-#
-# Author: Clement Laforet <clement@FreeBSD.org>
-# If you have questions, please contact me.
-#
-
-.ifdef(USE_APACHE)
-.error USE_APACHE and Makefile.modules.3rd can't be used together.
-.endif
-
-APXS?=		${LOCALBASE}/sbin/apxs
-MODULENAME?=	${PORTNAME}
-SHORTMODNAME?=	${MODULENAME:S/mod_//}
-SRC_FILE?=	${MODULENAME}.c
-OVERRIDABLE_VARS=	SRC_FILE MODULENAME SHORTMODNAME WRKSRC \
-			PKGNAMESUFFIX
-
-
-.if exists(${LOCALBASE}/include/apache2/http_core.h)
-WITH_APACHE2=	YES
-.   if defined (WANT_APACHE)
-.     if ${WANT_APACHE} == 13
-IGNORE=		"This module require apache13 and you have apache2 installed"
-.     endif
-.   endif
-.elif exists(${LOCALBASE}/include/apache/http_core.h)
-WITH_APACHE13=	YES
-.   if defined (WANT_APACHE)
-.     if ${WANT_APACHE} == 2
-IGNORE=		"This module require apache2 and you have apache13 installed"
-.     endif
-.   endif
-.   ifdef(WITH_APACHE2)
-IGNORE=	You have 'WITH_APACHE2' variable defined either in environment or in make(1) arguments. but apache13 is installed Please undefine and try again.
-.   endif
-.endif
-
-.if defined (WANT_APACHE)
-.  if ${WANT_APACHE} == 13
-WITH_APACHE13=		YES
-.  elif ${WANT_APACHE} == 2
-WITH_APACHE2=		YES
-.elif ${WANT_APACHE:Mcommon*} != ""
-PORT_IS_SERVER=		YES
-.  else
-IGNORE=		"Unknown apache version"
-.  endif
-.endif
-
-.if !defined(PORT_IS_SERVER)
-.if exists(${APXS})
-APXS_PREFIX!=	${APXS} -q prefix 2> /dev/null || echo NULL
-.   if ${APXS_PREFIX} == NULL
-IGNORE=	: Your apache does not support DSO modules
-.   endif
-.   if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX}
-IGNORE?=	PREFIX must be egal to APXS_PREFIX.
-.   endif
-.else
-APXS_PREFIX=	${APXS:S/\/sbin\/apxs//}
-.endif
-
-.if defined(WITH_APACHE2)
-AP_BUILDEXT=	la
-PLIST_SUB+=	APACHEMODDIR="libexec/apache2"
-APACHE_PORT=	www/apache2
-AP_VER=		2
-.else
-AP_BUILDEXT=	so
-PLIST_SUB+=	APACHEMODDIR="libexec/apache"
-APACHE_PORT?=	www/apache13
-AP_VER=		13
-.endif
-
-.for VAR in ${OVERRIDABLE_VARS}
-.   if defined(AP${AP_VER}_${VAR})
-${VAR}=	${AP${AP_VER}_${VAR}}
-.   endif
-.endfor
-
-BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
-RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
-PLIST_SUB+=	AP_NAME="${SHORTMODNAME}"
-PLIST_SUB+=	AP_MODULE="${MODULENAME}.so"
-.if defined(AP_GENPLIST)
-PLIST?=		${WRKDIR}/ap-plist
-.endif
-
-.if defined(AP_INC)
-AP_EXTRAS+=	-I ${AP_INC}
-.endif
-.if defined(AP_LIB)
-AP_EXTRAS+=	-L ${AP_LIB}
-.endif
-
-.if defined(AP_FAST_BUILD)
-
-ap-gen-plist:
-.if defined(AP_GENPLIST)
-.   if !exists(${PLIST})
-	@${ECHO} "===>  Generating apache plist"
-	@${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST}
-	@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
-	@${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST}
-	@${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST}
-.   endif
-.else
-	@${DO_NADA}
-.endif
-
-do-build: ap-gen-plist
-	@cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE}
-
-do-install:
-	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
-.endif
-
-.else # PORT_IS_SERVER
-
-# For slave ports:
-.if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR}
-IGNORE=	"Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync"
-.endif
-
-.if defined(SLAVE_PORT_MODULES)
-DEFAULT_MODULES_CATEGORIES+=	SLAVE_PORT
-ALL_MODULES_CATEGORIES+=	SLAVE_PORT
-.endif
-
-# Module selection
-.for category in ${DEFAULT_MODULES_CATEGORIES}
-DEFAULT_MODULES+=	${${category}_MODULES}
-# We select them
-WITH_${category}_MODULES= YES
-.endfor
-
-.for category in ${ALL_MODULES_CATEGORIES}
-AVAILABLE_MODULES+=	${${category}_MODULES}
-.endfor
-
-# Setting "@comment " as default.
-.for module in ${AVAILABLE_MODULES}
-${module}_PLIST_SUB=	"@comment "
-.endfor
-
-
-# Configure
-.if ${WANT_APACHE} == common13
-# dirty hack to make sure all modules are disabled before we select them
-CONFIGURE_ARGS+=	--disable-module="all"
-.elif ${WANT_APACHE} == common2
-CONFIGURE_ARGS+=	--disable-access --disable-auth \
-			--disable-charset-lite --disable-include \
-			--disable-log-config --disable-env --disable-setenvif \
-			--disable-mime --disable-status --disable-autoindex \
-			--disable-asis --disable-cgid --disable-cgi \
-			--disable-negotiation --disable-dir --disable-imap \
-			--disable-actions --disable-userdir --disable-alias
-.elif ${WANT_APACHE} == common21
-CONFIGURE_ARGS+=	--disable-authn-file --disable-authn-default \
-			--disable-authz-host --disable-authz-groupfile \
-			--disable-authz-user --disable-authz-default \
-			--disable-auth-basic --disable-charset-lite \
-			--disable-include --disable-log-config --disable-env \
-			--disable-setenvif --disable-mime --disable-status \
-			--disable-autoindex --disable-asis --disable-cgid \
-			--disable-cgi --disable-negotiation --disable-dir \
-			--disable-imagemap --disable-actions --disable-userdir \
-			--disable-alias
-.endif
-
-.if defined(WITH_MODULES)
-_APACHE_MODULES+=	${WITH_MODULES}
-.else
-.for category in ${ALL_MODULES_CATEGORIES}
-.if defined (WITHOUT_${category}_MODULES) || defined (WITH_CUSTOM_${category})
-.        if defined(WITH_${category}_MODULES})
-.        undef WITH_${category}_MODULES
-.        endif
-.    if defined (WITH_CUSTOM_${category})
-_APACHE_MODULES+=	${WITH_CUSTOM_${category}}
-.    endif
-.elif defined(WITH_${category}_MODULES)
-_APACHE_MODULES+=	${${category}_MODULES}
-.endif
-.endfor
-.    if defined(WITH_EXTRA_MODULES)
-_APACHE_MODULES+=	${WITH_EXTRA_MODULES}
-.    endif
-.endif
-
-
-.if !defined(WITH_STATIC_APACHE)
-.    if ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21
-# FYI
-#DYNAMIC_MODULES=	so
-CONFIGURE_ARGS+=	--enable-so
-.    endif
-.else
-.    if ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21
-CONFIGURE_ARGS+=	--disable-so
-.    endif
-WITH_ALL_STATIC_MODULES=	YES
-.endif
-
-.if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES)
-.if ${WANT_APACHE} == common13
-SUEXEC_CONFARGS=	suexec
-CONFIGURE_ARGS+=	--enable-suexec
-.elif ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21
-SUEXEC_CONFARGS=	with-suexec
-.else
-IGNORE=		Can not determine apache version
-.endif
-
-SUEXEC_DOCROOT?=		${PREFIX}/www/data
-SUEXEC_USERDIR?=		public_html
-SUEXEC_SAFEPATH?=		${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin
-SUEXEC_LOGFILE?=		/var/log/httpd-suexec.log
-SUEXEC_UIDMIN?=			1000
-SUEXEC_GIDMIN?=			1000
-SUEXEC_CALLER?=			${WWWOWN}
-_APACHE_MODULES+=		${SUEXEC_MODULES}
-CONFIGURE_ARGS+=		--${SUEXEC_CONFARGS}-caller=${SUEXEC_CALLER} \
-				--${SUEXEC_CONFARGS}-uidmin=${SUEXEC_UIDMIN} \
-				--${SUEXEC_CONFARGS}-gidmin=${SUEXEC_GIDMIN} \
-				--${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \
-				--${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \
-				--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
-				--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \
-				--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"
-.   if defined(WITH_SUEXEC_UMASK)
-CONFIGURE_ARGS+=		--${SUEXEC_CONFARGS}-umask=${WITH_SUEXEC_UMASK}
-.   endif
-.endif
-
-.if !defined(WITHOUT_MODULES)
-APACHE_MODULES=		${_APACHE_MODULES}
-.else
-APACHE_MODULES!=	\
-			for module in ${_APACHE_MODULES}; do \
-				${ECHO_CMD} ${WITHOUT_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
-				${ECHO_CMD} $${module}; \
-			done
-.endif
-
-.if defined(WITH_STATIC_MODULES)
-.   if WANT_APACHE=13
-STATIC_MODULE_CONFARG=	--enable-module=$${module}
-DSO_MODULE_CONFARG=	--enable-module=$${module} --enable-shared=$${module}
-.   else
-STATIC_MODULE_CONFARG=	--enable-$${module}
-DSO_MODULE_CONFARG=	--enable-$${module}=shared
-.endif
-_CONFIGURE_ARGS!=	\
-			for module in ${APACHE_MODULES} ; do \
-				${ECHO_CMD} ${WITH_STATIC_MODULES} | \
-					${GREP} -wq $${module} 2> /dev/null ; \
-				if [ "$${?}" = "0" ] ; then \
-						${ECHO_CMD} "${STATIC_MODULE_CONFARG}"; \
-					else \
-						${ECHO_CMD} "${DSO_MODULE_CONFARG}"; \
-					fi; done
-CONFIGURE_ARGS+=	${_CONFIGURE_ARGS}
-.elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
-WITH_STATIC_MODULES=	${APACHE_MODULES}
-.    if ${WANT_APACHE} == common13
-.      for module in ${APACHE_MODULES}
-CONFIGURE_ARGS+=	--enable-module=${module}
-.      endfor
-.    else
-CONFIGURE_ARGS+=	--enable-modules="${APACHE_MODULES}"
-.    endif
-.else
-.    if ${WANT_APACHE} == common13
-.      for module in ${APACHE_MODULES}
-CONFIGURE_ARGS+=	--enable-module=${module} --enable-shared=${module}
-.      endfor
-.    else
-CONFIGURE_ARGS+=	--enable-mods-shared="${APACHE_MODULES}"
-.    endif
-.endif
-
-.if defined(WITH_STATIC_MODULES)
-_SHARED_MODULES!=	\
-			for module in ${APACHE_MODULES} ; do \
-				${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \
-				${ECHO_CMD} $${module}; \
-			done
-SHARED_MODULES=		${_SHARED_MODULES}
-.elif !defined(WITH_ALL_STATIC_MODULES)
-SHARED_MODULES=		${APACHE_MODULES}
-.endif
-
-.  for module in ${SHARED_MODULES}
-${module}_PLIST_SUB=	""
-.  endfor
-
-.for module in ${AVAILABLE_MODULES}
-PLIST_SUB+=	MOD_${module:U}=${${module}_PLIST_SUB}
-.endfor
-
-.endif #PORT_IS_SERVER
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
deleted file mode 100644
index 7be7b126e9d4..000000000000
--- a/www/apache2/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (apache2/httpd-2.0.55.tar.bz2) = f1b5b65c8661db9ffe38b5a4a865a0e2
-SIZE (apache2/httpd-2.0.55.tar.bz2) = 4745220
-MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
-SIZE (apache2/powerlogo.gif) = 5279
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
deleted file mode 100644
index 5d6dc0db2e17..000000000000
--- a/www/apache2/files/apache.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: apache2
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable apache2:
-# apache2_enable (bool):      Set to "NO" by default.
-#                             Set it to "YES" to enable apache2
-# apache2_profiles (string):  Undefined by default. Define here your profiles.
-# apache2ssl_enable (bool):   Set to "NO" by default.
-#                             Set it to "YES" to start apache with SSL   
-#                             (if <IfDefined SSL> exists in httpd.conf)
-# apache2limits_enable (bool):Set to "NO" by default.
-#                             Set it to yes to run `limits $limits_args`
-#                             just before apache starts.
-# apache2_flags (str):        Set to "" by default.
-#                             Extra flags passed to start command.
-# apache2limits_args (str):   Default to "-e -C daemon"
-#                             Arguments of pre-start limits run.
-#
-
-. %%RC_SUBR%%
-
-name="apache2"
-rcvar=`set_rcvar`
-
-start_precmd="apache2_precmd"
-restart_precmd="apache2_checkconfig"
-reload_precmd="apache2_checkconfig"
-command="%%PREFIX%%/sbin/httpd"
-_pidprefix="/var/run/httpd"
-pidfile="${_pidprefix}.pid"
-required_files=%%PREFIX%%/etc/apache2/httpd.conf
-
-[ -z "${apache2_enable}" ]       && apache2_enable="NO"
-[ -z "${apache2ssl_enable}" ]    && apache2ssl_enable="NO"
-[ -z "${apache2_flags}" ]        && apache2_flags=""
-[ -z "${apache2limits_enable}" ] && apache2limits_enable="NO"
-[ -z "${apache2limits_args}" ]   && apache2limits_args="-e -C daemon"
-[ -z "${apache2_configfile}" ]   && apache2_configfile=""
-
-load_rc_config $name
-
-if [ -n "${2}" ]; then
-	profile=${2}
-	if [ "x${apache2_profiles}" != "x" ]; then
-		pidfile="${_pidprefix}.${profile}.pid"
-		eval apache2_configfile=\${apache2_${profile}_configfile}
-		[ "x${apache2_configfile}" = "x" ] && {
-			echo "You must define a configuration file (apache2_${profile}_configfile)"
-			exit 1
-		}
-		eval apache2_enable=\${apache2_${profile}_enable:-YES}
-		eval apache2ssl_enable=\${apache2ssl_${profile}_enable:-NO}
-		eval apache2_flags=\${apache2_${profile}_flags:-${apache2_flags}}
-		eval apache2limits_enable=\${apache2limits_${profile}_enable:-${apache2limits_enable}}
-		eval apache2limits_args=\${apache2limits_${profile}_args:-${apache2limits_args}}
-		pidfile="${_pidprefix}.${profile}.pid"
-		apache2_flags="-c \"PidFile ${pidfile}\" ${apache2_flags}"
-	else
-		echo "$0: extra argument ignored"
-	fi
-else
-	if [ "x${apache2_profiles}" != "x" -a "x${1}" != "xrestart" ]; then
-	for profile in ${apache2_profiles}; do
-		echo "===> apache2 profile: ${profile}"
-		$0 $1 $profile
-		retcode=$?
-		if [ "$?" -ne 0 ]; then
-			failed="${profile} ({$retcode}) ${failed}"
-		else
-			success="${profile} ${success}"
-		fi
-	done
-	exit 0
-	fi
-fi
-
-checkyesno apache2ssl_enable && \
-			apache2_flags="-DSSL $apache2_flags"
-
-[ "x${apache2_configfile}" != "x" ] && {
-			apache2_flags="-f ${apache2_configfile} ${apache2_flags}"
-			required_files=${apache2_configfile}
-}
-
-apache2_checkconfig()
-{
-	echo "Performing sanity check on apache2 configuration:"
-	eval "${command} ${apache2_flags} -t"
-}
-
-apache2_precmd() 
-{
-	if test -f %%PREFIX%%/sbin/envvars
-	then
-		. %%PREFIX%%/sbin/envvars
-	fi
-	if checkyesno apache2limits_enable
-	then
-		eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null
-	else
-		return 0
-        fi
-}
-
-sig_reload=SIGUSR1
-
-extra_commands="reload"
-run_rc_command "$1"
diff --git a/www/apache2/files/apache2libs.sh b/www/apache2/files/apache2libs.sh
deleted file mode 100644
index 67fe5c302561..000000000000
--- a/www/apache2/files/apache2libs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		/sbin/ldconfig -m %%PREFIX%%/lib/apache2
-		;;
-	stop)
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/www/apache2/files/build-fix-openssl_beta b/www/apache2/files/build-fix-openssl_beta
deleted file mode 100644
index 04f018790793..000000000000
--- a/www/apache2/files/build-fix-openssl_beta
+++ /dev/null
@@ -1,16 +0,0 @@
---- modules/ssl/ssl_toolkit_compat.h.orig	Fri Feb  4 21:21:18 2005
-+++ modules/ssl/ssl_toolkit_compat.h	Tue Aug 30 01:42:51 2005
-@@ -99,6 +99,13 @@
- #define HAVE_SSL_X509V3_EXT_d2i
- #endif
- 
-+#ifndef PEM_F_DEF_CALLBACK
-+#ifdef PEM_F_PEM_DEF_CALLBACK
-+/* In OpenSSL 0.9.8 PEM_F_DEF_CALLBACK was renamed */
-+#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK
-+#endif
-+#endif
-+
- #elif defined (SSLC_VERSION_NUMBER) /* RSA */
- 
- /* sslc does not support this function, OpenSSL has since 9.5.1 */
diff --git a/www/apache2/files/exp-apr-kqueue.patch b/www/apache2/files/exp-apr-kqueue.patch
deleted file mode 100644
index 98514717c579..000000000000
--- a/www/apache2/files/exp-apr-kqueue.patch
+++ /dev/null
@@ -1,524 +0,0 @@
-diff -Nursrclib/apr/configure.in srclib/apr/configure.in
---- srclib/apr/configure.in	Thu May 27 21:12:47 2004
-+++ srclib/apr/configure.in	Wed Jun 23 16:02:02 2004
-@@ -596,6 +596,25 @@
- 
- AC_CHECK_FUNCS(poll)
- 
-+# Checks for the FreeBSD KQueue and Linux epoll interfaces:
-+AC_CHECK_FUNC(kevent, 
-+  [AC_DEFINE([HAVE_KQUEUE], 1, [Define if the KQueue interface is supported])])
-+
-+# epoll* may be available in libc but return ENOSYS on a pre-2.6 kernel.
-+AC_CACHE_CHECK([for epoll support], [apr_cv_epoll],
-+[AC_TRY_RUN([
-+#include <sys/epoll.h>
-+#include <unistd.h>
-+
-+int main()
-+{
-+    return epoll_create(5) == -1;
-+}], [apr_cv_epoll=yes], [apr_cv_epoll=no], [apr_cv_epoll=no])])
-+
-+if test "$apr_cv_epoll" = "yes"; then
-+   AC_DEFINE([HAVE_EPOLL], 1, [Define if the epoll interface is supported])
-+fi
-+
- dnl ----------------------------- Checking for missing POSIX thread functions
- AC_CHECK_FUNCS([getpwnam_r getpwuid_r getgrnam_r getgrgid_r])
- 
-diff -Nursrclib/apr/poll/unix/poll.c srclib/apr/poll/unix/poll.c
---- srclib/apr/poll/unix/poll.c Sat Apr 10 21:29:52 2004
-+++ srclib/apr/poll/unix/poll.c Tue Jul 13 09:43:36 2004
-@@ -25,8 +25,15 @@
- #if HAVE_SYS_POLL_H
- #include <sys/poll.h>
- #endif
--#if HAVE_ALLOCA_H
--#include <alloca.h>
-+
-+#ifdef HAVE_KQUEUE
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#endif
-+
-+#ifdef HAVE_EPOLL
-+#include <sys/epoll.h>
- #endif
- 
- #ifdef NETWARE
-@@ -34,6 +41,63 @@
- #define HAS_PIPES(dt) (dt == APR_POLL_FILE) ? 1 : 0
- #endif
- 
-+#ifdef HAVE_KQUEUE
-+static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags)
-+{
-+    apr_int16_t rv = 0;
-+
-+    if (event & EVFILT_READ)
-+        rv |= APR_POLLIN;
-+    if (event & EVFILT_WRITE)
-+        rv |= APR_POLLOUT;
-+    if (flags & EV_ERROR || flags & EV_EOF)
-+        rv |= APR_POLLERR;
-+
-+    return rv;
-+}
-+
-+#endif
-+
-+#ifdef HAVE_EPOLL
-+static apr_int16_t get_epoll_event(apr_int16_t event)
-+{
-+    apr_int16_t rv = 0;
-+
-+    if (event & APR_POLLIN)
-+        rv |= EPOLLIN;
-+    if (event & APR_POLLPRI)
-+        rv |= EPOLLPRI;
-+    if (event & APR_POLLOUT)
-+        rv |= EPOLLOUT;
-+    if (event & APR_POLLERR)
-+        rv |= EPOLLERR;
-+    if (event & APR_POLLHUP)
-+        rv |= EPOLLHUP;
-+    /* APR_POLLNVAL is not handled by epoll. */
-+
-+    return rv;
-+}
-+
-+static apr_int16_t get_epoll_revent(apr_int16_t event)
-+{
-+    apr_int16_t rv = 0;
-+
-+    if (event & EPOLLIN)
-+        rv |= APR_POLLIN;
-+    if (event & EPOLLPRI)
-+        rv |= APR_POLLPRI;
-+    if (event & EPOLLOUT)
-+        rv |= APR_POLLOUT;
-+    if (event & EPOLLERR)
-+        rv |= APR_POLLERR;
-+    if (event & EPOLLHUP)
-+        rv |= APR_POLLHUP;
-+    /* APR_POLLNVAL is not handled by epoll. */
-+
-+    return rv;
-+}
-+#endif
-+
- #ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
- 
- static apr_int16_t get_event(apr_int16_t event)
-@@ -284,11 +348,19 @@
- 
- #endif 
- 
--
- struct apr_pollset_t {
-+    apr_pool_t *pool;
-+
-     apr_uint32_t nelts;
-     apr_uint32_t nalloc;
--#ifdef HAVE_POLL
-+#ifdef HAVE_KQUEUE
-+    int kqueue_fd;
-+    struct kevent kevent;
-+    struct kevent *ke_set;
-+#elif defined(HAVE_EPOLL)
-+    int epoll_fd;
-+    struct epoll_event *pollset;
-+#elif defined(HAVE_POLL)
-     struct pollfd *pollset;
- #else
-     fd_set readset, writeset, exceptset;
-@@ -296,18 +368,31 @@
- #endif
-     apr_pollfd_t *query_set;
-     apr_pollfd_t *result_set;
--    apr_pool_t *pool;
-+
- #ifdef NETWARE
-     int set_type;
- #endif
- };
- 
-+#if defined(HAVE_KQUEUE) || defined(HAVE_EPOLL)
-+static apr_status_t backend_cleanup(void *p_)
-+{
-+    apr_pollset_t *pollset = (apr_pollset_t *)p_;
-+#ifdef HAVE_KQUEUE
-+    close(pollset->kqueue_fd);
-+#elif defined(HAVE_EPOLL)
-+    close(pollset->epoll_fd);
-+#endif
-+    return APR_SUCCESS;
-+}
-+#endif /* HAVE_KQUEUE || HAVE_EPOLL */
-+
- APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
-                                              apr_uint32_t size,
-                                              apr_pool_t *p,
-                                              apr_uint32_t flags)
- {
--#if !defined(HAVE_POLL) && defined(FD_SETSIZE)
-+#if !defined(HAVE_KQUEUE) && !defined(HAVE_EPOLL) && !defined(HAVE_POLL) && defined(FD_SETSIZE)
-     if (size > FD_SETSIZE) {
-         *pollset = NULL;
-         return APR_EINVAL;
-@@ -316,7 +401,22 @@
-     *pollset = apr_palloc(p, sizeof(**pollset));
-     (*pollset)->nelts = 0;
-     (*pollset)->nalloc = size;
--#ifdef HAVE_POLL
-+    (*pollset)->pool = p;
-+#ifdef HAVE_KQUEUE
-+    (*pollset)->ke_set = (struct kevent*)apr_palloc(p, size * sizeof(struct  kevent));
-+    memset((*pollset)->ke_set, 0, size * sizeof(struct kevent));
-+    (*pollset)->kqueue_fd = kqueue();
-+    if ((*pollset)->kqueue_fd == -1) {
-+         return APR_ENOMEM;
-+    }
-+    apr_pool_cleanup_register(p, (void*)(*pollset), backend_cleanup, 
-+        apr_pool_cleanup_null);
-+#elif defined(HAVE_EPOLL)
-+    (*pollset)->epoll_fd = epoll_create(size);
-+    (*pollset)->pollset = apr_palloc(p, size * sizeof(struct epoll_event));
-+    apr_pool_cleanup_register(p, (void*)(*pollset), backend_cleanup, 
-+        apr_pool_cleanup_null);
-+#elif defined(HAVE_POLL)
-     (*pollset)->pollset = apr_palloc(p, size * sizeof(struct pollfd));
- #else
-     FD_ZERO(&((*pollset)->readset));
-@@ -329,23 +429,31 @@
- #endif
-     (*pollset)->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
-     (*pollset)->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
--    (*pollset)->pool = p;
-+
-     return APR_SUCCESS;
- }
- 
- APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t *pollset)
- {
--    /* A no-op function for now.  If we later implement /dev/poll
--     * support, we'll need to close the /dev/poll fd here
--     */
-+#if defined(HAVE_KQUEUE) || defined(HAVE_EPOLL)
-+    return apr_pool_cleanup_run(pollset->pool, pollset, backend_cleanup);
-+#else
-     return APR_SUCCESS;
-+#endif
- }
- 
- APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
-                                           const apr_pollfd_t *descriptor)
- {
--#ifndef HAVE_POLL
-+#ifdef HAVE_KQUEUE
-     apr_os_sock_t fd;
-+#elif defined(HAVE_EPOLL)
-+    struct epoll_event ev;
-+    int ret = -1;
-+#else
-+#if !defined(HAVE_POLL)
-+    apr_os_sock_t fd;
-+#endif
- #endif
- 
-     if (pollset->nelts == pollset->nalloc) {
-@@ -353,7 +461,49 @@
-     }
- 
-     pollset->query_set[pollset->nelts] = *descriptor;
--#ifdef HAVE_POLL
-+
-+#ifdef HAVE_KQUEUE
-+    if (descriptor->desc_type == APR_POLL_SOCKET) {
-+        fd = descriptor->desc.s->socketdes;
-+    }
-+    else {
-+        fd = descriptor->desc.f->filedes;
-+    }
-+
-+    if (descriptor->reqevents & APR_POLLIN) {
-+        EV_SET(&pollset->kevent, fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
-+
-+        if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0,
-+                   NULL) == -1) {
-+            return APR_ENOMEM;
-+        }
-+    }
-+
-+    if (descriptor->reqevents & APR_POLLOUT) {
-+        EV_SET(&pollset->kevent, fd, EVFILT_WRITE, EV_ADD, 0, 0, NULL);
-+
-+        if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0,
-+                   NULL) == -1) {
-+            return APR_ENOMEM;
-+        }
-+    }
-+
-+#elif defined(HAVE_EPOLL)
-+    ev.events = get_epoll_event(descriptor->reqevents);
-+    if (descriptor->desc_type == APR_POLL_SOCKET) {
-+        ev.data.fd = descriptor->desc.s->socketdes;
-+        ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_ADD,
-+                        descriptor->desc.s->socketdes, &ev);
-+    }
-+    else {
-+        ev.data.fd = descriptor->desc.f->filedes;
-+        ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_ADD,
-+                        descriptor->desc.f->filedes, &ev);
-+    }
-+    if (0 != ret) {
-+        return APR_EBADF;
-+    }
-+#elif defined(HAVE_POLL)
- 
-     if (descriptor->desc_type == APR_POLL_SOCKET) {
-         pollset->pollset[pollset->nelts].fd = descriptor->desc.s->socketdes;
-@@ -422,11 +572,97 @@
-                                              const apr_pollfd_t *descriptor)
- {
-     apr_uint32_t i;
--#ifndef HAVE_POLL
-+#ifdef HAVE_KQUEUE
-+    apr_os_sock_t fd;
-+#elif defined(HAVE_EPOLL)
-+    struct epoll_event ev;
-+    int ret = -1;
-+#elif !defined(HAVE_POLL)
-     apr_os_sock_t fd;
- #endif
- 
--#ifdef HAVE_POLL
-+#ifdef HAVE_KQUEUE
-+    for (i = 0; i < pollset->nelts; i++) {
-+        if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-+            /* Found an instance of the fd: remove this and any other copies  */
-+            apr_uint32_t dst = i;
-+            apr_uint32_t old_nelts = pollset->nelts;
-+            pollset->nelts--;
-+            for (i++; i < old_nelts; i++) {
-+                if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-+                    pollset->nelts--;
-+                }
-+                else {
-+                    pollset->query_set[dst] = pollset->query_set[i];
-+                    dst++;
-+                }
-+            }
-+
-+            if (descriptor->desc_type == APR_POLL_SOCKET) {
-+                fd = descriptor->desc.s->socketdes;
-+            }
-+            else {
-+                fd = descriptor->desc.f->filedes;
-+            }
-+
-+            if (descriptor->reqevents & APR_POLLIN) {
-+                EV_SET(&pollset->kevent, fd,
-+                       EVFILT_READ, EV_DELETE, 0, 0, NULL);
-+
-+                if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0,
-+                          NULL) == -1) {
-+                    return APR_EBADF;
-+                }
-+            }
-+
-+            if (descriptor->reqevents & APR_POLLOUT) {
-+                EV_SET(&pollset->kevent, fd,
-+                       EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
-+
-+                if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0,
-+                          NULL) == -1) {
-+                    return APR_EBADF;
-+                }
-+            }
-+
-+            return APR_SUCCESS;
-+        }
-+    }
-+#elif defined(HAVE_EPOLL)
-+    for (i = 0; i < pollset->nelts; i++) {
-+        if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-+            /* Found an instance of the fd: remove this and any other copies  */
-+            apr_uint32_t dst = i;
-+            apr_uint32_t old_nelts = pollset->nelts;
-+            pollset->nelts--;
-+            for (i++; i < old_nelts; i++) {
-+                if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-+                    pollset->nelts--;
-+                }
-+                else {
-+                    pollset->query_set[dst] = pollset->query_set[i];
-+                    dst++;
-+                }
-+            }
-+            ev.events = get_epoll_event(descriptor->reqevents);
-+            if (descriptor->desc_type == APR_POLL_SOCKET) {
-+                ev.data.fd = descriptor->desc.s->socketdes;
-+                ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_DEL,
-+                                descriptor->desc.s->socketdes, &ev);
-+            }
-+            else {
-+                ev.data.fd = descriptor->desc.f->filedes;
-+                ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_DEL,
-+                                descriptor->desc.f->filedes, &ev);
-+            }
-+            if (ret < 0) {
-+                return APR_EBADF;
-+            }
-+
-+            return APR_SUCCESS;
-+        }
-+    }
-+#elif defined(HAVE_POLL)
-     for (i = 0; i < pollset->nelts; i++) {
-         if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-             /* Found an instance of the fd: remove this and any other copies */
-@@ -487,8 +723,119 @@
- 
-     return APR_NOTFOUND;
- }
-+#ifdef HAVE_KQUEUE
-+APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
-+                                           apr_interval_time_t timeout,
-+                                           apr_int32_t *num,
-+                                           const apr_pollfd_t **descriptors)
-+{
-+    int rv;
-+    apr_uint32_t i, j, r = 0;
-+    struct timespec tv, *tvptr;
-+
-+    if (timeout < 0) {
-+        tvptr = NULL;
-+    }
-+    else {
-+        tv.tv_sec = (long)apr_time_sec(timeout);
-+        tv.tv_nsec = (long)apr_time_msec(timeout);
-+        tvptr = &tv;
-+    }
-+
-+    rv = kevent(pollset->kqueue_fd, NULL, 0, pollset->ke_set, pollset->nelts,
-+                tvptr);
-+    (*num) = rv;
-+    if (rv < 0) {
-+        return apr_get_netos_error();
-+    }
-+    if (rv == 0) {
-+        return APR_TIMEUP;
-+    }
-+
-+    /* TODO: Is there a better way to re-associate our data? */
-+    for (i = 0; i < pollset->nelts; i++) {
-+        apr_os_sock_t fd;
-+        if (pollset->query_set[i].desc_type == APR_POLL_SOCKET) {
-+            fd = pollset->query_set[i].desc.s->socketdes;
-+        }
-+        else {
-+            fd = pollset->query_set[i].desc.f->filedes;
-+        }
-+        for (j = 0; j < rv; j++) {
-+            if (pollset->ke_set[j].ident == fd ) {
-+                pollset->result_set[r] = pollset->query_set[i];
-+                pollset->result_set[r].rtnevents =
-+                    get_kqueue_revent(pollset->ke_set[j].filter,
-+                                      pollset->ke_set[j].flags);
-+                r++;
-+            }
-+        }
-+    }
-+
-+    (*num) = r;
-+
-+    if (descriptors) {
-+        *descriptors = pollset->result_set;
-+    }
-+
-+    return APR_SUCCESS;
-+}
-+
-+#elif defined(HAVE_EPOLL)
- 
--#ifdef HAVE_POLL
-+APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
-+                                           apr_interval_time_t timeout,
-+                                           apr_int32_t *num,
-+                                           const apr_pollfd_t **descriptors)
-+{
-+    int rv;
-+    apr_uint32_t i, j, k;
-+
-+    if (timeout > 0) {
-+        timeout /= 1000;
-+    }
-+
-+    rv = epoll_wait(pollset->epoll_fd, pollset->pollset, pollset->nelts,
-+                    timeout);
-+    (*num) = rv;
-+    if (rv < 0) {
-+        return apr_get_netos_error();
-+    }
-+    if (rv == 0) {
-+        return APR_TIMEUP;
-+    }
-+    j = 0;
-+    for (i = 0; i < pollset->nelts; i++) {
-+        if (pollset->pollset[i].events != 0) {
-+            /* TODO: Is there a better way to re-associate our data? */
-+            for (k = 0; k < pollset->nelts; k++) {
-+                if (pollset->query_set[k].desc_type == APR_POLL_SOCKET &&
-+                    pollset->query_set[k].desc.s->socketdes ==
-+                        pollset->pollset[i].data.fd) {
-+                    pollset->result_set[j] = pollset->query_set[k];
-+                    pollset->result_set[j].rtnevents =
-+                        get_epoll_revent(pollset->pollset[i].events);
-+                    j++;
-+                    break;
-+                }
-+                else if (pollset->query_set[k].desc_type == APR_POLL_FILE 
-+                         && pollset->query_set[k].desc.f->filedes ==
-+                            pollset->pollset[i].data.fd) {
-+                    pollset->result_set[j] = pollset->query_set[k];
-+                    pollset->result_set[j].rtnevents =
-+                        get_epoll_revent(pollset->pollset[i].events);
-+                    j++;
-+                    break;
-+                }
-+            }
-+        }
-+    }
-+    if (descriptors) {
-+        *descriptors = pollset->result_set;
-+    }
-+    return APR_SUCCESS;
-+}
-+#elif defined(HAVE_POLL)
- APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
-                                            apr_interval_time_t timeout,
-                                            apr_int32_t *num,
-@@ -517,7 +864,8 @@
-             j++;
-         }
-     }
--    *descriptors = pollset->result_set;
-+    if (descriptors)
-+        *descriptors = pollset->result_set;
-     return APR_SUCCESS;
- }
- 
-@@ -591,7 +939,8 @@
-         }
-     }
- 
--    *descriptors = pollset->result_set;
-+    if (descriptors)
-+        *descriptors = pollset->result_set;
-     return APR_SUCCESS;
- }
- 
-
diff --git a/www/apache2/files/exp-windowsupdate.patch b/www/apache2/files/exp-windowsupdate.patch
deleted file mode 100644
index 3f1306777100..000000000000
--- a/www/apache2/files/exp-windowsupdate.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/protocol.c.orig	Tue Jun 29 08:21:28 2004
-+++ server/protocol.c	Tue Jun 29 08:21:50 2004
-@@ -1248,7 +1248,7 @@
-      * We can only set a C-L in the response header if we haven't already
-      * sent any buckets on to the next output filter for this request.
-      */
--    if (ctx->data_sent == 0 && eos) {
-+    if (ctx->data_sent == 0 && eos && !r->header_only) {
-         ap_set_content_length(r, r->bytes_sent);
-     }
- 
diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in
deleted file mode 100644
index e9344df7a041..000000000000
--- a/www/apache2/files/patch-Makefile.in
+++ /dev/null
@@ -1,150 +0,0 @@
---- Makefile.in.orig	Wed Nov 24 20:31:09 2004
-+++ Makefile.in	Sun Apr 17 10:22:37 2005
-@@ -31,15 +31,21 @@
- 	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- 	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
- 	fi ; \
-+	if [ ! -d $(DESTDIR)$(EXAMPLESDIR) ]; then \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \
-+	fi ; \
- 	cd $(top_srcdir)/docs/conf; \
- 	for i in mime.types magic; do \
- 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
- 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
- 	    fi; \
-+	    cp -f $$i $$i-dist; \
-+	    $(INSTALL_DATA) $$i-dist $(DESTDIR)$(EXAMPLESDIR); \
- 	done; \
- 	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- 	    cd $$j ; \
- 	    for i in *-std*.conf; do \
-+		[ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
- 	    	( \
- 	    		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 \
-@@ -57,6 +63,9 @@
- 	    				if test "x$$j" = "xssl"; then \
- 	    					echo "<IfDefine SSL>"; \
- 	    				fi; \
-+					if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
-+					        echo -n "#"; \
-+					fi; \
- 	    				if test $$j != "^EOL^"; then \
- 	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
- 	    				fi; \
-@@ -70,23 +79,17 @@
- 	    				-e 's#@@Port@@#$(PORT)#g' \
- 	    				< $$i; \
- 	    		fi \
--	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
--	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
-+	    	) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \
-+	    	chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \
- 	    	file=`echo $$i|sed s/-std//`; \
- 	    	if [ "$$file" = "httpd.conf" ]; then \
- 	    		file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
- 	    	fi; \
- 	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
--	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
-+	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
- 	    	fi; \
- 	    done ; \
--	done ; \
--	if test -f "$(builddir)/envvars-std"; then \
--	    cp -p envvars-std $(DESTDIR)$(sbindir); \
--	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
--	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
--	    fi ; \
--	fi
-+	done ; 
- 
- install-build:
- 	@echo Installing build system files 
-@@ -108,44 +111,40 @@
- 	doxygen $(top_srcdir)/docs/doxygen.conf
- 
- install-htdocs:
--	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
--           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
--        else \
--	    echo Installing HTML documents ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
--	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
--	    cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
--
-+.if !defined(NO_WWWDATA)
-+	@echo Installing HTML documents
-+	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
-+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
-+	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
-+	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name ".svn" -print | xargs rm -rf
-+.endif
-+  
- install-error:
--	-@if [ -d $(DESTDIR)$(errordir) ]; then \
--           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
--        else \
--	    echo Installing error documents ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
--	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
--	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
--
-+.if !defined(NO_ERROR)
-+	@echo Installing error documents
-+	@test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
-+	cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
-+	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name ".svn" -print | xargs rm -rf 
-+	@test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
-+.endif
-+  
- install-icons:
--	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
--           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
--        else \
--	    echo Installing icons ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
--	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
--	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
--
-+.if !defined(NO_ICONS)
-+	@echo Installing icons
-+	@test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
-+	cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
-+	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name ".svn" -print | xargs rm -rf 
-+	@test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
-+.endif 
-+  
- install-cgi:
--	-@if [ -d $(DESTDIR)$(cgidir) ];then \
--	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
--	else \
--	   echo Installing CGIs ; \
--	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
--	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
--	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
-+.if !defined(NO_CGI)
-+	@echo Installing CGIs
-+	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
-+	cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
-+	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name ".svn" -print | xargs rm -rf 
-+	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
-+.endif
- 
- install-other:
- 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -191,8 +190,11 @@
- 	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
- 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
-+.if !defined(NOPORTDOCS)
-+	 @test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
- 	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- 	@(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
-+.endif
- 
- install-suexec:
- 	@if test -f $(builddir)/support/suexec; then \
diff --git a/www/apache2/files/patch-configure.in b/www/apache2/files/patch-configure.in
deleted file mode 100644
index 6d77c65b7f07..000000000000
--- a/www/apache2/files/patch-configure.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.in.orig	Thu Mar 18 08:36:52 2004
-+++ configure.in	Fri Jul  2 11:44:25 2004
-@@ -69,7 +69,7 @@
- 
- if test "$apr_found" = "reconfig"; then
-   APR_SUBDIR_CONFIG(srclib/apr,
--                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
-+                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir],
-                     [--enable-layout=*|\'--enable-layout=*])
-   dnl We must be the first to build and the last to be cleaned
-   AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
-@@ -96,7 +96,7 @@
- 
- if test "$apu_found" = "reconfig"; then
-   APR_SUBDIR_CONFIG(srclib/apr-util,
--                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
-+                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir],
-                     [--enable-layout=*|\'--enable-layout=*])
-   dnl We must be the last to build and the first to be cleaned
-   AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -545,8 +545,14 @@
- 	[Root directory of the Apache install area])
- AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
- 	[Location of the config file, relative to the Apache root directory])
-+AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log",
-+	[Location of error log file])
-+AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status",
-+	[Location of ScoreBoard file])
- AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
- 	[Location of the MIME types config file, relative to the Apache root directory])
-+AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}",
-+	[Location of document root])
- AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
- 	[Location of the source for the current MPM])
- 
diff --git a/www/apache2/files/patch-docs:conf:httpd-std.conf.in b/www/apache2/files/patch-docs:conf:httpd-std.conf.in
deleted file mode 100644
index 7a09e89ea821..000000000000
--- a/www/apache2/files/patch-docs:conf:httpd-std.conf.in
+++ /dev/null
@@ -1,127 +0,0 @@
---- docs/conf/httpd-std.conf.in.orig	Mon Aug 16 01:43:56 2004
-+++ docs/conf/httpd-std.conf.in	Sun Dec 12 12:34:08 2004
-@@ -68,7 +68,7 @@
- #
- <IfModule !mpm_netware.c>
- <IfModule !perchild.c>
--#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
-+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
- </IfModule>
- </IfModule>
- 
-@@ -265,8 +265,8 @@
- #  when the value of (unsigned)Group is above 60000; 
- #  don't use Group #-1 on these systems!
- #
--User nobody
--Group #-1
-+User %%WWWOWN%%
-+Group %%WWWGRP%%
- </IfModule>
- </IfModule>
- 
-@@ -314,10 +314,11 @@
- #
- # First, we configure the "default" to be a very restrictive set of 
- # features.  
--#
-+# 
- <Directory />
--    Options FollowSymLinks
-     AllowOverride None
-+    Order Deny,Allow
-+    Deny from all 
- </Directory>
- 
- #
-@@ -330,7 +331,7 @@
- #
- # This should be changed to whatever you set DocumentRoot to.
- #
--<Directory "@exp_htdocsdir@">
-+<Directory "%%WWWBASEDIR%%">
- 
- #
- # Possible values for the Options directive are "None", "All",
-@@ -365,24 +366,29 @@
- # UserDir: The name of the directory that is appended onto a user's home
- # directory if a ~user request is received.
- #
-+<IfModule mod_userdir.c>
- UserDir public_html
- 
-+UserDir disabled %%FTPUSERS%%
-+
- #
- # Control access to UserDir directories.  The following is an example
- # for a site where these directories are restricted to read-only.
- #
--#<Directory /home/*/public_html>
--#    AllowOverride FileInfo AuthConfig Limit Indexes
--#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
--#    <Limit GET POST OPTIONS PROPFIND>
--#        Order allow,deny
--#        Allow from all
--#    </Limit>
--#    <LimitExcept GET POST OPTIONS PROPFIND>
--#        Order deny,allow
--#        Deny from all
--#    </LimitExcept>
--#</Directory>
-+<Directory /home/*/public_html>
-+    AllowOverride FileInfo AuthConfig Limit Indexes
-+    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-+    <Limit GET POST OPTIONS PROPFIND>
-+        Order allow,deny
-+        Allow from all
-+    </Limit>
-+    <LimitExcept GET POST OPTIONS PROPFIND>
-+        Order deny,allow
-+        Deny from all
-+    </LimitExcept>
-+</Directory>
-+
-+</IfModule>
- 
- #
- # DirectoryIndex: sets the file that Apache will serve if a directory
-@@ -472,7 +478,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 @rel_logfiledir@/error_log
-+ErrorLog @rel_logfiledir@/httpd-error.log
- 
- #
- # LogLevel: Control the number of messages logged to the error_log.
-@@ -500,20 +506,20 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog @rel_logfiledir@/access_log common
-+#CustomLog @rel_logfiledir@/httpd-access.log common
- 
- #
- # If you would like to have agent and referer logfiles, uncomment the
- # following directives.
- #
--#CustomLog @rel_logfiledir@/referer_log referer
--#CustomLog @rel_logfiledir@/agent_log agent
-+#CustomLog @rel_logfiledir@/httpd-referer.log referer
-+#CustomLog @rel_logfiledir@/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 @rel_logfiledir@/access_log combined
-+CustomLog @rel_logfiledir@/httpd-access.log combined
- 
- #
- # ServerTokens
-@@ -1043,3 +1049,5 @@
- #    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
- #    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
- #</VirtualHost>
-+
-+Include @rel_sysconfdir@/Includes/*.conf
diff --git a/www/apache2/files/patch-docs:conf:ssl-std.conf.in b/www/apache2/files/patch-docs:conf:ssl-std.conf.in
deleted file mode 100644
index cf0bbeab218d..000000000000
--- a/www/apache2/files/patch-docs:conf:ssl-std.conf.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-
---- docs/conf/ssl-std.conf.in.orig	Mon Oct 13 16:14:10 2003
-+++ docs/conf/ssl-std.conf.in	Mon Oct 13 16:15:17 2003
-@@ -88,8 +88,8 @@
- DocumentRoot "@exp_htdocsdir@"
- ServerName www.example.com:443
- ServerAdmin you@example.com
--ErrorLog @exp_logfiledir@/error_log
--TransferLog @exp_logfiledir@/access_log
-+ErrorLog @exp_logfiledir@/httpd-error.log
-+TransferLog @exp_logfiledir@/httpd-access.log
- 
- #   SSL Engine Switch:
- #   Enable/Disable SSL for this virtual host.
-@@ -240,7 +240,7 @@
- #   Per-Server Logging:
- #   The home of a custom SSL log file. Use this when you want a
- #   compact non-error SSL logfile on a virtual host basis.
--CustomLog @exp_logfiledir@/ssl_request_log \
-+CustomLog @exp_logfiledir@/httpd-ssl_request.log \
-           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
- 
- </VirtualHost>                                  
diff --git a/www/apache2/files/patch-modules:ssl:mod_ssl.h b/www/apache2/files/patch-modules:ssl:mod_ssl.h
deleted file mode 100644
index e916df9d0376..000000000000
--- a/www/apache2/files/patch-modules:ssl:mod_ssl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/ssl/mod_ssl.h.orig	Tue Sep 16 01:00:06 2003
-+++ modules/ssl/mod_ssl.h	Sat Jan 10 22:08:18 2004
-@@ -123,7 +123,7 @@
- #else /* !HAVE_SSLC (implicit HAVE_OPENSSL) */
- 
- #include <ssl.h>
--#include <err.h>
-+#include <openssl/err.h>
- #include <x509.h>
- #include <pem.h>
- #include <crypto.h>
diff --git a/www/apache2/files/patch-server:main.c b/www/apache2/files/patch-server:main.c
deleted file mode 100644
index d297d4425fdb..000000000000
--- a/www/apache2/files/patch-server:main.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- server/main.c.orig	Thu Jun 13 04:34:56 2002
-+++ server/main.c	Sun Jul 21 08:54:09 2002
-@@ -78,6 +78,11 @@
- #include "ap_mpm.h"
- #include "mpm_common.h"
- 
-+#ifdef FREEBSD_THREAD_HACK
-+#include <unistd.h>
-+AP_DECLARE(int) ap_exists_config_define(const char *name);
-+#endif
-+
- /* WARNING: Win32 binds http_main.c dynamically to the server. Please place
-  *          extern functions and global data in another appropriate module.
-  *
-@@ -558,6 +563,21 @@
-         destroy_and_exit_process(process, 1);
-     }
- 
-+#ifdef FREEBSD_THREAD_HACK
-+    {
-+	int r;
-+
-+	if (! ap_exists_config_define("NO_DETACH")) {
-+	    if ((r = fork()) > 0)
-+		return 0;
-+	    if (r == -1) {
-+		perror("fork");
-+		return 0;
-+	    }
-+	    setsid();
-+	}
-+    }
-+#endif
-     ap_process_config_tree(server_conf, ap_conftree, process->pconf, ptemp);
-     ap_fixup_virtual_hosts(pconf, server_conf);
-     ap_fini_vhost_config(pconf, server_conf);
diff --git a/www/apache2/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache2/files/patch-srclib:apr-util:build:dbm.m4
deleted file mode 100644
index cca94b8fdd76..000000000000
--- a/www/apache2/files/patch-srclib:apr-util:build:dbm.m4
+++ /dev/null
@@ -1,80 +0,0 @@
---- srclib/apr-util/build/dbm.m4.orig	Sun Jan 16 18:27:07 2005
-+++ srclib/apr-util/build/dbm.m4	Sat Feb  5 12:14:28 2005
-@@ -298,8 +298,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB(1, -1, -1,
-     "$places",
--    "db_185.h",
--    "db"
-+    "db.h",
-+    "c"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=185
-@@ -341,7 +341,7 @@
-   APU_CHECK_BERKELEY_DB(3, -1, -1,
-     "$places",
-     "db3/db.h db.h",
--    "db3 db"
-+    "db3"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=3
-@@ -361,8 +361,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB("4", "0", "-1",
-     "$places",
--    "db4/db.h db.h",
--    "db-4.0 db4 db"
-+    "db4/db.h",
-+    "db4"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -382,8 +382,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB("4", "1", "-1",
-     "$places",
--    "db41/db.h db4/db.h db.h",
--    "db-4.1 db4 db"
-+    "db41/db.h",
-+    "db41"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -403,13 +403,14 @@
-   fi
-   APU_CHECK_BERKELEY_DB("4", "2", "-1",
-     "$places",
--    "db42/db.h db4/db.h db.h",
--    "db-4.2 db4 db"
-+    "db42/db.h",
-+    "db-4.2"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-   fi
- ])
-+
- dnl
- dnl APU_CHECK_DB43: is DB4.3 present?
- dnl
-@@ -422,8 +423,8 @@
-   fi
-   APU_CHECK_BERKELEY_DB("4", "3", "-1",
-     "$places",
--    "db43/db.h db4/db.h db.h",
--    "db-4.3 db43 db4 db"
-+    "db43/db.h",
-+    "db-4.3"
-   )
-   if test "$apu_have_db" = "1"; then
-     apu_db_version=4
-@@ -524,6 +525,7 @@
-       fi
-     fi
-   fi
-+
-   AC_MSG_CHECKING(for Berkeley DB)
-   if test "$apu_have_db" = "1"; then
-     AC_MSG_RESULT(found db$apu_db_version)
diff --git a/www/apache2/files/patch-srclib:apr-util:config.layout b/www/apache2/files/patch-srclib:apr-util:config.layout
deleted file mode 100644
index 222e91d975bc..000000000000
--- a/www/apache2/files/patch-srclib:apr-util:config.layout
+++ /dev/null
@@ -1,10 +0,0 @@
---- srclib/apr-util/config.layout.orig	Tue Jan  7 13:13:09 2003
-+++ srclib/apr-util/config.layout	Tue Apr  1 18:36:16 2003
-@@ -229,3 +229,7 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix     -${APRUTIL_MAJOR_VERSION}
- </Layout>
-+
-+<Layout FreeBSD>
-+    libsuffix:
-+</Layout>
diff --git a/www/apache2/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache2/files/patch-srclib:apr-util:xml:expat:buildconf.sh
deleted file mode 100644
index 0bbcfa783555..000000000000
--- a/www/apache2/files/patch-srclib:apr-util:xml:expat:buildconf.sh
+++ /dev/null
@@ -1,18 +0,0 @@
---- srclib/apr-util/xml/expat/buildconf.sh	Tue Jun 17 20:51:47 2003
-+++ srclib/apr-util/xml/expat/buildconf.sh	Tue Mar  9 07:52:57 2004
-@@ -3,13 +3,13 @@
- #
- # Build aclocal.m4 from libtool's libtool.m4
- #
--libtoolize=`conftools/PrintPath glibtoolize libtoolize`
-+libtoolize=${LIBTOOLIZE}
- if [ "x$libtoolize" = "x" ]; then
-     echo "libtoolize not found in path"
-     exit 1
- fi
- ltpath=`dirname $libtoolize`
--ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4}
- echo "Incorporating $ltfile into aclocal.m4 ..."
- echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
- echo "dnl edits here will be lost" >> aclocal.m4
diff --git a/www/apache2/files/patch-srclib:apr:build:buildcheck.sh b/www/apache2/files/patch-srclib:apr:build:buildcheck.sh
deleted file mode 100644
index a65902a7731d..000000000000
--- a/www/apache2/files/patch-srclib:apr:build:buildcheck.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- srclib/apr/build/buildcheck.sh	Sun Jan 25 16:41:56 2004
-+++ srclib/apr/build/buildcheck.sh	Tue Mar  9 07:49:42 2004
-@@ -26,7 +26,7 @@
- # output is multiline from 1.5 onwards
- 
- # Require libtool 1.3.3 or newer
--libtool=`build/PrintPath glibtool libtool`
-+libtool=${LIBTOOL}
- lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
- if test -z "$lt_pversion"; then
- echo "buildconf: libtool not found."
diff --git a/www/apache2/files/patch-srclib:apr:buildconf b/www/apache2/files/patch-srclib:apr:buildconf
deleted file mode 100644
index 484f86afa37b..000000000000
--- a/www/apache2/files/patch-srclib:apr:buildconf
+++ /dev/null
@@ -1,28 +0,0 @@
---- srclib/apr/buildconf	Tue Jun 17 20:44:25 2003
-+++ srclib/apr/buildconf	Tue Mar  9 07:53:27 2004
-@@ -60,7 +60,7 @@
- #
- build/buildcheck.sh || exit 1
- 
--libtoolize=`build/PrintPath glibtoolize libtoolize`
-+libtoolize=${LIBTOOLIZE}
- if [ "x$libtoolize" = "x" ]; then
-     echo "libtoolize not found in path"
-     exit 1
-@@ -81,14 +81,14 @@
- $libtoolize --copy --automake
- 
- ltpath=`dirname $libtoolize`
--ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
- 
- if [ ! -f $ltfile ]; then
-     echo "$ltfile not found"
-     exit 1
- fi
- 
--echo "buildconf: Using libtool.m4 at ${ltfile}."
-+echo "buildconf: Using ${LIBTOOL_VERSION}.m4 at ${ltfile}."
- 
- cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
- 
diff --git a/www/apache2/files/patch-srclib:apr:config.layout b/www/apache2/files/patch-srclib:apr:config.layout
deleted file mode 100644
index 5c52779635fc..000000000000
--- a/www/apache2/files/patch-srclib:apr:config.layout
+++ /dev/null
@@ -1,10 +0,0 @@
---- srclib/apr/config.layout.orig	Tue Jan  7 13:06:50 2003
-+++ srclib/apr/config.layout	Tue Apr  1 18:36:51 2003
-@@ -229,3 +229,7 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix:    -${APR_MAJOR_VERSION}
- </Layout>
-+
-+<Layout FreeBSD>
-+    libsuffix:
-+</Layout>
diff --git a/www/apache2/files/patch-srclib:apr:threadproc:unix:procsup.c b/www/apache2/files/patch-srclib:apr:threadproc:unix:procsup.c
deleted file mode 100644
index 13c663af7bd4..000000000000
--- a/www/apache2/files/patch-srclib:apr:threadproc:unix:procsup.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- srclib/apr/threadproc/unix/procsup.c.orig	Mon Apr  8 22:08:18 2002
-+++ srclib/apr/threadproc/unix/procsup.c	Sun Jul 21 08:45:44 2002
-@@ -59,6 +59,7 @@
-     int x;
- 
-     chdir("/");
-+#ifndef FREEBSD_THREAD_HACK
- #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS)
-     /* Don't detach for MPE because child processes can't survive the death of
-      * the parent. */
-@@ -89,6 +90,7 @@
-     if (setpgid(0, 0) == -1) {
-         return errno;
-     }
-+#endif
- #endif
- 
-     /* close out the standard file descriptors */
diff --git a/www/apache2/files/patch-support:Makefile.in b/www/apache2/files/patch-support:Makefile.in
deleted file mode 100644
index 66b6420974ec..000000000000
--- a/www/apache2/files/patch-support:Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- support/Makefile.in.orig	Fri Dec 17 17:03:38 2004
-+++ support/Makefile.in	Fri Dec 17 17:01:44 2004
-@@ -23,10 +23,7 @@
- 	    fi ; \
- 	done
- 	@if test -f "$(builddir)/envvars-std"; then \
--	    cp -p envvars-std $(DESTDIR)$(sbindir); \
--	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
--	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
--	    fi ; \
-+	    cp -p envvars-std $(DESTDIR)$(sbindir)/envvars; \
- 	fi
- 
- htpasswd_OBJECTS = htpasswd.lo
diff --git a/www/apache2/files/patch-support:apachectl.in b/www/apache2/files/patch-support:apachectl.in
deleted file mode 100644
index 7c5c3238e955..000000000000
--- a/www/apache2/files/patch-support:apachectl.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- support/apachectl.in.orig	Thu Sep 16 09:28:54 2004
-+++ support/apachectl.in	Thu Sep 16 09:29:14 2004
-@@ -63,7 +63,7 @@
- ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
- # --------------------                              --------------------
- # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
--
-+eval `limits -e -C daemon` >/dev/null 2>&1
- # Set the maximum number of file descriptors allowed per child process.
- if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then
-     $ULIMIT_MAX_FILES
diff --git a/www/apache2/files/patch-support:apxs.in b/www/apache2/files/patch-support:apxs.in
deleted file mode 100644
index db8081fa4fc5..000000000000
--- a/www/apache2/files/patch-support:apxs.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- support/apxs.in.orig	Mon Nov 29 10:24:23 2004
-+++ support/apxs.in	Mon Nov 29 10:25:05 2004
-@@ -629,8 +629,7 @@
-             if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
-                 print FP $content;
-                 close(FP);
--                system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
--                       "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
-+                system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
-                        "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
-             } else {
-                 notice("unable to open configuration file");
diff --git a/www/apache2/files/patch-support:envvars-std.in b/www/apache2/files/patch-support:envvars-std.in
deleted file mode 100644
index 26a094f31394..000000000000
--- a/www/apache2/files/patch-support:envvars-std.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- support/envvars-std.in.orig	Fri Dec 17 14:39:21 2004
-+++ support/envvars-std.in	Fri Dec 17 14:41:06 2004
-@@ -21,3 +21,10 @@
- export @SHLIBPATH_VAR@
- #
- @OS_SPECIFIC_VARS@
-+
-+ENVVARS_DIR=%%PREFIX%%/etc/apache2/envvars.d
-+
-+for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null)
-+do
-+	. ${envvars_file}
-+done
diff --git a/www/apache2/files/patch-support:log_server_status.in b/www/apache2/files/patch-support:log_server_status.in
deleted file mode 100644
index 136bafb9ff1a..000000000000
--- a/www/apache2/files/patch-support:log_server_status.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- support/log_server_status.in.orig	Tue Jun 18 23:21:53 2002
-+++ support/log_server_status.in	Tue Jun 18 23:23:08 2002
-@@ -63,7 +63,7 @@
- #
- require 'sys/socket.ph';
- 
--$wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "@logfiledir@/httpd-status-";  # Logs will be like "/var/log/httpd-status-19960312.log"
- $server = "localhost";          # Name of server, could be "www.foo.com"
- $port = "80";                   # Port on server
- $request = "/status/?auto";     # Request to send
-@@ -96,7 +96,7 @@
- 	chomp($date);
- 	($day,$time)=split(/:/,$date);
- 	$res=&tcp_connect($server,$port);
--	open(OUT,">>$wherelog$day");
-+	open(OUT,">>$wherelog$day.log");
- 	if ($res) {
- 		print OUT "$time:-1:-1:-1:-1:$res\n";
- 		exit 1;
diff --git a/www/apache2/pkg-descr b/www/apache2/pkg-descr
deleted file mode 100644
index 1102fa67e2cb..000000000000
--- a/www/apache2/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-The Apache HTTP Server Project is an effort to develop and maintain an
-open-source HTTP server for various modern desktop and server operating
-systems, such as UNIX and Windows NT. The goal of this project is to
-provide a secure, efficient and extensible server which provides HTTP
-services in sync with the current HTTP standards.
-The 2.x branch of Apache Web Server includes several improvements like
-threading, use of APR, native IPv6 and SSL support, and many more.
-
-WWW: http://httpd.apache.org/
diff --git a/www/apache2/pkg-install b/www/apache2/pkg-install
deleted file mode 100644
index 81e2af006263..000000000000
--- a/www/apache2/pkg-install
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache2/Attic/pkg-install,v 1.4 2004-04-07 14:27:47 clement Exp $
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
-	exit 0
-fi
-
-WWWUSER=www
-WWWGROUP=${WWWUSER}
-WWWUID=80
-WWWGID=${WWWUID}
-
-if ! pw groupshow "${WWWGROUP}" 2>/dev/null 1>&2; then
-	if pw groupadd ${WWWGROUP} -g ${WWWGID}; then
-		echo "Added group \"${WWWGROUP}\"."
-	else
-		echo "Adding group \"${WWWGROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-if ! pw usershow "${WWWUSER}" 2>/dev/null 1>&2; then
-	if pw useradd ${WWWUSER} -u ${WWWUID} -g ${WWWGROUP} -h - \
-		-s "/sbin/nologin" -d "/nonexistent" \
-		-c "World Wide Web Owner"; \
-	then
-		echo "Added user \"${WWWUSER}\"."
-	else
-		echo "Adding user \"${WWWUSER}\" failed..."
-		exit 1
-	fi
-fi
-
-exit 0
diff --git a/www/apache2/pkg-message b/www/apache2/pkg-message
deleted file mode 100644
index 301283fc1a86..000000000000
--- a/www/apache2/pkg-message
+++ /dev/null
@@ -1,2 +0,0 @@
-To run apache www server from startup, add apache2_enable="YES"
-in your /etc/rc.conf. Extra options can be found in startup script.
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
deleted file mode 100644
index 90d2c03b0574..000000000000
--- a/www/apache2/pkg-plist
+++ /dev/null
@@ -1,529 +0,0 @@
-@comment $FreeBSD$
-@exec mkdir -p %D/etc/apache2 2> /dev/null
-@unexec if cmp -s %D/etc/apache2/httpd.conf %D/%%EXAMPLESDIR%%/httpd-std.conf; then rm -f %D/etc/apache2/httpd.conf; fi
-%%EXAMPLESDIR%%/httpd-std.conf
-@exec [ -f %D/etc/apache2/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd-std.conf %D/etc/apache2/httpd.conf
-@unexec if cmp -s %D/etc/apache2/magic %D/%%EXAMPLESDIR%%/magic-dist; then rm -f %D/etc/apache2/magic; fi
-%%EXAMPLESDIR%%/magic-dist
-@exec [ -f %D/etc/apache2/magic ] || cp %D/%%EXAMPLESDIR%%/magic-dist %D/etc/apache2/magic
-@unexec if cmp -s %D/etc/apache2/mime.types %D/%%EXAMPLESDIR%%/mime.types-dist; then rm -f %D/etc/apache2/mime.types; fi
-%%EXAMPLESDIR%%/mime.types-dist
-@exec [ -f %D/etc/apache2/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types-dist %D/etc/apache2/mime.types
-@unexec if cmp -s %D/etc/apache2/ssl.conf %D/%%EXAMPLESDIR%%/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
-%%EXAMPLESDIR%%/ssl-std.conf
-@exec [ -f %D/etc/apache2/ssl.conf ] || cp %D/%%EXAMPLESDIR%%/ssl-std.conf %D/etc/apache2/ssl.conf
-etc/rc.d/000.apache2libs.sh
-etc/rc.d/apache2.sh
-include/apache2/ap_compat.h
-include/apache2/ap_config.h
-include/apache2/ap_config_auto.h
-include/apache2/ap_config_layout.h
-include/apache2/ap_listen.h
-include/apache2/ap_mmn.h
-include/apache2/ap_mpm.h
-include/apache2/ap_provider.h
-include/apache2/ap_regkey.h
-include/apache2/ap_release.h
-include/apache2/apr.h
-include/apache2/apr_allocator.h
-include/apache2/apr_anylock.h
-include/apache2/apr_atomic.h
-include/apache2/apr_base64.h
-include/apache2/apr_buckets.h
-include/apache2/apr_compat.h
-include/apache2/apr_date.h
-include/apache2/apr_dbm.h
-include/apache2/apr_dso.h
-include/apache2/apr_env.h
-include/apache2/apr_errno.h
-include/apache2/apr_file_info.h
-include/apache2/apr_file_io.h
-include/apache2/apr_fnmatch.h
-include/apache2/apr_general.h
-include/apache2/apr_getopt.h
-include/apache2/apr_global_mutex.h
-include/apache2/apr_hash.h
-include/apache2/apr_hooks.h
-include/apache2/apr_inherit.h
-include/apache2/apr_ldap.h
-include/apache2/apr_ldap_url.h
-include/apache2/apr_lib.h
-include/apache2/apr_md4.h
-include/apache2/apr_md5.h
-include/apache2/apr_mmap.h
-include/apache2/apr_network_io.h
-include/apache2/apr_optional.h
-include/apache2/apr_optional_hooks.h
-include/apache2/apr_poll.h
-include/apache2/apr_pools.h
-include/apache2/apr_portable.h
-include/apache2/apr_proc_mutex.h
-include/apache2/apr_queue.h
-include/apache2/apr_reslist.h
-include/apache2/apr_ring.h
-include/apache2/apr_rmm.h
-include/apache2/apr_sdbm.h
-include/apache2/apr_sha1.h
-include/apache2/apr_shm.h
-include/apache2/apr_signal.h
-include/apache2/apr_strings.h
-include/apache2/apr_strmatch.h
-include/apache2/apr_support.h
-include/apache2/apr_tables.h
-include/apache2/apr_thread_cond.h
-include/apache2/apr_thread_mutex.h
-include/apache2/apr_thread_proc.h
-include/apache2/apr_thread_rwlock.h
-include/apache2/apr_time.h
-include/apache2/apr_uri.h
-include/apache2/apr_user.h
-include/apache2/apr_uuid.h
-include/apache2/apr_version.h
-include/apache2/apr_want.h
-include/apache2/apr_xlate.h
-include/apache2/apr_xml.h
-include/apache2/apu.h
-include/apache2/apu_compat.h
-include/apache2/apu_version.h
-include/apache2/apu_want.h
-%%WORKER%%include/apache2/fdqueue.h
-%%THREADPOOL%%include/apache2/pod.h
-include/apache2/http_config.h
-include/apache2/http_connection.h
-include/apache2/http_core.h
-include/apache2/http_log.h
-include/apache2/http_main.h
-include/apache2/http_protocol.h
-include/apache2/http_request.h
-include/apache2/http_vhost.h
-include/apache2/httpd.h
-include/apache2/mod_cgi.h
-include/apache2/mod_core.h
-include/apache2/mod_dav.h
-include/apache2/mod_include.h
-include/apache2/mod_log_config.h
-include/apache2/mod_proxy.h
-include/apache2/mod_ssl.h
-include/apache2/mod_status.h
-include/apache2/mpm.h
-include/apache2/mpm_common.h
-include/apache2/mpm_default.h
-include/apache2/os.h
-include/apache2/pcre.h
-include/apache2/pcreposix.h
-%%WORKER%%include/apache2/pod.h
-include/apache2/rfc1413.h
-include/apache2/scoreboard.h
-include/apache2/ssl_expr.h
-include/apache2/ssl_expr_parse.h
-include/apache2/ssl_toolkit_compat.h
-include/apache2/ssl_util_ssl.h
-include/apache2/ssl_util_table.h
-include/apache2/unixd.h
-include/apache2/util_cfgtree.h
-include/apache2/util_charset.h
-include/apache2/util_ebcdic.h
-include/apache2/util_filter.h
-include/apache2/util_ldap.h
-include/apache2/util_md5.h
-include/apache2/util_script.h
-include/apache2/util_time.h
-include/apache2/util_xml.h
-lib/apache2/apr-config
-lib/apache2/apr.exp
-lib/apache2/aprutil.exp
-lib/apache2/apu-config
-lib/apache2/libapr-0.a
-lib/apache2/libapr-0.so
-lib/apache2/libapr-0.so.9
-lib/apache2/libaprutil-0.a
-lib/apache2/libaprutil-0.so
-lib/apache2/libaprutil-0.so.9
-libexec/apache2/httpd.exp
-%%MOD_ACCESS%%libexec/apache2/mod_access.so
-%%MOD_ACTIONS%%libexec/apache2/mod_actions.so
-%%MOD_ALIAS%%libexec/apache2/mod_alias.so
-%%MOD_ASIS%%libexec/apache2/mod_asis.so
-%%MOD_AUTH%%libexec/apache2/mod_auth.so
-%%MOD_AUTH_ANON%%libexec/apache2/mod_auth_anon.so
-%%MOD_AUTH_DBM%%libexec/apache2/mod_auth_dbm.so
-%%MOD_AUTH_DIGEST%%libexec/apache2/mod_auth_digest.so
-%%MOD_AUTH_LDAP%%libexec/apache2/mod_auth_ldap.so
-%%MOD_AUTOINDEX%%libexec/apache2/mod_autoindex.so
-%%MOD_BUCKETEER%%libexec/apache2/mod_bucketeer.so
-%%MOD_CACHE%%libexec/apache2/mod_cache.so
-%%MOD_CASE_FILTER%%libexec/apache2/mod_case_filter.so
-%%MOD_CASE_FILTER_IN%%libexec/apache2/mod_case_filter_in.so
-%%MOD_CERN_META%%libexec/apache2/mod_cern_meta.so
-%%MOD_CGI%%libexec/apache2/mod_cgi.so
-%%MOD_CGID%%libexec/apache2/mod_cgid.so
-%%MOD_CHARSET_LITE%%libexec/apache2/mod_charset_lite.so
-%%MOD_DAV%%libexec/apache2/mod_dav.so
-%%MOD_DAV_FS%%libexec/apache2/mod_dav_fs.so
-%%MOD_DEFLATE%%libexec/apache2/mod_deflate.so
-%%MOD_DIR%%libexec/apache2/mod_dir.so
-%%MOD_DISK_CACHE%%libexec/apache2/mod_disk_cache.so
-%%MOD_ENV%%libexec/apache2/mod_env.so
-%%MOD_EXPIRES%%libexec/apache2/mod_expires.so
-%%MOD_EXT_FILTER%%libexec/apache2/mod_ext_filter.so
-%%MOD_FILE_CACHE%%libexec/apache2/mod_file_cache.so
-%%MOD_HEADERS%%libexec/apache2/mod_headers.so
-%%MOD_IMAP%%libexec/apache2/mod_imap.so
-%%MOD_INCLUDE%%libexec/apache2/mod_include.so
-%%MOD_INFO%%libexec/apache2/mod_info.so
-%%MOD_LDAP%%libexec/apache2/mod_ldap.so
-%%MOD_LOG_CONFIG%%libexec/apache2/mod_log_config.so
-%%MOD_LOGIO%%libexec/apache2/mod_logio.so
-%%MOD_MEM_CACHE%%libexec/apache2/mod_mem_cache.so
-%%MOD_MIME%%libexec/apache2/mod_mime.so
-%%MOD_MIME_MAGIC%%libexec/apache2/mod_mime_magic.so
-%%MOD_NEGOTIATION%%libexec/apache2/mod_negotiation.so
-%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache2/mod_optional_hook_export.so
-%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache2/mod_optional_hook_import.so
-%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache2/mod_optional_fn_import.so
-%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache2/mod_optional_fn_export.so
-%%MOD_PROXY%%libexec/apache2/mod_proxy.so
-%%MOD_PROXY_CONNECT%%libexec/apache2/mod_proxy_connect.so
-%%MOD_PROXY_FTP%%libexec/apache2/mod_proxy_ftp.so
-%%MOD_PROXY_HTTP%%libexec/apache2/mod_proxy_http.so
-%%MOD_REWRITE%%libexec/apache2/mod_rewrite.so
-%%MOD_SETENVIF%%libexec/apache2/mod_setenvif.so
-%%MOD_SPELING%%libexec/apache2/mod_speling.so
-%%MOD_SSL%%libexec/apache2/mod_ssl.so
-%%MOD_STATUS%%libexec/apache2/mod_status.so
-%%MOD_SUEXEC%%libexec/apache2/mod_suexec.so
-%%MOD_UNIQUE_ID%%libexec/apache2/mod_unique_id.so
-%%MOD_USERDIR%%libexec/apache2/mod_userdir.so
-%%MOD_USERTRACK%%libexec/apache2/mod_usertrack.so
-%%MOD_VHOST_ALIAS%%libexec/apache2/mod_vhost_alias.so
-sbin/ab
-sbin/apachectl
-sbin/apxs
-sbin/checkgid
-sbin/dbmmanage
-sbin/envvars
-sbin/htdbm
-sbin/htdigest
-sbin/htpasswd
-sbin/httpd
-sbin/logresolve
-sbin/rotatelogs
-%%MOD_SUEXEC%%sbin/suexec
-share/apache2/build/apr_rules.mk
-share/apache2/build/config_vars.mk
-share/apache2/build/config.nice
-share/apache2/build/instdso.sh
-share/apache2/build/library.mk
-share/apache2/build/libtool
-share/apache2/build/ltlib.mk
-share/apache2/build/program.mk
-share/apache2/build/rules.mk
-share/apache2/build/special.mk
-%%CGI%%@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
-%%CGI%%www/cgi-bin-dist/printenv
-%%CGI%%www/cgi-bin-dist/test-cgi
-%%CGI%%@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin-dist %D/www/cgi-bin
-%%WWWDATA%%@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
-%%WWWDATA%%www/data-dist/apache_pb.gif
-%%WWWDATA%%www/data-dist/apache_pb.png
-%%WWWDATA%%www/data-dist/apache_pb2.gif
-%%WWWDATA%%www/data-dist/apache_pb2.png
-%%WWWDATA%%www/data-dist/apache_pb2_ani.gif
-%%WWWDATA%%www/data-dist/index.html.ca
-%%WWWDATA%%www/data-dist/index.html.cz.iso8859-2
-%%WWWDATA%%www/data-dist/index.html.de
-%%WWWDATA%%www/data-dist/index.html.dk
-%%WWWDATA%%www/data-dist/index.html.ee
-%%WWWDATA%%www/data-dist/index.html.el
-%%WWWDATA%%www/data-dist/index.html.en
-%%WWWDATA%%www/data-dist/index.html.es
-%%WWWDATA%%www/data-dist/index.html.et
-%%WWWDATA%%www/data-dist/index.html.fr
-%%WWWDATA%%www/data-dist/index.html.he.iso8859-8
-%%WWWDATA%%www/data-dist/index.html.hr.iso8859-2
-%%WWWDATA%%www/data-dist/index.html.it
-%%WWWDATA%%www/data-dist/index.html.ja.iso2022-jp
-%%WWWDATA%%www/data-dist/index.html.ko.euc-kr
-%%WWWDATA%%www/data-dist/index.html.lb.utf8
-%%WWWDATA%%www/data-dist/index.html.nl
-%%WWWDATA%%www/data-dist/index.html.nn
-%%WWWDATA%%www/data-dist/index.html.no
-%%WWWDATA%%www/data-dist/index.html.po.iso8859-2
-%%WWWDATA%%www/data-dist/index.html.pt
-%%WWWDATA%%www/data-dist/index.html.pt-br
-%%WWWDATA%%www/data-dist/index.html.ru.cp-1251
-%%WWWDATA%%www/data-dist/index.html.ru.cp866
-%%WWWDATA%%www/data-dist/index.html.ru.iso-ru
-%%WWWDATA%%www/data-dist/index.html.ru.koi8-r
-%%WWWDATA%%www/data-dist/index.html.ru.utf8
-%%WWWDATA%%www/data-dist/index.html.sv
-%%WWWDATA%%www/data-dist/index.html.var
-%%WWWDATA%%www/data-dist/index.html.zh-cn.gb2312
-%%WWWDATA%%www/data-dist/index.html.zh-tw.big5
-%%WWWDATA%%@exec [ ! -d %D/www/data ] && ln -fs %D/www/data-dist %D/www/data
-%%ERROR%%@unexec if [ -L %D/www/error ]; then rm -f %D/www/error; fi
-%%ERROR%%www/error-dist/HTTP_BAD_GATEWAY.html.var
-%%ERROR%%www/error-dist/HTTP_BAD_REQUEST.html.var
-%%ERROR%%www/error-dist/HTTP_FORBIDDEN.html.var
-%%ERROR%%www/error-dist/HTTP_GONE.html.var
-%%ERROR%%www/error-dist/HTTP_INTERNAL_SERVER_ERROR.html.var
-%%ERROR%%www/error-dist/HTTP_LENGTH_REQUIRED.html.var
-%%ERROR%%www/error-dist/HTTP_METHOD_NOT_ALLOWED.html.var
-%%ERROR%%www/error-dist/HTTP_NOT_FOUND.html.var
-%%ERROR%%www/error-dist/HTTP_NOT_IMPLEMENTED.html.var
-%%ERROR%%www/error-dist/HTTP_PRECONDITION_FAILED.html.var
-%%ERROR%%www/error-dist/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-%%ERROR%%www/error-dist/HTTP_REQUEST_TIME_OUT.html.var
-%%ERROR%%www/error-dist/HTTP_REQUEST_URI_TOO_LARGE.html.var
-%%ERROR%%www/error-dist/HTTP_SERVICE_UNAVAILABLE.html.var
-%%ERROR%%www/error-dist/HTTP_UNAUTHORIZED.html.var
-%%ERROR%%www/error-dist/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-%%ERROR%%www/error-dist/HTTP_VARIANT_ALSO_VARIES.html.var
-%%ERROR%%www/error-dist/README
-%%ERROR%%www/error-dist/contact.html.var
-%%ERROR%%www/error-dist/include/bottom.html
-%%ERROR%%www/error-dist/include/spacer.html
-%%ERROR%%www/error-dist/include/top.html
-%%ERROR%%@exec [ ! -d %D/www/error ] && ln -fs %D/www/error-dist %D/www/error
-%%ICONS%%@unexec if [ -L %D/www/icons ]; then rm -f %D/www/icons; fi
-%%ICONS%%www/icons-dist/README
-%%ICONS%%www/icons-dist/a.gif
-%%ICONS%%www/icons-dist/a.png
-%%ICONS%%www/icons-dist/alert.black.gif
-%%ICONS%%www/icons-dist/alert.black.png
-%%ICONS%%www/icons-dist/alert.red.gif
-%%ICONS%%www/icons-dist/alert.red.png
-%%ICONS%%www/icons-dist/apache_pb.gif
-%%ICONS%%www/icons-dist/apache_pb.png
-%%ICONS%%www/icons-dist/apache_pb2.gif
-%%ICONS%%www/icons-dist/apache_pb2.png
-%%ICONS%%www/icons-dist/apache_pb2_ani.gif
-%%ICONS%%www/icons-dist/back.gif
-%%ICONS%%www/icons-dist/back.png
-%%ICONS%%www/icons-dist/ball.gray.gif
-%%ICONS%%www/icons-dist/ball.gray.png
-%%ICONS%%www/icons-dist/ball.red.gif
-%%ICONS%%www/icons-dist/ball.red.png
-%%ICONS%%www/icons-dist/binary.gif
-%%ICONS%%www/icons-dist/binary.png
-%%ICONS%%www/icons-dist/binhex.gif
-%%ICONS%%www/icons-dist/binhex.png
-%%ICONS%%www/icons-dist/blank.gif
-%%ICONS%%www/icons-dist/blank.png
-%%ICONS%%www/icons-dist/bomb.gif
-%%ICONS%%www/icons-dist/bomb.png
-%%ICONS%%www/icons-dist/box1.gif
-%%ICONS%%www/icons-dist/box1.png
-%%ICONS%%www/icons-dist/box2.gif
-%%ICONS%%www/icons-dist/box2.png
-%%ICONS%%www/icons-dist/broken.gif
-%%ICONS%%www/icons-dist/broken.png
-%%ICONS%%www/icons-dist/burst.gif
-%%ICONS%%www/icons-dist/burst.png
-%%ICONS%%www/icons-dist/c.gif
-%%ICONS%%www/icons-dist/c.png
-%%ICONS%%www/icons-dist/comp.blue.gif
-%%ICONS%%www/icons-dist/comp.blue.png
-%%ICONS%%www/icons-dist/comp.gray.gif
-%%ICONS%%www/icons-dist/comp.gray.png
-%%ICONS%%www/icons-dist/compressed.gif
-%%ICONS%%www/icons-dist/compressed.png
-%%ICONS%%www/icons-dist/continued.gif
-%%ICONS%%www/icons-dist/continued.png
-%%ICONS%%www/icons-dist/dir.gif
-%%ICONS%%www/icons-dist/dir.png
-%%ICONS%%www/icons-dist/diskimg.gif
-%%ICONS%%www/icons-dist/diskimg.png
-%%ICONS%%www/icons-dist/down.gif
-%%ICONS%%www/icons-dist/down.png
-%%ICONS%%www/icons-dist/dvi.gif
-%%ICONS%%www/icons-dist/dvi.png
-%%ICONS%%www/icons-dist/f.gif
-%%ICONS%%www/icons-dist/f.png
-%%ICONS%%www/icons-dist/folder.gif
-%%ICONS%%www/icons-dist/folder.open.gif
-%%ICONS%%www/icons-dist/folder.open.png
-%%ICONS%%www/icons-dist/folder.png
-%%ICONS%%www/icons-dist/folder.sec.gif
-%%ICONS%%www/icons-dist/folder.sec.png
-%%ICONS%%www/icons-dist/forward.gif
-%%ICONS%%www/icons-dist/forward.png
-%%ICONS%%www/icons-dist/freebsd.gif
-%%ICONS%%www/icons-dist/generic.gif
-%%ICONS%%www/icons-dist/generic.png
-%%ICONS%%www/icons-dist/generic.red.gif
-%%ICONS%%www/icons-dist/generic.red.png
-%%ICONS%%www/icons-dist/generic.sec.gif
-%%ICONS%%www/icons-dist/generic.sec.png
-%%ICONS%%www/icons-dist/hand.right.gif
-%%ICONS%%www/icons-dist/hand.right.png
-%%ICONS%%www/icons-dist/hand.up.gif
-%%ICONS%%www/icons-dist/hand.up.png
-%%ICONS%%www/icons-dist/icon.sheet.gif
-%%ICONS%%www/icons-dist/icon.sheet.png
-%%ICONS%%www/icons-dist/image1.gif
-%%ICONS%%www/icons-dist/image1.png
-%%ICONS%%www/icons-dist/image2.gif
-%%ICONS%%www/icons-dist/image2.png
-%%ICONS%%www/icons-dist/image3.gif
-%%ICONS%%www/icons-dist/image3.png
-%%ICONS%%www/icons-dist/index.gif
-%%ICONS%%www/icons-dist/index.png
-%%ICONS%%www/icons-dist/layout.gif
-%%ICONS%%www/icons-dist/layout.png
-%%ICONS%%www/icons-dist/left.gif
-%%ICONS%%www/icons-dist/left.png
-%%ICONS%%www/icons-dist/link.gif
-%%ICONS%%www/icons-dist/link.png
-%%ICONS%%www/icons-dist/movie.gif
-%%ICONS%%www/icons-dist/movie.png
-%%ICONS%%www/icons-dist/p.gif
-%%ICONS%%www/icons-dist/p.png
-%%ICONS%%www/icons-dist/patch.gif
-%%ICONS%%www/icons-dist/patch.png
-%%ICONS%%www/icons-dist/pdf.gif
-%%ICONS%%www/icons-dist/pdf.png
-%%ICONS%%www/icons-dist/pie0.gif
-%%ICONS%%www/icons-dist/pie0.png
-%%ICONS%%www/icons-dist/pie1.gif
-%%ICONS%%www/icons-dist/pie1.png
-%%ICONS%%www/icons-dist/pie2.gif
-%%ICONS%%www/icons-dist/pie2.png
-%%ICONS%%www/icons-dist/pie3.gif
-%%ICONS%%www/icons-dist/pie3.png
-%%ICONS%%www/icons-dist/pie4.gif
-%%ICONS%%www/icons-dist/pie4.png
-%%ICONS%%www/icons-dist/pie5.gif
-%%ICONS%%www/icons-dist/pie5.png
-%%ICONS%%www/icons-dist/pie6.gif
-%%ICONS%%www/icons-dist/pie6.png
-%%ICONS%%www/icons-dist/pie7.gif
-%%ICONS%%www/icons-dist/pie7.png
-%%ICONS%%www/icons-dist/pie8.gif
-%%ICONS%%www/icons-dist/pie8.png
-%%ICONS%%www/icons-dist/portal.gif
-%%ICONS%%www/icons-dist/portal.png
-%%ICONS%%www/icons-dist/ps.gif
-%%ICONS%%www/icons-dist/ps.png
-%%ICONS%%www/icons-dist/quill.gif
-%%ICONS%%www/icons-dist/quill.png
-%%ICONS%%www/icons-dist/right.gif
-%%ICONS%%www/icons-dist/right.png
-%%ICONS%%www/icons-dist/screw1.gif
-%%ICONS%%www/icons-dist/screw1.png
-%%ICONS%%www/icons-dist/screw2.gif
-%%ICONS%%www/icons-dist/screw2.png
-%%ICONS%%www/icons-dist/script.gif
-%%ICONS%%www/icons-dist/script.png
-%%ICONS%%www/icons-dist/small/README.txt
-%%ICONS%%www/icons-dist/small/back.gif
-%%ICONS%%www/icons-dist/small/back.png
-%%ICONS%%www/icons-dist/small/binary.gif
-%%ICONS%%www/icons-dist/small/binary.png
-%%ICONS%%www/icons-dist/small/binhex.gif
-%%ICONS%%www/icons-dist/small/binhex.png
-%%ICONS%%www/icons-dist/small/blank.gif
-%%ICONS%%www/icons-dist/small/blank.png
-%%ICONS%%www/icons-dist/small/broken.gif
-%%ICONS%%www/icons-dist/small/broken.png
-%%ICONS%%www/icons-dist/small/burst.gif
-%%ICONS%%www/icons-dist/small/burst.png
-%%ICONS%%www/icons-dist/small/comp1.gif
-%%ICONS%%www/icons-dist/small/comp1.png
-%%ICONS%%www/icons-dist/small/comp2.gif
-%%ICONS%%www/icons-dist/small/comp2.png
-%%ICONS%%www/icons-dist/small/compressed.gif
-%%ICONS%%www/icons-dist/small/compressed.png
-%%ICONS%%www/icons-dist/small/continued.gif
-%%ICONS%%www/icons-dist/small/continued.png
-%%ICONS%%www/icons-dist/small/dir.gif
-%%ICONS%%www/icons-dist/small/dir.png
-%%ICONS%%www/icons-dist/small/dir2.gif
-%%ICONS%%www/icons-dist/small/dir2.png
-%%ICONS%%www/icons-dist/small/doc.gif
-%%ICONS%%www/icons-dist/small/doc.png
-%%ICONS%%www/icons-dist/small/forward.gif
-%%ICONS%%www/icons-dist/small/forward.png
-%%ICONS%%www/icons-dist/small/generic.gif
-%%ICONS%%www/icons-dist/small/generic.png
-%%ICONS%%www/icons-dist/small/generic2.gif
-%%ICONS%%www/icons-dist/small/generic2.png
-%%ICONS%%www/icons-dist/small/generic3.gif
-%%ICONS%%www/icons-dist/small/generic3.png
-%%ICONS%%www/icons-dist/small/image.gif
-%%ICONS%%www/icons-dist/small/image.png
-%%ICONS%%www/icons-dist/small/image2.gif
-%%ICONS%%www/icons-dist/small/image2.png
-%%ICONS%%www/icons-dist/small/index.gif
-%%ICONS%%www/icons-dist/small/index.png
-%%ICONS%%www/icons-dist/small/key.gif
-%%ICONS%%www/icons-dist/small/key.png
-%%ICONS%%www/icons-dist/small/movie.gif
-%%ICONS%%www/icons-dist/small/movie.png
-%%ICONS%%www/icons-dist/small/patch.gif
-%%ICONS%%www/icons-dist/small/patch.png
-%%ICONS%%www/icons-dist/small/ps.gif
-%%ICONS%%www/icons-dist/small/ps.png
-%%ICONS%%www/icons-dist/small/rainbow.gif
-%%ICONS%%www/icons-dist/small/rainbow.png
-%%ICONS%%www/icons-dist/small/sound.gif
-%%ICONS%%www/icons-dist/small/sound.png
-%%ICONS%%www/icons-dist/small/sound2.gif
-%%ICONS%%www/icons-dist/small/sound2.png
-%%ICONS%%www/icons-dist/small/tar.gif
-%%ICONS%%www/icons-dist/small/tar.png
-%%ICONS%%www/icons-dist/small/text.gif
-%%ICONS%%www/icons-dist/small/text.png
-%%ICONS%%www/icons-dist/small/transfer.gif
-%%ICONS%%www/icons-dist/small/transfer.png
-%%ICONS%%www/icons-dist/small/unknown.gif
-%%ICONS%%www/icons-dist/small/unknown.png
-%%ICONS%%www/icons-dist/small/uu.gif
-%%ICONS%%www/icons-dist/small/uu.png
-%%ICONS%%www/icons-dist/sound1.gif
-%%ICONS%%www/icons-dist/sound1.png
-%%ICONS%%www/icons-dist/sound2.gif
-%%ICONS%%www/icons-dist/sound2.png
-%%ICONS%%www/icons-dist/sphere1.gif
-%%ICONS%%www/icons-dist/sphere1.png
-%%ICONS%%www/icons-dist/sphere2.gif
-%%ICONS%%www/icons-dist/sphere2.png
-%%ICONS%%www/icons-dist/tar.gif
-%%ICONS%%www/icons-dist/tar.png
-%%ICONS%%www/icons-dist/tex.gif
-%%ICONS%%www/icons-dist/tex.png
-%%ICONS%%www/icons-dist/text.gif
-%%ICONS%%www/icons-dist/text.png
-%%ICONS%%www/icons-dist/transfer.gif
-%%ICONS%%www/icons-dist/transfer.png
-%%ICONS%%www/icons-dist/unknown.gif
-%%ICONS%%www/icons-dist/unknown.png
-%%ICONS%%www/icons-dist/up.gif
-%%ICONS%%www/icons-dist/up.png
-%%ICONS%%www/icons-dist/uu.gif
-%%ICONS%%www/icons-dist/uu.png
-%%ICONS%%www/icons-dist/uuencoded.gif
-%%ICONS%%www/icons-dist/uuencoded.png
-%%ICONS%%www/icons-dist/world1.gif
-%%ICONS%%www/icons-dist/world1.png
-%%ICONS%%www/icons-dist/world2.gif
-%%ICONS%%www/icons-dist/world2.png
-%%ICONS%%@dirrm www/icons-dist/small
-%%ICONS%%@dirrm www/icons-dist
-%%ICONS%%@exec [ ! -d %D/www/icons ] && ln -fs %D/www/icons-dist %D/www/icons
-%%ERROR%%@dirrm www/error-dist/include
-%%ERROR%%@dirrm www/error-dist
-%%WWWDATA%%@dirrm www/data-dist
-%%CGI%%@dirrm www/cgi-bin-dist
-@dirrm %%EXAMPLESDIR%%
-@dirrm share/apache2/build
-@dirrm share/apache2
-@unexec rmdir %D/libexec/apache2 2> /dev/null || true
-@dirrm lib/apache2
-@dirrm include/apache2
-@exec mkdir -p %D/etc/apache2/Includes 2> /dev/null || true
-@exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true
-@unexec rmdir %D/etc/apache2/Includes 2> /dev/null || true
-@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true
-@unexec rm -f %D/etc/apache2/httpd.conf.bak 2> /dev/null || true
-@unexec rmdir %D/etc/apache2 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2."
author	clement <clement@FreeBSD.org>	2005-12-04 08:27:20 +0800
committer	clement <clement@FreeBSD.org>	2005-12-04 08:27:20 +0800
commit	fa91c6edbb430e83f931b5027c7713474ce4684d (patch)
tree	5dfc51cb4c69d8b94739f3db8ff19e33c3834eea /www
parent	1d6508069b0bf57147e20c471f349d8f22204837 (diff)
download	freebsd-ports-gnome-fa91c6edbb430e83f931b5027c7713474ce4684d.tar.gz freebsd-ports-gnome-fa91c6edbb430e83f931b5027c7713474ce4684d.tar.zst freebsd-ports-gnome-fa91c6edbb430e83f931b5027c7713474ce4684d.zip