- bump PORTREVISION from ports if USE_APACHE=13+ or 20+ is defined

author: Olli Hauer <ohauer@FreeBSD.org> 2011-08-20 17:27:52 +0000
committer: Olli Hauer <ohauer@FreeBSD.org> 2011-08-20 17:27:52 +0000
commit: 7a0bd317631d50743f0a374e87553b67823ce01b (patch)
tree: a6a20687ac7deead25a53b4c03118c3a00060775 /www
parent: - change default mod_perl version, else the port will not build (diff)
121 files changed, 192 insertions, 150 deletions
diff --git a/www/MT/Makefile b/www/MT/Makefile
index 2362590d6aee..cb24331736de 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -55,7 +55,7 @@ USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
 .if defined(WITH_APACHE)
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 SUB_FILES+=	MT.conf
 SUB_LIST+=	DATADIR=${PREFIX}/${DATADIR} CGIDIR=${PREFIX}/${CGIDIR} \
 		APACHEETCDIR=${PREFIX}/${APACHEETCDIR} \
diff --git a/www/blogsum/Makefile b/www/blogsum/Makefile
index 20cb3524e023..61a6bdd77160 100644
--- a/www/blogsum/Makefile
+++ b/www/blogsum/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blogsum
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.dixongroup.net/
 
@@ -24,7 +24,7 @@ PERL_MODULES=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
-USE_APACHE_RUN=	1.3+
+USE_APACHE_RUN=	13+
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/cakephp11/Makefile b/www/cakephp11/Makefile
index b33cee5ceb77..806edd87e46d 100644
--- a/www/cakephp11/Makefile
+++ b/www/cakephp11/Makefile
@@ -20,7 +20,7 @@ LATEST_LINK=	cakephp11
 
 USE_BZIP2=	yes
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 SLAVE_PORT_MODULES=	rewrite
 
 CONFLICTS=	cakephp-1.[23].*
diff --git a/www/cakephp12/Makefile b/www/cakephp12/Makefile
index 1ddcd4f8d6b1..e2ead565ed73 100644
--- a/www/cakephp12/Makefile
+++ b/www/cakephp12/Makefile
@@ -66,7 +66,7 @@ SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
 .if defined(WITH_AP)
 SUB_FILES=	pkg-message
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 PKGMESSAGE=	pkg-message
 APDEP=
 .else
diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile
index 1ddcd4f8d6b1..e2ead565ed73 100644
--- a/www/cakephp13/Makefile
+++ b/www/cakephp13/Makefile
@@ -66,7 +66,7 @@ SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
 .if defined(WITH_AP)
 SUB_FILES=	pkg-message
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 PKGMESSAGE=	pkg-message
 APDEP=
 .else
diff --git a/www/cakephp2/Makefile b/www/cakephp2/Makefile
index 1ddcd4f8d6b1..e2ead565ed73 100644
--- a/www/cakephp2/Makefile
+++ b/www/cakephp2/Makefile
@@ -66,7 +66,7 @@ SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
 .if defined(WITH_AP)
 SUB_FILES=	pkg-message
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 PKGMESSAGE=	pkg-message
 APDEP=
 .else
diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile
index 43827c9cc562..21240396d77e 100644
--- a/www/codeigniter/Makefile
+++ b/www/codeigniter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	codeigniter
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://bitbucket.org/ellislab/codeigniter-reactor/get/
 PKGNAMESUFFIX=	-devel
@@ -77,7 +78,7 @@ OPTIONS=	APACHE "Configure for Apache-2.x" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
diff --git a/www/codeigniter17/Makefile b/www/codeigniter17/Makefile
index 060026fc8e28..99cdc7d95b6b 100644
--- a/www/codeigniter17/Makefile
+++ b/www/codeigniter17/Makefile
@@ -70,7 +70,7 @@ OPTIONS=	APACHE "Configure for Apache-2.x" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index b654b6c14e78..8db11c254daa 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dansguardian
 PORTVERSION=	2.10.1.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 
