Migrate USE_APACHE to USES= apache (category www)

 - Following migration of Mk/bsd.apache.mk to Mk/Uses/apache.mk

With hat:	apache

117 files changed, 118 insertions, 181 deletions

diff --git a/www/blogsum/Makefile b/www/blogsum/Makefile
index 356143712c57..961c5201cb53 100644
--- a/www/blogsum/Makefile
+++ b/www/blogsum/Makefile
@@ -18,10 +18,9 @@ RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
-USES=		perl5
+USES=		apache:run,2.2+ perl5
 NO_BUILD=	yes
 USE_PERL5=	run
-USE_APACHE_RUN=	22+
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile
index 2204e6fa7b65..350c4d5f0132 100644
--- a/www/codeigniter/Makefile
+++ b/www/codeigniter/Makefile
@@ -82,7 +82,7 @@ ODBC_DESC=	Install ODBC support for PHP
 PGSQL_DESC=	Install PostgreSQL support for PHP
 SQLITE_DESC=	Install SQLite support for PHP
 
-APACHE_VARS=	USE_APACHE_RUN=22+
+APACHE_USES=	apache:run,2.2+
 DOCS_VARS=	SUB_LIST+=HASHMARK=
 DOCS_VARS_OFF=	SUB_LIST+=HASHMARK=\#
 MSSQL_VARS=	USE_PHP+=mssql
