Migrate USE_APACHE to USES= apache (category www)

- Following migration of Mk/bsd.apache.mk to Mk/Uses/apache.mk With hat: apache
svn path=/head/; revision=464189
2024-11-24 00:45:52 +00:00 · 2018-03-11 17:38:45 +00:00 · 2018-03-11 17:38:45 +00:00 · 88b492b029 · 2021-03-31 03:12:20 +00:00
commit 88b492b029
parent d05bbd0416
117 changed files with 118 additions and 181 deletions
--- 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>

--- 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
--- 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}
--- 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

--- 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}
--- 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
--- 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
--- 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>
--- 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

--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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

--- 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}
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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} \
--- 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
--- 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
--- 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

--- 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=	#
--- 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
--- 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

--- 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>
--- 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
--- 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

--- 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"

--- 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`"
--- 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

--- 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} \
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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
--- 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}
--- 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
--- 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}"
--- 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

--- 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
--- 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}

--- 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
--- 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

--- 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
--- 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
--- 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}
--- 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

--- 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
--- 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
--- 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
--- 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>

--- 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
--- 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
--- 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:
--- 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

--- 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
--- 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
--- 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}
--- 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

--- 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
--- 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
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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
--- 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
--- 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}

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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}
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More