@@ -49,7 +50,7 @@ RESTRICTED=	Redistribution and commercial download is restricted.  Check ${DG_UR
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 .endif
 
 .if !defined(WITHOUT_TRICKLE)
diff --git a/www/dojo/Makefile b/www/dojo/Makefile
index 434564344b67..158a20a7ef5f 100644
--- a/www/dojo/Makefile
+++ b/www/dojo/Makefile
@@ -22,7 +22,7 @@ OPTIONS=		APACHE  "Configure for Apache-2.x" off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=		2.0+
+USE_APACHE=		20+
 CONFDIR=		${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=		${APACHEETCDIR}/Includes
 PLIST_SUB+=		NOAPACHE="" CONFDIR=${CONFDIR_REL}
diff --git a/www/dotproject/Makefile b/www/dotproject/Makefile
index 46efb9a00c47..23a90f06ff98 100644
--- a/www/dotproject/Makefile
+++ b/www/dotproject/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dotproject
 PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/dotProject%20Version%20${PORTVERSION}
 
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 USE_PHP=	gd mysql session zlib
 WANT_PHP_WEB=	yes
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 
 SUB_FILES=	pkg-message
 
diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index cc4270136847..c1c8d53329de 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dpsearch
 PORTVERSION=	4.53
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://dataparksearch.googlecode.com/files/ \
 		http://www.dataparksearch.org/
@@ -100,7 +100,7 @@ CONFIGURE_ARGS+=--enable-idn
 .endif
 
 .if defined(WITH_DPSEARCH_APACHE)
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 PLIST_SUB+=	APACHE=""
 CONFIGURE_ARGS+=--enable-apache-module
 .else
diff --git a/www/formication/Makefile b/www/formication/Makefile
index ff79b1d2ef5d..3803e9827aff 100644
--- a/www/formication/Makefile
+++ b/www/formication/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	formication
 PORTVERSION=	1.0.b1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.ranner.eu/stuff/ \
 		http://home.bluelife.at/ports/distfiles/
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.ranner.eu/stuff/ \
 MAINTAINER=	michael@ranner.eu
 COMMENT=	Formular processing tool written in perl
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/www/ftasv/Makefile b/www/ftasv/Makefile
index 8ad042e9f4e4..fc36f7942db8 100644
--- a/www/ftasv/Makefile
+++ b/www/ftasv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ftasv
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://fabletech.com/${PORTNAME}-download/
 
@@ -15,7 +15,7 @@ MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Is a commandline scoreboard viewer for the Apache server
 
 GNU_CONFIGURE=	yes
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 PLIST_FILES=	sbin/ftasv
 SUB_FILES=	pkg-message
diff --git a/www/gforge/Makefile b/www/gforge/Makefile
index 20515516fcdf..9146b31ed06c 100644
--- a/www/gforge/Makefile
+++ b/www/gforge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gforge
 PORTVERSION=	4.5.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 MASTER_SITES=	http://gforge.org/gf/download/frsrelease/150/245/
 
@@ -21,7 +21,7 @@ LICENSE=		GPLv2
 USE_BZIP2=		YES
 USE_PERL5=		YES
 HAS_CONFIGURE=		YES
-USE_APACHE=		1.3+
+USE_APACHE=		13+
 USE_AUTOTOOLS=	autoconf
 NO_BUILD=		YES
 USE_PHP=		pgsql session pcre
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index e839181c1bc1..657d8fa9b1b4 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 USE_XORG=	sm
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2
 GNU_CONFIGURE=	yes
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 7c6e84c646f4..3391c7163eb8 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libapreq2
 PORTVERSION=	2.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=libapreq
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Generic Apache2 Request Library
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf libtool
diff --git a/www/mimetex/Makefile b/www/mimetex/Makefile
index dda7b2f3709f..72efb7a94176 100644
--- a/www/mimetex/Makefile
+++ b/www/mimetex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mimetex
 PORTVERSION=	20080906.1.70
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www math
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${DIST_SUBDIR}/ \
 		http://www.forkosh.com/
@@ -18,7 +18,7 @@ MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A CGI script that lets you embed LaTeX math in your HTML pages
 
 NO_WRKSUBDIR=	yes
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_ZIP=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/www/mod_antiloris/Makefile b/www/mod_antiloris/Makefile
index 409d3060d564..4d81428336be 100644
--- a/www/mod_antiloris/Makefile
+++ b/www/mod_antiloris/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_antiloris
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.monshouwer.eu/pub/linux/mod_antiloris/
 
diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile
index c8ca78bcec0a..f73dee00fc5a 100644
--- a/www/mod_asn/Makefile
+++ b/www/mod_asn/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Look up the AS and network prefix of IP address
 
 LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr1
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 AP_FAST_BUILD=	YES
 MANUAL_PACKAGE_BUILD=	devel/apr1 with pgsql option required
 
diff --git a/www/mod_auth_cas/Makefile b/www/mod_auth_cas/Makefile
index 398296633caa..1588dd45c732 100644
--- a/www/mod_auth_cas/Makefile
+++ b/www/mod_auth_cas/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_auth_cas
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	www
 #MASTER_SITES=	https://www.ja-sig.org/svn/cas-clients/mod_auth_cas/tags/mod_auth_cas-1.0.8/src/
 # SVN tags only, *sigh*
@@ -21,7 +22,7 @@ MAKE_JOBS_SAFE=	yes
 
 NO_WRKSUBDIR=	yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_auth_cookie_mysql2/Makefile b/www/mod_auth_cookie_mysql2/Makefile
index b9900ffcca5c..aab6987bbaca 100644
--- a/www/mod_auth_cookie_mysql2/Makefile
+++ b/www/mod_auth_cookie_mysql2/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mod_auth_cookie_mysql2
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/
 DISTNAME=	${PORTNAME}_1.0
diff --git a/www/mod_auth_external2/Makefile b/www/mod_auth_external2/Makefile
index 0592525f2d67..8c8806b1fcf8 100644
--- a/www/mod_auth_external2/Makefile
+++ b/www/mod_auth_external2/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mod_auth_external
 PORTVERSION=	2.2.11
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.unixpapa.com/software/
 DIST_SUBDIR=	apache20
diff --git a/www/mod_auth_form/Makefile b/www/mod_auth_form/Makefile
index e71c2891e862..b3d89c5a2081 100644
--- a/www/mod_auth_form/Makefile
+++ b/www/mod_auth_form/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_auth_form
 PORTVERSION=	2.05
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://comp.uark.edu/~ajarthu/mod_auth_form/download.php?download=v2_05/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ MAKE_JOBS_SAFE=  yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_MYSQL=	YES
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MYSQL_PREFIX="${LOCALBASE}" APACHE2_PREFIX="${LOCALBASE}" \
diff --git a/www/mod_auth_imap2/Makefile b/www/mod_auth_imap2/Makefile
index ef603650ecad..5819a65bfcd0 100644
--- a/www/mod_auth_imap2/Makefile
+++ b/www/mod_auth_imap2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_auth_imap
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ben.brillat.net/files/projects/mod_auth_imap2/
 DISTNAME=	mod_auth_imap2-${PORTVERSION}
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index 42a4a6922bc2..4401d8b2faf6 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	mod_auth_kerb
 PORTVERSION=	5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	SF/modauthkerb/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE=  yes
 
 LATEST_LINK=   mod_auth_kerb2
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/www/mod_auth_mellon/Makefile b/www/mod_auth_mellon/Makefile
index 5e31c5a37a6f..92eb0d97c516 100644
--- a/www/mod_auth_mellon/Makefile
+++ b/www/mod_auth_mellon/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-apxs2=${APXS}
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-Wall" OPENSSL_LIBS="-lssl"
 
-USE_APACHE=		2.2+
+USE_APACHE=		22+
 
 PLIST_FILES=		${APACHEMODDIR}/mod_auth_mellon.so
 
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index 813df1772f5f..9964e06005d2 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_auth_mysql
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.heuer.org/mod_auth_mysql/old/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -24,7 +24,7 @@ LATEST_LINK=	mod_auth_mysql2
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_JOBS_SAFE=  yes
 USE_MYSQL=	YES
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC+=	${LOCALBASE}/include/mysql
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index df8acb923f5b..fa138cbdda6c 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mod_auth_mysql
 PORTVERSION=	3.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	SF/modauthmysql/modauthmysql/${PORTVERSION}
 PKGNAMESUFFIX=	_another
diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index d0d359c871b1..8a655367922a 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_auth_openid
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://butterfat.net/releases/mod_auth_openid/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -21,7 +22,7 @@ MAKE_JOBS_SAFE=  yes
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_openid.so
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcre=${LOCALBASE}
diff --git a/www/mod_auth_pam2/Makefile b/www/mod_auth_pam2/Makefile
index 794cfbdee8f2..63e00b998a69 100644
--- a/www/mod_auth_pam2/Makefile
+++ b/www/mod_auth_pam2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_auth_pam
 PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile
index e7980251dc27..33869449d2fd 100644
--- a/www/mod_auth_pgsql2/Makefile
+++ b/www/mod_auth_pgsql2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mod_auth_pgsql
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/
 
diff --git a/www/mod_auth_pubtkt/Makefile b/www/mod_auth_pubtkt/Makefile
index 9d5acbeaaec2..f51bc6b89736 100644
--- a/www/mod_auth_pubtkt/Makefile
+++ b/www/mod_auth_pubtkt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_auth_pubtkt
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://neon1.net/mod_auth_pubtkt/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ COMMENT=	An Apache module to provide public key ticket based authentication
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--apxs=${APXS}
 
diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile
index deda3d20810e..00cc08ef2dd7 100644
--- a/www/mod_auth_tkt/Makefile
+++ b/www/mod_auth_tkt/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	kuriyama
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Lightweight single-sign-on authentication module for apache
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 AP_FAST_BUILD=	YES
 SRC_FILE=	${PORTNAME}.c sha2.c
diff --git a/www/mod_auth_xradius/Makefile b/www/mod_auth_xradius/Makefile
index 428e4a13cc85..c46695f8df2f 100644
--- a/www/mod_auth_xradius/Makefile
+++ b/www/mod_auth_xradius/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mod_auth_xradius
 PORTVERSION=	0.4.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.outoforder.cc/downloads/mod_auth_xradius/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ COMMENT=	Enables RADIUS authentication
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/www/mod_backtrace/Makefile b/www/mod_backtrace/Makefile
index 55244771f0d1..0140e5dc510f 100644
--- a/www/mod_backtrace/Makefile
+++ b/www/mod_backtrace/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_backtrace
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://people.apache.org/~trawick/ \
 		http://dl.moov.de/freebsd/${PORTNAME}/
diff --git a/www/mod_bw/Makefile b/www/mod_bw/Makefile
index 652cbfaed2dd..7e232e56fd65 100644
--- a/www/mod_bw/Makefile
+++ b/www/mod_bw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_bw
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.ivn.cl/apache/files/source/
 EXTRACT_SUFX=	.tgz
diff --git a/www/mod_cband/Makefile b/www/mod_cband/Makefile
index 91f262ffb416..ae69e351b10d 100644
--- a/www/mod_cband/Makefile
+++ b/www/mod_cband/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_cband
 PORTVERSION=	0.9.7.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.sfr-fresh.com/unix/privat/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile
index adf26f78dce9..e5cfbc84e917 100644
--- a/www/mod_cfg_ldap/Makefile
+++ b/www/mod_cfg_ldap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_cfg_ldap
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	SF/modcfgldap/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	apache2
diff --git a/www/mod_chroot/Makefile b/www/mod_chroot/Makefile
index fd07bfd7678e..8f151751e0cf 100644
--- a/www/mod_chroot/Makefile
+++ b/www/mod_chroot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_chroot
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://core.segfault.pl/~hobbit/mod_chroot/dist/
 
diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile
index 5338a4d03052..40cdeab2cec6 100644
--- a/www/mod_cplusplus/Makefile
+++ b/www/mod_cplusplus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_cplusplus
 PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/modcplusplus/modcplusplus/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ COMMENT=	Apache module for loading C++ objects as handlers
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_AUTOTOOLS=	autoconf autoheader libtool automake aclocal
 CFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/www/mod_cvs2/Makefile b/www/mod_cvs2/Makefile
index 3f9b67967453..15598bddb6f6 100644
--- a/www/mod_cvs2/Makefile
+++ b/www/mod_cvs2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_cvs
 PORTVERSION=	0.5.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://resare.com/noa/mod_cvs/dist/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ MAKE_JOBS_SAFE=	yes
 
 LATEST_LINK=	mod_cvs2
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_dnssd/Makefile b/www/mod_dnssd/Makefile
index b5822db7009f..7181bb1a4f97 100644
--- a/www/mod_dnssd/Makefile
+++ b/www/mod_dnssd/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	avahi-client.3:${PORTSDIR}/net/avahi-app
 MAKE_JOBS_SAFE=	yes
 
 USE_GMAKE=	yes
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/www/mod_domaintree/Makefile b/www/mod_domaintree/Makefile
index d4e9d76de527..c5e97b7dcda0 100644
--- a/www/mod_domaintree/Makefile
+++ b/www/mod_domaintree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_domaintree
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dev.iworks.at/mod_domaintree/
 EXTRACT_SUFX=	.tgz
@@ -17,7 +18,7 @@ COMMENT=	Hostname to filesystem mapper for Apache 2
 MAKE_JOBS_SAFE=  yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile
index c3969b346b90..1a6665b826b7 100644
--- a/www/mod_encoding/Makefile
+++ b/www/mod_encoding/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_encoding
 PORTVERSION=	20021209
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://webdav.todo.gr.jp/download/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ MAKE_JOBS_SAFE=	yes
 # Mostly because of the dependency of mod_dav.
 #APACHE_VERSION=	1.3.6
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_ICONV=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile
index f3a0f2bfd991..c20b0a61b91c 100644
--- a/www/mod_evasive/Makefile
+++ b/www/mod_evasive/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_evasive
 PORTVERSION=	1.10.1
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://www.zdziarski.com/blog/wp-content/uploads/2010/02/
 DISTNAME=	mod_evasive_${PORTVERSION}
@@ -19,7 +20,7 @@ MAKE_JOBS_SAFE=  yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
diff --git a/www/mod_extract_forwarded/Makefile b/www/mod_extract_forwarded/Makefile
index 4bc55a66fdc6..66391f5844c7 100644
--- a/www/mod_extract_forwarded/Makefile
+++ b/www/mod_extract_forwarded/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_extract_forwarded
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.openinfo.co.uk/apache/
 DISTNAME=	extract_forwarded-${DISTVERSION}
diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile
index dcff6a28ecef..18646164904d 100644
--- a/www/mod_fastcgi/Makefile
+++ b/www/mod_fastcgi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_fastcgi
 PORTVERSION=	2.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.fastcgi.com/dist/
 
@@ -17,7 +17,7 @@ COMMENT=	A fast-cgi module for Apache
 MAKE_JOBS_SAFE=	yes
 
 CONFLICTS=	apache-contrib-1.*
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	*.c
diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile
index 081fca9ad62a..33cc2635c751 100644
--- a/www/mod_fcgid/Makefile
+++ b/www/mod_fcgid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_fcgid
 PORTVERSION=	2.3.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=		${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT=	An alternative FastCGI module for Apache2
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	configure.apxs
diff --git a/www/mod_fileiri/Makefile b/www/mod_fileiri/Makefile
index e7fcb107e09f..8d8451eef075 100644
--- a/www/mod_fileiri/Makefile
+++ b/www/mod_fileiri/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_fileiri
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/pgollucci
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_flickr/Makefile b/www/mod_flickr/Makefile
index d7f96a4d4902..373bbd4c8f0c 100644
--- a/www/mod_flickr/Makefile
+++ b/www/mod_flickr/Makefile
@@ -5,32 +5,32 @@
 # $FreeBSD$
 #
 
-PORTNAME=		mod_flickr
+PORTNAME=	mod_flickr
 PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=		www
+PORTREVISION=	2
+CATEGORIES=	www
 MASTER_SITES=	http://www.vshank.com/modcode/
 
-MAINTAINER=		venkyshankar@yahoo.com
-COMMENT=		Apache module for Flickr API access
+MAINTAINER=	venkyshankar@yahoo.com
+COMMENT=	Apache module for Flickr API access
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 MAKE_JOBS_SAFE=	yes
 
-XTRA_FLAGS=		-lcurl
+XTRA_FLAGS=	-lcurl
 
-AP_INC=			${LOCALBASE}/include
-AP_LIB=			${LOCALBASE}/lib
+AP_INC=		${LOCALBASE}/include
+AP_LIB=		${LOCALBASE}/lib
 
 .if defined(WITH_DEBUG)
 XTRA_FLAGS+=	-DDEBUG
 .endif
 
-AP_EXTRAS=		${XTRA_FLAGS}
+AP_EXTRAS=	${XTRA_FLAGS}
 USE_LDCONFIG=	yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_geoip2/Makefile b/www/mod_geoip2/Makefile
index c8200d05530d..ea6cf3b3d65e 100644
--- a/www/mod_geoip2/Makefile
+++ b/www/mod_geoip2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_geoip2
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	www geography
 MASTER_SITES=	http://geolite.maxmind.com/download/geoip/api/mod_geoip2/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -23,7 +24,7 @@ CONFLICTS=	mod_geoip-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 MODULENAME=	mod_geoip
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index 3aed7461605c..aac573f50d62 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_gnutls
 PORTVERSION=	0.5.10
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://modgnutls.sourceforge.net/downloads/ \
 		http://www.outoforder.cc/downloads/mod_gnutls/
@@ -22,7 +23,7 @@ LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 GNU_CONFIGURE=	yes
 
 DOCS=		LICENSE NEWS README README.ENV
diff --git a/www/mod_gzip2/Makefile b/www/mod_gzip2/Makefile
index 6d8f1ed5855a..b0e30422c91b 100644
--- a/www/mod_gzip2/Makefile
+++ b/www/mod_gzip2/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An Internet Content Acceleration module for Apache2+
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 MAKE_ENV+=	"APXS=${APXS}"
diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile
index ebe9106750ce..afa80bb34518 100644
--- a/www/mod_hosts_access/Makefile
+++ b/www/mod_hosts_access/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_hosts_access
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/pgollucci
 
@@ -15,7 +16,7 @@ COMMENT=	Apache module that makes Apache respect hosts.allow and hosts.deny
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_jail/Makefile b/www/mod_jail/Makefile
index 56a6929dc76c..a51ac88c9232 100644
--- a/www/mod_jail/Makefile
+++ b/www/mod_jail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_jail
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://mod-jail.googlecode.com/files/
 
@@ -16,7 +17,7 @@ COMMENT=	Apache 1.3.x/2.0.xx module to enable an easy alternative to mod_chroot
 MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/mod_jail-0.5.1
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
diff --git a/www/mod_jk-apache2/Makefile b/www/mod_jk-apache2/Makefile
index 2e8c71ec2225..60919639680a 100644
--- a/www/mod_jk-apache2/Makefile
+++ b/www/mod_jk-apache2/Makefile
@@ -6,8 +6,8 @@
 #
 
 MASTERDIR=	${.CURDIR}/../mod_jk
-USE_APACHE=	2.0+
-PORTREVISION=	1
+USE_APACHE=	20+
+PORTREVISION=	2
 PORTEPOCH=	0
 LATEST_LINK=	mod_jk-ap2
 
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index cf9970521c4d..ba2e4008dbb6 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_jk
 PORTVERSION=	1.2.31
+PORTREVISION=	1
 PORTEPOCH?=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE}
@@ -19,7 +20,7 @@ COMMENT?=	Apache JK module for connecting to Tomcat using AJP1X
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE?=	1.3+
+USE_APACHE?=	13+
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/mod_limitipconn2/Makefile b/www/mod_limitipconn2/Makefile
index 31d82771dd2f..df47f420573a 100644
--- a/www/mod_limitipconn2/Makefile
+++ b/www/mod_limitipconn2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_limitipconn
 PORTVERSION=	0.23
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://dominia.org/djao/limit/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ MAKE_JOBS_SAFE=	yes
 
 LATEST_LINK=	mod_limitipconn2
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_BZIP2=	YES
 
 AP_FAST_BUILD=	yes
diff --git a/www/mod_line_edit/Makefile b/www/mod_line_edit/Makefile
index 29833a714841..353e6975ffbf 100644
--- a/www/mod_line_edit/Makefile
+++ b/www/mod_line_edit/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_SAFE=  yes
 
 WRKSRC=	${WRKDIR}
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_lisp2/Makefile b/www/mod_lisp2/Makefile
index 5df839462163..3c4432154530 100644
--- a/www/mod_lisp2/Makefile
+++ b/www/mod_lisp2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_lisp2
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://freebsd.minira.nl/
 
diff --git a/www/mod_log_config-st/Makefile b/www/mod_log_config-st/Makefile
index 35d66d772bb0..c641382a5332 100644
--- a/www/mod_log_config-st/Makefile
+++ b/www/mod_log_config-st/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_log_config-st
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 # Original location: http://bitbrook.de/software/mod_log_mysql/mod_log_config.c
 MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/
diff --git a/www/mod_log_dbd/Makefile b/www/mod_log_dbd/Makefile
index f6e924cedcaf..342acceccd12 100644
--- a/www/mod_log_dbd/Makefile
+++ b/www/mod_log_dbd/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Uses APR DBD to store Apache access logs in a database
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apache=${PREFIX}
diff --git a/www/mod_log_firstbyte/Makefile b/www/mod_log_firstbyte/Makefile
index 72d110f3bd68..f0c2810756e0 100644
--- a/www/mod_log_firstbyte/Makefile
+++ b/www/mod_log_firstbyte/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_log_firstbyte
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://mod-log-firstbyte.googlecode.com/svn/trunk/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -18,7 +19,7 @@ COMMENT=	Log the time between request and the first byte of the response served
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 PROJECTHOST=	mod-log-firstbyte
 PKGMESSAGE=	${WRKSRC}/readme.txt
diff --git a/www/mod_log_mysql/Makefile b/www/mod_log_mysql/Makefile
index ad656d7fbeac..e5404812125a 100644
--- a/www/mod_log_mysql/Makefile
+++ b/www/mod_log_mysql/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_log_mysql
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 # Original location: http://bitbrook.de/software/mod_log_mysql/mod_log_mysql.c
 # Please handle update requests with care!
diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index 97b249852087..4f4c9f215dab 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mod_log_sql
 PORTVERSION=	1.101
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.outoforder.cc/downloads/${PORTNAME}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_memcache/Makefile b/www/mod_memcache/Makefile
index 88580c7da5ec..5f153f8b689b 100644
--- a/www/mod_memcache/Makefile
+++ b/www/mod_memcache/Makefile
@@ -19,7 +19,7 @@ MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
 PROJECTHOST=	modmemcache
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index 0bc998b8f4fb..53ec0b3209ba 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mod_mono
 PORTVERSION=	2.10
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -20,7 +21,7 @@ BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 		xsp:${PORTSDIR}/www/xsp
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--man=${PREFIX}/man
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index d9555e900462..f9a2efca3af0 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_musicindex
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES=	www audio
 MASTER_SITES=	http://www.parisc-linux.org/~varenet/musicindex/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -27,7 +28,7 @@ OPTIONS=	NLS "Native language support" on \
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/www/mod_ntlm2/Makefile b/www/mod_ntlm2/Makefile
index d09a35f8eee0..5fed4d2bc8bd 100644
--- a/www/mod_ntlm2/Makefile
+++ b/www/mod_ntlm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_ntlm2
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	SF/modntlm/modntlm2/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 80e2e20c4d0d..3f2d6716e874 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_perl
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_APACHE}
@@ -26,7 +27,7 @@ MAKE_JOBS_SAFE=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 PERL_CONFIGURE=	5.8.0+
 GMAKE=		yes
 
diff --git a/www/mod_proctitle/Makefile b/www/mod_proctitle/Makefile
index a2b22e853c86..2ac29e11a79e 100644
--- a/www/mod_proctitle/Makefile
+++ b/www/mod_proctitle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_proctitle
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.springdaemons.com/soft/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ COMMENT=	Set httpd process titles to reflect currently processed request
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/www/mod_proxy_html/Makefile b/www/mod_proxy_html/Makefile
index 04822f074ccd..21e135cf3110 100644
--- a/www/mod_proxy_html/Makefile
+++ b/www/mod_proxy_html/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:${PORTSDIR}/www/mod_xml
 MAKE_JOBS_SAFE=	yes
 
 SUB_FILES=	pkg-message
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 SHORTMODNAME=	proxy_html
diff --git a/www/mod_proxy_xml/Makefile b/www/mod_proxy_xml/Makefile
index f923d9610169..a17b5fedcece 100644
--- a/www/mod_proxy_xml/Makefile
+++ b/www/mod_proxy_xml/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mod_proxy_xml
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://apache.webthing.com/svn/apache/filters/xmlns/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -21,7 +22,7 @@ MAKE_JOBS_SAFE=	yes
 WRKSRC=	${WRKDIR}
 
 USE_GNOME=	libxml2
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile
index a7d76f318225..d84fd0dff69d 100644
--- a/www/mod_python3/Makefile
+++ b/www/mod_python3/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Apache module that embeds the Python interpreter within the server
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 USE_PYTHON=	yes
 
 MAKE_ARGS+=	APXS=${APXS}
diff --git a/www/mod_remoteip/Makefile b/www/mod_remoteip/Makefile
index ba0f73408a42..2cd8e3739f94 100644
--- a/www/mod_remoteip/Makefile
+++ b/www/mod_remoteip/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Replaces the client IP address/hostname with that given by a proxy
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 86bbdb2f2dfd..cd9059e48b57 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -20,7 +20,7 @@ WRKSRC=			${WRKDIR}/libapache2-mod-rivet-${PORTVERSION}
 MAKE_JOBS_SAFE=	yes
 LICENSE=		ASL
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 USE_AUTOTOOLS=	automake autoconf
 USE_TCL=	84+
 GMAKE=		yes
diff --git a/www/mod_rpaf/Makefile b/www/mod_rpaf/Makefile
index da717d92f1ba..c10d62b44704 100644
--- a/www/mod_rpaf/Makefile
+++ b/www/mod_rpaf/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Make proxied requests appear with client IP
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE?=	1.3
+USE_APACHE?=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
@@ -23,7 +23,6 @@ AP_GENPLIST=	YES
 
 .if ${APACHE_VERSION} >= 20
 SRC_FILE=	mod_rpaf-2.0.c
-PKGNAMESUFFIX=	-ap2
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/mod_rpaf2/Makefile b/www/mod_rpaf2/Makefile
index 5a801dd48263..7cba7fde36db 100644
--- a/www/mod_rpaf2/Makefile
+++ b/www/mod_rpaf2/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 USE_APACHE=	20+
 LATEST_LINK=	mod_rpaf2
 MASTERDIR=	${.CURDIR}/../mod_rpaf
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index b234aed86062..4002d001fc97 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_ruby
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ COMMENT=	An Apache module that embeds Ruby interpreter within
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_RUBY=	yes
 USE_PERL5_BUILD=	yes
 
diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile
index 1d3f4d384041..64cc439ca02f 100644
--- a/www/mod_scgi/Makefile
+++ b/www/mod_scgi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_scgi
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}mod_
@@ -19,7 +20,7 @@ MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 7cc5b21548d6..21f56955ba08 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_security
 PORTVERSION=	2.5.13
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	SF/mod-security/modsecurity-apache/${PORTVERSION}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -20,7 +21,7 @@ MAKE_JOBS_SAFE=	yes
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre \
 		apr-1:${PORTSDIR}/devel/apr1
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 AP_GENPLIST=	yes
diff --git a/www/mod_security21/Makefile b/www/mod_security21/Makefile
index 723e799ac3d3..6c27b59f778c 100644
--- a/www/mod_security21/Makefile
+++ b/www/mod_security21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_security21
 PORTVERSION=	2.1.7
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/download/
 DISTNAME=	${PORTNAME:S/_//:S/21//}-apache_${PORTVERSION}
@@ -16,7 +17,7 @@ COMMENT=	An intrusion detection and prevention engine
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS+=	-DWITH_LIBXML2
diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile
index 6b6e09f6a1fd..4d2d4d6d67e1 100644
--- a/www/mod_tidy/Makefile
+++ b/www/mod_tidy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_tidy
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://mod-tidy.sourceforge.net/src/
 DIST_SUBDIR=	apache2
diff --git a/www/mod_tsa/Makefile b/www/mod_tsa/Makefile
index 6b20f3f579f8..4a02eb77ee87 100644
--- a/www/mod_tsa/Makefile
+++ b/www/mod_tsa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_tsa
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://am.nesiac.org/static/ \
   http://ubique.spb.ru/src/
diff --git a/www/mod_vhost_ldap/Makefile b/www/mod_vhost_ldap/Makefile
index 7d9ae21595ac..e3521c2bc51f 100644
--- a/www/mod_vhost_ldap/Makefile
+++ b/www/mod_vhost_ldap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_vhost_ldap
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/1422/
 DISTNAME=	${PORTNAME:S/_/-/g}-${PORTVERSION}
diff --git a/www/mod_vhs/Makefile b/www/mod_vhs/Makefile
index c5843e10867d..01661fa6a803 100644
--- a/www/mod_vhs/Makefile
+++ b/www/mod_vhs/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Mass virtual hosting using mod_ldap or mod_dbd with Apache 2.2.x
 
 MANUAL_PACKAGE_BUILD=	needs apr with LDAP and DBD options enabled
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
 WANT_PHP_MOD=	yes
diff --git a/www/mod_webkit/Makefile b/www/mod_webkit/Makefile
index cf122dcb9b42..724e766bc68a 100644
--- a/www/mod_webkit/Makefile
+++ b/www/mod_webkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_webkit
 PORTVERSION=	1.1b1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/webware/Webware/1.1b1
 DISTNAME=	Webware-${PORTVERSION}
@@ -16,7 +17,7 @@ COMMENT=	A apache module for WebWare WebKit AppServer
 
 MAKE_JOBS_SAFE=  yes
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_wsgi/Makefile b/www/mod_wsgi/Makefile
index ce592862f0b0..5758032a121e 100644
--- a/www/mod_wsgi/Makefile
+++ b/www/mod_wsgi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_wsgi
 PORTVERSION=	2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		http://apt.douglasthrift.net/files/${PORTNAME}/ \
@@ -26,7 +26,7 @@ CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-3.* mod_wsgi-3.*
 
 PROJECTHOST=	modwsgi
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_PYTHON=	2.5-2.7
 
 GNU_CONFIGURE=	yes
diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile
index 8f5b016b5afc..a1293ee70bc9 100644
--- a/www/mod_wsgi3/Makefile
+++ b/www/mod_wsgi3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_wsgi
 PORTVERSION=	3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		http://apt.douglasthrift.net/files/${PORTNAME}/ \
@@ -26,7 +26,7 @@ CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
 
 PROJECTHOST=	modwsgi
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_PYTHON=	2.5+
 
 GNU_CONFIGURE=	yes
diff --git a/www/mod_xml2enc/Makefile b/www/mod_xml2enc/Makefile
index 5f582783117e..248c6e3fcf33 100644
--- a/www/mod_xml2enc/Makefile
+++ b/www/mod_xml2enc/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Apache module for converting encoding before and/or after a filter run
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 SHORTMODNAME=	xml2enc
diff --git a/www/mod_xmlns/Makefile b/www/mod_xmlns/Makefile
index 3d2a00f7cf38..7a7ceb1a72b4 100644
--- a/www/mod_xmlns/Makefile
+++ b/www/mod_xmlns/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mod_xmlns
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://apache.webthing.com/svn/apache/filters/xmlns/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -19,7 +20,7 @@ COMMENT=	Apache module for XML namespaces
 MAKE_JOBS_SAFE=  yes
 
 USE_GNOME=	libxml2
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 XML2_INC=	${LOCALBASE}/include/libxml2
 XML2_LIB=	${LOCALBASE}/lib
diff --git a/www/mod_xsendfile/Makefile b/www/mod_xsendfile/Makefile
index abebdaad3818..88910c9c741a 100644
--- a/www/mod_xsendfile/Makefile
+++ b/www/mod_xsendfile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_xsendfile
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://tn123.org/mod_xsendfile/ \
 		http://cloud.github.com/downloads/potatosalad/mod_xsendfile/
@@ -17,7 +17,7 @@ COMMENT=	An Apache2 module that processes X-SENDFILE headers
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mythplugin-mythweb/Makefile b/www/mythplugin-mythweb/Makefile
index ae9656f5d2ec..83c838e172fd 100644
--- a/www/mythplugin-mythweb/Makefile
+++ b/www/mythplugin-mythweb/Makefile
@@ -33,7 +33,7 @@ OPTIONS=	APACHE "Enable Apache Support" on \
 .include <bsd.port.options.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 .endif
 
 .if defined(WITH_LIGHTTPD)
diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile
index 8ee778bfdb88..dd1e54a39a1f 100644
--- a/www/nibbleblog/Makefile
+++ b/www/nibbleblog/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nibbleblog
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/v${PORTVERSION}/
 DISTNAME=	nibbleblogv302
@@ -28,7 +29,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.options.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 .endif
 .if defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
diff --git a/www/ocaml-net/Makefile b/www/ocaml-net/Makefile
index b1272efb76c5..b70f13d02fdf 100644
--- a/www/ocaml-net/Makefile
+++ b/www/ocaml-net/Makefile
@@ -102,7 +102,7 @@ CONFIGURE_ARGS+=	-disable-gtk2
 .endif
 
 .if defined(WITH_APACHE)
-USE_APACHE=		1.3+
+USE_APACHE=		13+
 CONFIGURE_ARGS+=	-enable-apache -apxs ${APXS} -apache ${HTTPD}
 OCAML_PKGDIRS+=		netcgi_apache
 .else
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index d21ec9d44eff..3f9e9c234761 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Apache-AuthCookie
 PORTVERSION=	3.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 893c139292af..a2fd53f922ec 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Apache-AuthTicket
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -27,7 +28,7 @@ MAN3=		Apache::AuthTicket.3 \
 		Apache::AuthTicket::Base.3 \
 		Apache2::AuthTicket.3
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile
index 21d1da1acda2..1cdb1962affe 100644
--- a/www/p5-Apache-DB/Makefile
+++ b/www/p5-Apache-DB/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Apache-DB
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 52bbd2d2266c..86d8a1192281 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	Apache-DBI
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	www databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 481772ecc8e4..e3e6bc304233 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Apache-Gallery
 PORTVERSION=	1.0.2
-PORTEPOCH=	2
+PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	http://apachegallery.dk/download/ \
 		CPAN
@@ -26,7 +26,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LICENSE=	ART10
 PERL_CONFIGURE=	yes
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 
 .include <bsd.port.pre.mk>
 .if ${APACHE_VERSION} == 13
diff --git a/www/p5-Apache2-Scoreboard/Makefile b/www/p5-Apache2-Scoreboard/Makefile
index b1d7a98940b1..e0098d47e395 100644
--- a/www/p5-Apache2-Scoreboard/Makefile
+++ b/www/p5-Apache2-Scoreboard/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Apache2-Scoreboard
 PORTVERSION=	2.09.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MJH
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.0:${PORTSDIR}/www/mod_perl2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
 
diff --git a/www/p5-Bundle-Sledge/Makefile b/www/p5-Bundle-Sledge/Makefile
index 0f4ec264e64c..1631998e7db2 100644
--- a/www/p5-Bundle-Sledge/Makefile
+++ b/www/p5-Bundle-Sledge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Bundle-Sledge
 PORTVERSION=	0.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index e7da6cf37cce..a55a558f498d 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	CGI-SpeedyCGI
 PORTVERSION=	2.22
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -23,7 +23,7 @@ OPTIONS=	APACHE "Enable mod_speedycgi" On
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 PLIST_SUB+=	APACHE=""
 .else
 PLIST_SUB+=	APACHE="@comment "
diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile
index 86c77526c9d8..65ee3fd0e434 100644
--- a/www/p5-MasonX-WebApp/Makefile
+++ b/www/p5-MasonX-WebApp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	MasonX-WebApp
 PORTVERSION=	0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/www/photo_gallery/Makefile b/www/photo_gallery/Makefile
index 60ecbf88dceb..386e4aa7ffd0 100644
--- a/www/photo_gallery/Makefile
+++ b/www/photo_gallery/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		photo_gallery
 PORTVERSION=		1.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=		www
 MASTER_SITES=		http://www.capybara.org/~dfraser/photo_gallery/
 DISTNAME=		${PORTNAME}_${PORTVERSION}
@@ -19,7 +19,7 @@ RUN_DEPENDS=	anytopnm:${PORTSDIR}/graphics/netpbm\
 		${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info\
 		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_PERL5=	yes
 NO_BUILD=	yes
 
diff --git a/www/prado/Makefile b/www/prado/Makefile
index 8234065c181a..0041408121d9 100644
--- a/www/prado/Makefile
+++ b/www/prado/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prado
 PORTVERSION=	3.1.6.r2699
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	prado3
@@ -26,7 +26,7 @@ WRKSRCDOCS=	${WRKDIR}/${PORTNAME}-docs-${PORTVERSION:C|.r|-r|}
 
 USE_ZIP=	yes
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 NO_BUILD=	yes
 WANT_PHP_WEB=	yes
diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index a1e7187853fa..3bb1542927f9 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rt
 PORTVERSION?=	3.6.11
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		http://download.bestpractical.com/pub/rt/devel/ \
@@ -55,7 +56,7 @@ LATEST_LINK=	rt36
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 NO_PACKAGE=	Executes scripts in post-install phase
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_PERL5=	5.8.3+
 
 CONFIGURE_ARGS=	--prefix=${RT_PATH} \
diff --git a/www/rt38/Makefile b/www/rt38/Makefile
index 302025fe32d7..4fb438642087 100644
--- a/www/rt38/Makefile
+++ b/www/rt38/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	rt
 PORTVERSION=	3.8.10
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
@@ -67,7 +68,7 @@ RUN_DEPENDS+=	${STANDALONE_DEPS}
 .endif
 
 .if defined(WITH_APACHE) || defined(WITH_FASTCGI) || defined(WITH_MODPERL)
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 .endif
 
 .if defined(WITH_FASTCGI)
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 302025fe32d7..4fb438642087 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	rt
 PORTVERSION=	3.8.10
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
@@ -67,7 +68,7 @@ RUN_DEPENDS+=	${STANDALONE_DEPS}
 .endif
 
 .if defined(WITH_APACHE) || defined(WITH_FASTCGI) || defined(WITH_MODPERL)
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 .endif
 
 .if defined(WITH_FASTCGI)
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 6c79b088280d..54d2931f1816 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -31,7 +31,7 @@ IGNORE=		supports only one web-server: apache22 or nginx. \
 .endif
 
 .if !defined(WITHOUT_APACHEPORT)
-USE_APACHE=	2.2+
+USE_APACHE=	22+
 .endif
 
 .if defined(WITH_NGINXPORT)
diff --git a/www/sams/Makefile b/www/sams/Makefile
index 7484c2eb47c8..d8a6f12f016b 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -48,7 +48,7 @@ USE_PHP+=	ldap
 .endif
 
 .if defined(WITH_APACHE)
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 .endif
 
 .if defined(WITH_INSTALLGD)
diff --git a/www/siteframe/Makefile b/www/siteframe/Makefile
index 416025a796cf..098effc1ef6e 100644
--- a/www/siteframe/Makefile
+++ b/www/siteframe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	siteframe
 PORTVERSION=	5.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.broadpool.net/pub/siteframe/
 
@@ -16,7 +16,7 @@ COMMENT=	A web community content management system in PHP5 and MySQL
 
 RUN_DEPENDS=	${LOCALBASE}/share/smarty/Smarty.class.php:${PORTSDIR}/www/smarty
 
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 USE_PHP=	mysqli simplexml xml session gd
 DEFAULT_PHP_VER=	5
 IGNORE_WITH_PHP=	4
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index eb3304b11360..d847bcbba6e0 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	suphp
 PORTVERSION=	0.7.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/ \
 		${MASTER_SITE_LOCAL:S|%SUBDIR%|koitsu|}
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	aclocal:env automake:env autoconf:env libtool:env
 
 # Maintainer has not tested suPHP 0.6.x on Apache 1.3.
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 CFLAGS+=	-I${LOCALBASE}/include
 USE_PHP=	yes
 WANT_PHP_CGI=	yes
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 87cca8551f82..7aa79686a881 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thundercache
 PORTVERSION=	6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.bmsoftware.org/packs/ \
 		http://www8.freebsdbrasil.com.br/~eksffa/thunder/ \
@@ -50,7 +50,7 @@ DISTNAME=	thundercache-6.1.201104260900-32bits-fbsd
 WRKSRC=		${WRKDIR}/thunder
 
 .if defined (WITH_APACHE)
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 .endif
 
 .if defined (WITH_PGSQL)
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 774605b25bef..d3a6bba0f05d 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	thundersnarf
 PORTVERSION=	1.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.tracanelli.com.br/l/dev/thunder/ \
@@ -27,7 +28,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME:R}
 .include <bsd.port.pre.mk>
 
 .if defined (WITH_APACHE)
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 .endif
 
 .if defined (WITH_PGSQL)
diff --git a/www/webcalendar-devel/Makefile b/www/webcalendar-devel/Makefile
index 7ed137c8baf2..a3b9f339ed9e 100644
--- a/www/webcalendar-devel/Makefile
+++ b/www/webcalendar-devel/Makefile
@@ -47,7 +47,7 @@ OPTIONS=	APACHE "Configure for Apache-2.x" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 
 PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
diff --git a/www/webobjects/Makefile b/www/webobjects/Makefile
index c2a11f16c0d7..5f82b5403cb1 100644
--- a/www/webobjects/Makefile
+++ b/www/webobjects/Makefile
@@ -57,7 +57,7 @@ COPYTREE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
 	${FIND} $$1 -type d -exec ${CHMOD} 755 {} \;' --
 
 .if defined(WITH_APACHE)
-USE_APACHE?=	1.3+
+USE_APACHE?=	13+
 BUILD_DEPENDS+=	${APACHEMODDIR}/mod_WebObjects.so:../../www/mod_webobjects
 .endif
 
diff --git a/www/websh/Makefile b/www/websh/Makefile
index ededc189f978..32b9a7a8459c 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	websh
 PORTVERSION=	3.6.0b5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www tcl
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=tcl/${PORTNAME}/source
@@ -32,7 +32,7 @@ SUB_LIST+=	TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION}
 SUB_LIST+=	APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR}
 PLIST_SUB+=	TCL_DVER=${TCL_DVER}
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 CONFIGURE_ARGS+=--with-httpdinclude=`apxs -q includedir`
 
 CPPFLAGS+=	-I ${LOCALBASE}/include/apr-1
diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile
index 9326f6395346..f5da2295530a 100644
--- a/www/wwwstat/Makefile
+++ b/www/wwwstat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wwwstat
 PORTVERSION=	2.01
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.ics.uci.edu/pub/websoft/wwwstat/ \
 		ftp://ftp.gwdg.de/pub/misc/www-stat/websoft/wwwstat/
@@ -21,7 +21,7 @@ COMMENT=	Webserver logfile analysis package
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	1.3+
+USE_APACHE=	13+
 USE_PERL5=	yes
 MAKE_ENV+=	PERL5=${PERL5}
 
diff --git a/www/yahoo-ui/Makefile b/www/yahoo-ui/Makefile
index 552de3293cf6..6c2768fef371 100644
--- a/www/yahoo-ui/Makefile
+++ b/www/yahoo-ui/Makefile
@@ -33,7 +33,7 @@ NOPORTEXAMPLES=	yes
 .endif
 
 .if defined(WITH_APACHE)
-USE_APACHE=	2.0+
+USE_APACHE=	20+
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
 PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
author	Olli Hauer <ohauer@FreeBSD.org>	2011-08-20 17:27:52 +0000
committer	Olli Hauer <ohauer@FreeBSD.org>	2011-08-20 17:27:52 +0000
commit	7a0bd317631d50743f0a374e87553b67823ce01b (patch)
tree	a6a20687ac7deead25a53b4c03118c3a00060775 /www
parent	- change default mod_perl version, else the port will not build (diff)