- remove www/apache20 and devel/apr0

- s/USE_APACHE= 20+/USE_APACHE= 22+/
- unify s/YES/yes/
- cleanup APACHE_VERSION <= 22 usage
- add entry to MOVED

with hat apache@

MOVED

@@ -3639,3 +3639,5 @@ sysutils/cfengine|sysutils/cfengine22|2012-08-14|Standardize port naming
 sysutils/cfengine-legacy|sysutils/cfengine32|2012-08-14|Standardize port naming
 sysutils/cfengine3|sysutils/cfengine33|2012-08-14|Standardize port naming
 lang/erlang-lite|lang/erlang|2012-08-15|Redundant port removed
+devel/apr0|devel/apr1|2012-08-18|Has expired
+www/apache20|www/apache22|2012-08-18|Has expired

databases/gnatsweb4/Makefile

@@ -18,7 +18,7 @@ RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes

databases/mysqlard/Makefile

@@ -17,7 +17,7 @@ COMMENT=	A tool to collect and graph database statistics from MySQL
 BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 USE_MYSQL=	yes
 
 MYSQLARD_DIR?=	${PREFIX}/www/mysqlard

databases/mysqldumper/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	mysqldumper
 PORTVERSION=	1.24.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/MySQLDumper/
 DISTNAME=	MySQLDumper${PORTVERSION}
@@ -32,7 +32,7 @@ WWWGRP=		${WWWOWN}
 .include <bsd.port.options.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 .endif
 .if defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd

deskutils/myitcrm/Makefile

@@ -43,7 +43,7 @@ WANT_PHP_CGI=	yes
 .endif
 
 .if !defined(WITHOUT_APACHE)
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 .endif
 .if defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd

deskutils/phpcollab/Makefile

@@ -35,7 +35,7 @@ USE_PHP+=	pgsql
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 .endif
 .if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE=	22
+USE_APACHE_RUN=	22
 .endif
 .if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd

deskutils/simplegroupware/Makefile

@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Groupware is an open source enterprise application
 
 NO_BUILD=	yes
-USE_APACHE=	22
+USE_APACHE_RUN=	22
 USE_MYSQL=	yes
 USE_PHP=	mysql
 

deskutils/surrealtodo/Makefile

@@ -35,7 +35,7 @@ LIGHTTPD_DESC=	Use Lighttpd webserver
 USE_PHP+=	pgsql
 .endif
 .if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE=	22
+USE_APACHE_RUN=	22
 .endif
 .if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd

devel/Makefile

@@ -46,7 +46,6 @@
     SUBDIR += apache-ant
     SUBDIR += api-sanity-autotest
     SUBDIR += apiextractor
-    SUBDIR += apr0
     SUBDIR += apr1
     SUBDIR += apr2
     SUBDIR += arduino

devel/apr0/Makefile

@@ -1,170 +0,0 @@
-# New ports collection makefile for: apr
-# Date created:		19 February 2002
-# Whom:			Garrett Rooney <rooneg@electricjellyfish.net>
-#
-# $FreeBSD$
-
-PORTNAME=	apr
-PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	apr
-DISTFILES=	apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
-
-MAINTAINER=	apache@FreeBSD.org
-COMMENT=	Apache Portability Library
-
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
-
-DEPRECATED= will be unsupported by ASF when 2.4.0 is released, migrate to devel/apr1 now
-EXPIRATION_DATE=    2012-02-01
-
-MAKE_JOBS_SAFE=	yes
-
-NO_OPTIONS_SORT=yes
-# apr
-OPTIONS_DEFINE=	THREADS IPV6 DEVRANDOM
-# apr-util
-OPTIONS_DEFINE+=BDB GDBM LDAP NDBM
-
-OPTIONS_DEFAULT=THREADS IPV6 DEVRANDOM BDB GDBM
-
-DEVRANDOM_DESC=	Use /dev/random or compatible
-NDBM_DESC=	NDBM support
-
-.include <bsd.port.options.mk>
-
-APR_VERSION=	0.9.20
-APU_VERSION=	0.9.19
-
-NO_LATEST_LINK=	yes
-
-USE_ICONV=		yes
-USE_AUTOTOOLS=	automake autoconf libtool:env
-USE_PERL5_BUILD=	yes
-USE_LDCONFIG=		yes
-GNU_CONFIGURE=		yes
-
-CONFIGURE_ENV=	CC="${CC}"
-
-NO_WRKSUBDIR=	yes
-APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
-APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
-
-PLIST_SUB=	SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
-SHLIB_APR_MAJOR=	9
-SHLIB_APU_MAJOR=	9
-
-APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-0
-APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
-		--with-expat=${LOCALBASE} \
-		--with-iconv=${LOCALBASE}
-
-########## APR Options
-.if ${PORT_OPTIONS:MTHREADS}
-APR_CONF_ARGS+=	--enable-threads
-.else
-APR_CONF_ARGS+=	--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-APR_CONF_ARGS+=	--enable-ipv6
-.else
-APR_CONF_ARGS+=	--disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MDEVRANDOM}
-APR_CONF_ARGS+=	--with-devrandom
-.else
-APR_CONF_ARGS+=	--without-devrandom
-.endif
-
-#======== APR-Util Options
-.if ${PORT_OPTIONS:MGDBM}
-PLIST_SUB+=	GDBM=""
-LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
-APU_CONF_ARGS+=	--with-gdbm=${LOCALBASE}
-.else
-PLIST_SUB+=	GDBM="@comment "
-APU_CONF_ARGS+=	--without-gdbm
-.endif
-
-.if ${PORT_OPTIONS:MBDB}
-PLIST_SUB+=	BDB=""
-USE_BDB=	42+
-INVALID_BDB_VER=	50
-APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
-.else
-PLIST_SUB+=	BDB="@comment "
-APU_CONF_ARGS+=	--without-berkeley-db
-.endif
-
-.if ${PORT_OPTIONS:MNDBM}
-PLIST_SUB+=	NDBM=""
-APU_CONF_ARGS+=	--with-ndbm=/usr
-.else
-PLIST_SUB+=	NDBM="@comment "
-APU_CONF_ARGS+=	--without-ndbm
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-PLIST_SUB+=	LDAP=""
-USE_OPENLDAP=	yes
-APU_CONF_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
-	--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
-.else
-PLIST_SUB+=	LDAP="@comment "
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \
-		${APR_WRKDIR}/build/apr_hints.m4
-	${FIND} ${APR_WRKDIR} ${APU_WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
-		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
-		${APU_WRKDIR}/build/apu-conf.m4
-	${REINPLACE_CMD} -e 's,void main(void),int main(void),'\
-		${APR_WRKDIR}/build/apr_network.m4
-
-run-autotools::
-	cd ${APR_WRKDIR} ; \
-		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
-	cd ${APU_WRKDIR} ; \
-		${RM} -fr xml/expat
-	cd ${APU_WRKDIR} ; \
-		${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf \
-		--with-apr=${APR_WRKDIR}
-	cd ${APR_WRKDIR}; \
-		${SETENV} ${CONFIGURE_ENV} ${SH} \
-		./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}
-	cd ${APU_WRKDIR}; \
-		${SETENV} ${CONFIGURE_ENV} ${SH} \
-		./configure ${CONFIGURE_ARGS} ${APU_CONF_ARGS}
-
-do-configure:
-	${DO_NADA}
-
-do-build:
-	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE}
-	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE}
-
-do-install:
-	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
-	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
-
-debug_autoconf:
-	@${ECHO} "LIBTOOL: ${LIBTOOL_VERSION}"
-	@${ECHO} "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}"
-	@${ECHO} "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}"
-	@${ECHO} "AUTOCONF_DIR: ${AUTOCONF_DIR}"
-	@${ECHO} "BUILD_DEPENDS: ${BUILD_DEPENDS}"
-	@${ECHO} "ACLOCAL_DIR: ${ACLOCAL_DIR}"
-	@${ECHO} "LIBTOOLFILES: ${LIBTOOLFILES}"
-	@${ECHO} "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}"
-	@${ECHO} "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}"
-	@${ECHO} "LIBTOOL_M4: ${LIBTOOL_M4}"
-	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_CONF_ARGS}"
-	@${ECHO} "${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} ${APR_UTIL_CONF_ARGS}"
-
-.include <bsd.port.mk>

devel/apr0/distinfo

@@ -1,4 +0,0 @@
-SHA256 (apr-0.9.20.tar.gz) = db9feb30dedb916d7a4d893336e20df8c01bdfa65b4eeb36ad7c3d763860a76e
-SIZE (apr-0.9.20.tar.gz) = 1084515
-SHA256 (apr-util-0.9.19.tar.gz) = 9ffa9f5a1a0d2eddddd1c114e99a8f5e49aa8018db6f0bc6eeab4724d9eaa085
-SIZE (apr-util-0.9.19.tar.gz) = 591729

devel/apr0/files/patch-apr-0.9.20__build__buildcheck.sh

@@ -1,11 +0,0 @@
---- ./apr-0.9.20/build/buildcheck.sh.orig	2004-11-24 23:10:04.000000000 +0000
-+++ ./apr-0.9.20/build/buildcheck.sh	2010-10-20 21:08:11.853623919 +0000
-@@ -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."

devel/apr0/files/patch-apr-0.9.20__buildconf

