Mk/Uses/apache.mk: Refactor after removal of older versions

apache22 and apache25 had been removed a long time ago however the
apache.mk file has never been refactored and is out of sync from the
file Mk/bsd.default-versions.mk. These changes refactors the removals of
the older versions. In addition:

- Move some keywords like USE_APACHE, USE_APACHE_BUILD, USE_APACHE_RUN
  from SANITY_DEPRECATED to SANITY_UNSUPPORTED
- Remove apache versions from ports Makefiles as currently there is only
  one available version in the tree. However the version checks are
  still valid and should work flawlessly whenever a new version is
  added. For example USES=apache:2.2+ are simply replaced with
  USES=apache. As currently there are no other versions available for
  test this could not be checked on it's own ground.
- Update FOO_USE=APACHE=yes to FOO_USES=apache
- Remove trailing whitespaces

Approved by:    portmgr
Differential Revision: https://reviews.freebsd.org/D38113

106 files changed, 114 insertions, 138 deletions

diff --git a/Mk/Uses/apache.mk b/Mk/Uses/apache.mk
index c711648af941..d772ec62686f 100644
--- a/Mk/Uses/apache.mk
+++ b/Mk/Uses/apache.mk
@@ -1,6 +1,3 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
-#
 # apache.mk - Apache related macros.
 # Author: Clement Laforet <clement@FreeBSD.org>
 # Author: Olli Hauer <ohauer@FreeBSD.org>
@@ -15,9 +12,8 @@
 # version	If your port requires a specific Apache httpd version, you can
 #			set this to [min]-[max] or min+ or -max or an explicit version
 #
-#				USES=apache:2.2		# Only use Apache 2.2
+#				USES=apache:2.4		# Only use Apache 2.4
 #				USES=apache:2.4+	# Use Apache 2.4 or newer
-#				USES=apache:2.2-2.4	# Use Apache 2.2 or 2.4
 #				USES=apache:-2.4	# Use Apache 2.4 or earlier
 #				USES=apache			# Use the default apache version
 #
@@ -51,13 +47,13 @@
 # Variables, for internal use by the Apache ports framework only
 #  The following values for USE_APACHE are reserved and only valid
 #  in apache-server ports!
-#      USES= apache:server,2.2
+#      USES= apache:server,2.4
 #
 #
 # The following variables can be read by ports and must not be modified
 #
 #  APACHE_VERSION		The major-minor release version of the chosen
-#						Apache server, e.g. 2.2 or 2.4
+#						Apache server, e.g. 2.4
 #
 #  APACHEETCDIR			Location of the Apache configuration directory
 #						Default: ${LOCALBASE}/etc/apache24
@@ -77,7 +73,7 @@ _USES_POST+=	apache
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-_APACHE_SUPPORTED_VERSIONS=	2.4 2.2 2.5	# preferred version first
+_APACHE_SUPPORTED_VERSIONS=	2.4 # preferred version first
 
 # Print warnings
 _ERROR_MSG=	: Error from apache.mk.
@@ -260,7 +256,7 @@ _APACHE_WANTED_VERSIONS=	${_APACHE_SUPPORTED_VERSIONS}
 _APACHE_WANTED_VERSIONS:=	${_APACHE_WANTED_VERSIONS:N${_ver}}
 .      endif
 .      if !empty(_APACHE_VERSION_MAX) && ${_ver} > ${_APACHE_VERSION_MAX}
-_APACHE_WANTED_VERSIONS:=	${_APACHE_WANTED_VERSIONS:N${_ver}}		
+_APACHE_WANTED_VERSIONS:=	${_APACHE_WANTED_VERSIONS:N${_ver}}
 .      endif
 .    endfor
 
@@ -281,11 +277,7 @@ APACHE_VERSION:=	${_APACHE_WANTED_VERSION}
 BROKEN=	${_ERROR_MSG} Apache ${_APACHE_VERSION} is installed and port requires ${_APACHE_WANTED_VERSION}
 .    endif
 
-.    if ${APACHE_VERSION} >= 2.5
-APXS?=	${LOCALBASE}/bin/apxs
-.    else
 APXS?=	${LOCALBASE}/sbin/apxs
-.    endif
 
 .    if exists(${APXS})
 APXS_PREFIX!=	${APXS} -q prefix 2> /dev/null || echo NULL
