git: 40843b1ccb8f - main - Mk/Uses/apache.mk: Refactor after removal of older versions
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 Jan 2023 17:56:17 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=40843b1ccb8f70cca82dd115a71a46ae2a97a450
commit 40843b1ccb8f70cca82dd115a71a46ae2a97a450
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-01-21 16:38:37 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-01-25 17:54:07 +0000
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
---
Mk/Uses/apache.mk | 22 +++++-----------------
Mk/bsd.sanity.mk | 5 ++---
databases/gnatsweb4/Makefile | 2 +-
devel/bugzilla44/Makefile | 2 +-
devel/bugzilla50/Makefile | 2 +-
devel/p5-Log-Dispatch/Makefile | 2 +-
devel/pushmi/Makefile | 2 +-
devel/viewvc-devel/Makefile | 2 +-
dns/dns-ui/Makefile | 2 +-
finance/frontaccounting/Makefile | 2 +-
finance/frontaccounting24/Makefile | 2 +-
lang/neko/Makefile | 2 +-
lang/php80/Makefile | 3 +--
lang/php81/Makefile | 3 +--
lang/php82/Makefile | 3 +--
mail/dspam/Makefile | 2 +-
mail/p5-qpsmtpd/Makefile | 2 +-
net-mgmt/chillispot/Makefile | 2 +-
net-mgmt/observium/Makefile | 4 ++--
net-mgmt/ocsinventory-server/Makefile | 2 +-
net-mgmt/pandorafms_console/Makefile | 2 +-
net/p5-Apache2-SOAP/Makefile | 2 +-
net/prosearch/Makefile | 3 +--
security/maia/Makefile | 3 +--
security/openscep/Makefile | 2 +-
security/shibboleth-sp/Makefile | 2 +-
textproc/htdig/Makefile | 2 +-
www/dojo/Makefile | 2 +-
www/formication/Makefile | 2 +-
www/fpc-httpd24/Makefile | 2 +-
www/gnome-user-share/Makefile | 2 +-
www/libapreq2/Makefile | 2 +-
www/mod_amazon_proxy/Makefile | 2 +-
www/mod_asn/Makefile | 2 +-
www/mod_auth_cas/Makefile | 2 +-
www/mod_auth_cookie_mysql2/Makefile | 2 +-
www/mod_auth_gssapi/Makefile | 2 +-
www/mod_auth_kerb2/Makefile | 2 +-
www/mod_auth_mellon/Makefile | 2 +-
www/mod_auth_mysql2/Makefile | 2 +-
www/mod_auth_mysql_another/Makefile | 2 +-
www/mod_auth_openid/Makefile | 2 +-
www/mod_auth_openidc/Makefile | 2 +-
www/mod_auth_pam2/Makefile | 2 +-
www/mod_auth_pgsql2/Makefile | 2 +-
www/mod_auth_pubtkt/Makefile | 10 ++--------
www/mod_auth_tkt/Makefile | 2 +-
www/mod_auth_xradius/Makefile | 2 +-
www/mod_authn_dovecot/Makefile | 2 +-
www/mod_authnz_external24/Makefile | 2 +-
www/mod_cfg_ldap/Makefile | 2 +-
www/mod_cloudflare/Makefile | 2 +-
www/mod_dav_svn/Makefile | 2 +-
www/mod_defensible/Makefile | 2 +-
www/mod_dnssd/Makefile | 2 +-
www/mod_evasive/Makefile | 2 +-
www/mod_fastcgi/Makefile | 2 +-
www/mod_fcgid/Makefile | 2 +-
www/mod_fileiri/Makefile | 2 +-
www/mod_gnutls/Makefile | 2 +-
www/mod_h264_streaming/Makefile | 2 +-
www/mod_http2/Makefile | 2 +-
www/mod_jk/Makefile | 2 +-
www/mod_limitipconn2/Makefile | 2 +-
www/mod_maxminddb/Makefile | 2 +-
www/mod_memcache/Makefile | 2 +-
www/mod_memcache_block/Makefile | 2 +-
www/mod_mono/Makefile | 2 +-
www/mod_mpm_itk/Makefile | 2 +-
www/mod_perl2/Makefile | 4 ++--
www/mod_qos/Makefile | 2 +-
www/mod_realdoc/Makefile | 2 +-
www/mod_reproxy/Makefile | 2 +-
www/mod_rivet/Makefile | 2 +-
www/mod_rpaf2/Makefile | 2 +-
www/mod_scgi/Makefile | 2 +-
www/mod_security/Makefile | 2 +-
www/mod_setenvifplus/Makefile | 2 +-
www/mod_tidy/Makefile | 2 +-
www/mod_umask/Makefile | 2 +-
www/mod_webauth/Makefile | 2 +-
www/mod_webkit/Makefile | 2 +-
www/mod_wsgi4/Makefile | 2 +-
www/mod_xsendfile/Makefile | 2 +-
www/mythplugin-mythweb/Makefile | 2 +-
www/nibbleblog/Makefile | 2 +-
www/otrs/Makefile | 2 +-
www/p5-Apache-AuthCookie/Makefile | 2 +-
www/p5-Apache-AuthTicket/Makefile | 2 +-
www/p5-Apache-Clean2/Makefile | 2 +-
www/p5-Apache-DB/Makefile | 2 +-
www/p5-Apache-DBI/Makefile | 2 +-
www/p5-Apache-MP3/Makefile | 2 +-
www/p5-Apache-ParseFormData/Makefile | 2 +-
www/p5-CGI-SpeedyCGI/Makefile | 2 +-
www/p5-HTML-Mason/Makefile | 2 +-
www/p5-MasonX-WebApp/Makefile | 2 +-
www/p5-Maypole/Makefile | 2 +-
www/p5-Text-MultiMarkdown-ApacheHandler/Makefile | 2 +-
www/p5-libapreq2/Makefile | 2 +-
www/rt44/Makefile | 2 +-
www/rt50/Makefile | 2 +-
www/rubygem-passenger/Makefile | 2 +-
www/suphp/Makefile | 2 +-
www/thundercache/Makefile | 2 +-
www/thundersnarf/Makefile | 2 +-
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
*** 649 LINES SKIPPED ***