@@ -1,75 +0,0 @@
---- ./apr-0.9.20/buildconf.orig	2006-09-20 16:04:09.000000000 +0000
-+++ ./apr-0.9.20/buildconf	2010-10-20 21:08:11.863623823 +0000
-@@ -23,7 +23,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
-@@ -35,29 +35,48 @@
- # Note: APR supplies its own config.guess and config.sub -- we do not
- #       rely on libtool's versions
- #
--echo "Copying libtool helper files ..."
-+echo "buildconf: copying libtool helper files using $libtoolize"
- 
- # Remove any libtool files so one can switch between libtool 1.3
- # and libtool 1.4 by simply rerunning the buildconf script.
--(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
--
--$libtoolize --copy --automake
--
--ltpath=`dirname $libtoolize`
--ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4)
- 
--if [ ! -f $ltfile ]; then
-+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-+lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-+IFS=.; set $lt_version; IFS=' '
-+if test "$1" = "1"; then
-+  $libtoolize --copy --automake
-+  if [ -f libtool.m4 ]; then
-+    ltfile=`pwd`/libtool.m4
-+  else
-+   ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
-+                   < $libtoolize`"
-+   ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
-+   # Expecting the code above to be very portable, but just in case...
-+   if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
-+     ltpath=`dirname $libtoolize`
-+     ltfile=${LIBTOOL_M4}
-+   fi
-+  fi
-+  if [ ! -f $ltfile ]; then
-     echo "$ltfile not found"
-     exit 1
-+  fi
-+  # Do we need this anymore?
-+  echo "buildconf: Using libtool.m4 at ${ltfile}."
-+  cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
-+fi
-+if test "$1" = "2"; then
-+  $libtoolize --copy
-+  # Wouldn't it just be better to define top_builddir??
-+  mv build/libtool.m4 build/libtool.m4.$$
-+  cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
-+  chmod 664 build/libtool.m4.$$
-+  rm build/libtool.m4.$$
- fi
- 
--echo "buildconf: Using libtool.m4 at ${ltfile}."
--
--cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
--
--# This is just temporary until people's workspaces are cleared -- remove
--# any old aclocal.m4 left over from prior build so it doesn't cause errors.
--rm -f aclocal.m4
-+# Clean up any leftovers
-+rm -f aclocal.m4 libtool.m4
- 
- #
- # Generate the autoconf header and ./configure

devel/apr0/files/patch-apr-0.9.20__config.layout

@@ -1,10 +0,0 @@
---- ./apr-0.9.20/config.layout.orig	2004-11-24 23:02:04.000000000 +0000
-+++ ./apr-0.9.20/config.layout	2010-10-20 21:08:11.854622653 +0000
-@@ -229,3 +229,7 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix:    -${APR_MAJOR_VERSION}
- </Layout>
-+
-+<Layout FreeBSD>
-+    libsuffix:
-+</Layout>

devel/apr0/files/patch-apr-0.9.20__configure.in

@@ -1,43 +0,0 @@
---- ./apr-0.9.20/configure.in.orig	2008-06-20 17:32:47.000000000 +0000
-+++ ./apr-0.9.20/configure.in	2010-10-20 21:08:11.857624440 +0000
-@@ -7,6 +7,7 @@
- AC_INIT(build/apr_common.m4)
- AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
- AC_CONFIG_AUX_DIR(build)
-+AC_CONFIG_MACRO_DIR(build)
- 
- dnl
- dnl Include our own M4 macros along with those for libtool
-@@ -16,6 +17,11 @@
- sinclude(build/apr_threads.m4)
- sinclude(build/apr_hints.m4)
- sinclude(build/libtool.m4)
-+sinclude(build/ltsugar.m4)
-+sinclude(build/argz.m4)
-+sinclude(build/ltoptions.m4)
-+sinclude(build/ltversion.m4)
-+sinclude(build/lt~obsolete.m4)
- 
- dnl Save user-defined environment settings for later restoration
- dnl
-@@ -98,6 +104,8 @@
- dnl preload section from invoking the macro to get compiler info.
- AC_PROG_CC
- 
-+AC_PROG_SED
-+
- dnl Preload
- APR_PRELOAD
- 
-@@ -141,6 +149,11 @@
- AC_ARG_ENABLE(experimental-libtool,[  --experimental-libtool Use experimental custom libtool (not included in source distribution)],
-   [experimental_libtool=$enableval],[experimental_libtool=no])
- 
-+dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL
-+if test "x$Xsed" = "x"; then
-+  Xsed="$SED -e 1s/^X//"
-+fi
-+
- case $host in
- *os2*)
-     # Use a custom-made libtool replacement

devel/apr0/files/patch-apr-0.9.20__threadproc__unix__procsup.c

@@ -1,18 +0,0 @@
---- ./apr-0.9.20/threadproc/unix/procsup.c.orig	2006-09-20 16:04:09.000000000 +0000
-+++ ./apr-0.9.20/threadproc/unix/procsup.c	2010-10-20 21:08:11.859622744 +0000
-@@ -21,6 +21,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. */
-@@ -56,6 +57,7 @@
-         return errno;
-     }
- #endif
-+#endif
- 
-     /* close out the standard file descriptors */
-     if (freopen("/dev/null", "r", stdin) == NULL) {

devel/apr0/files/patch-apr-util-0.9.19__config.layout

@@ -1,10 +0,0 @@
---- ./apr-util-0.9.19/config.layout.orig	2004-11-24 23:45:40.000000000 +0000
-+++ ./apr-util-0.9.19/config.layout	2010-10-20 21:08:11.861623284 +0000
-@@ -229,3 +229,7 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix     -${APRUTIL_MAJOR_VERSION}
- </Layout>
-+
-+<Layout FreeBSD>
-+    libsuffix:
-+</Layout>

devel/apr0/pkg-descr

@@ -1,8 +0,0 @@
-The Apache Portable Runtime is a library of C data structures and routines, 
-forming a system portability layer that covers as many operating systems as 
-possible, including Unices, Win32, BeOS, and OS/2.
-
-This port also includes the APR-Util package, which contains some useful 
-utilities built on top of APR.
-
-WWW: http://apr.apache.org/

devel/apr0/pkg-plist

@@ -1,82 +0,0 @@
-bin/apr-config
-bin/apu-config
-%%DATADIR%%/build-0/apr_rules.mk
-%%DATADIR%%/build-0/libtool
-%%DATADIR%%/build-0/make_exports.awk
-%%DATADIR%%/build-0/make_var_export.awk
-%%DATADIR%%/build-0/mkdir.sh
-include/apr-0/apr.h
-include/apr-0/apr_allocator.h
-include/apr-0/apr_anylock.h
-include/apr-0/apr_atomic.h
-include/apr-0/apr_compat.h
-include/apr-0/apr_base64.h
-include/apr-0/apr_buckets.h
-include/apr-0/apr_date.h
-include/apr-0/apr_dbm.h
-include/apr-0/apr_dso.h
-include/apr-0/apr_env.h
-include/apr-0/apr_errno.h
-include/apr-0/apr_file_info.h
-include/apr-0/apr_file_io.h
-include/apr-0/apr_fnmatch.h
-include/apr-0/apr_general.h
-include/apr-0/apr_getopt.h
-include/apr-0/apr_global_mutex.h
-include/apr-0/apr_hash.h
-include/apr-0/apr_hooks.h
-include/apr-0/apr_inherit.h
-include/apr-0/apr_ldap_url.h
-include/apr-0/apr_ldap.h
-include/apr-0/apr_lib.h
-include/apr-0/apr_md4.h
-include/apr-0/apr_md5.h
-include/apr-0/apr_mmap.h
-include/apr-0/apr_network_io.h
-include/apr-0/apr_optional.h
-include/apr-0/apr_optional_hooks.h
-include/apr-0/apr_poll.h
-include/apr-0/apr_pools.h
-include/apr-0/apr_portable.h
-include/apr-0/apr_proc_mutex.h
-include/apr-0/apr_queue.h
-include/apr-0/apr_reslist.h
-include/apr-0/apr_ring.h
-include/apr-0/apr_rmm.h
-include/apr-0/apr_sdbm.h
-include/apr-0/apr_sha1.h
-include/apr-0/apr_shm.h
-include/apr-0/apr_signal.h
-include/apr-0/apr_strings.h
-include/apr-0/apr_strmatch.h
-include/apr-0/apr_support.h
-include/apr-0/apr_tables.h
-include/apr-0/apr_thread_cond.h
-include/apr-0/apr_thread_mutex.h
-include/apr-0/apr_thread_proc.h
-include/apr-0/apr_thread_rwlock.h
-include/apr-0/apr_time.h
-include/apr-0/apr_uri.h
-include/apr-0/apr_user.h
-include/apr-0/apr_uuid.h
-include/apr-0/apr_version.h
-include/apr-0/apr_want.h
-include/apr-0/apr_xlate.h
-include/apr-0/apr_xml.h
-include/apr-0/apu.h
-include/apr-0/apu_compat.h
-include/apr-0/apu_version.h
-include/apr-0/apu_want.h
-lib/apr.exp
-lib/aprutil.exp
-lib/libapr-0.a
-lib/libapr-0.la
-lib/libapr-0.so
-lib/libapr-0.so.%%SHLIB_APR_MAJOR%%
-lib/libaprutil-0.a
-lib/libaprutil-0.la
-lib/libaprutil-0.so
-lib/libaprutil-0.so.%%SHLIB_APU_MAJOR%%
-@dirrm %%DATADIR%%/build-0
-@dirrm %%DATADIR%%
-@dirrm include/apr-0

devel/bugzilla/Makefile

@@ -45,7 +45,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMODPERL}
-USE_APACHE_RUN=	20+
+USE_APACHE_RUN=	22+
 .endif
 
 .include <bsd.port.pre.mk>

devel/bugzilla3/Makefile

@@ -45,7 +45,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMODPERL}
-USE_APACHE_RUN=	20+
+USE_APACHE_RUN=	22+
 .endif
 
 .include <bsd.port.pre.mk>

devel/bugzilla42/Makefile

@@ -48,7 +48,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMODPERL}
-USE_APACHE_RUN=	20+
+USE_APACHE_RUN=	22+
 .endif
 
 .include <bsd.port.pre.mk>

devel/otrs/Makefile

@@ -74,7 +74,7 @@ CLEAN_FILES=	scripts/suse* scripts/redhat* \
 		var/httpd/htdocs/js/thirdparty/ckeditor-3.4.2/_source \
 		var/httpd/htdocs/skins/Agent/*/img/source
 
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 USE_PERL5=	yes
 
 PLIST_SUB+=	VER_CKEDITOR="3.6.3"

devel/p5-Log-Dispatch/Makefile

@@ -50,7 +50,7 @@ MAIL_SENDER_DESC=		Mail::Sender support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHELOG}
-USE_APACHE=	20+
+USE_APACHE=	22+
 .endif
 
 .include <bsd.port.pre.mk>

devel/pushmi/Makefile

@@ -30,7 +30,7 @@ BUILD_DEPENDS:=	${RUN_DEPENDS} \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
 
 PERL_CONFIGURE=	yes
-USE_APACHE=	20+
+USE_APACHE=	22+
 
 MAN3=		Pushmi.3 \
 		Pushmi::Command::Mirror.3 \

devel/subversion/Makefile.common

@@ -94,16 +94,14 @@ SVNUSER?=	svn
 .endif
 
 .if defined(WITH_APACHE)
-USE_APACHE=   20+
+USE_APACHE=   22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${APACHE_VERSION} > 20
 LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
 APR_CONFIG=   ${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=   ${LOCALBASE}/bin/apu-1-config
 .else
-LIB_DEPENDS+= apr-0:${PORTSDIR}/devel/apr0
-APR_CONFIG=   ${LOCALBASE}/bin/apr-config
-APU_CONFIG=   ${LOCALBASE}/bin/apu-config
+IGNORE=	please update to apache22
 .endif
 .else
 LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1

devel/subversion16/Makefile.common

@@ -91,16 +91,14 @@ SVNUSER?=	svn
 .endif
 
 .if defined(WITH_APACHE)
-USE_APACHE=   20+
+USE_APACHE=   22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${APACHE_VERSION} > 20
 LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
 APR_CONFIG=   ${LOCALBASE}/bin/apr-1-config
 APU_CONFIG=   ${LOCALBASE}/bin/apu-1-config
 .else
-LIB_DEPENDS+= apr-0:${PORTSDIR}/devel/apr0
-APR_CONFIG=   ${LOCALBASE}/bin/apr-config
-APU_CONFIG=   ${LOCALBASE}/bin/apu-config
+IGNORE=	please update to apache22
 .endif
 .else
 LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1

devel/viewvc/Makefile

@@ -57,7 +57,7 @@ RUN_DEPENDS+=	${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/p
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	20+
+USE_APACHE_RUN=	22+
 .endif
 
 .if ${PORT_OPTIONS:MLIGHTTPD}

french/facturier/Makefile

@@ -23,7 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/htmldoc:${PORTSDIR}/textproc/htmldoc			\
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 NO_BUILD=	yes
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 USE_PERL5_RUN=	yes
 USE_MYSQL=	yes
 

games/hlstatsx/Makefile

@@ -16,7 +16,7 @@ MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Real-time player and clan rankings and statistics for HL2 and mods
 
 NO_BUILD=	yes
-USE_APACHE=	20+
+USE_APACHE=	22+
 USE_PHP=	gd mysql
 USE_PERL5_RUN=	yes
 USE_ZIP=	yes

graphics/mapserver/Makefile

@@ -77,13 +77,13 @@ CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE} --with-tiff=${LOCALBASE} --with-png=${L
 .endif
 
 .if defined(WITH_WMS)
-WITH_CURL=		YES
+WITH_CURL=		yes
 CONFIGURE_ARGS+=	--with-wms --with-wmsclient
 .endif
 
 .if defined(WITH_WFS)
-WITH_CURL=		YES
-WITH_GDAL=		YES
+WITH_CURL=		yes
+WITH_GDAL=		yes
 CONFIGURE_ARGS+=	--with-wfs --with-wfsclient
 .endif
 
@@ -99,13 +99,13 @@ CONFIGURE_ARGS+=	--with-geos=${LOCALBASE}/bin/geos-config
 .endif
 
 .if defined(WITH_MYGIS)
-USE_MYSQL=		YES
+USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mygis=${LOCALBASE}/bin/mysql_config
 .endif
 
 .if defined(WITH_POSTGIS)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libpgport.a:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-USE_PGSQL=		YES
+USE_PGSQL=		yes
 DEFAULT_PGSQL_VER=	83
 CONFIGURE_ARGS+=	--with-postgis=${LOCALBASE}/bin/pg_config
 .endif

lang/php5/Makefile

@@ -117,7 +117,7 @@ IGNORE=		cannot be built with multiple SAPI (apache and embedded)
 
 .if ${PORT_OPTIONS:MAPACHE}
 PHP_SAPI+=	mod
-USE_APACHE=	20+
+USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}

lang/php52/Makefile

@@ -143,7 +143,7 @@ CONFIGURE_ARGS+=--disable-cgi
 
 .if defined(WITH_APACHE)
 PHP_SAPI+=	mod
-USE_APACHE=	20+
+USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod

lang/php53/Makefile

@@ -109,7 +109,7 @@ PLIST_SUB+=	FPM="@comment "
 
 .if ${PORT_OPTIONS:MAPACHE}
 PHP_SAPI+=	mod
-USE_APACHE=	20+
+USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}

mail/dracmail/Makefile

@@ -36,7 +36,7 @@ OPTIONS=	POSTGRE "Use PostgreSQL Database" off \
 USE_PHP+=	pgsql
 .endif
 .if defined(WITH_APACHE)
-USE_APACHE=	22
+USE_APACHE_RUN=	22
 .endif
 .if defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd

mail/dspam-devel/Makefile

@@ -414,7 +414,7 @@ CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 .	if defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
 .	else
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 .	endif
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD

mail/dspam/Makefile

@@ -398,7 +398,7 @@ CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 .	if defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
 .	else
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 .	endif
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD

mail/p5-qpsmtpd/Makefile

@@ -32,7 +32,7 @@ MOD_PERL_DESC=	"Apache Support via mod_perl"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMODPERL}
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
 .endif
 

mail/sympa/Makefile

@@ -91,7 +91,7 @@ USE_MYSQL=	yes
 .if defined(WITH_FASTCGI)
 RUN_DEPENDS+=	p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
 . if !defined(WITHOUT_APACHE)
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 RUN_DEPENDS+=   ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 . endif
 .endif

mail/vqregister/Makefile

@@ -17,7 +17,7 @@ COMMENT=	An extremely admin-configurable email user signup CGI
 BUILD_DEPENDS=	${VPOPMAIL_DIR}:${PORTSDIR}/mail/vpopmail
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_APACHE_RUN=	20+
+USE_APACHE_RUN=	22+
 VPOPMAIL_DIR?=	${LOCALBASE}/vpopmail
 
 USE_MYSQL=	yes

misc/instant-server/Makefile

@@ -28,7 +28,7 @@ SAMBA_PORT?=	net/samba34
 # Don't let stupid programs ask for configuration.
 
 BATCH=		YES
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 NO_BUILD=	yes
 
 # comms/hylafax irc/ircd-hybrid

net-mgmt/argus-monitor/Makefile

@@ -27,7 +27,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_PERL5=	yes
 USE_RC_SUBR=	argusd
 HAS_CONFIGURE=	yes
-USE_APACHE=	20+
+USE_APACHE=	22+
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	--bin_dir=${PREFIX}/bin --sbin_dir=${PREFIX}/sbin \
 		--lib_dir=${PREFIX}/lib/argus-monitor --data_dir=${PREFIX}/etc/argus-monitor \

net-mgmt/netdisco/Makefile

@@ -36,7 +36,7 @@ GROUPS=		netdisco
 
 USE_PERL5=	yes
 USE_PGSQL=	yes
-USE_APACHE=	20+
+USE_APACHE=	22+
 
 USE_RC_SUBR=	netdisco
 

net-mgmt/ocsinventory-ng/Makefile

@@ -24,7 +24,7 @@ RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
 		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
 		p5-XML-Entities>=0:${PORTSDIR}/textproc/p5-XML-Entities
 
-USE_APACHE=	20+
+USE_APACHE=	22+
 USE_MYSQL=	41+
 USE_PERL5=	5.8.0+
 WANT_PHP_WEB=	yes

net-mgmt/ourmon/Makefile

@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap \
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 
 WRKSRC=			${WRKDIR}/mrourmon
-USE_APACHE=		20+
+USE_APACHE_RUN=		22+
 USE_PERL5=		yes
 NO_BUILD=		yes
 NO_INSTALL_MANPAGES=	yes

net-mgmt/pandorafms_console/Makefile

@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/twopi:${PORTSDIR}/graphics/graphviz
 
 OPTIONS=	PGSQL "Use PostgreSQL backend (experimental)" off
 
-USE_APACHE=	20+
+USE_APACHE=	22+
 USE_PHP=	curl gd gettext json ldap mbstring mysql snmp session \
 		xml zip zlib
 WANT_PHP_WEB=	yes

net-p2p/rtgui/Makefile

@@ -23,7 +23,7 @@ BUILD_DEPENDS+=	xmlrpc-c-config:${PORTSDIR}/net/xmlrpc-c
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
-USE_APACHE=	20+
+USE_APACHE=	22+
 BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_scgi.so:${PORTSDIR}/www/mod_scgi
 .elif defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd

net/p5-Apache2-SOAP/Makefile

@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-USE_APACHE=	20+
+USE_APACHE=	22+
 
 MAN3=		Apache2::SOAP.3
 

net/prosearch/Makefile

@@ -32,8 +32,7 @@ OPTIONS=\
 		CRAWLER "With crawler deps (nmap, p5-libwww)" on \
 		SAMBA "crawler with SAMBA (file://)" on \
 		RSYNC " crawler with RSYNC " off \
-		APACH22 "With web server apache2.2+" on \
-		APACH20 "With web server apache2.0+" off \
+		APACHE "With web server apache2.2+" on \
 		MOD_PERL2 "With MOD_PERL2" off \
 		MOD_FASTCGI "With MOD_FASTCGI" off \
 		DB "With database server deps" on \
@@ -69,14 +68,10 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-smbclient
 RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
 .endif
 
-.if defined(WITH_APACH22)
+.if defined(WITH_APACHE)
 USE_APACHE=	22+
 .endif
 
-.if defined(WITH_APACH20)
-USE_APACHE=	20+
-.endif
-
 .if defined(WITH_NGINX)
 RUN_DEPENDS+=\
 nginx:${PORTSDIR}/www/nginx

ports-mgmt/tinderbox-devel/Makefile

@@ -75,7 +75,7 @@ RUN_DEPENDS+=	p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MY
 .endif
 
 .if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI)
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 .elif defined(WITH_LIGHTTPD) && defined(WITH_WEBUI)
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .elif defined(WITH_HIAWATHA) && defined(WITH_WEBUI)

ports-mgmt/tinderbox/Makefile

@@ -74,7 +74,7 @@ RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
 .if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI)
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 .elif defined(WITH_LIGHTTPD) && defined(WITH_WEBUI)
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .elif defined(WITH_HIAWATHA) && defined(WITH_WEBUI)

print/openprinting/Makefile

@@ -59,8 +59,9 @@ CONFIGURE_ARGS+=\
 
 # NOTE: This has only been tested with www/apache20, with integrated APR.
 .if defined(WITH_MOD_IPP)
-USE_APACHE=	20
-CONFIGURE_ARGS+=--with-apache=${LOCALBASE}
+IGNORE=	no supported apache versions available
+#USE_APACHE=	20
+#CONFIGURE_ARGS+=--with-apache=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-apache
 .endif

security/maia/Makefile

@@ -94,7 +94,7 @@ USE_RC_SUBR+=	maiad
 # setting USE_ variables. C'est la vie.
 
 .if defined(WITH_APACHE)
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 .endif
 
 .if defined(WITH_WEBHOST)

security/openscep/Makefile

@@ -19,7 +19,7 @@ MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
 USE_OPENSSL=	yes
 USE_OPENLDAP=	yes
-USE_APACHE=	20+
+USE_APACHE=	22+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes

security/phpdeadlock/Makefile

@@ -21,7 +21,7 @@ DLDIR=		www/${DLURL}
 PORTDOCS=	CHANGES.txt COPYING.txt UPGRADE.txt
 
 USE_DOS2UNIX=	yes
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 USE_PHP=	mysql session ctype pcre
 NO_BUILD=	yes
 

security/shibboleth2-sp/Makefile

@@ -36,8 +36,9 @@ CONFIGURE_ARGS=	--enable-apache-22 --with-apxs22=${APXS}
 PLIST_SUB+=	WITH_APACHE_22=""
 PLIST_SUB+=	WITH_APACHE_20="@comment "
 .else
-USE_APACHE=	20
-CONFIGURE_ARGS=	--enable-apache-20 --with-apxs2=${APXS} --with-apr=${PREFIX}/lib/apache2/apr-config --with-apu=${PREFIX}/lib/apache2/apu-config
+IGNORE=	apache20 is no longer available
+#USE_APACHE=	20
+#CONFIGURE_ARGS=	--enable-apache-20 --with-apxs2=${APXS} --with-apr=${PREFIX}/lib/apache2/apr-config --with-apu=${PREFIX}/lib/apache2/apu-config
 PLIST_SUB+=	WITH_APACHE_22="@comment "
 PLIST_SUB+=	WITH_APACHE_20=""
 .endif

sysutils/dtc/Makefile

@@ -53,7 +53,7 @@ NO_BUILD=	yes
 USE_PHP=	mysql pcre session
 MAN8=		dtc-chroot-shell.8 dtc-chroot-wrapper.8
 MANCOMPRESSED=	no
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 
 .if defined(WITH_PHP5)
 DEFAULT_PHP_VER=5

sysutils/froxlor/Makefile

@@ -38,7 +38,7 @@ OPTIONS=	APACHE "Use Apache (2.2) as http server" On \
 .include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_APACHE)
-USE_APACHE=	22
+USE_APACHE_RUN=	22
 .endif
 
 .if !defined(WITHOUT_MYSQL)

textproc/htdig/Makefile

@@ -39,7 +39,7 @@ OPTIONS=	APACHE "Include ${APACHE_PORT} as a dependency" on
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
-USE_APACHE=	20+
+USE_APACHE=	22+
 CONFIGURE_ARGS+=	--with-apache=${LOCALBASE}/sbin
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 PLIST_DIRSTRY+=	www/cgi-bin www/data www/icons

www/MT/Makefile

@@ -56,7 +56,7 @@ USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
 .if defined(WITH_APACHE)
-USE_APACHE=	20+
+USE_APACHE_RUN=	22+
 SUB_FILES+=	MT.conf
 SUB_LIST+=	DATADIR=${PREFIX}/${DATADIR} CGIDIR=${PREFIX}/${CGIDIR} \
 		APACHEETCDIR=${PREFIX}/${APACHEETCDIR} \

www/Makefile

@@ -19,7 +19,6 @@
     SUBDIR += aolserver-xotcl
     SUBDIR += apache-forrest
     SUBDIR += apache-mode.el
-    SUBDIR += apache20
     SUBDIR += apache22
     SUBDIR += apache22-event-mpm
     SUBDIR += apache22-itk-mpm

www/apache20/Makefile

@@ -1,231 +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.64
-PORTREVISION=	3
-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?=	apache@FreeBSD.org
-COMMENT?=	Version 2.0.x of Apache web server with ${WITH_MPM:L} MPM.
-
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
-	pcre:${PORTSDIR}/devel/pcre \
-	apr-0:${PORTSDIR}/devel/apr0
-
-USERS=	www
-GROUPS=	www
-
-MAKE_JOBS_SAFE=	yes
-
-DEPRECATED=	will be unsupported by ASF when 2.4.0 is release, migrate to 2.2.x+ now
-EXPIRATION_DATE=	2012-01-01
-
-LATEST_LINK=	apache20
-
-CONFLICTS=	apache-2.2.* apache-*-2.2.* \
-		caudium14-1.*
-
-## XXX: Every possible option for things in Makefile.modules needs to be
-## XXX: in OPTIONS too, or its not passed to make.
-#OPTIONS=	\
-#	IPV6                    "Enable IPv6 support"                   On  \
-#	BDB                     "Enable BerkeleyDB dbm"                 Off \
-#	KQUEUE_SUPPORT          "Enable kqueue in bundled apr"          Off \
-#	SSL                     "Enable SSL support"                    On  \
-#	SSL_EXPERIMENTAL_ENGINE "Use Experimental SSL engine"           Off \
-#	DEBUG                   "Enable debugging"                      Off \
-#	EXCEPTION_HOOK          "Enable Exception Hook"                 On  \
-#	LDAP                    "Enable LDAP Support"                   Off \
-#	THREADS                 "Enable threads in apr"                 Off
-
-USE_ICONV=		yes
-USE_AUTOTOOLS=		autoconf libtool
-USE_PERL5=		yes
-USE_RC_SUBR=		apache2
-USE_APACHE=		common20
-LIBTOOLFILES=		configure.in
-USE_BZIP2=		yes
-
-MPM_ITK_VERSION?=	20061030-01
-
-.if defined(WITH_SUEXEC_RSRCLIMIT)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-suexec_rsrclimit
-.if !defined(WITH_SUEXEC)
-IGNORE=	suEXEC resource limit patch requires mod_suexec.\
-	Please add 'WITH_SUEXEC=YES' to you /etc/make.conf
-.endif
-.endif
-
-CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
-		--enable-layout=FreeBSD \
-		--with-perl=${PERL5} \
-		--with-port=${WITH_HTTP_PORT} \
-		--with-expat=${LOCALBASE} \
-		--with-iconv=${LOCALBASE} \
-		--with-apr=${LOCALBASE}/bin/apr-config \
-		--with-apr-util=${LOCALBASE}/bin/apu-config \
-		--libdir=${PREFIX_RELDEST}/lib/apache2 \
-		--includedir=${PREFIX_RELDEST}/include/apache2
-
-CONFIGURE_ENV=	\
-	CONFIG_SHELL="${SH}" \
-	LOCALBASE="${LOCALBASE}"
-
-PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
-
-MAKE_ENV+=	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+=	--enable-ldap=shared --enable-auth-ldap=shared --with-ldap \
-	--with-ldap-lib="${LOCALBASE}/lib" \
-	--with-ldap-include="${LOCALBASE}/include"
-.endif
-
-.include "${APACHEDIR}/Makefile.doc"
-.include "${APACHEDIR}/Makefile.modules"
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPENSSL_PORT)
-EXTRA_PATCHES+=	${FILESDIR}/extra-openssl-9.8up.patch
-.endif
-
-.if ${OSVERSION} < 700014 && ${ARCH} == i386
-USE_PKGCONFIG=	yes
-.endif
-
-.if defined(WITH_THREADS)
-CONFIGURE_ARGS+=	--enable-threads
-.   if ${ARCH} == i386
-CONFIGURE_ARGS+=	--enable-nonportable-atomics
-.   endif
-.endif
-
-CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L}
-
-show-options:
-	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
-
-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}	""
-
-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
-	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
-	@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
-	@${RM} -rf ${WRKSRC}/srclib/pcre ${WRKSRC}/include/pcreposix.h
-	@${RM} -rf ${WRKSRC}/srclib/apr ${WRKSRC}/srclib/apr-util
-	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' ${WRKSRC}/server/core.c
-	@${REINPLACE_CMD} -e "s,\$abs_builddir/srclib/pcre/libpcre.la,${LOCALBASE}/lib/libpcre.la," ${WRKSRC}/configure.in
-	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
-
-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
-
-post-install:
-	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
-	@${MKDIR} ${PREFIX}/etc/apache2/Includes
-	@${ECHO_CMD} ""
-	@${CAT} ${PKGMESSAGE}
-.if !defined(NOPORTDOCS)
-	@[ -d ${DOCSDIR}/style/lang/ ] && ${TOUCH} ${DOCSDIR}/style/lang/.keepme
-.endif
-
-.include <bsd.port.post.mk>

www/apache20/Makefile.doc

@@ -1,150 +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_BDB:             Define to select bdb via bsd.database.mk
-##                                desired version may be set with
-##                                WITH_BDB_VER or APACHE22_WITH_BDB_VER
-##          WITH_BDB_BASE:        Define to use bdb from base (1.85)
-##      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]
-##
-## 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 ;-)

www/apache20/Makefile.modules

@@ -1,117 +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:
-# WITH_MPM: prefork worker perchild threadpool itk
-
-.if ${WITH_MPM:L} == "prefork"
-PLIST_SUB+=		WORKER="@comment " THREADPOOL="@comment "
-
-.elif ${WITH_MPM:L} == "worker"
-PLIST_SUB+=		WORKER="" THREADPOOL="@comment "
-
-.elif ${WITH_MPM:L} == "threadpool"
-PLIST_SUB+=		WORKER="@comment " THREADPOOL=""
-
-.elif ${WITH_MPM:L} == "perchild"
-PLIST_SUB+=		WORKER="@comment " THREADPOOL="@comment "
-
-.elif ${WITH_MPM:L} == "itk"
-PLIST_SUB+=		WORKER="@comment " THREADPOOL="@comment "
-EXTRA_PATCHES+=		${PATCHDIR}/mpm-itk-${MPM_ITK_VERSION}
-
-.else
-IGNORE=			"Unknown MPM: ${WITH_MPM}"
-.endif	# MPM prefork
-
-.if ${WITH_MPM:L} != "prefork"
-PKGNAMESUFFIX=		-${WITH_MPM:L}
-.endif
-
-.if ${WITH_MPM:L} == "worker" || ${WITH_MPM:L} == "perchild" || ${WITH_MPM:L} == "threadpool"
-WITH_THREADS=		yes
-WITH_THREADS_MODULES=	yes
-WITHOUT_MODULES+=	CGI
-.endif
-
-# xDBM section
-#
-.if !defined(WITH_DBM)
-.   if defined(WITH_BDB) || defined(WITH_BDB_BASE) || defined(WITH_BERKELEYDB)
-WITH_DBM=	bdb
-.   endif
-.endif
-
-.if defined(WITH_BERKELEYDB) && !defined(WITH_BDB_VER)
-.   if ${WITH_BERKELEYDB} == "FreeBSD"
-WITH_BDB_BASE=	yes
-.   else
-WITH_BDB_VER=	${WITH_BERKELEYDB:S/db//}
-.   endif
-.endif
-
-.if defined(WITH_DBM)
-.   if ${WITH_DBM:L} == "sdbm"
-CONFIGURE_ARGS+=	--with-dbm=sdbm
-.   elif ${WITH_DBM:L} == "ndbm"
-CONFIGURE_ARGS+=	--with-ndbm
-.   elif ${WITH_DBM:L} == "gdbm"
-LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE}
-.   elif ${WITH_DBM:L} == "db" || ${WITH_DBM:L} == "bdb"
-.	if defined(WITH_BDB_BASE)
-CONFIGURE_ARGS+=	--with-dbm=db185 \
-			--with-berkeley-db=/usr
-.	else
-USE_BDB=		yes
-INVALID_BDB_VER=	46 47
-CONFIGURE_ARGS+=	--with-dbm=db${BDB_VER:S/40/4/} \
-			--with-berkeley-db=${LOCALBASE}
-.	endif
-.   else
-.   else
-IGNORE=		"Unknown DBM"
-.   endif
-.else
-CONFIGURE_ARGS+=	--with-dbm=sdbm
-.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 \
-			DUMPIO
-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

www/apache20/distinfo

@@ -1,4 +0,0 @@
-SHA256 (apache2/httpd-2.0.64.tar.bz2) = f7a4eb022eaa5f2d84e558b526481c599a42415817547aacb9abc758428114a7
-SIZE (apache2/httpd-2.0.64.tar.bz2) = 4954766
-SHA256 (apache2/powerlogo.gif) = 0144675a80761b9660bdb652d331d9ba3bebdff89c0fa35a56aa463662a53254
-SIZE (apache2/powerlogo.gif) = 5279

www/apache20/files/apache2.in

@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: apache2
-# REQUIRE: LOGIN cleanvar
-# KEYWORD: 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 (str):     Set to "" by default.
-#                              Define your profiles here.
-# 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.
-
-. /etc/rc.subr
-
-name="apache2"
-rcvar=apache2_enable
-
-start_precmd="apache2_precmd"
-restart_precmd="apache2_checkconfig"
-reload_precmd="apache2_checkconfig"
-reload_cmd="apache2_graceful"
-graceful_cmd="apache2_graceful"
-configtest_cmd="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 "$apache2limits_enable" ] && apache2limits_enable="NO"
-[ -z "$apache2limits_args" ]   && apache2limits_args="-e -C daemon"
-
-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:-}"
-		if [ "x${apache2_configfile}" = "x" ]; then
-			echo "You must define a configuration file (apache2_${profile}_configfile)"
-			exit 1
-		fi
-		required_files="${apache2_configfile}"
-		eval apache2_enable="\${apache2_${profile}_enable:-${apache2_enable}}"
-		eval apache2ssl_enable=\${apache2ssl_${profile}_enable:-NO}
-		eval apache2_flags="\${apache2_${profile}_flags:-${apache2_flags}}"
-		eval apache2_http_accept_enable="\${apache2_${profile}_http_accept_enable:-${apache2_http_accept_enable}}"
-		eval apache2limits_enable="\${apache2limits_${profile}_enable:-${apache2limits_enable}}"
-		eval apache2limits_args="\${apache2limits_${profile}_args:-${apache2limits_args}}"
-		apache2_flags="-f ${apache2_configfile} -c \"PidFile ${pidfile}\" ${apache2_flags}"
-	else
-		echo "$0: extra argument ignored"
-	fi
-else
-	if [ "x${apache2_profiles}" != "x" -a "x$1" != "x" ]; then
-		for profile in ${apache2_profiles}; do
-			echo "===> apache2 profile: ${profile}"
-			%%PREFIX%%/etc/rc.d/apache2 $1 ${profile}
-			retcode="$?"
-			if [ "0${retcode}" -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"
-
-apache2_requirepidfile()
-{
-	if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then
-		echo "${name} not running? (check $pidfile)."
-		exit 1
-	fi
-}
-
-apache2_checkconfig()
-{
-	if test -f %%PREFIX%%/sbin/envvars
-	then
-		. %%PREFIX%%/sbin/envvars
-	fi
-
-	echo "Performing sanity check on apache2 configuration:"
-	eval ${command} ${apache2_flags} -t
-}
-
-apache2_graceful() {
-	apache2_requirepidfile
-
-	echo "Performing a graceful restart"
-	eval ${command} ${apache2_flags} -k graceful
-}
-
-apache2_precmd() 
-{
-	apache2_checkconfig
-
-	if checkyesno apache2limits_enable
-	then
-		eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null
-	else
-		return 0
-        fi
-}
-
-extra_commands="reload graceful configtest"
-run_rc_command "$1"

www/apache20/files/extra-openssl-9.8up.patch

@@ -1,40 +0,0 @@
---- ./modules/ssl/ssl_engine_init.c.orig	2010-05-06 16:52:31.600756207 -0400
-+++ ./modules/ssl/ssl_engine_init.c	2010-05-06 16:53:33.937798326 -0400
-@@ -531,7 +531,7 @@
-             ssl_die();
-         }
- 
--        SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list);
-+        SSL_CTX_set_client_CA_list(ctx, ca_list);
-     }
- 
-     /*
---- ./modules/ssl/ssl_util_ssl.c.orig	2010-05-06 16:52:50.473746445 -0400
-+++ ./modules/ssl/ssl_util_ssl.c	2010-05-06 16:54:44.811924436 -0400
-@@ -291,7 +291,7 @@
- #ifdef HAVE_SSL_X509V3_EXT_d2i
-     X509_EXTENSION *ext;
-     int ext_nid;
--    STACK *sk;
-+    STACK_OF(SSL_CIPHER) *sk;
-     BOOL is_sgc;
-     int idx;
-     int i;
-@@ -300,7 +300,7 @@
-     idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
-     if (idx >= 0) {
-         ext = X509_get_ext(cert, idx);
--        if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
-+        if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
-             for (i = 0; i < sk_num(sk); i++) {
-                 ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
-                 if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
-@@ -466,7 +466,7 @@
-     X509 *x509;
-     unsigned long err;
-     int n;
--    STACK *extra_certs;
-+    STACK_OF(X509) *extra_certs;
- 
-     if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
-         return -1;

www/apache20/files/extra-patch-suexec_rsrclimit

@@ -1,50 +0,0 @@
-diff -Nru support/Makefile.in.orig1 support/Makefile.in
---- support/Makefile.in.orig1	2010-05-14 10:05:11.000000000 +0400
-+++ support/Makefile.in	2010-05-14 10:05:41.000000000 +0400
-@@ -57,7 +57,7 @@
- 
- suexec_OBJECTS = suexec.lo
- suexec: $(suexec_OBJECTS)
--	$(LINK) $(suexec_OBJECTS)
-+	$(LINK) -lutil $(suexec_OBJECTS)
- 
- httxt2dbm_OBJECTS = httxt2dbm.lo
- httxt2dbm: $(httxt2dbm_OBJECTS)
-diff -Nru support/suexec.c.orig1 support/suexec.c
---- support/suexec.c.orig1	2006-07-12 11:40:55.000000000 +0400
-+++ support/suexec.c	2010-05-14 10:05:41.000000000 +0400
-@@ -37,6 +37,7 @@
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <login_cap.h>
- #include <string.h>
- #include <time.h>
- #if APR_HAVE_UNISTD_H
-@@ -242,6 +243,7 @@
-     char *cmd;              /* command to be executed    */
-     char cwd[AP_MAXPATH];   /* current working directory */
-     char dwd[AP_MAXPATH];   /* docroot working directory */
-+    login_cap_t *lc;        /* user resource limits      */
-     struct passwd *pw;      /* password entry holder     */
-     struct group *gr;       /* group entry holder        */
-     struct stat dir_info;   /* directory info holder     */
-@@ -448,6 +450,18 @@
-     }
- 
-     /*
-+     * Apply user resource limits based on login class.
-+     */
-+    if ((lc = login_getclassbyname(pw->pw_class, pw)) == NULL) {
-+               log_err("failed to login_getclassbyname()\n");
-+               exit(109);
-+       }
-+       if ((setusercontext(lc, pw, uid, LOGIN_SETRESOURCES)) != 0) {
-+               log_err("failed to setusercontext()\n");
-+               exit(109);
-+       }
-+
-+    /*
-      * Change UID/GID here so that the following tests work over NFS.
-      *
-      * Initialize the group access list for the target user,

www/apache20/files/patch-Makefile.in

@@ -1,166 +0,0 @@
---- ./Makefile.in.orig	2010-05-23 19:54:31.000000000 -0400
-+++ ./Makefile.in	2010-05-23 19:54:22.083759943 -0400
-@@ -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,31 +79,23 @@
- 	    				-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 
- 	@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
- 	@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
- 	cp build/*.mk $(DESTDIR)$(installbuilddir); \
--	sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
--	    build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
- 	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
- 	cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
- 
-@@ -108,44 +109,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)
-@@ -179,7 +176,6 @@
- 	@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
- 	@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
- 	@cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir)
--	@cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)
- 	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
- 	@chmod 644 $(DESTDIR)$(includedir)/*.h
- 
-@@ -191,8 +187,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 \

www/apache20/files/patch-acinclude.m4

@@ -1,21 +0,0 @@
---- ./acinclude.m4.orig	2008-01-07 10:01:56.000000000 -0500
-+++ ./acinclude.m4	2010-05-06 16:06:03.732834004 -0400
-@@ -169,13 +169,17 @@
- 
-   if test -z "$module_standalone"; then
-     if test -z "$2"; then
--      libname="mod_$1.la"
-+      # The filename of a convenience library must have a "lib" prefix:
-+      libname="libmod_$1.la"
-       BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
-       modpath_static="$modpath_static $libname"
-       cat >>$modpath_current/modules.mk<<EOF
- $libname: $objects
- 	\$(MOD_LINK) $objects $5
- EOF
-+      if test ! -z "$5"; then
-+        APR_ADDTO(AP_LIBS, [$5])
-+      fi
-     else
-       apache_need_shared=yes
-       libname="mod_$1.la"

www/apache20/files/patch-build__library.mk

@@ -1,8 +0,0 @@
---- ./build/library.mk.orig	2006-07-12 03:40:55.000000000 -0400
-+++ ./build/library.mk	2010-05-06 16:06:03.733831899 -0400
-@@ -19,4 +19,4 @@
- LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
- 
- $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
--	$(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
-+	$(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)

www/apache20/files/patch-build__rules.mk.in

@@ -1,11 +0,0 @@
---- ./build/rules.mk.in.orig	2006-07-12 03:40:55.000000000 -0400
-+++ ./build/rules.mk.in	2010-05-06 16:06:03.734831750 -0400
-@@ -45,7 +45,7 @@
- 
- LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
- SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
--MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-+MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
- 
- # Cross compile commands
- 

www/apache20/files/patch-build__special.mk

@@ -1,11 +0,0 @@
---- ./build/special.mk.orig	2006-07-12 03:40:55.000000000 -0400
-+++ ./build/special.mk	2010-05-06 16:06:03.734831750 -0400
-@@ -26,7 +26,7 @@
- install-modules:
- 	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir);
- 	@builtin='$(BUILTIN_LIBS)'; \
--	has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \
-+	has_mod_so=`echo $$builtin|sed 's/^.*libmod_so.*$$/has_mod_so/'`; \
- 	if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \
- 		list='$(shared)'; \
- 		for i in $$list; do \

www/apache20/files/patch-configure.in

@@ -1,41 +0,0 @@
---- ./configure.in.orig	2009-05-29 14:44:26.000000000 +0000
-+++ ./configure.in	2010-10-21 05:40:35.808628475 +0000
-@@ -124,11 +124,6 @@
- AC_PROG_CC
- AC_PROG_CPP
- 
--echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
--
--APR_SUBDIR_CONFIG(srclib/pcre,
--                  [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
--
- echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
- 
- dnl Absolute source/build directory
-@@ -172,7 +167,7 @@
-       LIBTOOL="$my_libtool \$(LTFLAGS)"
-       libtoolversion=`$my_libtool --version`
-       case $libtoolversion in
--          *1.[[45]]*)
-+          *1.[[45]]* | *[[2-9]].[[0-9]]*)
-               SH_LIBTOOL='$(LIBTOOL)'
-               SHLTCFLAGS="-prefer-pic"
-               LTCFLAGS="-prefer-non-pic -static"
-@@ -490,7 +485,7 @@
-   AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
- 
- dnl AP_LIBS specifies the actual libraries. note we have some required libs.
--AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS"
-+AP_LIBS="$a/usr/local/lib/libpcre.la $AP_LIBS"
- 
- dnl APR should go after the other libs, so the right symbols can be picked up
- AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"
-@@ -531,7 +526,7 @@
- APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
- APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile os/Makefile)
- APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)
--APACHE_FAST_OUTPUT(support/Makefile srclib/pcre/Makefile)
-+APACHE_FAST_OUTPUT(support/Makefile) 
- 
- if test -d ./test; then
-     APACHE_FAST_OUTPUT(test/Makefile)

www/apache20/files/patch-docs__conf__httpd-std.conf.in

@@ -1,127 +0,0 @@
---- ./docs/conf/httpd-std.conf.in.orig	2008-03-22 00:00:26.000000000 +0000
-+++ ./docs/conf/httpd-std.conf.in	2010-10-21 05:40:35.666621609 +0000
-@@ -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
-@@ -1040,3 +1046,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

www/apache20/files/patch-docs__conf__ssl-std.conf.in

@@ -1,22 +0,0 @@
---- ./docs/conf/ssl-std.conf.in.orig	2005-11-13 12:13:06.000000000 -0500
-+++ ./docs/conf/ssl-std.conf.in	2010-05-06 16:06:03.726831828 -0400
-@@ -86,8 +86,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.
-@@ -238,7 +238,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>                                  

www/apache20/files/patch-include__ap_mmn.h

@@ -1,19 +0,0 @@
---- ./include/ap_mmn.h.orig	2010-10-21 05:47:06.975621911 +0000
-+++ ./include/ap_mmn.h	2010-10-21 05:48:25.311622079 +0000
-@@ -88,12 +88,15 @@
-  * 20020903.12 (2.0.56-dev) added ap_get_server_revision / ap_version_t
-  * 20020903.13 (2.0.62-dev) Add *ftp_directory_charset to proxy_dir_conf
-  * 20020903.14 (2.0.64-dev) added ap_vhost_iterate_given_conn
-+ * 20050127.0  (2.1.3-dev)  renamed regex_t->ap_regex_t, regmatch_t->ap_regmatch_t,
-+ *                          REG_*->AP_REG_*, removed reg* in place of ap_reg*;
-+ *                          added ap_regex.h
-  */
- 
- #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
- 
- #ifndef MODULE_MAGIC_NUMBER_MAJOR
--#define MODULE_MAGIC_NUMBER_MAJOR 20020903
-+#define MODULE_MAGIC_NUMBER_MAJOR 20050127
- #endif
- #define MODULE_MAGIC_NUMBER_MINOR 14                    /* 0...n */
- 

www/apache20/files/patch-include__ap_regex.h

@@ -1,148 +0,0 @@
---- ./include/ap_regex.h.orig	2010-10-21 05:40:53.671621395 +0000
-+++ ./include/ap_regex.h	2010-10-21 05:40:53.672627949 +0000
-@@ -0,0 +1,145 @@
-+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
-+ * applicable.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+/* This is the header for the POSIX wrapper interface to the PCRE Perl-
-+Compatible Regular Expression library. It defines the things POSIX says should
-+be there. I hope.
-+
-+            Copyright (c) 1997-2004 University of Cambridge
-+
-+-----------------------------------------------------------------------------
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+
-+    * Redistributions of source code must retain the above copyright notice,
-+      this list of conditions and the following disclaimer.
-+
-+    * Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+
-+    * Neither the name of the University of Cambridge nor the names of its
-+      contributors may be used to endorse or promote products derived from
-+      this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGE.
-+-----------------------------------------------------------------------------
-+*/
-+
-+#ifndef AP_REGEX_H
-+#define AP_REGEX_H
-+
-+/* Have to include stdlib.h in order to ensure that size_t is defined. */
-+
-+#include <stdlib.h>
-+
-+/* Allow for C++ users */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* Options for ap_regexec: */
-+
-+#define AP_REG_ICASE    0x01 /** use a case-insensitive match */
-+#define AP_REG_NEWLINE  0x02 /** don't match newlines against '.' etc */
-+#define AP_REG_NOTBOL   0x04 /** ^ will not match against start-of-string */
-+#define AP_REG_NOTEOL   0x08 /** $ will not match against end-of-string */
-+
-+#define AP_REG_EXTENDED (0)  /** unused */
-+#define AP_REG_NOSUB    (0)  /** unused */
-+
-+/* Error values: */
-+enum {
-+  AP_REG_ASSERT = 1,  /** internal error ? */
-+  AP_REG_ESPACE,      /** failed to get memory */
-+  AP_REG_INVARG,      /** invalid argument */
-+  AP_REG_NOMATCH      /** match failed */
-+};
-+
-+/* The structure representing a compiled regular expression. */
-+typedef struct {
-+  void *re_pcre;
-+  size_t re_nsub;
-+  size_t re_erroffset;
-+} ap_regex_t;
-+
-+typedef int regoff_t;
-+
-+/* The structure in which a captured offset is returned. */
-+typedef struct {
-+  regoff_t rm_so;
-+  regoff_t rm_eo;
-+} ap_regmatch_t;
-+
-+#ifndef AP_DECLARE
-+#define AP_DECLARE(x) x
-+#endif /* AP_DECLARE */
-+
-+/* The functions */
-+
-+/**
-+ * Compile a regeular expression.
-+ * @param preg Returned compiled regex
-+ * @param regex The regular expression string
-+ * @param cflags Must be zero (currently).
-+ * @return Zero on success or non-zero on error
-+ */
-+AP_DECLARE(int) ap_regcomp(ap_regex_t *preg, const char *regex, int cflags);
-+
-+/**
-+ * Match a null-terminated string against a pre-compiled regex.
-+ * @param preg The pre-compiled regex
-+ * @param string The string to match
-+ * @param nmatch Provide information regarding the location of any matches
-+ * @param pmatch Provide information regarding the location of any matches
-+ * @param eflags Bitwise OR of any of AP_REG_* flags 
-+ * @return 0 for successful match, #REG_NOMATCH otherwise
-+ */ 
-+AP_DECLARE(int) ap_regexec(const ap_regex_t *preg, const char *string,
-+                           size_t nmatch, ap_regmatch_t *pmatch, int eflags);
-+
-+/**
-+ * Return the error code returned by regcomp or regexec into error messages
-+ * @param errcode the error code returned by regexec or regcomp
-+ * @param preg The precompiled regex
-+ * @param errbuf A buffer to store the error in
-+ * @param errbuf_size The size of the buffer
-+ */
-+AP_DECLARE(size_t) ap_regerror(int errcode, const ap_regex_t *preg, 
-+                               char *errbuf, size_t errbuf_size);
-+
-+/** Destroy a pre-compiled regex.
-+ * @param preg The pre-compiled regex to free.
-+ */
-+AP_DECLARE(void) ap_regfree(ap_regex_t *preg);
-+
-+#ifdef __cplusplus
-+}   /* extern "C" */
-+#endif
-+
-+#endif /* AP_REGEX_T */
-+

www/apache20/files/patch-include__http_core.h

@@ -1,11 +0,0 @@
---- ./include/http_core.h.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./include/http_core.h	2010-10-21 05:40:55.842621572 +0000
-@@ -493,7 +493,7 @@
-     
-     /* Access control */
-     apr_array_header_t *sec_file;
--    regex_t *r;
-+    ap_regex_t *r;
- 
-     const char *mime_type;       /* forced with ForceType  */
-     const char *handler;         /* forced with SetHandler */

www/apache20/files/patch-include__httpd.h

@@ -1,65 +0,0 @@
---- ./include/httpd.h.orig	2010-10-07 22:24:15.000000000 +0000
-+++ ./include/httpd.h	2010-10-21 05:40:55.841622281 +0000
-@@ -41,7 +41,7 @@
- 
- #include "os.h"
- 
--#include "pcreposix.h"
-+#include "ap_regex.h"
- 
- /* Note: util_uri.h is also included, see below */
- 
-@@ -1523,40 +1523,15 @@
-  *   @li #REG_NEWLINE  - Match-any-character operators don't match new-line
-  * @return The compiled regular expression
-  */
--AP_DECLARE(regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
--				   int cflags);
--
-+AP_DECLARE(ap_regex_t *) ap_pregcomp(apr_pool_t *p, const char *pattern,
-+                                     int cflags);
-+    
- /**
-  * Free the memory associated with a compiled regular expression
-  * @param p The pool the regex was allocated from
-  * @param reg The regular expression to free
-  */
--AP_DECLARE(void) ap_pregfree(apr_pool_t *p, regex_t *reg);
--
--/**
-- * Match a null-terminated string against a pre-compiled regex.
-- * @param preg The pre-compiled regex
-- * @param string The string to match
-- * @param nmatch Provide information regarding the location of any matches
-- * @param pmatch Provide information regarding the location of any matches
-- * @param eflags Bitwise or of any of:
-- *   @li #REG_NOTBOL - match-beginning-of-line operator always
-- *     fails to match
-- *   @li #REG_NOTEOL - match-end-of-line operator always fails to match
-- * @return 0 for successful match, #REG_NOMATCH otherwise
-- */ 
--AP_DECLARE(int)    ap_regexec(regex_t *preg, const char *string,
--                              size_t nmatch, regmatch_t pmatch[], int eflags);
--
--/**
-- * Return the error code returned by regcomp or regexec into error messages
-- * @param errcode the error code returned by regexec or regcomp
-- * @param preg The precompiled regex
-- * @param errbuf A buffer to store the error in
-- * @param errbuf_size The size of the buffer
-- */
--AP_DECLARE(size_t) ap_regerror(int errcode, const regex_t *preg, 
--                               char *errbuf, size_t errbuf_size);
-+AP_DECLARE(void) ap_pregfree(apr_pool_t *p, ap_regex_t *reg);
- 
- /**
-  * After performing a successful regex match, you may use this function to 
-@@ -1570,7 +1545,7 @@
-  * @param pmatch the pmatch array returned from ap_pregex
-  */
- AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input, const char *source,
--                              size_t nmatch, regmatch_t pmatch[]);
-+                              size_t nmatch, ap_regmatch_t pmatch[]);
- 
- /**
-  * We want to downcase the type/subtype for comparison purposes

www/apache20/files/patch-modules__experimental__config.m4

@@ -1,11 +0,0 @@
---- modules/experimental/config.m4.orig	2010-05-07 00:41:44.796911069 -0400
-+++ modules/experimental/config.m4	2010-05-07 00:41:27.000000000 -0400
-@@ -33,7 +33,7 @@
- ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
- APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no)
- 
--auth_ldap_objects="mod_auth_ldap.lo"
-+auth_ldap_objects="mod_auth_ldap.lo $ldap_objects"
- APACHE_MODULE(auth_ldap, LDAP based authentication, $auth_ldap_objects, , no)
- 
- APACHE_MODPATH_FINISH

www/apache20/files/patch-modules__filters__mod_include.c

@@ -1,17 +0,0 @@
---- ./modules/filters/mod_include.c.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/filters/mod_include.c	2010-10-21 05:40:53.670622104 +0000
-@@ -1173,11 +1173,11 @@
- static int re_check(request_rec *r, include_ctx_t *ctx, 
-                     char *string, char *rexp)
- {
--    regex_t *compiled;
--    const apr_size_t nres = sizeof(*ctx->re_result) / sizeof(regmatch_t);
-+    ap_regex_t *compiled;
-+    const apr_size_t nres = sizeof(*ctx->re_result) / sizeof(ap_regmatch_t);
-     int regex_error;
- 
--    compiled = ap_pregcomp(r->pool, rexp, REG_EXTENDED | REG_NOSUB);
-+    compiled = ap_pregcomp(r->pool, rexp, AP_REG_EXTENDED | AP_REG_NOSUB);
-     if (compiled == NULL) {
-         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                       "unable to compile pattern \"%s\"", rexp);

www/apache20/files/patch-modules__filters__mod_include.h

@@ -1,11 +0,0 @@
---- ./modules/filters/mod_include.h.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/filters/mod_include.h	2010-10-21 05:40:55.843621981 +0000
-@@ -140,7 +140,7 @@
-     int          start_seq_len;
-     char         *end_seq;
-     char         *re_string;
--    regmatch_t   (*re_result)[10];
-+    ap_regmatch_t   (*re_result)[10];
- } include_ctx_t;
- 
- /* These flags are used to set flag bits. */

www/apache20/files/patch-modules__mappers__mod_alias.c

@@ -1,47 +0,0 @@
---- ./modules/mappers/mod_alias.c.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/mappers/mod_alias.c	2010-10-21 05:40:53.667623114 +0000
-@@ -40,7 +40,7 @@
-     const char *real;
-     const char *fake;
-     char *handler;
--    regex_t *regexp;
-+    ap_regex_t *regexp;
-     int redir_status;                /* 301, 302, 303, 410, etc */
- } alias_entry;
- 
-@@ -112,7 +112,7 @@
-     /* XX r can NOT be relative to DocumentRoot here... compat bug. */
- 
-     if (use_regex) {
--        new->regexp = ap_pregcomp(cmd->pool, f, REG_EXTENDED);
-+        new->regexp = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED);
-         if (new->regexp == NULL)
-             return "Regular expression could not be compiled.";
-         new->real = r;
-@@ -176,7 +176,7 @@
-     alias_server_conf *serverconf = ap_get_module_config(s->module_config,
-                                                          &alias_module);
-     int status = (int) (long) cmd->info;
--    regex_t *r = NULL;
-+    ap_regex_t *r = NULL;
-     const char *f = arg2;
-     const char *url = arg3;
- 
-@@ -196,7 +196,7 @@
-     }
- 
-     if (use_regex) {
--        r = ap_pregcomp(cmd->pool, f, REG_EXTENDED);
-+        r = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED);
-         if (r == NULL)
-             return "Regular expression could not be compiled.";
-     }
-@@ -314,7 +314,7 @@
-                             int doesc, int *status)
- {
-     alias_entry *entries = (alias_entry *) aliases->elts;
--    regmatch_t regm[AP_MAX_REG_MATCH];
-+    ap_regmatch_t regm[AP_MAX_REG_MATCH];
-     char *found = NULL;
-     int i;
- 

www/apache20/files/patch-modules__mappers__mod_rewrite.c

@@ -1,66 +0,0 @@
---- ./modules/mappers/mod_rewrite.c.orig	2006-07-27 17:07:21.000000000 +0000
-+++ ./modules/mappers/mod_rewrite.c	2010-10-21 05:40:53.666621309 +0000
-@@ -552,7 +552,7 @@
-     char *str = apr_pstrdup(cmd->pool, in_str);
-     rewrite_server_conf *sconf;
-     rewritecond_entry *newcond;
--    regex_t *regexp;
-+    ap_regex_t *regexp;
-     char *a1;
-     char *a2;
-     char *a3;
-@@ -602,11 +602,11 @@
-        we can compile the pattern for case insensitive matching,
-        under the old V8 library we have to do it self via a hack */
-     if (newcond->flags & CONDFLAG_NOCASE) {
--        rc = ((regexp = ap_pregcomp(cmd->pool, cp, REG_EXTENDED|REG_ICASE))
-+        rc = ((regexp = ap_pregcomp(cmd->pool, cp, AP_REG_EXTENDED|AP_REG_ICASE))
-               == NULL);
-     }
-     else {
--        rc = ((regexp = ap_pregcomp(cmd->pool, cp, REG_EXTENDED)) == NULL);
-+        rc = ((regexp = ap_pregcomp(cmd->pool, cp, AP_REG_EXTENDED)) == NULL);
-     }
-     if (rc) {
-         return apr_pstrcat(cmd->pool,
-@@ -697,7 +697,7 @@
-     char *str = apr_pstrdup(cmd->pool, in_str);
-     rewrite_server_conf *sconf;
-     rewriterule_entry *newrule;
--    regex_t *regexp;
-+    ap_regex_t *regexp;
-     char *a1;
-     char *a2;
-     char *a3;
-@@ -743,9 +743,9 @@
-         newrule->flags |= RULEFLAG_NOTMATCH;
-         cp++;
-     }
--    mode = REG_EXTENDED;
-+    mode = AP_REG_EXTENDED;
-     if (newrule->flags & RULEFLAG_NOCASE) {
--        mode |= REG_ICASE;
-+        mode |= AP_REG_ICASE;
-     }
-     if ((regexp = ap_pregcomp(cmd->pool, cp, mode)) == NULL) {
-         return apr_pstrcat(cmd->pool,
-@@ -1945,8 +1945,8 @@
-     char *output;
-     const char *vary;
-     char newuri[MAX_STRING_LEN];
--    regex_t *regexp;
--    regmatch_t regmatch[AP_MAX_REG_MATCH];
-+    ap_regex_t *regexp;
-+    ap_regmatch_t regmatch[AP_MAX_REG_MATCH];
-     backrefinfo *briRR = NULL;
-     backrefinfo *briRC = NULL;
-     int failed;
-@@ -2303,7 +2303,7 @@
-     char input[MAX_STRING_LEN];
-     apr_finfo_t sb;
-     request_rec *rsub;
--    regmatch_t regmatch[AP_MAX_REG_MATCH];
-+    ap_regmatch_t regmatch[AP_MAX_REG_MATCH];
-     int rc;
- 
-     /*

www/apache20/files/patch-modules__mappers__mod_rewrite.h

@@ -1,28 +0,0 @@
---- ./modules/mappers/mod_rewrite.h.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/mappers/mod_rewrite.h	2010-10-21 05:40:53.667623114 +0000
-@@ -199,14 +199,14 @@
- typedef struct {
-     char    *input;                /* Input string of RewriteCond */
-     char    *pattern;              /* the RegExp pattern string */
--    regex_t *regexp;
-+    ap_regex_t *regexp;
-     int      flags;                /* Flags which control the match */
- } rewritecond_entry;
- 
- typedef struct {
-     apr_array_header_t *rewriteconds;    /* the corresponding RewriteCond entries */
-     char    *pattern;              /* the RegExp pattern string */
--    regex_t *regexp;               /* the RegExp pattern compilation */
-+    ap_regex_t *regexp;               /* the RegExp pattern compilation */
-     char    *output;               /* the Substitution string */
-     int      flags;                /* Flags which control the substitution */
-     char    *forced_mimetype;      /* forced MIME type of substitution */
-@@ -290,7 +290,7 @@
- typedef struct backrefinfo {
-     char *source;
-     int nsub;
--    regmatch_t regmatch[AP_MAX_REG_MATCH];
-+    ap_regmatch_t regmatch[AP_MAX_REG_MATCH];
- } backrefinfo;
- 
- 

www/apache20/files/patch-modules__metadata__mod_headers.c

@@ -1,27 +0,0 @@
---- ./modules/metadata/mod_headers.c.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/metadata/mod_headers.c	2010-10-21 05:40:53.655623801 +0000
-@@ -113,7 +113,7 @@
-     hdr_actions action;
-     char *header;
-     apr_array_header_t *ta;   /* Array of format_tag structs */
--    regex_t *regex;
-+    ap_regex_t *regex;
-     const char *condition_var;
- } header_entry;
- 
-@@ -344,13 +344,13 @@
-             return "header unset takes two arguments";
-     }
-     else if (new->action == hdr_echo) {
--        regex_t *regex;
-+        ap_regex_t *regex;
-         if (value)
-             return "Header echo takes two arguments";
-         else if (cmd->info == &hdr_in)
-             return "Header echo only valid on Header directive";
-         else {
--            regex = ap_pregcomp(cmd->pool, hdr, REG_EXTENDED | REG_NOSUB);
-+            regex = ap_pregcomp(cmd->pool, hdr, AP_REG_EXTENDED | AP_REG_NOSUB);
-             if (regex == NULL) {
-                 return "Header echo regex could not be compiled";
-             }

www/apache20/files/patch-modules__metadata__mod_setenvif.c

@@ -1,63 +0,0 @@
---- ./modules/metadata/mod_setenvif.c.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/metadata/mod_setenvif.c	2010-10-21 05:40:53.656624209 +0000
-@@ -106,9 +106,9 @@
- };
- typedef struct {
-     char *name;                 /* header name */
--    regex_t *pnamereg;          /* compiled header name regex */
-+    ap_regex_t *pnamereg;       /* compiled header name regex */
-     char *regex;                /* regex to match against */
--    regex_t *preg;              /* compiled regex */
-+    ap_regex_t *preg;           /* compiled regex */
-     const apr_strmatch_pattern *pattern; /* non-regex pattern to match */
-     apr_table_t *features;      /* env vars to set (or unset) */
-     enum special special_type;  /* is it a "special" header ? */
-@@ -159,7 +159,7 @@
- }
- 
- /*
-- * any non-NULL magic constant will do... used to indicate if REG_ICASE should
-+ * any non-NULL magic constant will do... used to indicate if AP_REG_ICASE should
-  * be used
-  */
- #define ICASE_MAGIC	((void *)(&setenvif_module))
-@@ -171,8 +171,8 @@
-      *    -,_,[A-Z\, [a-z] and [0-9].
-      * assume the header name is a regular expression.
-      */
--    regex_t *preg = ap_pregcomp(p, "^[-A-Za-z0-9_]*$",
--                                (REG_EXTENDED | REG_NOSUB ));
-+    ap_regex_t *preg = ap_pregcomp(p, "^[-A-Za-z0-9_]*$",
-+                                   (AP_REG_EXTENDED | AP_REG_NOSUB ));
-     ap_assert(preg != NULL);
- 
-     if (ap_regexec(preg, name, 0, NULL, 0)) {
-@@ -318,7 +318,7 @@
-         }
-         else {
-             new->preg = ap_pregcomp(cmd->pool, regex,
--                                    (REG_EXTENDED | (icase ? REG_ICASE : 0)));
-+                                    (AP_REG_EXTENDED | (icase ? AP_REG_ICASE : 0)));
-             if (new->preg == NULL) {
-                 return apr_pstrcat(cmd->pool, cmd->cmd->name,
-                                    " regex could not be compiled.", NULL);
-@@ -354,8 +354,8 @@
-              */
-             if (is_header_regex(cmd->pool, fname)) {
-                 new->pnamereg = ap_pregcomp(cmd->pool, fname,
--                                            (REG_EXTENDED | REG_NOSUB
--                                             | (icase ? REG_ICASE : 0)));
-+                                            (AP_REG_EXTENDED | AP_REG_NOSUB
-+                                             | (icase ? AP_REG_ICASE : 0)));
-                 if (new->pnamereg == NULL)
-                     return apr_pstrcat(cmd->pool, cmd->cmd->name,
-                                        "Header name regex could not be "
-@@ -453,7 +453,7 @@
-     apr_size_t val_len = 0;
-     int i, j;
-     char *last_name;
--    regmatch_t regm[AP_MAX_REG_MATCH];
-+    ap_regmatch_t regm[AP_MAX_REG_MATCH];
- 
-     if (!ap_get_module_config(r->request_config, &setenvif_module)) {
-         ap_set_module_config(r->request_config, &setenvif_module,

www/apache20/files/patch-modules__metadata__mod_usertrack.c

@@ -1,29 +0,0 @@
---- ./modules/metadata/mod_usertrack.c.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/metadata/mod_usertrack.c	2010-10-21 05:40:53.653628850 +0000
-@@ -84,7 +84,7 @@
-     char *cookie_name;
-     char *cookie_domain;
-     char *regexp_string;  /* used to compile regexp; save for debugging */
--    regex_t *regexp;  /* used to find usertrack cookie in cookie header */
-+    ap_regex_t *regexp;  /* used to find usertrack cookie in cookie header */
- } cookie_dir_rec;
- 
- /* Make Cookie: Now we have to generate something that is going to be
-@@ -201,7 +201,7 @@
-                                       cookie_name,
-                                       "=([^;]+)", NULL);
- 
--    dcfg->regexp = ap_pregcomp(p, dcfg->regexp_string, REG_EXTENDED);
-+    dcfg->regexp = ap_pregcomp(p, dcfg->regexp_string, AP_REG_EXTENDED);
-     ap_assert(dcfg->regexp != NULL);
- }
- 
-@@ -210,7 +210,7 @@
-     cookie_dir_rec *dcfg = ap_get_module_config(r->per_dir_config,
- 						&usertrack_module);
-     const char *cookie_header;
--    regmatch_t regm[NUM_SUBS];
-+    ap_regmatch_t regm[NUM_SUBS];
- 
-     /* Do not run in subrequests */
-     if (!dcfg->enabled || r->main) {

www/apache20/files/patch-modules__metadata__mod_version.c

@@ -1,16 +0,0 @@
---- ./modules/metadata/mod_version.c.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/metadata/mod_version.c	2010-10-21 05:40:53.654632332 +0000
-@@ -142,11 +142,11 @@
- static int match_version(apr_pool_t *pool, char *version_string,
-                          const char **error)
- {
--    regex_t *compiled;
-+    ap_regex_t *compiled;
-     const char *to_match;
-     int rc;
- 
--    compiled = ap_pregcomp(pool, version_string, REG_EXTENDED);
-+    compiled = ap_pregcomp(pool, version_string, AP_REG_EXTENDED);
-     if (!compiled) {
-         *error = "Unable to compile regular expression";
-         return 0;

www/apache20/files/patch-modules__proxy__mod_proxy.c

@@ -1,47 +0,0 @@
---- ./modules/proxy/mod_proxy.c.orig	2008-01-03 13:42:06.000000000 +0000
-+++ ./modules/proxy/mod_proxy.c	2010-10-21 05:40:53.657622382 +0000
-@@ -573,7 +573,7 @@
-     struct proxy_remote *new;
-     char *p, *q;
-     char *r, *f, *scheme;
--    regex_t *reg = NULL;
-+    ap_regex_t *reg = NULL;
-     int port;
- 
-     r = apr_pstrdup(cmd->pool, r1);
-@@ -603,7 +603,7 @@
-         port = -1;
-     *p = '\0';
-     if (regex) {
--        reg = ap_pregcomp(cmd->pool, f, REG_EXTENDED);
-+        reg = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED);
-         if (!reg)
-             return "Regular expression for ProxyRemoteMatch could not be compiled.";
-     }
-@@ -970,7 +970,7 @@
-     char *old_path = cmd->path;
-     proxy_dir_conf *conf;
-     ap_conf_vector_t *new_dir_conf = ap_create_per_dir_config(cmd->pool);
--    regex_t *r = NULL;
-+    ap_regex_t *r = NULL;
-     const command_rec *thiscmd = cmd->cmd;
- 
-     const char *err = ap_check_cmd_context(cmd,
-@@ -1004,7 +1004,7 @@
-      * scheme?  See proxy_fixup()
-      */
-     if (thiscmd->cmd_data) { /* <ProxyMatch> */
--        r = ap_pregcomp(cmd->pool, cmd->path, REG_EXTENDED);
-+        r = ap_pregcomp(cmd->pool, cmd->path, AP_REG_EXTENDED);
-         if (!r) {
-             return "Regex could not be compiled";
-         }
-@@ -1015,7 +1015,7 @@
-             return "<Proxy ~ > block must specify a path";
-         if (strncasecmp(cmd->path, "proxy:", 6))
-             cmd->path += 6;
--        r = ap_pregcomp(cmd->pool, cmd->path, REG_EXTENDED);
-+        r = ap_pregcomp(cmd->pool, cmd->path, AP_REG_EXTENDED);
-         if (!r) {
-             return "Regex could not be compiled";
-         }

www/apache20/files/patch-modules__proxy__mod_proxy.h

@@ -1,30 +0,0 @@
---- ./modules/proxy/mod_proxy.h.orig	2008-01-03 13:42:06.000000000 +0000
-+++ ./modules/proxy/mod_proxy.h	2010-10-21 05:40:53.658621114 +0000
-@@ -90,12 +90,12 @@
- 
- /* static information about a remote proxy */
- struct proxy_remote {
--    const char *scheme;		/* the schemes handled by this proxy, or '*' */
--    const char *protocol;	/* the scheme used to talk to this proxy */
--    const char *hostname;	/* the hostname of this proxy */
--    apr_port_t  port;		/* the port for this proxy */
--    regex_t *regexp;		/* compiled regex (if any) for the remote */
--    int use_regex;		/* simple boolean. True if we have a regex pattern */
-+    const char *scheme;     /* the schemes handled by this proxy, or '*' */
-+    const char *protocol;   /* the scheme used to talk to this proxy */
-+    const char *hostname;   /* the hostname of this proxy */
-+    apr_port_t  port;       /* the port for this proxy */
-+    ap_regex_t *regexp;        /* compiled regex (if any) for the remote */
-+    int use_regex;          /* simple boolean. True if we have a regex pattern */
- };
- 
- struct proxy_alias {
-@@ -165,7 +165,7 @@
- typedef struct {
-     const char *p;            /* The path */
-     int         p_is_fnmatch; /* Is this path an fnmatch candidate? */
--    regex_t    *r;            /* Is this a regex? */
-+    ap_regex_t  *r;            /* Is this a regex? */
-     const char *ftp_directory_charset;
- } proxy_dir_conf;
- 

www/apache20/files/patch-modules__proxy__proxy_ftp.c

@@ -1,17 +0,0 @@
---- ./modules/proxy/proxy_ftp.c.orig	2010-05-13 19:18:50.000000000 +0000
-+++ ./modules/proxy/proxy_ftp.c	2010-10-21 05:40:53.660623887 +0000
-@@ -426,11 +426,11 @@
-         int found = 0;
-         int eos = 0;
- 
--        regex_t *re = NULL;
--        regmatch_t re_result[LS_REG_MATCH];
-+        ap_regex_t *re = NULL;
-+        ap_regmatch_t re_result[LS_REG_MATCH];
- 
-         /* Compile the output format of "ls -s1" as a fallback for non-unix ftp listings */
--        re = ap_pregcomp(p, LS_REG_PATTERN, REG_EXTENDED);
-+        re = ap_pregcomp(p, LS_REG_PATTERN, AP_REG_EXTENDED);
-         ap_assert(re != NULL);
- 
-         /* get a complete line */

www/apache20/files/patch-modules__ssl__mod_ssl.h

@@ -1,11 +0,0 @@
---- ./modules/ssl/mod_ssl.h.orig	2007-05-08 19:08:47.000000000 -0400
-+++ ./modules/ssl/mod_ssl.h	2010-05-06 16:06:03.737831861 -0400
-@@ -90,7 +90,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>

www/apache20/files/patch-modules__ssl__ssl_expr_eval.c

@@ -1,31 +0,0 @@
---- ./modules/ssl/ssl_expr_eval.c.orig	2006-07-12 07:40:55.000000000 +0000
-+++ ./modules/ssl/ssl_expr_eval.c	2010-10-21 05:40:53.660623887 +0000
-@@ -126,24 +126,24 @@
-             ssl_expr *e1;
-             ssl_expr *e2;
-             char *word;
--            regex_t *regex;
-+            ap_regex_t *regex;
- 
-             e1 = (ssl_expr *)node->node_arg1;
-             e2 = (ssl_expr *)node->node_arg2;
-             word = ssl_expr_eval_word(r, e1);
--            regex = (regex_t *)(e2->node_arg1);
-+            regex = (ap_regex_t *)(e2->node_arg1);
-             return (ap_regexec(regex, word, 0, NULL, 0) == 0);
-         }
-         case op_NRE: {
-             ssl_expr *e1;
-             ssl_expr *e2;
-             char *word;
--            regex_t *regex;
-+            ap_regex_t *regex;
- 
-             e1 = (ssl_expr *)node->node_arg1;
-             e2 = (ssl_expr *)node->node_arg2;
-             word = ssl_expr_eval_word(r, e1);
--            regex = (regex_t *)(e2->node_arg1);
-+            regex = (ap_regex_t *)(e2->node_arg1);
-             return !(ap_regexec(regex, word, 0, NULL, 0) == 0);
-         }
-         default: {

www/apache20/files/patch-modules__ssl__ssl_expr_parse.c

@@ -1,26 +0,0 @@
---- ./modules/ssl/ssl_expr_parse.c.orig	2010-10-14 18:00:30.000000000 +0000
-+++ ./modules/ssl/ssl_expr_parse.c	2010-10-21 05:40:53.661622060 +0000
-@@ -818,9 +818,9 @@
- case 24:
- #line 148 "ssl_expr_parse.y"
- { 
--                regex_t *regex;
-+                ap_regex_t *regex;
-                 if ((regex = ap_pregcomp(ssl_expr_info.pool, ssl_expr_yyvsp[0].cpVal, 
--                                         REG_EXTENDED|REG_NOSUB)) == NULL) {
-+                                         AP_REG_EXTENDED|AP_REG_NOSUB)) == NULL) {
-                     ssl_expr_error = "Failed to compile regular expression";
-                     YYERROR;
-                     regex = NULL;
-@@ -831,9 +831,9 @@
- case 25:
- #line 158 "ssl_expr_parse.y"
- {
--                regex_t *regex;
-+                ap_regex_t *regex;
-                 if ((regex = ap_pregcomp(ssl_expr_info.pool, ssl_expr_yyvsp[0].cpVal, 
--                                         REG_EXTENDED|REG_NOSUB|REG_ICASE)) == NULL) {
-+                                         AP_REG_EXTENDED|AP_REG_NOSUB|AP_REG_ICASE)) == NULL) {
-                     ssl_expr_error = "Failed to compile regular expression";
-                     YYERROR;
-                     regex = NULL;

www/apache20/files/patch-modules__ssl__ssl_expr_parse.y

@@ -1,25 +0,0 @@
---- ./modules/ssl/ssl_expr_parse.y.orig	2010-10-14 18:00:24.000000000 +0000
-+++ ./modules/ssl/ssl_expr_parse.y	2010-10-21 05:40:53.662624424 +0000
-@@ -113,18 +113,18 @@
-           ;
- 
- regex     : T_REGEX { 
--                regex_t *regex;
-+                ap_regex_t *regex;
-                 if ((regex = ap_pregcomp(ssl_expr_info.pool, $1, 
--                                         REG_EXTENDED|REG_NOSUB)) == NULL) {
-+                                         AP_REG_EXTENDED|AP_REG_NOSUB)) == NULL) {
-                     ssl_expr_error = "Failed to compile regular expression";
-                     YYERROR;
-                 }
-                 $$ = ssl_expr_make(op_Regex, regex, NULL);
-             }
-           | T_REGEX_I {
--                regex_t *regex;
-+                ap_regex_t *regex;
-                 if ((regex = ap_pregcomp(ssl_expr_info.pool, $1, 
--                                         REG_EXTENDED|REG_NOSUB|REG_ICASE)) == NULL) {
-+                                         AP_REG_EXTENDED|AP_REG_NOSUB|AP_REG_ICASE)) == NULL) {
-                     ssl_expr_error = "Failed to compile regular expression";
-                     YYERROR;
-                 }

www/apache20/files/patch-modules__ssl__ssl_toolkit_compat.h

@@ -1,16 +0,0 @@
---- ./modules/ssl/ssl_toolkit_compat.h.orig	2006-07-12 03:40:55.000000000 -0400
-+++ ./modules/ssl/ssl_toolkit_compat.h	2010-05-06 16:43:34.888290876 -0400
-@@ -121,6 +121,13 @@
- #endif
- #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 */

www/apache20/files/patch-server__Makefile.in

@@ -1,11 +0,0 @@
---- ./server/Makefile.in.orig	2006-03-09 21:30:38.000000000 +0000
-+++ ./server/Makefile.in	2010-10-21 05:40:53.644623499 +0000
-@@ -13,7 +13,7 @@
- 	util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \
- 	rfc1413.c connection.c listen.c \
- 	mpm_common.c util_charset.c util_debug.c util_xml.c \
--	util_filter.c exports.c buildmark.c \
-+	util_filter.c util_pcre.c buildmark.c exports.c \
- 	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
- 	eoc_bucket.c
-