@@ -300,11 +292,7 @@ IGNORE?=	PREFIX must be equal to APXS_PREFIX.
 APACHEMODDIR=		libexec/apache${APACHE_VERSION:S/.//}
 APACHEINCLUDEDIR=	include/apache${APACHE_VERSION:S/.//}
 APACHEETCDIR=		etc/apache${APACHE_VERSION:S/.//}
-.    if ${APACHE_VERSION} == 2.5
-_APACHE_PORT?=		www/apache${APACHE_VERSION:S/.//}-devel
-.    else
 _APACHE_PORT?=		www/apache${APACHE_VERSION:S/.//}
-.    endif
 
 PLIST_SUB+=	APACHEMODDIR="${APACHEMODDIR}" \
 		APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index 5d60596d85f4..516b33e0a518 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -209,11 +209,10 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD \
 		XORG_CAT CARGO_USE_GITHUB CARGO_USE_GITLAB CARGO_GIT_SUBDIR \
 		USE_RUBY USE_RUBY_EXTCONF USE_RUBY_SETUP RUBY_NO_BUILD_DEPENDS \
-		RUBY_NO_RUN_DEPENDS
+		RUBY_NO_RUN_DEPENDS USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN
 SANITY_DEPRECATED=	MLINKS \
 			USE_MYSQL WANT_MYSQL_VER \
-			PYDISTUTILS_INSTALLNOSINGLE \
-			USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN
+			PYDISTUTILS_INSTALLNOSINGLE
 SANITY_NOTNEEDED=	CMAKE_NINJA WX_UNICODE USE_KDEBASE_VER \
 			USE_KDELIBS_VER USE_QT_VER
 
diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile
index 684b7f9e7217..ff476e0dc4c0 100644
--- a/databases/gnatsweb4/Makefile
+++ b/databases/gnatsweb4/Makefile
@@ -11,7 +11,7 @@ WWW=		https://www.gnu.org/software/gnats/
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		apache:run,2.2+ perl5 shebangfix
+USES=		apache:run perl5 shebangfix
 SHEBANG_FILES=	gnatsweb.pl
 USE_PERL5=	run
 NO_BUILD=	yes
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile
index 7a23e2e48dc9..a25faf0111fe 100644
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -45,7 +45,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt
 .include "${.CURDIR}/Makefile.common"
 .include "${.CURDIR}/Makefile.options"
 
-MODPERL_USE=		APACHE_RUN=22+
+MODPERL_USES=		apache:run
 MYSQL_USES=		mysql
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 PGSQL_USES=		pgsql
diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile
index dbea1db374db..d98749921708 100644
--- a/devel/bugzilla50/Makefile
+++ b/devel/bugzilla50/Makefile
@@ -46,7 +46,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt
 .include "${.CURDIR}/Makefile.common"
 .include "${.CURDIR}/Makefile.options"
 
-MODPERL_USE=		APACHE_RUN=22+
+MODPERL_USES=		apache:run
 MYSQL_USES=		mysql
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 PGSQL_USES=		pgsql:9.1+
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index 81ef9a36d583..be349b5c393d 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -37,7 +37,7 @@ MAILSENDER_DESC=	Mail::Sender support
 MAILSENDMAIL_DESC=	Mail::Sendmail support
 
 APACHELOG_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
-APACHELOG_USE=		APACHE_RUN=22+
+APACHELOG_USES=		apache:run
 MIMELITE_RUN_DEPENDS=	p5-MIME-Lite>=0:mail/p5-MIME-Lite
 MAILSEND_RUN_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
 MAILSENDER_RUN_DEPENDS=	p5-Mail-Sender>=0:mail/p5-Mail-Sender
diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile
index 4e642df4bdd5..0a6ae19342fa 100644
--- a/devel/pushmi/Makefile
+++ b/devel/pushmi/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
 		p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
 		svk>=2.0.0:devel/svk
 
-USES=		apache:2.2+ perl5
+USES=		apache perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/devel/viewvc-devel/Makefile b/devel/viewvc-devel/Makefile
index e87671525480..2ec4881524fa 100644
--- a/devel/viewvc-devel/Makefile
+++ b/devel/viewvc-devel/Makefile
@@ -29,7 +29,7 @@ WEBSRV_DESC=		Enable web server support
 APMOD_DESC=		depend on Apache module
 
 MODWSGI_DESC=		Add mod_wsgi to the list of package dependencies
-APACHE_USE=		APACHE_RUN=24+
+APACHE_USES=		apache:run
 
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 MODWSGI_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}mod_wsgi>=4.4.13:www/mod_wsgi4@${PY_FLAVOR}
diff --git a/dns/dns-ui/Makefile b/dns/dns-ui/Makefile
index 33ddbe9429fe..43cd5fbc18f0 100644
--- a/dns/dns-ui/Makefile
+++ b/dns/dns-ui/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFAULT=	APACHE PGSQLSRV
 APACHE_DESC=		Use apache as webserver
 PGSQLSRV_DESC=		Use local postgres instance
 
-APACHE_USES=		apache:run,2.2+ php:mod
+APACHE_USES=		apache:run php:mod
 APACHE_USES_OFF=	php:web
 PGSQLSRV_VARS=		WANT_PGSQL=server
 
diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile
index 542da29b52c4..ce2215df8699 100644
--- a/finance/frontaccounting/Makefile
+++ b/finance/frontaccounting/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	APACHE MYSQL_SERVER
 MYSQL_SERVER_DESC=	MySQL server support
 NGINX_DESC=		NGINX web server
 
-APACHE_USES=		apache:run,2.2+ php:web
+APACHE_USES=		apache:run php:web
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 LIGHTTPD_USES=		php:web
 NGINX_RUN_DEPENDS=	nginx:www/nginx
diff --git a/finance/frontaccounting24/Makefile b/finance/frontaccounting24/Makefile
index a52bde4bb846..9e2caa235a58 100644
--- a/finance/frontaccounting24/Makefile
+++ b/finance/frontaccounting24/Makefile
@@ -35,7 +35,7 @@ MYSQL_CLIENT_DESC=	MySQL client connector support
 MYSQL_SERVER_DESC=	MySQL server support
 NGINX_DESC=		NGINX web server
 
-APACHE_USES=		apache:run,2.2+ php:web
+APACHE_USES=		apache:run php:web
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 LIGHTTPD_USES=		php:web
 NGINX_RUN_DEPENDS=	nginx:www/nginx
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index 482123554a95..182e8ab48209 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -35,7 +35,7 @@ UI_USES=	gnome
 UI_USE=		gnome=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
 UI_CMAKE_BOOL=	WITH_UI
 
-APACHE_USE=	apache=22+
+APACHE_USES=	apache
 APACHE_CMAKE_BOOL=	WITH_APACHE
 
 .include <bsd.port.mk>
diff --git a/lang/php80/Makefile b/lang/php80/Makefile
index 6b8b32dd6358..85486b348290 100644
--- a/lang/php80/Makefile
+++ b/lang/php80/Makefile
@@ -95,8 +95,7 @@ CONFIGURE_ARGS+=--without-pcre-jit
 .endif
 
 .if defined(PKGNAMEPREFIX)
-USES+=		apache:2.2+
-.include "${PORTSDIR}/Mk/Uses/apache.mk"
+USES+=		apache
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
diff --git a/lang/php81/Makefile b/lang/php81/Makefile
index 5e7c20d97ab1..af232eed7af0 100644
--- a/lang/php81/Makefile
+++ b/lang/php81/Makefile
@@ -96,8 +96,7 @@ CONFIGURE_ARGS+=	--without-pcre-jit
 .endif
 
 .if defined(PKGNAMEPREFIX)
-USES+=			apache:2.2+
-.include "${PORTSDIR}/Mk/Uses/apache.mk"
+USES+=			apache
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=	--with-apxs2filter=${APXS}
 .else
diff --git a/lang/php82/Makefile b/lang/php82/Makefile
index f61b12ec4766..ae4cdc3c2c66 100644
--- a/lang/php82/Makefile
+++ b/lang/php82/Makefile
@@ -96,8 +96,7 @@ CONFIGURE_ARGS+=	--without-pcre-jit
 .endif
 
 .if defined(PKGNAMEPREFIX)
-USES+=			apache:2.2+
-.include "${PORTSDIR}/Mk/Uses/apache.mk"
+USES+=			apache
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=	--with-apxs2filter=${APXS}
 .else
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index cf79e22c0951..70c28d661d56 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -397,7 +397,7 @@ CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 .	if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:www/lighttpd
 .	else
-USES+=		apache:2.2+
+USES+=		apache
 .	endif
 LIB_DEPENDS+=	libgd.so:graphics/gd
 RUN_DEPENDS+=	p5-GD>=0:graphics/p5-GD
diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index 95c1708b5cb0..e496b821c2f7 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -25,7 +25,7 @@ GH_ACCOUNT=	smtpd
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMODPERL}
-USES+=		apache:run,2.2+
+USES+=		apache:run
 RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 .endif
 
diff --git a/net-mgmt/chillispot/Makefile b/net-mgmt/chillispot/Makefile
index 4959bd660603..dbd9dcbcd392 100644
--- a/net-mgmt/chillispot/Makefile
+++ b/net-mgmt/chillispot/Makefile
@@ -26,7 +26,7 @@ OPTIONS_SINGLE_RADIUS=	FREERADIUS OPENRADIUS
 FREERADIUS_DESC=depend on FreeRADIUS
 OPENRADIUS_DESC=depend on OpenRADIUS
 
-APACHE_USE=	apache_run=22+
+APACHE_USES=	apache:run
 FREERADIUS_RUN_DEPENDS=	radiusd:net/freeradius
 OPENRADIUS_RUN_DEPENDS=	radiusd:net/openradius
 
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
index 0967de39a440..e2bea9c27867 100644
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -43,7 +43,7 @@ LIB_DEPENDS+=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	APACHEMOD DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER SUBVERSION WMIC
 OPTIONS_DEFAULT=	APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SUBVERSION WMIC
-APACHEMOD_DESC=	Use PHP with Apache 2.2+ module
+APACHEMOD_DESC=	Use PHP with Apache 2.4+ module
 FPING_DESC=	Enable fping support ping monitoring
 IPMITOOL_DESC=	Enable support for monitoring hardware IPMI
 MYSQLD_DESC=	Use local MySQL server
@@ -76,7 +76,7 @@ PORTDOCS=	INSTALL README VERSION
 PORTEXAMPLES=	snmp.conf.example snmpd.conf.example
 
 .if ${PORT_OPTIONS:MAPACHEMOD}
-USES+=	apache:run,2.2+
+USES+=	apache:run
 .endif
 .if !defined(PACKAGE_BUILDING)
 USES+=	php:mod
diff --git a/net-mgmt/ocsinventory-server/Makefile b/net-mgmt/ocsinventory-server/Makefile
index f73aade89d59..465477f37b8f 100644
--- a/net-mgmt/ocsinventory-server/Makefile
+++ b/net-mgmt/ocsinventory-server/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	p5-XML-Simple>=2.12:textproc/p5-XML-Simple \
 		p5-Switch>=0:lang/p5-Switch \
 		p5-Plack>=0:www/p5-Plack
 
-USES=		apache:run,2.2+ mysql perl5
+USES=		apache:run mysql perl5
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
diff --git a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile
index 0879c51be885..fb1430a3dc03 100644
--- a/net-mgmt/pandorafms_console/Makefile
+++ b/net-mgmt/pandorafms_console/Makefile
@@ -10,7 +10,7 @@ LICENSE_FILE=	${PANDORA_LICENSE_FILE}
 
 RUN_DEPENDS=	${LOCALBASE}/bin/twopi:graphics/graphviz
 
-USES=		apache:run,2.2+ php:web shebangfix
+USES=		apache:run php:web shebangfix
 SHEBANG_FILES=	include/languages/extract_newlines.sh \
 		include/languages/util-all \
 		include/languages/util-bzr-update \
diff --git a/net/p5-Apache2-SOAP/Makefile b/net/p5-Apache2-SOAP/Makefile
index 14df20d5feb9..0df59bf9915e 100644
--- a/net/p5-Apache2-SOAP/Makefile
+++ b/net/p5-Apache2-SOAP/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 		p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 
-USES=		apache:2.2+ perl5
+USES=		apache perl5
 USE_PERL5=	configure
 NO_ARCH=	yes
 
diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index ca3f91a1ec23..6b2f3d2f2661 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -28,7 +28,6 @@ OPTIONS_DEFAULT=	CRAWLER SAMBA APACHE DB MYSQL
 CRAWLER_DESC=		With crawler (nmap, p5-libwww)
 SAMBA_DESC=		crawler with SAMBA (file://)
 RSYNC_DESC=		crawler with RSYNC
-APACHE_DESC=		With web server apache2.2+
 MOD_PERL2_DESC=		With MOD_PERL2
 MOD_FASTCGI_DESC=	With MOD_FASTCGI
 DB_DESC=		With both database server and client
@@ -59,7 +58,7 @@ RUN_DEPENDS+=	rsync:net/rsync
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
-USES+=		apache:run,2.2+
+USES+=		apache:run
 .endif
 
 .if ${PORT_OPTIONS:MNGINX}
diff --git a/security/maia/Makefile b/security/maia/Makefile
index 611c4fed77e6..77fecd2366b5 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -49,7 +49,6 @@ OPTIONS_DEFINE=	APACHE LIGHTTPD NGINX WEBHOST MYSQL LOCAL PGSQL \
 OPTIONS_DEFAULT=	MYSQL CLAMAV DOCS SPAMASSASSIN BDB IPCOUNTRY \
 			DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM ZOO
 
-APACHE_DESC=		Use Apache web server
 LIGHTTPD_DESC=		Use LighTTPD web server
 NGINX_DESC=			Use Nginx web server
 WEBHOST_DESC=		PHP, PEAR, etc... for Maia web interface
@@ -98,7 +97,7 @@ USE_RC_SUBR+=	maiad
 # setting USE_ variables. C'est la vie.
 
 .if ${PORT_OPTIONS:MAPACHE}
-USES+=		apache:run,2.4+
+USES+=		apache:run
 .endif
 
 .if ${PORT_OPTIONS:MWEBHOST}
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index 1835c7ba6232..67fd39562883 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 DEPRECATED=	Do not support recent RFC 8894
 EXPIRATION_DATE=	2023-03-31
 
-USES=		apache:2.2+ gmake libtool ssl
+USES=		apache gmake libtool ssl
 BROKEN_SSL=	base
 BROKEN_SSL_REASON=	unexpected type name 'issuer_and_subject_t': expected expression
 IGNORE_SSL=	libressl libressl-devel
diff --git a/security/shibboleth-sp/Makefile b/security/shibboleth-sp/Makefile
index dd23c4060629..bd8eefe90f85 100644
--- a/security/shibboleth-sp/Makefile
+++ b/security/shibboleth-sp/Makefile
@@ -47,7 +47,7 @@ ODBC_DESC=	ODBC database backend - store sessions in a database
 FASTCGI_DESC=	FastCGI protocol support, e.g. for NGINX
 APACHE_DESC=	Build Apache module
 
-APACHE_USES=	apache:2.4+
+APACHE_USES=	apache
 
 ODBC_CONFIGURE_ENABLE=	odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index cbd3cf5cb7f1..8533687aba91 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -35,7 +35,7 @@ CONFLICTS_INSTALL=	htdump mifluz # bin/htdb_dump bin/htdb_load bin/htdb_stat bin
 OPTIONS_DEFINE=	APACHE DOCS
 OPTIONS_DEFAULT=	APACHE
 
-APACHE_USE=	APACHE=22+
+APACHE_USES=	apache
 APACHE_CONFIGURE_ON=	--with-apache=${LOCALBASE}/sbin
 
 PORTDOCS=	*
diff --git a/www/dojo/Makefile b/www/dojo/Makefile
index b53b62587715..e6fbac398dba 100644
--- a/www/dojo/Makefile
+++ b/www/dojo/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=		yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
-USES=			apache:run,2.2+ cpe
+USES=			apache:run cpe
 CPE_VENDOR=	linuxfoundation
 CONFDIR=		${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=		${APACHEETCDIR}/Includes
diff --git a/www/formication/Makefile b/www/formication/Makefile
index b21e75f4de4d..87c8f4dc116c 100644
--- a/www/formication/Makefile
+++ b/www/formication/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	michael@ranner.eu
 COMMENT=	Formular processing tool written in perl
 WWW=		http://www.villainy.com/developers.html
 
-USES=		apache:run,2.2+ perl5
+USES=		apache:run perl5
 USE_PERL5=	run
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/www/fpc-httpd24/Makefile b/www/fpc-httpd24/Makefile
index db8474e34697..e92f34c986d1 100644
--- a/www/fpc-httpd24/Makefile
+++ b/www/fpc-httpd24/Makefile
@@ -13,6 +13,6 @@ EXTRACTUNITDIR=	${WRKUNITDIR}
 OPTIONS_DEFINE=	APACHE24
 APACHE24_DESC=	Install apache24 server
 
-APACHE24_USE=	APACHE=24
+APACHE24_USES=	apache:2.4
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index c996222b1d16..1723a12ef9fe 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_dnssd>=0:www/mod_dnssd \
 		console-kit-daemon:sysutils/consolekit2
 
-USES=		apache:2.2+ gettext gmake gnome libtool pkgconfig tar:xz xorg
+USES=		apache gettext gmake gnome libtool pkgconfig tar:xz xorg
 USE_XORG=	sm
 USE_GNOME=	gnomeprefix gtk30 intlhack nautilus3
 GNU_CONFIGURE=	yes
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 1900c43fabcb..4161b0fe0453 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 INSTALL_TARGET=	install-strip
-USES=		apache:2.2+ cpe libtool
+USES=		apache cpe libtool
 CPE_VENDOR=	apache
 USE_LDCONFIG=	yes
 
diff --git a/www/mod_amazon_proxy/Makefile b/www/mod_amazon_proxy/Makefile
index 7a6c6824ff67..7fa21e1cd131 100644
--- a/www/mod_amazon_proxy/Makefile
+++ b/www/mod_amazon_proxy/Makefile
@@ -10,7 +10,7 @@ WWW=		https://github.com/machu/mod_amazon_proxy
 
 LIB_DEPENDS=	libapreq2.so:www/libapreq2
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_LIB=	${LOCALBASE}/lib -lcrypto
 
diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile
index 0ab9efa161bb..9ef058bca04a 100644
--- a/www/mod_asn/Makefile
+++ b/www/mod_asn/Makefile
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1
 
-USES=		apache:2.2+
+USES=		apache
 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 ae1f424cefcb..79421550ce95 100644
--- a/www/mod_auth_cas/Makefile
+++ b/www/mod_auth_cas/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/README
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre
 
-USES=		apache:2.4 ssl
+USES=		apache ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jasig
diff --git a/www/mod_auth_cookie_mysql2/Makefile b/www/mod_auth_cookie_mysql2/Makefile
index 9aefec94a16a..0480261860af 100644
--- a/www/mod_auth_cookie_mysql2/Makefile
+++ b/www/mod_auth_cookie_mysql2/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows authentication against MySQL database via secure cookie
 WWW=		http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/
 
-USES=		apache:2.2+ mysql
+USES=		apache mysql
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_auth_gssapi/Makefile b/www/mod_auth_gssapi/Makefile
index 7f50b3d5005f..9d09fb649cec 100644
--- a/www/mod_auth_gssapi/Makefile
+++ b/www/mod_auth_gssapi/Makefile
@@ -11,7 +11,7 @@ WWW=		https://github.com/gssapi/mod_auth_gssapi
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf apache:2.4+ bison gssapi:mit,flags libtool ssl
+USES=		autoreconf apache bison gssapi:mit,flags libtool ssl
 USES+=		pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	gssapi
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index d6c6a8864ca8..83c7d96fca1e 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE
 
 PORTSCOUT=	limit:^5.4
 
-USES=		apache:2.2+
+USES=		apache
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4
 
diff --git a/www/mod_auth_mellon/Makefile b/www/mod_auth_mellon/Makefile
index 4df20ffa0317..a8e97cbd0ed1 100644
--- a/www/mod_auth_mellon/Makefile
+++ b/www/mod_auth_mellon/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libcurl.so:ftp/curl \
     		liblasso.so:security/lasso
 
-USES=		apache:2.2+ autoreconf cpe gettext-runtime gnome libtool \
+USES=		apache autoreconf cpe gettext-runtime gnome libtool \
 		pkgconfig ssl
 USE_GNOME=	glib20
 USE_GITHUB=	yes
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index 2d56e9cb0331..ac9a1590a7fc 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -12,7 +12,7 @@ WWW=		https://www.heuer.org/mod_auth_mysql/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+ mysql tar:tgz
+USES=		apache mysql tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index a49b5d5d6216..ad050a68034f 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -11,7 +11,7 @@ WWW=		http://modauthmysql.sourceforge.net/
 
 LICENSE=	APACHE10
 
-USES=		apache:2.2+ mysql
+USES=		apache mysql
 
 SHORTMODNAME=	mysql_auth
 AP_FAST_BUILD=	yes
diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index 882e990109ef..3c27cce84ead 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libopkele.so:devel/libopkele \
 		libsqlite3.so:databases/sqlite3
 
-USES=		apache:2.2+ autoreconf cpe gmake libtool pkgconfig
+USES=		apache 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 3408f8d5be5d..a8a9035e6ff8 100644
--- a/www/mod_auth_openidc/Makefile
+++ b/www/mod_auth_openidc/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libcjose.so:devel/cjose \
 		libjansson.so:devel/jansson \
 		libpcre.so:devel/pcre
 
-USES=		apache:2.2+ autoreconf cpe gmake libtool pkgconfig ssl
+USES=		apache 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 e6b9f3d6e24e..8692d0740b9f 100644
--- a/www/mod_auth_pam2/Makefile
+++ b/www/mod_auth_pam2/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PAM modules for user authentication
 WWW=		http://pam.sourceforge.net/mod_auth_pam/
 
-USES=		apache:2.2+
+USES=		apache
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	*.html
diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile
index a13ce8588f2d..b4d77616848a 100644
--- a/www/mod_auth_pgsql2/Makefile
+++ b/www/mod_auth_pgsql2/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PostgreSQL databases for user authentication
 WWW=		http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 
-USES=		apache:2.2+ pgsql
+USES=		apache 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 5db6ffce0372..96d2d17d53f5 100644
--- a/www/mod_auth_pubtkt/Makefile
+++ b/www/mod_auth_pubtkt/Makefile
@@ -9,17 +9,11 @@ MAINTAINER=	mk@neon1.net
 COMMENT=	Apache module to provide public key ticket based authentication
 WWW=		https://neon1.net/mod_auth_pubtkt/
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	src/mod_auth_pubtkt.c
 
-.include <bsd.port.pre.mk>
-
-.if ${APACHE_VERSION} > 2.2
 AP_EXTRAS=	-DAPACHE24
-.else
-AP_EXTRAS=	-DAPACHE22
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile
index 2915a5a127f8..4588d88e0ef3 100644
--- a/www/mod_auth_tkt/Makefile
+++ b/www/mod_auth_tkt/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight single-sign-on authentication module for apache
 WWW=		http://www.openfusion.com.au/labs/mod_auth_tkt/
 
-USES=		apache:2.2+ shebangfix
+USES=		apache shebangfix
 SHEBANG_FILES=	../cgi/login.cgi \
 		../cgi/logout.cgi
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
diff --git a/www/mod_auth_xradius/Makefile b/www/mod_auth_xradius/Makefile
index 2d7cd59ad778..ae3e293cd580 100644
--- a/www/mod_auth_xradius/Makefile
+++ b/www/mod_auth_xradius/Makefile
@@ -11,7 +11,7 @@ WWW=		http://www.outoforder.cc/projects/apache/mod_auth_xradius/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+ tar:bzip2
+USES=		apache tar:bzip2
 GNU_CONFIGURE=	yes
 # Seems dead upstream. Don't expect a proper fix.
 CFLAGS+=	-fcommon
diff --git a/www/mod_authn_dovecot/Makefile b/www/mod_authn_dovecot/Makefile
index b0de1fb863fa..f60de2b9755f 100644
--- a/www/mod_authn_dovecot/Makefile
+++ b/www/mod_authn_dovecot/Makefile
@@ -9,7 +9,7 @@ WWW=		https://github.com/bmanojlovic/mod_authn_dovecot
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4
+USES=		apache
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bmanojlovic
diff --git a/www/mod_authnz_external24/Makefile b/www/mod_authnz_external24/Makefile
index a9b230664e90..e5693af1001d 100644
--- a/www/mod_authnz_external24/Makefile
+++ b/www/mod_authnz_external24/Makefile
@@ -11,7 +11,7 @@ WWW=		https://code.google.com/p/mod-auth-external/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4 cpe
+USES=		apache cpe
 CPE_VENDOR=	${PORTNAME}_project
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile
index 6e2a4a3075f2..4280c096aca8 100644
--- a/www/mod_cfg_ldap/Makefile
+++ b/www/mod_cfg_ldap/Makefile
@@ -11,7 +11,7 @@ WWW=		https://sourceforge.net/projects/modcfgldap/
 
 LICENSE=	BSD3CLAUSE
 
-USES=		apache:2.2+
+USES=		apache
 USE_OPENLDAP=	yes
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_cloudflare/Makefile b/www/mod_cloudflare/Makefile
index 99db15fa6f82..d56a8fd811e4 100644
--- a/www/mod_cloudflare/Makefile
+++ b/www/mod_cloudflare/Makefile
@@ -14,7 +14,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	cloudflare
 GH_TAGNAME=	98ab38a
 
-USES=		apache:2.4+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	cloudflare
diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile
index a06983a31794..27ea5c9a89ce 100644
--- a/www/mod_dav_svn/Makefile
+++ b/www/mod_dav_svn/Makefile
@@ -7,7 +7,7 @@ MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Apache module for subversion serving
 WWW=		https://subversion.apache.org/
 
-USES=		apache:2.2+
+USES=		apache
 
 .include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
diff --git a/www/mod_defensible/Makefile b/www/mod_defensible/Makefile
index 942c0f9caf31..04672cb3dc05 100644
--- a/www/mod_defensible/Makefile
+++ b/www/mod_defensible/Makefile
@@ -9,7 +9,7 @@ WWW=		https://github.com/jd/mod_defensible
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4+
+USES=		apache
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jd
diff --git a/www/mod_dnssd/Makefile b/www/mod_dnssd/Makefile
index c96308a0bc7a..ea5824ec0e64 100644
--- a/www/mod_dnssd/Makefile
+++ b/www/mod_dnssd/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
-USES=		apache:2.2+ gmake pkgconfig
+USES=		apache 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_evasive/Makefile b/www/mod_evasive/Makefile
index 02a79dec1afc..0b950b829b1a 100644
--- a/www/mod_evasive/Makefile
+++ b/www/mod_evasive/Makefile
@@ -11,7 +11,7 @@ WWW=		https://github.com/jzdziarski/mod_evasive
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		apache:2.2+
+USES=		apache
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jzdziarski
diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile
index 79d57753d71e..3e3a75bf7845 100644
--- a/www/mod_fastcgi/Makefile
+++ b/www/mod_fastcgi/Makefile
@@ -7,7 +7,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache 2.4 fast-cgi module
 WWW=		https://github.com/FastCGI-Archives/mod_fastcgi
 
-USES=		apache:2.4+
+USES=		apache
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FastCGI-Archives
diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile
index 2ad547021b4d..a835d779c0cf 100644
--- a/www/mod_fcgid/Makefile
+++ b/www/mod_fcgid/Makefile
@@ -11,7 +11,7 @@ WWW=		https://httpd.apache.org/mod_fcgid/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+ cpe
+USES=		apache cpe
 CPE_VENDOR=	apache
 
 HAS_CONFIGURE=		yes
diff --git a/www/mod_fileiri/Makefile b/www/mod_fileiri/Makefile
index cb64fc799d53..a121df578f18 100644
--- a/www/mod_fileiri/Makefile
+++ b/www/mod_fileiri/Makefile
@@ -12,7 +12,7 @@ WWW=		https://www.w3.org/2003/06/mod_fileiri/
 
 #LICENSE=	AL11
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index 736b4bca7c4f..7a7df3a04a43 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 GNU_CONFIGURE=	yes
-USES=		apache:2.4 compiler:c++11-lang cpe libtool pkgconfig python:3.7+ tar:bzip2
+USES=		apache compiler:c++11-lang cpe libtool pkgconfig python:3.7+ tar:bzip2
 CPE_VENDOR=	${PORTNAME}_project
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
diff --git a/www/mod_h264_streaming/Makefile b/www/mod_h264_streaming/Makefile
index 9aa2588553a9..89c4c9291a1c 100644
--- a/www/mod_h264_streaming/Makefile
+++ b/www/mod_h264_streaming/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME=	h264
 LICENSE_TEXT=	No commercial use
 LICENSE_PERMS=	auto-accept
 
-USES=		apache:2.2+
+USES=		apache
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apxs="${APXS}"
diff --git a/www/mod_http2/Makefile b/www/mod_http2/Makefile
index 86b78443183d..a6d8d6955afe 100644
--- a/www/mod_http2/Makefile
+++ b/www/mod_http2/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 
-USES=		apache:2.4+ libtool ssl pkgconfig
+USES=		apache libtool ssl pkgconfig
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--without-curl
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index fbf7bde49552..d7b96641c20f 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -12,7 +12,7 @@ WWW=		https://tomcat.apache.org/connectors-doc/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+ gmake
+USES=		apache gmake
 APACHE_VER=	2.0
 GNU_CONFIGURE=	yes
 
diff --git a/www/mod_limitipconn2/Makefile b/www/mod_limitipconn2/Makefile
index 3f441bc42d41..6bfb5bdd6afc 100644
--- a/www/mod_limitipconn2/Makefile
+++ b/www/mod_limitipconn2/Makefile
@@ -14,7 +14,7 @@ WWW=		https://dominia.org/djao/limitipconn2.html
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		apache:2.2+ tar:bzip2
+USES=		apache tar:bzip2
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_maxminddb/Makefile b/www/mod_maxminddb/Makefile
index cff823a9ac22..efd87d27898f 100644
--- a/www/mod_maxminddb/Makefile
+++ b/www/mod_maxminddb/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
-USES=		apache:2.4+ autoreconf compiler:c11 gmake localbase
+USES=		apache autoreconf compiler:c11 gmake localbase
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
diff --git a/www/mod_memcache/Makefile b/www/mod_memcache/Makefile
index 3bb94dbd8b48..374c2848dbd8 100644
--- a/www/mod_memcache/Makefile
+++ b/www/mod_memcache/Makefile
@@ -11,7 +11,7 @@ WWW=		https://github.com/joshrotenberg/modmemcache
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		apache:2.2+
+USES=		apache
 USE_GITHUB=	yes
 GH_ACCOUNT=	joshrotenberg
 GH_PROJECT=	modmemcache
diff --git a/www/mod_memcache_block/Makefile b/www/mod_memcache_block/Makefile
index 67edfcd2139c..44caff25bf5d 100644
--- a/www/mod_memcache_block/Makefile
+++ b/www/mod_memcache_block/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS+=	libmemcached.so:databases/libmemcached
 USE_GITHUB=	yes
 GH_ACCOUNT=	gaod
 
-USES=		apache:2.4+
+USES=		apache
 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 a72e8a0e4296..f7a28f83373a 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	xsp:www/xsp
 RUN_DEPENDS=	xsp:www/xsp
 
-USES=		apache:2.2+ libtool mono pkgconfig
+USES=		apache libtool mono pkgconfig
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --man=${PREFIX}/man
diff --git a/www/mod_mpm_itk/Makefile b/www/mod_mpm_itk/Makefile
index 59ea3e95e678..e8bfe21e138c 100644
--- a/www/mod_mpm_itk/Makefile
+++ b/www/mod_mpm_itk/Makefile
@@ -13,7 +13,7 @@ WWW=		http://mpm-itk.sesse.net/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4
+USES=		apache
 GNU_CONFIGURE=	yes
 
 AP_FAST_BUILD=	yes
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 0246bf12b7d3..59f77d6989b5 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -20,7 +20,7 @@ TEST_DEPENDS=	p5-CGI>=4.15:www/p5-CGI \
 
 SUB_FILES=	pkg-message ${APMOD_FILE}
 SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}
-USES=		apache:2.2+ cpe gmake perl5
+USES=		apache cpe gmake perl5
 USE_PERL5=	configure
 USE_CSTD=	gnu89
 CPE_VENDOR=	apache
@@ -55,7 +55,7 @@ HAS_ITHREADS=	1
 PLIST_SUB+=	ITHREADS=""
 .else
 PLIST_SUB+=	ITHREADS="@comment "
-. if !${APACHE_VERSION:M22}
+. if ${APACHE_VERSION:M24}
 IGNORE=		requires PERL with "THREADS=on", please rebuild PERL and all depending ports
 . endif
 .endif
diff --git a/www/mod_qos/Makefile b/www/mod_qos/Makefile
index 51152043fdbf..a0e7ba87df2a 100644
--- a/www/mod_qos/Makefile
+++ b/www/mod_qos/Makefile
@@ -12,7 +12,7 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
-USES=		apache:2.2+
+USES=		apache
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_realdoc/Makefile b/www/mod_realdoc/Makefile
index df596ab4acfd..e245b2443a59 100644
--- a/www/mod_realdoc/Makefile
+++ b/www/mod_realdoc/Makefile
@@ -8,7 +8,7 @@ WWW=		https://github.com/etsy/mod_realdoc
 
 LICENSE=	MIT
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 USE_GITHUB=	yes
diff --git a/www/mod_reproxy/Makefile b/www/mod_reproxy/Makefile
index a4e8b4664bee..614d71d6a64c 100644
--- a/www/mod_reproxy/Makefile
+++ b/www/mod_reproxy/Makefile
@@ -11,7 +11,7 @@ LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/lestrrat-mod_reproxy-0f945ff
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index ab8c4aa07112..397360fa2822 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libitcl.so:lang/itcl
 
-USES+=		apache:2.2-2.4 compiler:c11 gmake \
+USES=		apache compiler:c11 gmake \
 		libtool tcl:86+,tea
 USE_LDCONFIG=	${PREFIX}/lib/rivet
 
diff --git a/www/mod_rpaf2/Makefile b/www/mod_rpaf2/Makefile
index 8205404b22ef..81a69c11e872 100644
--- a/www/mod_rpaf2/Makefile
+++ b/www/mod_rpaf2/Makefile
@@ -11,7 +11,7 @@ WWW=		https://github.com/gnif/mod_rpaf/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4+ cpe
+USES=		apache cpe
 
 CPE_VENDOR=	thomas_eibner
 
diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile
index 88f636b5efea..7cec9e295919 100644
--- a/www/mod_scgi/Makefile
+++ b/www/mod_scgi/Makefile
@@ -11,7 +11,7 @@ WWW=		https://python.ca/scgi/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE.txt
 
-USES=		apache:2.4
+USES=		apache
 
 SCGI_DIR=	apache2
 WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 5962ed0905a0..93992f953db4 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS+=	libpcre.so:devel/pcre \
 		libgdbm.so:databases/gdbm \
 		libexpat.so:textproc/expat2
 
-USES=		apache:2.4+ bdb gnome perl5 pkgconfig shebangfix
+USES=		apache bdb gnome perl5 pkgconfig shebangfix
 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 0a9371920351..98f2e2523f2a 100644
--- a/www/mod_setenvifplus/Makefile
+++ b/www/mod_setenvifplus/Makefile
@@ -12,7 +12,7 @@ WWW=		http://modsetenvifplus.sourceforge.net/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE.txt
 
-USES=		apache:2.4
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	${WRKSRC}/apache2/${MODULENAME}.c
diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile
index b8506142e215..5b27c2d4a1f6 100644
--- a/www/mod_tidy/Makefile
+++ b/www/mod_tidy/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_INC+=	${LOCALBASE}/include/tidy
diff --git a/www/mod_umask/Makefile b/www/mod_umask/Makefile
index 372a123e7c04..e1afdff1514e 100644
--- a/www/mod_umask/Makefile
+++ b/www/mod_umask/Makefile
@@ -11,7 +11,7 @@ WWW=		http://www.outoforder.cc/projects/httpd/mod_umask/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+ tar:bzip2
+USES=		apache tar:bzip2
 GNU_CONFIGURE=	yes
 
 AP_FAST_BUILD=	yes
diff --git a/www/mod_webauth/Makefile b/www/mod_webauth/Makefile
index 9d99fa1f5dd2..3bf530c01fae 100644
--- a/www/mod_webauth/Makefile
+++ b/www/mod_webauth/Makefile
@@ -12,7 +12,7 @@ WWW=		http://webauth.stanford.edu/
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libsasl2.so:security/cyrus-sasl2
 
-USES=		apache:2.4 libtool pathfix pkgconfig ssl
+USES=		apache 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 a38eb715327a..4177c0f20bec 100644
--- a/www/mod_webkit/Makefile
+++ b/www/mod_webkit/Makefile
@@ -12,7 +12,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Cito
 GH_PROJECT=	w4py
 
-USES=		apache:2.4+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS=	marshal.c
diff --git a/www/mod_wsgi4/Makefile b/www/mod_wsgi4/Makefile
index 6ab3dfc8f9cd..d8d920991508 100644
--- a/www/mod_wsgi4/Makefile
+++ b/www/mod_wsgi4/Makefile
@@ -10,7 +10,7 @@ WWW=		https://www.modwsgi.org/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4+ cpe gettext python:3.6-3.11
+USES=		apache cpe gettext python:3.6-3.11
 USE_PYTHON=	flavors
 
 CPE_VENDOR=	modwsgi
diff --git a/www/mod_xsendfile/Makefile b/www/mod_xsendfile/Makefile
index c47c6fc31804..9eb0319b017e 100644
--- a/www/mod_xsendfile/Makefile
+++ b/www/mod_xsendfile/Makefile
@@ -10,7 +10,7 @@ WWW=		https://tn123.org/mod_xsendfile/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 USE_GITHUB=	yes
diff --git a/www/mythplugin-mythweb/Makefile b/www/mythplugin-mythweb/Makefile
index bd768fd2bf18..43a9faaca996 100644
--- a/www/mythplugin-mythweb/Makefile
+++ b/www/mythplugin-mythweb/Makefile
@@ -30,7 +30,7 @@ REINPLACE_ARGS=	-i ""
 OPTIONS_DEFINE=	APACHE LIGHTTPD NGINX
 OPTIONS_DEFAULT=	APACHE
 
-APACHE_USES=		apache:2.2+
+APACHE_USES=		apache
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 NGINX_DESC=		Nginx server support
 NGINX_RUN_DEPENDS=	nginx:www/nginx
diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile
index e914e782d16d..311409024381 100644
--- a/www/nibbleblog/Makefile
+++ b/www/nibbleblog/Makefile
@@ -23,7 +23,7 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=	APACHE LIGHTTPD
 OPTIONS_DEFAULT=	APACHE
 
-APACHE_USE=		APACHE_RUN=22+
+APACHE_USES=		apache:run
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 
 do-install:
diff --git a/www/otrs/Makefile b/www/otrs/Makefile
index a9b29f7531f0..6f317aeb4cf2 100644
--- a/www/otrs/Makefile
+++ b/www/otrs/Makefile
@@ -107,7 +107,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_USES=		apache:run,2.2+
+APACHE_USES=		apache:run
 
 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 a04d59441511..ca344ea9072e 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=1.39:www/mod_perl2 \
 		p5-URI>=1.36:net/p5-URI \
 		p5-WWW-Form-UrlEncoded>=0:www/p5-WWW-Form-UrlEncoded
 
-USES=		apache:2.2+ perl5
+USES=		apache perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index 1e374862b93a..0be27b724b99 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=1.9922:www/mod_perl2 \
 		p5-SQL-Abstract>=0:databases/p5-SQL-Abstract
 
 NO_ARCH=	yes
-USES=		apache:2.2+ perl5
+USES=		apache 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 9e1f1ff01843..7316807745f2 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 		p5-HTML-Clean>=0.8:www/p5-HTML-Clean
 
-USES=		apache:2.2+ perl5
+USES=		apache perl5
 USE_PERL5=	configure
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile
index 16bc3f2f5964..c90f3f7a8169 100644
--- a/www/p5-Apache-DB/Makefile
+++ b/www/p5-Apache-DB/Makefile
@@ -14,7 +14,7 @@ LICENSE_COMB=	dual
 
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
-USES=		apache:run,2.2+ perl5
+USES=		apache:run perl5
 USE_PERL5=	configure
 
 post-install:
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index f2c8d8c2a436..9491392bf1d7 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 
 CONFLICTS=	p5-Apache-DBI-mp[12]*
 
-USES=		apache:2.2+ perl5
+USES=		apache perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index 0f5ee0bca806..b1e96cb2c308 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	p5-Audio-Wav>=0:audio/p5-Audio-Wav \
 		p5-Ogg-Vorbis-Header>=0:audio/p5-Ogg-Vorbis-Header \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
-USES=		apache:2.2+ perl5
+USES=		apache perl5
 USE_PERL5=	configure
 NO_ARCH=	yes
 
diff --git a/www/p5-Apache-ParseFormData/Makefile b/www/p5-Apache-ParseFormData/Makefile
index ac75161d9430..1c9de9f08628 100644
--- a/www/p5-Apache-ParseFormData/Makefile
+++ b/www/p5-Apache-ParseFormData/Makefile
@@ -12,7 +12,7 @@ WWW=		https://metacpan.org/release/Apache-ParseFormData
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
-USES=		apache:2.2+ perl5
+USES=		apache perl5
 USE_PERL5=	configure
 
 post-patch:
diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index 613985e34e57..b0302a218d73 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -20,7 +20,7 @@ OPTIONS_DEFAULT=APACHE
 APACHE_DESC=	Build mod_speedycgi
 
 OPTIONS_SUB=	yes
-APACHE_USE=	APACHE=22+
+APACHE_USES=	apache
 APACHE_CONFIGURE_ENV_OFF=	WITHOUT_APACHE=yes
 
 post-patch:
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 2de520a5947d..b94fbac5a63a 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFINE=	MODPERL
 
 MODPERL_BUILD_DEPENDS=	p5-libapreq2>=0:www/p5-libapreq2
 MODPERL_RUN_DEPENDS=	p5-libapreq2>=0:www/p5-libapreq2
-MODPERL_USE=		APACHE_RUN=22+
+MODPERL_USES=		apache:run
 
 post-patch:
 	@${REINPLACE_CMD} -e '/bin\/convert/d' ${WRKSRC}/Makefile.PL
diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile
index 0273e77e7b67..ef06e01b5d9b 100644
--- a/www/p5-MasonX-WebApp/Makefile
+++ b/www/p5-MasonX-WebApp/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	mp2bug:www/mod_perl2 \
 TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
 		p5-Test-Output>=0:devel/p5-Test-Output
 
-USES=		apache:run,2.2+ perl5
+USES=		apache:run perl5
 USE_PERL5=	modbuild
 
 .include <bsd.port.mk>
diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile
index 1030eb4af1d3..8bd2bd8be25d 100644
--- a/www/p5-Maypole/Makefile
+++ b/www/p5-Maypole/Makefile
@@ -60,7 +60,7 @@ DOC_FILES=	../Manual.pod \
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-MODPERL2_USE=		APACHE_RUN=22+
+MODPERL2_USES=		apache:run
 MODPERL2_BUILD_DEPENDS=	p5-libapreq2>=0:www/p5-libapreq2
 
 post-install:
diff --git a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
index edd5d501eca0..84afc1e55ed5 100644
--- a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
+++ b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	p5-Text-MultiMarkdown>=0:textproc/p5-Text-MultiMarkdown \
 		p5-Text-Typography>=0:textproc/p5-Text-Typography \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2
 
-USES=		apache:run,2.2+ perl5
+USES=		apache:run perl5
 USE_PERL5=	configure
 SUB_FILES=	pkg-message
 
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index fdaf79f5c4b8..a42ef217d386 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apache2-apxs=${APXS} \
 		--with-expat=${LOCALBASE} \
 		--enable-perl-glue --with-perl=${PERL}
-USES=		apache:2.2+ cpe libtool perl5
+USES=		apache cpe libtool perl5
 CPE_VENDOR=	apache
 USE_PERL5=	run
 USE_LDCONFIG=	yes
diff --git a/www/rt44/Makefile b/www/rt44/Makefile
index f1c7aeca0fb6..f97351728c68 100644
--- a/www/rt44/Makefile
+++ b/www/rt44/Makefile
@@ -67,7 +67,7 @@ AP_MODPERL_DESC=		Deploy with apache and mod_perl
 AP_MODPERL_RUN_DEPENDS=		${MODPERL2_DEPS}
 
 AP_MODFASTCGI_DESC=		Deploy with apache and mod_fastcgi
-AP_MODFASTCGI_USE=		APACHE_RUN=22+
+AP_MODFASTCGI_USES=		apache:run
 AP_MODFASTCGI_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi \
 				${FASTCGI_DEPS}
 
diff --git a/www/rt50/Makefile b/www/rt50/Makefile
index 599504ace8c3..8d130850df77 100644
--- a/www/rt50/Makefile
+++ b/www/rt50/Makefile
@@ -68,7 +68,7 @@ AP_MODPERL_DESC=		Deploy with apache and mod_perl
 AP_MODPERL_RUN_DEPENDS=		${MODPERL2_DEPS}
 
 AP_MODFASTCGI_DESC=		Deploy with apache and mod_fastcgi
-AP_MODFASTCGI_USE=		APACHE_RUN=22+
+AP_MODFASTCGI_USES=		apache:run
 AP_MODFASTCGI_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi \
 				${FASTCGI_DEPS}
 
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index d70aec97b545..34540a81e09e 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
-USES+=		apache:2.2+
+USES+=		apache
 .endif
 
 RAKE_BIN=	${LOCALBASE}/bin/rake
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index a6f2b80d05af..2831eee1cd46 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -14,7 +14,7 @@ WWW=		https://www.suphp.org/
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USES=		apache:2.2+ autoreconf cpe libtool php:cgi,flavors
+USES=		apache autoreconf cpe libtool php:cgi,flavors
 SUB_FILES=	pkg-message
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 1a98a4321e83..97d751b54c8f 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -41,7 +41,7 @@ BITS=		${ARCH:S/amd64/64/:S/x86_64/64/:S/i386/32/}bits
 WRKSRC=		${WRKDIR}/thunder
 
 .if ${PORT_OPTIONS:MAPACHE}
-USES+=		apache:run,2.2+
+USES+=		apache:run
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index b9b9798a055f..917db96179e7 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}
-USES+=		apache:run,2.2+
+USES+=		apache:run
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}