diff --git a/www/dojo/Makefile b/www/dojo/Makefile
index 3d89f617a4c2..b2ff5af1cb8e 100644
--- a/www/dojo/Makefile
+++ b/www/dojo/Makefile
@@ -19,7 +19,7 @@ OPTIONS_SUB=		yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=		22+
+USES=			apache:run,2.2+
 CONFDIR=		${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=		${APACHEETCDIR}/Includes
 PLIST_SUB+=		CONFDIR=${CONFDIR_REL}
diff --git a/www/dotproject/Makefile b/www/dotproject/Makefile
index fba54689af67..205da4066429 100644
--- a/www/dotproject/Makefile
+++ b/www/dotproject/Makefile
@@ -13,12 +13,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 IGNORE_WITH_PHP=	70 71 72
 
-USES=		cpe shebangfix php:web
+USES=		apache:run,2.2+ cpe shebangfix php:web
 SHEBANG_FILES=	misc/cvs2cl/cvs2cl.pl
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 USE_PHP=	gd mysql session zlib
-USE_APACHE_RUN=	22+
 
 SUB_FILES=	pkg-message
 
diff --git a/www/formication/Makefile b/www/formication/Makefile
index 83c52f4ec644..521deee6acfe 100644
--- a/www/formication/Makefile
+++ b/www/formication/Makefile
@@ -11,8 +11,7 @@ MASTER_SITES=	http://www.ranner.eu/stuff/ \
 MAINTAINER=	michael@ranner.eu
 COMMENT=	Formular processing tool written in perl
 
-USES=		perl5
-USE_APACHE_RUN=	22+
+USES=		apache:run,2.2+ perl5
 USE_PERL5=	run
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/www/ftasv/Makefile b/www/ftasv/Makefile
index e05b77775360..f0a90a3281a5 100644
--- a/www/ftasv/Makefile
+++ b/www/ftasv/Makefile
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 PLIST_FILES=	sbin/ftasv
 PORTDOCS=	AUTHORS ChangeLog README
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 78439369765d..49fe83a6a8b7 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 RUN_DEPENDS=	ap*-mod_dnssd>=0:www/mod_dnssd \
 		console-kit-daemon:sysutils/consolekit2
 
-USES=		gettext gmake libtool pkgconfig tar:xz
-USE_APACHE=	22+
+USES=		apache:2.2+ gettext gmake libtool pkgconfig tar:xz
 USE_XORG=	sm
 USE_GNOME=	gnomeprefix gtk30 intlhack nautilus3
 GNU_CONFIGURE=	yes
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 6d30c04f2936..8f21945f6095 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -15,8 +15,7 @@ LICENSE=	APACHE20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 INSTALL_TARGET=	install-strip
-USES=		libtool
-USE_APACHE=	22+
+USES=		apache:2.2+ libtool
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/www/mod_amazon_proxy/Makefile b/www/mod_amazon_proxy/Makefile
index 28d93b40d6b2..6c04ff94cc5d 100644
--- a/www/mod_amazon_proxy/Makefile
+++ b/www/mod_amazon_proxy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Amazon Auth Proxy for Product Advertising API
 
 LIB_DEPENDS=	libapreq2.so:www/libapreq2
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_LIB=	${LOCALBASE}/lib -lcrypto
 
diff --git a/www/mod_antiloris/Makefile b/www/mod_antiloris/Makefile
index e3ab9066ddc9..25443967b610 100644
--- a/www/mod_antiloris/Makefile
+++ b/www/mod_antiloris/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Protect Apache 2.x against the Slowloris HTTP DoS attack
 
 LICENSE=	APACHE20
 
-USES=		tar:bzip2
-USE_APACHE=	22
+USES=		apache:2.2 tar:bzip2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS+=	-a
diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile
index c2cfdddf1d12..6c02384ed99f 100644
--- a/www/mod_asn/Makefile
+++ b/www/mod_asn/Makefile
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 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 23f0684c2ab4..a8f693eb3032 100644
--- a/www/mod_auth_cas/Makefile
+++ b/www/mod_auth_cas/Makefile
@@ -17,13 +17,12 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jasig
-USES=		ssl
+USES=		apache:2.2+ ssl
 
 HAS_CONFIGURE=	yes
 # configure requires LDFLAGS to find libpcre
 LDFLAGS+=	-L${AP_LIB}
 
-USE_APACHE=	22+
 AP_LIB=		${LOCALBASE}/lib
 AP_EXTRAS=	-lpcre -lssl -lcrypto
 
diff --git a/www/mod_auth_cookie_mysql2/Makefile b/www/mod_auth_cookie_mysql2/Makefile
index 165458f3c0a1..607ad5cacee2 100644
--- a/www/mod_auth_cookie_mysql2/Makefile
+++ b/www/mod_auth_cookie_mysql2/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows authentication against MySQL database via secure cookie
 
 USE_MYSQL=	yes
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_auth_external2/Makefile b/www/mod_auth_external2/Makefile
index f42272efe8b1..3477a9825f1b 100644
--- a/www/mod_auth_external2/Makefile
+++ b/www/mod_auth_external2/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Allows users authentication based on external mechanisms
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	auth_external
diff --git a/www/mod_auth_gssapi/Makefile b/www/mod_auth_gssapi/Makefile
index 3d38c0895b85..3f2608a6a0d9 100644
--- a/www/mod_auth_gssapi/Makefile
+++ b/www/mod_auth_gssapi/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Apache module for authenticating users with GSSAPI
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf bison gssapi:mit,flags libtool ssl
-USE_APACHE=	24+
+USES=		autoreconf apache:2.4+ bison gssapi:mit,flags libtool ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	modauthgssapi
 GNU_CONFIGURE=	yes
diff --git a/www/mod_auth_imap2/Makefile b/www/mod_auth_imap2/Makefile
index 6de6cf3d2ebc..bd741b94f29a 100644
--- a/www/mod_auth_imap2/Makefile
+++ b/www/mod_auth_imap2/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Apache 2 module to provide authentication via an IMAP mail server
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2-${PORTVERSION}
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index efea169b98a7..95bdc31eca87 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -19,7 +19,7 @@ LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE
 
 PORTSCOUT=	limit:^5.4
 
-USE_APACHE=	22+
+USES		apache:2.2+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4
 
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index ab5ae32f525f..a4870da0f923 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -14,10 +14,9 @@ COMMENT=	MySQL-based authentication module with VirtualHost support
 
 LICENSE=	APACHE20
 
-USES=		tar:tgz
+USES=		apache:2.2+ tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_MYSQL=	yes
-USE_APACHE=	22+
 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 ad39d5271cc5..4813913ce7f6 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Allows users to use MySQL databases for user authentication
 LICENSE=	APACHE10
 
 USE_MYSQL=	yes
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 SHORTMODNAME=	mysql_auth
 AP_FAST_BUILD=	yes
diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index 7e30f1f68c6c..a89717597b63 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -19,8 +19,7 @@ BROKEN_powerpc64=	Does not build
 LIB_DEPENDS=	libopkele.so:devel/libopkele \
 		libsqlite3.so:databases/sqlite3
 
-USES=		autoreconf cpe gmake libtool pkgconfig
-USE_APACHE=	22+
+USES=		apache:2.2+ autoreconf cpe gmake libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	bmuller
 
diff --git a/www/mod_auth_openidc/Makefile b/www/mod_auth_openidc/Makefile
index fa8acf6187ce..d41054f5d725 100644
--- a/www/mod_auth_openidc/Makefile
+++ b/www/mod_auth_openidc/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libcjose.so:devel/cjose \
 		libjansson.so:devel/jansson \
 		libpcre.so:devel/pcre
 
-USES=		autoreconf cpe gmake libtool pkgconfig ssl
-USE_APACHE=	22+
+USES=		apache:2.2+ autoreconf cpe gmake libtool pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	pingidentity
 CPE_VENDOR=	${GH_ACCOUNT}
diff --git a/www/mod_auth_pam2/Makefile b/www/mod_auth_pam2/Makefile
index fe57e27f96c9..7fecef1e7583 100644
--- a/www/mod_auth_pam2/Makefile
+++ b/www/mod_auth_pam2/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PAM modules for user authentication
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	*.html
diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile
index 58beacfc409d..61839d5c4890 100644
--- a/www/mod_auth_pgsql2/Makefile
+++ b/www/mod_auth_pgsql2/Makefile
@@ -11,8 +11,7 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
-USES=		pgsql
-USE_APACHE=	22+
+USES=		apache:2.2+ pgsql
 
 AP_INC?=	${LOCALBASE}/include
 AP_LIB?=	${LOCALBASE}/lib -lpq
diff --git a/www/mod_auth_pubtkt/Makefile b/www/mod_auth_pubtkt/Makefile
index 41905a0c0e93..0142aa57cc59 100644
--- a/www/mod_auth_pubtkt/Makefile
+++ b/www/mod_auth_pubtkt/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	mk@neon1.net
 COMMENT=	Apache module to provide public key ticket based authentication
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	src/mod_auth_pubtkt.c
diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile
index 79bd887e6db4..abadace047f6 100644
--- a/www/mod_auth_tkt/Makefile
+++ b/www/mod_auth_tkt/Makefile
@@ -10,10 +10,9 @@ MASTER_SITES=	LOCAL/kuriyama \
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Lightweight single-sign-on authentication module for apache
 
-USES=		shebangfix
+USES=		apache:2.2+ shebangfix
 SHEBANG_FILES=	../cgi/login.cgi \
 		../cgi/logout.cgi
-USE_APACHE=	22+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PATCH_STRIP=	-p1
diff --git a/www/mod_auth_xradius/Makefile b/www/mod_auth_xradius/Makefile
index 7792fb77c319..c478a3d14ca9 100644
--- a/www/mod_auth_xradius/Makefile
+++ b/www/mod_auth_xradius/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Enables RADIUS authentication
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
-USES=	tar:bzip2
+USES=		apache:2.2+ tar:bzip2
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_xradius.so
diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile
index a5ce6109a02a..f0162bcbc86f 100644
--- a/www/mod_authn_sasl/Makefile
+++ b/www/mod_authn_sasl/Makefile
@@ -20,8 +20,7 @@ SASLAUTHD_DESC=	cyrus-sasl2-saslauthd support
 SASLAUTHD_RUN_DEPENDS=	saslauthd:security/cyrus-sasl2-saslauthd
 .include <bsd.port.options.mk>
 
-USES=		tar:bzip2
-USE_APACHE=	22
+USES=		apache:2.2 tar:bzip2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_LIB=		${LOCALBASE}/lib -lsasl2
diff --git a/www/mod_authnz_crowd/Makefile b/www/mod_authnz_crowd/Makefile
index b82046511068..28b1d3032407 100644
--- a/www/mod_authnz_crowd/Makefile
+++ b/www/mod_authnz_crowd/Makefile
@@ -21,10 +21,9 @@ BROKEN_powerpc64=	Does not build: error: curl/curl.h: No such file or directory
 
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib
-USES=		autoreconf libtool
+USES=		apache:2.2+ autoreconf libtool
 USE_GNOME=	libxml2
 USE_GCC=	any
-USE_APACHE=	22+
 
 SUB_FILES=	pkg-message zzz_authnz_crowd.conf
 SUB_LIST+=	APACHEETCDIR=${APACHEETCDIR} \
diff --git a/www/mod_authnz_external24/Makefile b/www/mod_authnz_external24/Makefile
index e6f69bfb2d21..fb7a93efd423 100644
--- a/www/mod_authnz_external24/Makefile
+++ b/www/mod_authnz_external24/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Allows users authentication based on external mechanisms on apache 2.4
 
 LICENSE=	APACHE20
 
-USE_APACHE=	24
+USES=		apache:2.4
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	authnz_external
diff --git a/www/mod_backtrace/Makefile b/www/mod_backtrace/Makefile
index 8e5a79483b4f..42022e59b98c 100644
--- a/www/mod_backtrace/Makefile
+++ b/www/mod_backtrace/Makefile
@@ -18,7 +18,7 @@ LICENSE=	APACHE20
 
 MANUAL_PACKAGE_BUILD=	requires apache WITH_EXCEPTION_HOOK=yes
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS+=	-lexecinfo
diff --git a/www/mod_bw/Makefile b/www/mod_bw/Makefile
index 35a5cecb208f..37803914c67b 100644
--- a/www/mod_bw/Makefile
+++ b/www/mod_bw/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Bandwidth and Connection control per Virtual Host or Directory
 LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/mod_bw
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_cband/Makefile b/www/mod_cband/Makefile
index 688c05f53820..baa577e308f3 100644
--- a/www/mod_cband/Makefile
+++ b/www/mod_cband/Makefile
@@ -18,8 +18,7 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSE
 LICENSE_FILE_BSD4CLAUSE=	${WRKSRC}/libpatricia.copyright
 
-USES=		tar:tgz
-USE_APACHE=	22
+USES=		apache:2.2 tar:tgz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apxs=${APXS}
 ALL_TARGET=	#
diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile
index bf4e58de1b23..f1cddeddd19b 100644
--- a/www/mod_cfg_ldap/Makefile
+++ b/www/mod_cfg_ldap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Allows you to keep your virtual host configuration in a LDAP directory
 
 LICENSE=	BSD3CLAUSE
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 USE_OPENLDAP=	yes
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_chroot/Makefile b/www/mod_chroot/Makefile
index 6a206e576dde..25592bcf4aca 100644
--- a/www/mod_chroot/Makefile
+++ b/www/mod_chroot/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	http://core.segfault.pl/~hobbit/mod_chroot/dist/
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	The mod_chroot makes running Apache in a chroot easy
 
-USES=		cpe
+USES=		apache:2.2+ cpe
 CPE_VENDOR=	marek_gutkowski
-USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index f000b829675b..a1db566b98b7 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Scans content delivered by the Apache20 proxy module for viruses
 
 LICENSE=	GPLv2
 
-USE_APACHE=	22
-USES=		libtool
+USES=		apache:2.2 libtool
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.options.mk>
diff --git a/www/mod_cloudflare/Makefile b/www/mod_cloudflare/Makefile
index 1868e943f77a..006ccbe67fa4 100644
--- a/www/mod_cloudflare/Makefile
+++ b/www/mod_cloudflare/Makefile
@@ -16,7 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	cloudflare
 GH_TAGNAME=	340fa0a
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	cloudflare
diff --git a/www/mod_cvs2/Makefile b/www/mod_cvs2/Makefile
index 6dc356b07001..3dbea8b05288 100644
--- a/www/mod_cvs2/Makefile
+++ b/www/mod_cvs2/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	Academic Free License 1.2
 LICENSE_FILE=	${WRKSRC}/LICENSE.AFL
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile
index 29e8a52139f1..39c3773c1a06 100644
--- a/www/mod_dav_svn/Makefile
+++ b/www/mod_dav_svn/Makefile
@@ -18,7 +18,7 @@ PKGDIR=		${.CURDIR}
 
 SVN_BUILD_ADDONS=	yes
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 .include "${MASTERDIR}/Makefile.common"
 
diff --git a/www/mod_dnssd/Makefile b/www/mod_dnssd/Makefile
index 71b0c164c789..7d97630cd23a 100644
--- a/www/mod_dnssd/Makefile
+++ b/www/mod_dnssd/Makefile
@@ -16,8 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
-USES=		gmake pkgconfig
-USE_APACHE=	22+
+USES=		apache:2.2+ gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \
 		APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`"
diff --git a/www/mod_domaintree/Makefile b/www/mod_domaintree/Makefile
index de2c0de894b5..99a52b0395a7 100644
--- a/www/mod_domaintree/Makefile
+++ b/www/mod_domaintree/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	danger@FreeBSD.org
 COMMENT=	Hostname to filesystem mapper for Apache 2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile
index ebd622f9d430..c5b9752077d0 100644
--- a/www/mod_encoding/Makefile
+++ b/www/mod_encoding/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Apache module for non-ASCII filename interoperability
 
 LICENSE=	APACHE11
 
-USE_APACHE=	22+
-USES=		iconv gmake
+USES=		apache:2.2+ iconv gmake
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile
index cd32bde76c17..cffd8b0f0803 100644
--- a/www/mod_evasive/Makefile
+++ b/www/mod_evasive/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 MODULENAME=	${PORTNAME}20
diff --git a/www/mod_extract_forwarded/Makefile b/www/mod_extract_forwarded/Makefile
index fd678d77637d..dcfe3e17fed4 100644
--- a/www/mod_extract_forwarded/Makefile
+++ b/www/mod_extract_forwarded/Makefile
@@ -15,7 +15,7 @@ OPTIONS_DEFINE=	YOSHFUJI
 YOSHFUJI_DESC=	yoshfuji patch (support IPv6 addr in config, etc)
 #OPTIONS_DEFAULT=	YOSHFUJI
 
-USE_APACHE=	22
+USES=		apache:2.2
 WRKSRC=		${WRKDIR}/extract_forwarded
 PORTDOCS=	INSTALL README
 PATCH_STRIP=	-p1
diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile
index 623886c8cc91..88ebc5911055 100644
--- a/www/mod_fastcgi/Makefile
+++ b/www/mod_fastcgi/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache 2.2 fast-cgi module
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	*.c
diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile
index 1f6136071dff..c65a6d93eba8 100644
--- a/www/mod_fcgid/Makefile
+++ b/www/mod_fcgid/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Alternative FastCGI module for Apache2
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
-USES=		cpe
+USES=		apache:2.2+ cpe
 CPE_VENDOR=	apache
 
 HAS_CONFIGURE=		yes
diff --git a/www/mod_fileiri/Makefile b/www/mod_fileiri/Makefile
index 1afe5040ccac..728ef855777f 100644
--- a/www/mod_fileiri/Makefile
+++ b/www/mod_fileiri/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Apache 2.x http IRIs module
 
 #LICENSE=	AL11
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_flickr/Makefile b/www/mod_flickr/Makefile
index dd5e868323fb..fffaee59001f 100644
--- a/www/mod_flickr/Makefile
+++ b/www/mod_flickr/Makefile
@@ -24,7 +24,7 @@ XTRA_FLAGS+=	-DDEBUG
 AP_EXTRAS=	${XTRA_FLAGS}
 USE_LDCONFIG=	yes
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_geoip2/Makefile b/www/mod_geoip2/Makefile
index 02d7cb0ea0aa..1dc1cf454af6 100644
--- a/www/mod_geoip2/Makefile
+++ b/www/mod_geoip2/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	GeoIP>=1.4.4:net/GeoIP
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 GH_PROJECT=	geoip-api-mod_geoip2
-USE_APACHE=	22+
+USES=		apache:2.2+
 MODULENAME=	mod_geoip
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index 342092f0e37e..18be7dac2c4a 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 GNU_CONFIGURE=	yes
-USES=		libtool pkgconfig tar:bzip2
-USE_APACHE=	24
+USES=		apache:2.4 libtool pkgconfig tar:bzip2
 
 DBDIR=		${PREFIX}/var/db/${PORTNAME}
 PLIST_SUB=	SED="${SED}" WWWGRP=${WWWGRP} WWWOWN=${WWWOWN}
diff --git a/www/mod_gzip2/Makefile b/www/mod_gzip2/Makefile
index 11ffda40bffc..60f5fc5cad53 100644
--- a/www/mod_gzip2/Makefile
+++ b/www/mod_gzip2/Makefile
@@ -13,11 +13,10 @@ COMMENT=	Apache 2.x Internet Content Acceleration module
 
 #LICENSE=	AL11
 
-USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 MAKE_ENV+=	"APXS=${APXS}"
-USES=		gmake
+USES=		apache:2.2+ gmake
 
 PORTDOCS=	commands.txt samples.txt
 PORTEXAMPLES=	mod_gzip2.conf.sample
diff --git a/www/mod_h264_streaming/Makefile b/www/mod_h264_streaming/Makefile
index 6e6bbfcedc3b..3f01e0221a04 100644
--- a/www/mod_h264_streaming/Makefile
+++ b/www/mod_h264_streaming/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Apache H264 streaming module
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apxs="${APXS}"
diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile
index 0b5afd380a61..9a6d4ea450a1 100644
--- a/www/mod_hosts_access/Makefile
+++ b/www/mod_hosts_access/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Apache module that makes Apache respect hosts.allow and hosts.deny
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_http2-devel/Makefile b/www/mod_http2-devel/Makefile
index 3fb85d4d3b8c..35fb0cdc8d41 100644
--- a/www/mod_http2-devel/Makefile
+++ b/www/mod_http2-devel/Makefile
@@ -16,9 +16,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 
-USES=		autoreconf libtool ssl
+USES=		apache:2.4+ autoreconf libtool ssl
 USE_GITHUB=	yes
-USE_APACHE=	24+
 
 GH_ACCOUNT=	icing
 GH_PROJECT=	mod_h2
diff --git a/www/mod_layout22/Makefile b/www/mod_layout22/Makefile
index 8cb2bfd86e24..43b328a90de1 100644
--- a/www/mod_layout22/Makefile
+++ b/www/mod_layout22/Makefile
@@ -15,7 +15,7 @@ CONFLICTS=	mod_layout-3.* mod_layout-4.*
 
 PORTSCOUT=	limit:^5
 
-USE_APACHE=	22
+USES=		apache:2.2+
 
 MAKE_ARGS+=	builddir=${WRKSRC}
 
diff --git a/www/mod_limitipconn2/Makefile b/www/mod_limitipconn2/Makefile
index 0c59b6f74456..7b2a015aac3d 100644
--- a/www/mod_limitipconn2/Makefile
+++ b/www/mod_limitipconn2/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Allows you to limit the number of simultaneous connexions
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
-USES=		tar:bzip2
+USES=		apache:2.2+ tar:bzip2
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_line_edit/Makefile b/www/mod_line_edit/Makefile
index 89094dda370b..db8927cb25f2 100644
--- a/www/mod_line_edit/Makefile
+++ b/www/mod_line_edit/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Apache module for simple text rewriting
 
 LICENSE=	GPLv2
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_log_config-st/Makefile b/www/mod_log_config-st/Makefile
index 370c373b5635..0f70b8d4b413 100644
--- a/www/mod_log_config-st/Makefile
+++ b/www/mod_log_config-st/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Modified version of mod_log_config for Apache 2.2.x
 
 LICENSE=	APACHE11
 
-USES=		tar:xz
-USE_APACHE=	22
+USES=		apache:2.2 tar:xz
 AP_FAST_BUILD=	yes
 SRC_FILE=	mod_log_config.c
 SHORTMODNAME=	log_config
diff --git a/www/mod_log_mysql/Makefile b/www/mod_log_mysql/Makefile
index b8520fb7c2b6..f747d9aeb6f5 100644
--- a/www/mod_log_mysql/Makefile
+++ b/www/mod_log_mysql/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Allows Apache 2.2.x to log to a MySQL database
 LICENSE=	PD APACHE11
 LICENSE_COMB=	multi
 
-USES=		tar:xz
+USES=		apache:2.2 tar:xz
 RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:www/mod_log_config-st
 
-USE_APACHE=	22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 USE_MYSQL=	yes
diff --git a/www/mod_log_sql2-dtc/Makefile b/www/mod_log_sql2-dtc/Makefile
index bd3f471bc76e..6be5413d7aeb 100644
--- a/www/mod_log_sql2-dtc/Makefile
+++ b/www/mod_log_sql2-dtc/Makefile
@@ -21,8 +21,7 @@ DBI_CONFIGURE_OFF=	--without-dbi
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 
 GNU_CONFIGURE=	yes
-USES=		gmake tar:bzip2
-USE_APACHE=	22
+USES=		apache:2.2 gmake tar:bzip2
 USE_MYSQL=	yes
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index f990c132e892..12b531e65779 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-USES=		gmake tar:bzip2
-USE_APACHE=	22+
+USES=		apache:2.2+ gmake tar:bzip2
 USE_MYSQL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/www/mod_macro22/Makefile b/www/mod_macro22/Makefile
index 96306788ebb3..e3d6fda500b9 100644
--- a/www/mod_macro22/Makefile
+++ b/www/mod_macro22/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 PORTDOCS=	${PORTNAME}.html
diff --git a/www/mod_memcache/Makefile b/www/mod_memcache/Makefile
index f817f74aca01..8d18b599c4f3 100644
--- a/www/mod_memcache/Makefile
+++ b/www/mod_memcache/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Apache 2.2.x module to manage apr_memcache connections
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 USE_GITHUB=	yes
 GH_ACCOUNT=	joshrotenberg
 GH_PROJECT=	modmemcache
diff --git a/www/mod_memcache_block/Makefile b/www/mod_memcache_block/Makefile
index d49334d961d1..6506d346f3e4 100644
--- a/www/mod_memcache_block/Makefile
+++ b/www/mod_memcache_block/Makefile
@@ -16,7 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	netik
 GH_TAGNAME=	7b1fcec
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_INC=		${LOCALBASE}/include/libmemcached
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index 944f9bcaaa8e..25bdaedc0c08 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS=	mono:lang/mono \
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --man=${PREFIX}/man
 INSTALL_TARGET=	install
-USES=		libtool mono pkgconfig
-USE_APACHE=	22+
+USES=		apache:2.2+ libtool mono pkgconfig
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/mod_mpm_itk/Makefile b/www/mod_mpm_itk/Makefile
index b271494d1328..333e34d1b4aa 100644
--- a/www/mod_mpm_itk/Makefile
+++ b/www/mod_mpm_itk/Makefile
@@ -15,7 +15,7 @@ COMMENT=	This MPM allows you to run each vhost under a separate uid and gid
 
 LICENSE=	APACHE20
 
-USE_APACHE=	24
+USES=		apache:2.4
 GNU_CONFIGURE=	yes
 
 AP_FAST_BUILD=	yes
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index 5aea038a3f29..055db73bfe5b 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Apache module that allows downloading and streaming of audio
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libarchive localbase:ldflags
-USE_APACHE=	22
+USES=		apache:2.2 libarchive localbase:ldflags
 
 OPTIONS_DEFINE=	NLS FLAC MP3 MP4 VORBIS LIBARCHIVE FILECACHE MYSQLCACHE DOCS
 OPTIONS_DEFAULT=MP3 LIBARCHIVE FILECACHE
diff --git a/www/mod_ntlm2/Makefile b/www/mod_ntlm2/Makefile
index e91eb0743a9b..a6f8c26e535f 100644
--- a/www/mod_ntlm2/Makefile
+++ b/www/mod_ntlm2/Makefile
@@ -12,8 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	NTLM authentication module for the Apache2 webserver
 
-USES=		samba:build
-USE_APACHE=	22
+USES=		apache:2.2 samba:build
 MAKE_ENV=	APXS=${APXS}
 
 do-install:
diff --git a/www/mod_pagespeed/Makefile b/www/mod_pagespeed/Makefile
index ebfaa27332eb..1de151388edf 100644
--- a/www/mod_pagespeed/Makefile
+++ b/www/mod_pagespeed/Makefile
@@ -32,9 +32,8 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libicutu.so:devel/icu \
 		libopencv_legacy.so:graphics/opencv
 
-USES=		compiler:c++14-lang gperf jpeg gmake localbase pkgconfig \
-		python:2.7 shebangfix ssl tar:xz
-USE_APACHE=	22+
+USES=		apache:2.2+ compiler:c++14-lang gperf jpeg gmake localbase \
+		pkgconfig python:2.7 shebangfix ssl tar:xz
 SHEBANG_GLOB=	*.gyp *.gypi *.py *.sh
 SHEBANG_FILES=	build/fix_proto_and_invoke_protoc
 
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 97965c6fe8e9..6caf6de2a57a 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -22,8 +22,7 @@ TEST_DEPENDS=	p5-CGI>=4.15:www/p5-CGI \
 
 SUB_FILES=	pkg-message ${APMOD_FILE}
 SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}
-USE_APACHE=	22+
-USES=		cpe gmake perl5
+USES=		apache:2.2+ cpe gmake perl5
 USE_PERL5=	configure
 USE_CSTD=	gnu89
 CPE_VENDOR=	apache
diff --git a/www/mod_proctitle/Makefile b/www/mod_proctitle/Makefile
index 677847cf6d44..54770b29f8e2 100644
--- a/www/mod_proctitle/Makefile
+++ b/www/mod_proctitle/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Set httpd process titles to reflect currently processed request
 
 LICENSE=	BSD2CLAUSE
 
-USE_APACHE=	22+
 GNU_CONFIGURE=	yes
-USES=		tar:bzip2
+USES=		apache:2.2+ tar:bzip2
 
 CFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/apr-1
diff --git a/www/mod_proxy_html/Makefile b/www/mod_proxy_html/Makefile
index 42638d7df877..0aa8b1ed1d5d 100644
--- a/www/mod_proxy_html/Makefile
+++ b/www/mod_proxy_html/Makefile
@@ -17,11 +17,10 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:www/mod_xml2enc
 
 SUB_FILES=	pkg-message
-USE_APACHE=	22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	proxy_html
-USES=		tar:bzip2
+USES=		apache:2.2 tar:bzip2
 USE_GNOME=	libxml2
 
 AP_INC+=	${LOCALBASE}/include/libxml2 -I${WRKSRC}
diff --git a/www/mod_proxy_uwsgi/Makefile b/www/mod_proxy_uwsgi/Makefile
index d814ad81bbcf..99dd2672a6d1 100644
--- a/www/mod_proxy_uwsgi/Makefile
+++ b/www/mod_proxy_uwsgi/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}mod_proxy_
 MAINTAINER=	schmidt@ze.tum.de
 COMMENT=	Apache proxy module to pass requests to uwsgi
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_proxy_xml/Makefile b/www/mod_proxy_xml/Makefile
index c66ecfbba610..727bd7686d01 100644
--- a/www/mod_proxy_xml/Makefile
+++ b/www/mod_proxy_xml/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for rewriting URI references in XML
 
 USE_GNOME=	libxml2
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_python33/Makefile b/www/mod_python33/Makefile
index 9f42f3199f98..2ccce85016e3 100644
--- a/www/mod_python33/Makefile
+++ b/www/mod_python33/Makefile
@@ -17,8 +17,7 @@ LICENSE=	APACHE20
 
 CONFLICTS_INSTALL=	ap2[24]-mod_python3[^3]*
 
-USE_APACHE=	22
-USES=		cpe python:2.7 tar:tgz
+USES=		apache:2.2 cpe python:2.7 tar:tgz
 CPE_VENDOR=	apache
 
 GNU_CONFIGURE=		yes
diff --git a/www/mod_python35/Makefile b/www/mod_python35/Makefile
index ae6436acb8f3..c4676d07c614 100644
--- a/www/mod_python35/Makefile
+++ b/www/mod_python35/Makefile
@@ -18,8 +18,7 @@ LICENSE=	APACHE20
 
 CONFLICTS_INSTALL=	ap2[24]-mod_python3[^5]*
 
-USE_APACHE=	22+
-USES=		cpe python:2.7 tar:tgz
+USES=		apache:2.2+ cpe python:2.7 tar:tgz
 CPE_VENDOR=	apache
 SUB_FILES=	pkg-message 270_mod_python.conf.sample
 
diff --git a/www/mod_qos/Makefile b/www/mod_qos/Makefile
index 2107808e92b9..dbed5c13f31b 100644
--- a/www/mod_qos/Makefile
+++ b/www/mod_qos/Makefile
@@ -12,7 +12,7 @@ COMMENT=	QoS for Apache
 
 LICENSE=	GPLv2+
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_GENPLIST=	yes
 AP_FAST_BUILD=	yes
 
diff --git a/www/mod_realdoc/Makefile b/www/mod_realdoc/Makefile
index 7880dfac2bb3..abe2ba3c2842 100644
--- a/www/mod_realdoc/Makefile
+++ b/www/mod_realdoc/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Apache module to support atomic deploys
 
 LICENSE=	MIT
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 USE_GITHUB=	yes
diff --git a/www/mod_remoteip/Makefile b/www/mod_remoteip/Makefile
index fe08fb63fc6f..6a37ae5954ea 100644
--- a/www/mod_remoteip/Makefile
+++ b/www/mod_remoteip/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	httpd-2.3.5-alpha
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Replaces the client IP address/hostname with that given by a proxy
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_reproxy/Makefile b/www/mod_reproxy/Makefile
index f6854c966a58..1c8231065d5e 100644
--- a/www/mod_reproxy/Makefile
+++ b/www/mod_reproxy/Makefile
@@ -12,7 +12,7 @@ LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/lestrrat-mod_reproxy-0f945ff
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 2f62a5267e50..bdd4d9f9cc51 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libitcl.so:lang/itcl
 
-USES+=		gmake libtool tcl:85+,tea
-USE_APACHE=	22-24
+USES+=		apache:2.2-2.4 gmake libtool tcl:85+,tea
 USE_LDCONFIG=	${PREFIX}/lib/rivet
 
 INSTALL_TARGET=	install-strip
diff --git a/www/mod_rpaf2/Makefile b/www/mod_rpaf2/Makefile
index 8061c20781d0..d991f46e21f4 100644
--- a/www/mod_rpaf2/Makefile
+++ b/www/mod_rpaf2/Makefile
@@ -17,7 +17,7 @@ GH_ACCOUNT=	gnif
 
 DOCS=	README.md
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 SHORTMODNAME=	rpaf
 
diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile
index 13ea7942083e..8115c7f76722 100644
--- a/www/mod_scgi/Makefile
+++ b/www/mod_scgi/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE.txt
 SCGI_DIR=	apache2
 WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 72f8dd4e8795..08351c32703a 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS+=	libpcre.so:devel/pcre \
 		libgdbm.so:databases/gdbm \
 		libexpat.so:textproc/expat2
 
-USES=		perl5 pkgconfig shebangfix bdb
-USE_APACHE=	22+
+USES=		apache:2.2+ perl5 pkgconfig shebangfix bdb
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	tools/rules-updater.pl.in mlogc/mlogc-batch-load.pl.in
diff --git a/www/mod_setenvifplus/Makefile b/www/mod_setenvifplus/Makefile
index cc0954347ebc..265845835edc 100644
--- a/www/mod_setenvifplus/Makefile
+++ b/www/mod_setenvifplus/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Allows setting environment variables based on request attributes
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	${WRKSRC}/apache2/${MODULENAME}.c
diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile
index 2a16e5a8e9d7..c874bfebbd05 100644
--- a/www/mod_spdy/Makefile
+++ b/www/mod_spdy/Makefile
@@ -24,8 +24,7 @@ BUILD_DEPENDS=	greadlink:sysutils/coreutils \
 		bash:shells/bash
 
 ONLY_FOR_ARCHS=	amd64 i386
-USE_APACHE=	22
-USES=		compiler gmake python:2.7 ssl tar:xz
+USES=		apache:2.2 compiler gmake python:2.7 ssl tar:xz
 REINPLACE_ARGS=	-i ""
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile
index c04df45d85ca..a8a5c69767d6 100644
--- a/www/mod_tidy/Makefile
+++ b/www/mod_tidy/Makefile
@@ -17,7 +17,7 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_INC+=	${LOCALBASE}/include/tidy
diff --git a/www/mod_tsa/Makefile b/www/mod_tsa/Makefile
index 246b00b6319c..fd0dc6a0f280 100644
--- a/www/mod_tsa/Makefile
+++ b/www/mod_tsa/Makefile
@@ -20,8 +20,7 @@ CONFIGURE_ARGS=	--with-openssl-incdir=${OPENSSLINC} \
 				--with-apxs=${APXS}
 MAKE_ARGS+=	APXS=${APXS}
 
-USES=		ssl
-USE_APACHE=	22+
+USES=		apache:2.2+ ssl
 AP_EXTRAS+=	-DMOD_TSA_VERSION=\\\"mod_tsa/${PORTVERSION}\\\"
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_uid/Makefile b/www/mod_uid/Makefile
index fb5c6e625422..f7274348e19b 100644
--- a/www/mod_uid/Makefile
+++ b/www/mod_uid/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Apache module issuing the "correct" cookies for counting the site visit
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 MODULENAME=	mod_uid2
diff --git a/www/mod_umask/Makefile b/www/mod_umask/Makefile
index def399f0c4e5..6a13ce86f768 100644
--- a/www/mod_umask/Makefile
+++ b/www/mod_umask/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Apache 2.x module to set umask of created files
 
 LICENSE=	APACHE20
 
-USES=	tar:bzip2
+USES=		apache:2.2+ tar:bzip2
 GNU_CONFIGURE=	yes
-USE_APACHE=	22+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_vhost_ldap/Makefile b/www/mod_vhost_ldap/Makefile
index 895b841c8bd1..2caf4852bfba 100644
--- a/www/mod_vhost_ldap/Makefile
+++ b/www/mod_vhost_ldap/Makefile
@@ -16,7 +16,7 @@ LICENSE=	APACHE20
 
 USE_OPENLDAP=	yes
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_LIB+=	${LOCALBASE}/lib -lldap
diff --git a/www/mod_vhs/Makefile b/www/mod_vhs/Makefile
index dd2475532b62..32430eaf17a1 100644
--- a/www/mod_vhs/Makefile
+++ b/www/mod_vhs/Makefile
@@ -15,9 +15,8 @@ LICENSE=	APACHE11
 
 MANUAL_PACKAGE_BUILD=	needs apr with LDAP and DBD options enabled
 
-USES=		php:mod,build cpe
+USES=		apache:2.2+ php:mod,build cpe
 CPE_VENDOR=	xavier_beaudouin
-USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	*.c
diff --git a/www/mod_webauth/Makefile b/www/mod_webauth/Makefile
index 22f29c96ae96..d955d16ddcd4 100644
--- a/www/mod_webauth/Makefile
+++ b/www/mod_webauth/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Apache module for authenticating users with Kerberos v5
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libsasl2.so:security/cyrus-sasl2
 
-USES=		libtool pathfix pkgconfig ssl
-USE_APACHE=	22+
+USES=		apache:2.2+ libtool pathfix pkgconfig ssl
 USE_OPENLDAP=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/mod_webkit/Makefile b/www/mod_webkit/Makefile
index e7bcdf206fc1..a3c4d5c98db2 100644
--- a/www/mod_webkit/Makefile
+++ b/www/mod_webkit/Makefile
@@ -14,7 +14,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Cito
 GH_PROJECT=	w4py
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS=	marshal.c
diff --git a/www/mod_whatkilledus/Makefile b/www/mod_whatkilledus/Makefile
index 27bbd0696c7b..c324f566f127 100644
--- a/www/mod_whatkilledus/Makefile
+++ b/www/mod_whatkilledus/Makefile
@@ -17,7 +17,7 @@ LICENSE=	APACHE20
 
 MANUAL_PACKAGE_BUILD=	requires apache WITH_EXCEPTION_HOOK=yes
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	whatkilledus
diff --git a/www/mod_wsgi4/Makefile b/www/mod_wsgi4/Makefile
index 4f45feff24e6..dfade3a106ad 100644
--- a/www/mod_wsgi4/Makefile
+++ b/www/mod_wsgi4/Makefile
@@ -15,8 +15,7 @@ LICENSE=	APACHE20
 
 CONFLICTS_INSTALL=${PKGNAMEPREFIX}mod_wsgi3.* mod_wsgi3.*
 
-USES=		gettext python
-USE_APACHE=	22+
+USES=		apache:2.2+ gettext python
 USE_PYTHON=	flavors
 
 GNU_CONFIGURE=	yes
diff --git a/www/mod_xml2enc/Makefile b/www/mod_xml2enc/Makefile
index 95801225c6be..d2c79372cbf8 100644
--- a/www/mod_xml2enc/Makefile
+++ b/www/mod_xml2enc/Makefile
@@ -16,11 +16,10 @@ LICENSE=	GPLv2
 
 # included in apache24
 # http://httpd.apache.org/docs/2.4/mod/mod_xml2enc.html
-USE_APACHE=	22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	xml2enc
-USES=	tar:bzip2
+USES=		apache:2.2 tar:bzip2
 USE_GNOME=	libxml2
 
 AP_INC+=	${LOCALBASE}/include/libxml2 -I${WRKSRC}
diff --git a/www/mod_xmlns/Makefile b/www/mod_xmlns/Makefile
index 549cd620f180..3231f9ac1ec5 100644
--- a/www/mod_xmlns/Makefile
+++ b/www/mod_xmlns/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Apache module for XML namespaces
 LICENSE=	GPLv2
 
 USE_GNOME=	libxml2
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_xsendfile/Makefile b/www/mod_xsendfile/Makefile
index 9eb8f3167dc3..c5cbfce9b6c6 100644
--- a/www/mod_xsendfile/Makefile
+++ b/www/mod_xsendfile/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Apache2 module that processes X-SENDFILE headers
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 USE_GITHUB=	yes
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 00ab2a13d17a..76fdb23fc817 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -885,9 +885,8 @@ LIB_DEPENDS+=	libapr-1.so:devel/apr1 \
 		libluajit-5.1.so:lang/luajit \
 		libpcre.so:devel/pcre \
 		libyajl.so:devel/yajl
-USE_APACHE=	22+
 USE_GNOME+=	libxml2
-USES+=		pkgconfig shebangfix
+USES+=		apache:2.2+ pkgconfig shebangfix
 MASTER_SITES+=	http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity
 DISTFILES+=	modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 556ee8ab6706..17db8da50199 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -894,9 +894,8 @@ LIB_DEPENDS+=	libapr-1.so:devel/apr1 \
 		libluajit-5.1.so:lang/luajit \
 		libpcre.so:devel/pcre \
 		libyajl.so:devel/yajl
-USE_APACHE=	22+
 USE_GNOME+=	libxml2
-USES+=		pkgconfig shebangfix
+USES+=		apache:2.2+ pkgconfig shebangfix
 MASTER_SITES+=	http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity
 DISTFILES+=	modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity
diff --git a/www/otrs/Makefile b/www/otrs/Makefile
index bafff6beb7c3..94e952c0bc06 100644
--- a/www/otrs/Makefile
+++ b/www/otrs/Makefile
@@ -100,7 +100,7 @@ SSL_RUN_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 
 APACHE_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2 \
 			p5-Apache-DBI>0:www/p5-Apache-DBI
-APACHE_USE=		apache_run=22+
+APACHE_USES=		apache:run,2.2+
 
 REPORTS_RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD \
 			p5-GD-Graph>=0:graphics/p5-GD-Graph \
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index b0bb61fb11c5..c87fc43f03aa 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -23,9 +23,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-URI>=1.71:net/p5-URI
 
 NO_ARCH=	yes
-USE_APACHE=	22+
 USE_PERL5=	configure
-USES=		perl5
+USES=		apache:2.2+ perl5
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 5c7c25b29789..5d872eaca4e9 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -25,8 +25,7 @@ BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=1.9922:www/mod_perl2 \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
-USE_APACHE=	22+
-USES=		perl5
+USES=		apache:2.2+ perl5
 USE_PERL5=	configure
 
 # Remove README.apache-2.4.pod to avoid conflicts with p5-Apache-AuthCookie
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index af26b04812e9..2d27fc03d38e 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 		p5-HTML-Clean>=0.8:www/p5-HTML-Clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		perl5
+USES=		apache:2.2+ perl5
 USE_PERL5=	configure
-USE_APACHE=	22+
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile
index f3e2b5d06868..d0795277a4e9 100644
--- a/www/p5-Apache-DB/Makefile
+++ b/www/p5-Apache-DB/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Debugging and profiling tools for mod_perl
 
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
-USES=		perl5
+USES=		apache:run,2.2+ perl5
 USE_PERL5=	configure
-USE_APACHE_RUN=	22+
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 53eda447507a..2223afc7fa6d 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -24,9 +24,8 @@ BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
 		p5-CGI>=0:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		perl5
+USES=		apache:2.2+ perl5
 USE_PERL5=	configure
-USE_APACHE=	22+
 NO_ARCH=	yes
 
 DOC_FILES=	INSTALL LICENSE README TODO UPGRADE
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index f1a70cc9dc02..7674277ec35b 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -19,8 +19,7 @@ BUILD_DEPENDS=	p5-Audio-Wav>=0:audio/p5-Audio-Wav \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		perl5
-USE_APACHE=	22+
+USES=		apache:2.2+ perl5
 USE_PERL5=	configure
 NO_ARCH=	yes
 
diff --git a/www/p5-Apache-ParseFormData/Makefile b/www/p5-Apache-ParseFormData/Makefile
index 1c8b879200fd..cc5bdb040a77 100644
--- a/www/p5-Apache-ParseFormData/Makefile
+++ b/www/p5-Apache-ParseFormData/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Module allows you to easily decode/parse form and query data
 BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		perl5
+USES=		apache:2.2+ perl5
 USE_PERL5=	configure
-USE_APACHE=	22+
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile
index 6cabb14662af..6f051bd1de83 100644
--- a/www/p5-MasonX-WebApp/Makefile
+++ b/www/p5-MasonX-WebApp/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
 		p5-Test-Output>=0:devel/p5-Test-Output
 
-USE_APACHE_RUN=	22+
-USES=		perl5
+USES=		apache:run,2.2+ perl5
 USE_PERL5=	modbuild
 
 .include <bsd.port.mk>
diff --git a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
index c07f6a923f57..0b0917099869 100644
--- a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
+++ b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	p5-Text-MultiMarkdown>=0:textproc/p5-Text-MultiMarkdown \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_APACHE_RUN=	22+
-USES=		perl5
+USES=		apache:run,2.2+ perl5
 USE_PERL5=	configure
 SUB_FILES=	pkg-message
 
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 944ac12996d1..ae906d370a53 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -17,8 +17,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apache2-apxs=${APXS} \
 		--with-expat=${LOCALBASE} \
 		--enable-perl-glue --with-perl=${PERL}
-USES=		libtool perl5
-USE_APACHE=	22+
+USES=		apache:2.2+ libtool perl5
 USE_PERL5=	run
 USE_LDCONFIG=	yes
 
diff --git a/www/photo_gallery/Makefile b/www/photo_gallery/Makefile
index 466abb486ee4..4aa3865e2842 100644
--- a/www/photo_gallery/Makefile
+++ b/www/photo_gallery/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS=	anytopnm:graphics/netpbm\
 		p5-Image-Info>=0:graphics/p5-Image-Info\
 		p5-URI>=0:net/p5-URI
 
-USE_APACHE_RUN=	22+
-USES=		perl5 shebangfix tar
+USES=		apache:run,2.2+ perl5 shebangfix tar
 SHEBANG_FILES=	index.cgi
 perl_OLD_CMD=	/usr/pkg/bin/perl
 NO_BUILD=	yes
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index c63417425051..f5de86abc5f8 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -30,7 +30,7 @@ OPTIONS_EXCLUDE=DOCS
 SYMLINK_DESC=	Create passenger symlink
 
 .if ${FLAVOR} == apache
-USE_APACHE=	22+
+USES+=		apache:2.2+
 .endif
 
 USE_RUBY=	yes
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 3579612f6dc9..1f0e182c9330 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -13,10 +13,9 @@ MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Securely execute PHP scripts under Apache
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf libtool php:cgi
+USES=		apache:2.2+ autoreconf libtool php:cgi
 SUB_FILES=	pkg-message
 
-USE_APACHE=	22+
 CFLAGS+=	-I${LOCALBASE}/include
 USE_CSTD=	gnu89
 USE_CXXSTD=	gnu++98
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 6d7c47c7ac47..4e5c7f8375ed 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -44,7 +44,7 @@ BITS=		${ARCH:S/amd64/64/:S/x86_64/64/:S/i386/32/}bits
 WRKSRC=		${WRKDIR}/thunder
 
 .if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22+
+USES+=		apache:run,2.2+
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index bed7cdc4bf5b..409cbef3f88c 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB=	OWNER=${WWWOWN} GROUP=${WWWGRP}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22+
+USES+=		apache:run,2.2+
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
diff --git a/www/websh/Makefile b/www/websh/Makefile
index e1f7c7f3a684..8f9852a19b1b 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -15,7 +15,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 TCL_DVER=	${TCL_VER:S/.//}
 
-USES=		autoreconf gmake tcl:tea
+USES=		apache:2.2+ autoreconf gmake tcl:tea
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
 USE_LDCONFIG=	yes
 SUB_FILES=	httpd.conf pkgIndex.tcl pkg-message
@@ -27,7 +27,6 @@ PLIST_SUB+=	NOMINORVERSION=${TCL_VER:C/8.[345]//:C/^..*/"@comment "/}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-USE_APACHE=	22+
 CONFIGURE_ARGS+=--with-httpdinclude=`apxs -q includedir`
 
 CPPFLAGS+=	-I ${LOCALBASE}/include/apr-1