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,435 +1,423 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
-#
 # apache.mk - Apache related macros.
 # Author: Clement Laforet <clement@FreeBSD.org>
 # Author: Olli Hauer <ohauer@FreeBSD.org>
 # Author: Bernard Spil <brnrd@FreeSBD.org>
 #
 # Please view me with 4 column tabs!
 
 # Feature:		apache
 # Usage:		USES=apache or USES=apache:args
 # Valid args:	<version>, build, run, server
 #
 # 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
 #
 #			Valid version numbers are specified in the variable
 #			APACHE_SUPPORTED_VERSIONS below
 #
 # build		Indicates that Apache is needed at build time and adds it to
 #			BUILD_DEPENDS.
 # run		Indicates that Apache is needed at run time and adds it to
 #			RUN_DEPENDS.
 # server	Indicates that the port is a server port.
 #
 # If build and run are omitted, Apache will be added as BUILD_DEPENDS and
 # RUN_DEPENDS
 #
 # Variables, which can be set by the port:
 #
 #  AP_FAST_BUILD	automatic module build
 #
 #  AP_GENPLIST		automatic PLIST generation plus add
 #					the module disabled into httpd.conf
 #					(only if no pkg-plist exist)
 #
 #  MODULENAME		Name of the Apache module
 #					default: ${PORTNAME}
 #  SHORTMODNAME		Short name of the Apache module
 #					default: ${MODULENAME:S/mod_//}
 #  SRC_FILE			Source file of the APACHE MODULE
 #					default: ${MODULENAME}.c
 #
 # 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
 #
 #  APACHEINCLUDEDIR		Location of the Apache include files
 #						Default: ${LOCALBASE}/include/apache24
 #
 #  APACHEMODDIR			Location of the Apache modules
 #						Default: ${LOCALBASE}/libxexec/apache24
 #
 #  APACHE_DEFAULT		Default Apache version
 #
 
 .if !defined(_INCLUDE_USES_APACHE_PRE_MK)
 _INCLUDE_USES_APACHE_PRE_MK=	yes
 _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.
 
 # Important Note:
 #  The "+" sign is only valid as last sign, not between
 #  two versions or in combination with range!
 .  if defined(apache_ARGS) && !empty(apache_ARGS)
 # Preserve original arguments list
 _APACHE_ARGS=		${apache_ARGS}
 .    if ${_APACHE_ARGS:Mserver} || ${_APACHE_ARGS:Mcommon}
 _APACHE_PORT_IS_SERVER=	yes
 _APACHE_ARGS:=		${_APACHE_ARGS:Nserver}
 .    endif
 .    if ${_APACHE_ARGS:Mbuild}
 _APACHE_BUILD_DEP=	yes
 _APACHE_ARGS:=		${_APACHE_ARGS:Nbuild}
 .    endif
 .    if ${_APACHE_ARGS:Mrun}
 _APACHE_RUN_DEP=	yes
 _APACHE_ARGS:=		${_APACHE_ARGS:Nrun}
 .    endif
 .    if empty(_APACHE_ARGS)
 _APACHE_ARGS=		${APACHE_DEFAULT}
 .    endif
 # _APACHE_ARGS must now contain a version(-range)
 .    if !empty(_APACHE_ARGS:C/^2\.[0-9]//:S/^-//:C/^2\.[0-9]//:C/\+$//)
 IGNORE= ${_ERROR_MSG} Illegal use of USES= ${USES:Mapache*}
 # Catch USES= apache:[min]-[max]+
 .    elif ${apache_ARGS:C/[.a-z0-9]//g} == "-+"
 IGNORE= ${_ERROR_MSG} Illegal use of USES= ${USES:Mapache*}
 .    endif
 .  endif # defined(apache_ARGS)
 
 # The port does not specify a build, run or server dependency, assume both
 # build and run are required.
 .  if !defined(_APACHE_BUILD_DEP) && !defined(_APACHE_RUN_DEP) && \
 	!defined(_APACHE_PORT_IS_SERVER)
 _APACHE_BUILD_DEP=	yes
 _APACHE_RUN_DEP=	yes
 .  endif
 
 .  if defined(DEFAULT_APACHE_VER)
 IGNORE+=	"DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS+=apache=${DEFAULT_APACHE_VER} instead"
 .  endif
 
 .  if defined(WITH_MODULES) || defined(WITHOUT_MODULES)
 IGNORE=	${_ERROR_MSG} WITH(OUT)_MODULES has been removed, use www_${PORTNAME}_(UN)SET
 .  endif
 
 # ===============================================================
 .  if defined(_APACHE_PORT_IS_SERVER)
 
 # Module selection
 .    for category in ${DEFAULT_MODULES_CATEGORIES}
 DEFAULT_MODULES+=	${${category}_MODULES}
 .    endfor
 
 .    for category in ${ALL_MODULES_CATEGORIES}
 AVAILABLE_MODULES+=	${${category}_MODULES}
 .    endfor
 
 # OPTIONS handling
 .    for module in ${AVAILABLE_MODULES}
 .      if ${PORT_OPTIONS:M${module}}
 _APACHE_ENABLED_MODS+=	${module}
 .      else
 _APACHE_DISABLED_MODS+=	${module}
 .      endif
 .    endfor
 
 .    if !defined(WITH_STATIC_APACHE)
 CONFIGURE_ARGS+=	--enable-so
 .    else
 CONFIGURE_ARGS+=	--disable-so
 WITH_ALL_STATIC_MODULES=	yes
 .    endif
 
 .    if ${PORT_OPTIONS:MSUEXEC}
 _APACHE_ENABLED_MODS+=	${SUEXEC_MODULES}
 SUEXEC_CONFARGS=	with-suexec
 
 # SUEXEC_DOCROOT should exist
 SUEXEC_DOCROOT?=	${PREFIX}/www/data
 #SUEXEC_DOCROOT?=	${WWWDIR}
 SUEXEC_USERDIR?=	public_html
 # avoid duplicate search paths
 .      if ${LOCALBASE} == ${PREFIX}
 SUEXEC_SAFEPATH?=	${LOCALBASE}/bin:/usr/bin:/bin
 .      else
 SUEXEC_SAFEPATH?=	${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin
 .      endif
 SUEXEC_LOGFILE?=	/var/log/httpd-suexec.log
 SUEXEC_UIDMIN?=		1000
 SUEXEC_GIDMIN?=		1000
 SUEXEC_CALLER?=		${WWWOWN}
 CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-caller=${SUEXEC_CALLER} \
 			--${SUEXEC_CONFARGS}-uidmin=${SUEXEC_UIDMIN} \
 			--${SUEXEC_CONFARGS}-gidmin=${SUEXEC_GIDMIN} \
 			--${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \
 			--${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \
 			--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
 			--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"
 
 .      if defined(WITH_SUEXEC_UMASK)
 CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK}
 .      endif
 
 .      if !${PORT_OPTIONS:MSUEXEC_SYSLOG}
 CONFIGURE_ARGS+=	--${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}"
 .      endif
 
 .    endif
 
 .    if !defined(_APACHE_DISABLED_MODS)
 APACHE_MODULES=		${_APACHE_ENABLED_MODS}
 .    else
 .      for module in ${_APACHE_ENABLED_MODS:O:u}
 .        if !${_APACHE_DISABLED_MODS:M${module}}
 APACHE_MODULES+=	${module}
 .        endif
 .      endfor
 .    endif
 
 .    if defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
 WITH_STATIC_MODULES=	${APACHE_MODULES}
 .    endif
 
 .    for module in ${AVAILABLE_MODULES}
 .      if !empty(WITH_STATIC_MODULES:M${module})
 CONFIGURE_ARGS+=	--enable-${module:tl}=static
 PLIST_SUB+=	MOD_${module}="@comment "
 .      elif !empty(APACHE_MODULES:M${module})
 CONFIGURE_ARGS+=	--enable-${module:tl}=shared
 PLIST_SUB+=	MOD_${module}=""
 .      else
 CONFIGURE_ARGS+=	--disable-${module:tl}
 PLIST_SUB+=	MOD_${module}="@comment "
 .      endif
 .    endfor
 
 # pkg-plist workaround STATIC support
 .    if ${PORT_OPTIONS:MSUEXEC}
 PLIST_SUB+=	SUEXEC=""
 .    else
 PLIST_SUB+=	SUEXEC="@comment "
 .    endif
 
 .    if ${PORT_OPTIONS:MLOG_FORENSIC}
 PLIST_SUB+=	FORENSIC=""
 .    else
 PLIST_SUB+=	FORENSIC="@comment "
 .    endif
 
 #### End of _APACHE_PORT_IS_SERVER ####
 
 # ===============================================================
 .  else
 HTTPD?=		${LOCALBASE}/sbin/httpd
 
 MODULENAME?=	${PORTNAME}
 SHORTMODNAME?=	${MODULENAME:S/mod_//}
 SRC_FILE?=	${MODULENAME}.c
 
 .    if exists(${HTTPD})
 _APACHE_VERSION!=	${HTTPD} -v | ${SED} -ne 's/^Server version: Apache\/\([1-9]\.[0-9]*\).*/\1/p'
 .    endif
 
 # Validate Apache version whether it meets the version restriction.
 _APACHE_VERSION_CHECK:=		${_APACHE_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}
 _APACHE_VERSION_MIN_TMP:=	${_APACHE_VERSION_CHECK:C/([1-9]\.[0-9])[-+].*/\1/}
 _APACHE_VERSION_MIN:=		${_APACHE_VERSION_MIN_TMP:M[1-9].[0-9]}
 _APACHE_VERSION_MAX_TMP:=	${_APACHE_VERSION_CHECK:C/.*-([1-9]\.[0-9])/\1/}
 _APACHE_VERSION_MAX:=		${_APACHE_VERSION_MAX_TMP:M[1-9].[0-9]}
 
 # Remove from _WANTED_VERSIONS that which is not wanted
 _APACHE_WANTED_VERSIONS=	${_APACHE_SUPPORTED_VERSIONS}
 .    for _ver in ${_APACHE_SUPPORTED_VERSIONS:O}
 .      if !empty(_APACHE_VERSION_MIN) && ${_ver} < ${_APACHE_VERSION_MIN}
 _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
 
 # Check if installed Apache version matches a wanted version
 .    if defined(_APACHE_VERSION) && $(_APACHE_WANTED_VERSIONS:M${_APACHE_VERSION})
 _APACHE_WANTED_VERSION=	${_APACHE_VERSION}
 .    endif
 # Select Apache version if not already set
 .    for _ver in ${APACHE_DEFAULT} ${_APACHE_SUPPORTED_VERSIONS}
 .      if !defined(_APACHE_WANTED_VERSION) && ${_APACHE_WANTED_VERSIONS:M${_ver}}
 _APACHE_WANTED_VERSION=	${_ver}
 .      endif
 .    endfor
 
 APACHE_VERSION:=	${_APACHE_WANTED_VERSION}
 
 .    if defined(_APACHE_VERSION) && ${_APACHE_VERSION} != ${APACHE_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
 .      if ${APXS_PREFIX} == NULL
 IGNORE=	: Your apache does not support DSO modules
 .      endif
 .      if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX}
 IGNORE?=	PREFIX must be equal to APXS_PREFIX.
 .      endif
 .    endif
 
 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}" \
 		APACHEETCDIR="${APACHEETCDIR}" \
 		APACHE_VERSION="${APACHE_VERSION}"
 
 SUB_LIST+=	APACHEMODDIR="${APACHEMODDIR}" \
 		APACHEETCDIR="${APACHEETCDIR}" \
 		APACHE_VERSION="${APACHE_VERSION}"
 
 APACHE_PKGNAMEPREFIX=	ap${APACHE_VERSION:S/.//}-
 
 .    if defined(AP_FAST_BUILD)
 PKGNAMEPREFIX?=	${APACHE_PKGNAMEPREFIX}
 .    endif
 
 .    if defined(_APACHE_BUILD_DEP)
 BUILD_DEPENDS+=	${APXS}:${_APACHE_PORT}
 .    endif
 
 .    if defined(_APACHE_RUN_DEP)
 RUN_DEPENDS+=	${APXS}:${_APACHE_PORT}
 .    endif
 
 PLIST_SUB+=	AP_NAME="${SHORTMODNAME}"
 PLIST_SUB+=	AP_MODULE="${MODULENAME}.so"
 
 .    if defined(AP_GENPLIST)
 PLIST?=		${WRKDIR}/ap-plist
 .    endif
 
 .    if defined(AP_INC)
 AP_EXTRAS+=	-I ${AP_INC}
 .    endif
 .    if defined(AP_LIB)
 AP_EXTRAS+=	-L ${AP_LIB}
 .    endif
 
 .  endif # End of _APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MOULE
 .endif # End of !_INCLUDE_USES_APACHE_PRE_MK
 
 # ===============================================================
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_APACHE_POST_MK)
 _INCLUDE_USES_APACHE_POST_MK=	apache.mk
 .  if defined(NO_BUILD) && !defined(_APACHE_RUN_DEP)
 BROKEN=	If NO_BUILD is used, then apache:run is sufficient. Please fix your Makefile
 .  endif
 
 .  if defined(_APACHE_PORT_IS_SERVER)
 .    if !target(print-closest-mirrors)
 print-closest-mirrors:
 	@${ECHO_MSG} -n "Fetching list of nearest mirror: " >&2
 	@MIRRORS=`${FETCH_CMD} -T 30 -qo - http://www.apache.org/dyn/closer.cgi/httpd/ 2> /dev/null\
 	| ${GREP} /httpd/ | ${SED} 's/.*href="\(.*\)"><str.*/\1/g' | \
 	${HEAD} -7 | ${TAIL} -6` ; \
 	${ECHO_MSG} done >&2; if [ "x$$MIRRORS" != "x" ]; then \
 	${ECHO_MSG} -n "MASTER_SITE_APACHE_HTTPD?= ";\
 	${ECHO_MSG} $$MIRRORS; else \
 	${ECHO_MSG} "No mirrors found!">&2 ; fi
 .    endif
 
 .    if !target(show-modules)
 show-modules:
 .      if !empty(APACHE_MODULES)
 .        for module in ${AVAILABLE_MODULES}
 	@${PRINTF} "%-20s : " ${module}
 .          if ${APACHE_MODULES:M${module}}
 		@${ECHO_CMD} -n "enabled "
 .            if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
 			@${ECHO_CMD} " (static)"
 .            else
 			@${ECHO_CMD} "(shared)"
 .            endif
 .          else
 		@${ECHO_CMD} disabled
 .          endif
 .        endfor
 .      else
 .        for module in ${AVAILABLE_MODULES}
 	@${PRINTF} "%-20s : disabled\n" ${module}
 .        endfor
 .      endif
 .    endif
 
 .  else
 
 .    if defined(AP_MODENABLE)
 AP_MOD_EN=	-a
 .    else
 AP_MOD_EN=	-A
 .    endif
 PLIST_SUB+=	AP_MOD_EN="${AP_MOD_EN}"
 
 .    if defined(AP_FAST_BUILD)
 .      if !target(ap-gen-plist)
 _USES_build+=	490:ap-gen-plist
 ap-gen-plist:
 .        if defined(AP_GENPLIST)
 .          if !exists(${PLIST})
 	@${ECHO_MSG} "===>  Generating apache plist"
 	@${ECHO_CMD} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
 	@${ECHO_CMD} "@postexec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
 	@${ECHO_CMD} "@postunexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
 	@${ECHO_CMD} "@postunexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"" >> ${PLIST}
 .          endif
 .        endif
 .      endif
 
 .      if !target(do-build)
 do-build:
 	(cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.la ${SRC_FILE})
 .      endif
 
 .      if !target(do-install)
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.la
 .        if !defined(DEBUG)
 		@${ECHO_MSG} "===> strip ${APACHEMODDIR}/${MODULENAME}.so"
 		@[ -e ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so ] && ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 .        else
 		@${ECHO_MSG} "===> DEBUG is set, will not strip ${APACHEMODDIR}/${MODULENAME}.so"
 .        endif
 .      endif
 
 .    endif          # defined(AP_FAST_BUILD)
 .  endif          # defined(_APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MODULE)
 .endif          # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_APACHE_PRE_MK)
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
@@ -1,327 +1,326 @@
 # MAINTAINER: portmgr@FreeBSD.org
 #
 
 # Warnings for everyone
 
 .for opt in ${ALL_OPTIONS:NDEBUG}
 .  if defined(WITH_${opt})
 WARNING+=     "WITH_${opt} is unsupported, use WITH=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_SET+=${opt} to set it globally, or ${OPTIONS_NAME}_SET+=${opt} for only this port."
 .  endif
 .  if defined(WITHOUT_${opt})
 WARNING+=     "WITHOUT_${opt} is unsupported, use WITHOUT=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_UNSET+=${opt} to set it globally, or ${OPTIONS_NAME}_UNSET+=${opt} for only this port."
 .  endif
 .endfor
 
 ALL_UNSUPPORTED=	WITHOUT_NLS NOPORTDOCS NOPORTEXAMPLES WITH_BDB_VER \
 			OVERRIDE_LINUX_BASE_PORT WITH_OPENSSL_PORT \
 			WITH_OPENSSL_BASE PYTHON_DEFAULT_VERSION \
 			PYTHON2_DEFAULT_VERSION PYTHON3_DEFAULT_VERSION
 ALL_DEPRECATED=
 ALL_NOTNEEDED=		WITH_NEW_XORG WITHOUT_NEW_XORG WITH_KMS WITHOUT_KMS
 
 WITHOUT_NLS_ALT=	"OPTIONS_UNSET=NLS, or ${OPTIONS_NAME}_UNSET+=NLS instead"
 NOPORTDOCS_ALT=		"OPTIONS_UNSET=DOCS, or ${OPTIONS_NAME}_UNSET+=DOCS instead"
 NOPORTEXAMPLES_ALT=	"OPTIONS_UNSET=EXAMPLES, or ${OPTIONS_NAME}_UNSET+=EXAMPLES instead"
 WITH_BDB_VER_ALT=	"DEFAULT_VERSIONS+=bdb=${WITH_BDB_VER}"
 OVERRIDE_LINUX_BASE_PORT_ALT=	"DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}"
 WITH_OPENSSL_PORT_ALT=	"DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT:Uopenssl} in your make.conf"
 WITH_OPENSSL_BASE_ALT=	"DEFAULT_VERSIONS+=ssl=base in your make.conf"
 WITH_NEW_XORG_ALT=	"removed and has no effect"
 WITHOUT_NEW_XORG_ALT=	${WITH_NEW_XORG_ALT}
 WITH_MKS_ALT=	"removed and has no effect"
 WITHOUT_MKS_ALT=	${WITH_MKS_ALT}
 PYTHON_DEFAULT_VERSION_ALT=	"DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//}"
 PYTHON2_DEFAULT_VERSION_ALT=	"DEFAULT_VERSIONS=python2=${PYTHON2_DEFAULT_VERSION:S/^python//}"
 PYTHON3_DEFAULT_VERSION_ALT=	"DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//}"
 
 .for a in ${ALL_DEPRECATED}
 .  if defined(${a})
 WARNING+=	"${a} is deprecated, please use ${${a}_ALT}"
 .  endif
 .endfor
 
 .for a in ${ALL_NOTNEEDED}
 .  if defined(${a})
 WARNING+=	"${a} is not needed: ${${a}_REASON}"
 .  endif
 .endfor
 
 .for a in ${ALL_UNSUPPORTED}
 .  if defined(${a})
 ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
 .  endif
 .endfor
 
 
 
 # Warnings only when DEVELOPER=yes
 .if defined(DEVELOPER)
 
 .if exists(${.CURDIR}/../../Mk/bsd.port.mk) || ${OVERLAYS:tA:M${.CURDIR:H:H}} == ${.CURDIR:H:H}
 .  if ${.CURDIR:H:T} != ${PKGCATEGORY}
 DEV_ERROR+=	"The first entry in CATEGORIES should be the directory where the port lives"
 .  endif
 .else
 DEV_WARNING+=	"Not validating first entry in CATEGORIES due to being outside of PORTSDIR. Please ensure this is proper when committing."
 .endif
 
 .if defined(USE_PERL5) && ${USE_PERL5} == yes
 DEV_ERROR+=	"USE_PERL5=yes is unsupported, please use USES=perl5 instead"
 .endif
 
 .if !empty(LIB_DEPENDS:M*/../*)
 DEV_ERROR+=	"LIB_DEPENDS contains unsupported relative path to dependency"
 .endif
 
 .if !empty(RUN_DEPENDS:M*/../*)
 DEV_ERROR+=	"RUN_DEPENDS contains unsupported relative path to dependency"
 .endif
 
 .if defined(USE_GNOME) && ${USE_GNOME:Mpkgconfig}
 DEV_ERROR+=	"USE_GNOME=pkgconfig is unsupported, please use USES=pkgconfig"
 .endif
 
 .if defined(USE_ZOPE) && ${USE_ZOPE} == yes
 DEV_ERROR+=	"USE_ZOPE=yes is unsupported, please use USES=zope instead"
 .endif
 
 .if defined(USE_SDL) && ${USE_SDL} == yes
 DEV_ERROR+=	"USE_SDL=yes is unsupported, please use USE_SDL=sdl instead"
 .endif
 
 .if defined(USE_GITHUB) && defined(GH_COMMIT)
 DEV_ERROR+=	"GH_COMMIT is unsupported, please convert GHL-\>GH in MASTER_SITES and set GH_TAGNAME to tag or commit hash and remove GH_COMMIT"
 .endif
 
 .if defined(USE_GNOME) && ${USE_GNOME:Mgnomehack}
 DEV_WARNING+=	"USE_GNOME=gnomehack is deprecated, please use USES=pathfix"
 .endif
 
 .if defined(USE_GNOME) && ${USE_GNOME:Mdesktopfileutils}
 DEV_WARNING+=	"USE_GNOME=desktopfileutils is deprecated, please use USES=desktop-file-utils"
 .endif
 
 .if defined(LIB_DEPENDS) && ${LIB_DEPENDS:Nlib*}
 DEV_ERROR+=	"All LIB_DEPENDS should use the new format and start out with lib.  \(libfoo.so vs foo.so\)"
 .endif
 
 .if defined(LICENSE)
 .  if ${LICENSE:MBSD}
 DEV_WARNING+=	"LICENSE must not contain BSD, instead use BSD[234]CLAUSE"
 .  endif
 .elif !defined(DISABLE_LICENSES)
 .  if empty(USES:Mmetaport)
 DEV_WARNING+=	"Please set LICENSE for this port"
 .  endif
 .endif
 
 .for _a in ${ONLY_FOR_ARCHS}
 .  if defined(ONLY_FOR_ARCHS_REASON_${_a})
 DEV_WARNING+=	"ONLY_FOR_ARCHS_${_a} is defined and ${_a} is in ONLY_FOR_ARCHS, the message will never be used."
 .  endif
 .endfor
 
 .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
 DEV_ERROR+=	"USE_PYDISTUTILS=easy_install is no longer supported, please use USE_PYDISTUTILS=yes"
 .endif
 
 .if defined(USE_PYTHON) && (${USE_PYTHON} == "yes" || ${USE_PYTHON:C/[-0-9.+]*//} == "")
 _PYTHON_VAL := ${USE_PYTHON}
 .  if ${_PYTHON_VAL} != "yes"
 DEV_ERROR+=	"USE_PYTHON=${_PYTHON_VAL} is no longer supported, please use USES=python:${_PYTHON_VAL}"
 .  else
 DEV_ERROR+=	"USE_PYTHON=yes is no longer supported, please use USES=python"
 .  endif
 .endif
 .if defined(USE_PYTHON_RUN)
 .  if ${USE_PYTHON_RUN} != "yes"
 DEV_ERROR+=	"USE_PYTHON_RUN is no longer supported, please use USES=python:${USE_PYTHON_RUN},run"
 .  else
 DEV_ERROR+=	"USE_PYTHON_RUN is no longer supported, please use USES=python:run"
 .  endif
 .endif
 .if defined(USE_PYTHON_BUILD)
 .  if ${USE_PYTHON_BUILD} != "yes"
 DEV_ERROR+=	"USE_PYTHON_BUILD is no longer supported, please use USES=python:${USE_PYTHON_BUILD},build"
 .  else
 DEV_ERROR+=	"USE_PYTHON_BUILD is no longer supported, please use USES=python:build"
 .  endif
 .endif
 
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} == YES
 DEV_ERROR+=	"USE_RC_SUBR=yes has not been supported for a long time, remove it."
 .endif
 
 .if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || \
    defined(USE_TK)  || defined(USE_TK_BUILD)  || defined(USE_TK_RUN)  || defined(USE_TK_WRAPPER)
 DEV_ERROR+=	"USE_TCL and USE_TK are no longer supported, please use USES=tcl or USES=tk"
 .endif
 
 .if defined(USE_FPC) && ${USE_FPC:tl} == "yes"
 DEV_ERROR+=	"USE_FPC=yes is no longer supported, please use USES=fpc"
 .endif
 
 .if ! empty(USES:Mruby) && ! empty(USES:Mgem)
 DEV_ERROR=	"'USES=gem' implies 'USES=ruby'. You should not specify both of them"
 .endif
 
 .for _type in EXAMPLES DOCS
 .  if defined(PORT${_type}) && empty(_REALLY_ALL_POSSIBLE_OPTIONS:M${_type})
 DEV_ERROR+=	"PORT${_type} does not do anything unless the ${_type} option is present."
 .  endif
 .endfor
 
 .if empty(PORTEPOCH) || !empty(PORTEPOCH:C/[0-9]+//)
 DEV_ERROR+=	"PORTEPOCH needs to be an integer \>= 0"
 .endif
 
 .if empty(PORTREVISION) || !empty(PORTREVISION:C/[0-9]+//)
 DEV_ERROR+=	"PORTREVISION needs to be an integer \>= 0"
 .endif
 
 # Whitelist of options helper lookalikes that should not be reported on:
 _OPTIONS_HELPERS_SEEN+=	OPENSSL_LDFLAGS
 _BROKEN_OPTIONS_HELPERS=
 .for opt in ${_REALLY_ALL_POSSIBLE_OPTIONS}
 .  for helper in ${_ALL_OPTIONS_HELPERS}
 .    if defined(${opt}_${helper}) && empty(_OPTIONS_HELPERS_SEEN:M${opt}_${helper})
 _BROKEN_OPTIONS_HELPERS+=	${opt}_${helper}
 .    endif
 .  endfor
 .endfor
 .if !empty(_BROKEN_OPTIONS_HELPERS)
 DEV_ERROR+=	"The following options helpers are incorrectly set after bsd.port.options.mk and are ineffective: ${_BROKEN_OPTIONS_HELPERS}"
 .endif
 
 SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \
 		USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \
 		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \
 		INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
 		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
 		UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD USE_PHPEXT \
 		USE_ZENDEXT USE_PHP_BUILD USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI \
 		WANT_PHP_MOD WANT_PHP_WEB WANT_PHP_EMB USE_BDB PLIST_DIRSTRY \
 		USE_RCORDER USE_OPENSSL WANT_GNOME RUBYGEM_AUTOPLIST WANT_SDL \
 		INSTALLS_EGGINFO USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
 		USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \
 		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
 
 .for a in 1 2 3 4 5 6 7 8 9 L N
 SANITY_DEPRECATED+=	MAN${a}
 MAN${a}_ALT=		pkg-plist to list manpages
 .endfor
 
 USE_AUTOTOOLS_ALT=	USES=autoreconf and GNU_CONFIGURE=yes
 USE_OPENAL_ALT=		USES=openal
 USE_FAM_ALT=		USES=fam
 USE_MAKESELF_ALT=	USES=makeself
 USE_ZIP_ALT=		USES=zip
 USE_LHA_ALT=		USES=lha
 USE_BZIP2_ALT=		USES=tar:bzip2
 USE_XZ_ALT=		USES=tar:xz
 USE_CMAKE_ALT=		USES=cmake
 USE_READLINE_ALT=	USES=readline
 USE_ICONV_ALT=		USES=iconv
 USE_GMAKE_ALT=		USES=gmake
 PERL_CONFIGURE_ALT=	USES=perl5 along with USE_PERL5=configure
 PERL_MODBUILD_ALT=	USES=perl5 along with USE_PERL5=modbuild
 USE_PERL5_BUILD_ALT=	USES=perl5 along with USE_PERL5=build
 USE_PERL5_RUN_ALT=	USES=perl5 along with USE_PERL5=run
 USE_DISPLAY_ALT=	USES=display
 USE_FUSE_ALT=		USES=fuse
 USE_GETTEXT_ALT=	USES=gettext
 USE_SCONS_ALT=		USES=scons
 USE_DRUPAL_ALT=		USES=drupal
 USE_PYDISTUTILS_ALT=		USE_PYTHON=distutils
 USE_PGSQL_ALT=		USES=pgsql
 INSTALLS_SHLIB_ALT=	USE_LDCONFIG
 NEED_ROOT_ALT=		USES=fakeroot or USES=uidfix
 PYTHON_CONCURRENT_INSTALL_ALT=	USE_PYTHON=concurrent
 PYDISTUTILS_AUTOPLIST_ALT=	USE_PYTHON=autoplist
 PYTHON_PY3K_PLIST_HACK_ALT=	USE_PYTHON=py3kplist
 PYDISTUTILS_NOEGGINFO_ALT=	USE_PYTHON=noegginfo
 USE_PYTHON_PREFIX_ALT=		USE_PYTHON=pythonprefix
 NO_INSTALL_MANPAGES_ALT=	USES=imake:noman
 UNIQUENAME_ALT=		PKGBASE
 LATEST_LINK_ALT=	PKGBASE
 CMAKE_NINJA_REASON=	Now the ninja generator is the default
 WX_UNICODE_REASON=	Now no-op as only unicode is supported now
 PLIST_DIRSTRY_ALT=	PLIST_DIRS
 USE_SQLITE_ALT=		USES=sqlite
 USE_FIREBIRD_ALT=	USES=firebird
 USE_BDB_ALT=		USES=bdb:${USE_BDB}
 USE_MYSQL_ALT=		USES=mysql:${USE_MYSQL}
 WANT_MYSQL_VER_ALT=	USES=mysql:${WANT_MYSQL_VER}
 USE_OPENSSL_ALT=	USES=ssl
 USE_PHPIZE_ALT=		USES=php:phpize
 USE_PHPEXT_ALT=		USES=php:ext
 USE_ZENDEXT_ALT=	USES=php:zend
 USE_PHP_BUILD_ALT=	USES=php:build
 WANT_PHP_CLI_ALT=	USES=php:cli
 WANT_PHP_CGI_ALT=	USES=php:cgi
 WANT_PHP_MOD_ALT=	USES=php:mod
 WANT_PHP_WEB_ALT=	USES=php:web
 WANT_PHP_EMB_ALT=	USES=php:embed
 USE_RCORDER_ALT=	USE_RC_SUBR=${USE_RCORDER}
 WANT_GNOME_ALT=		USES=gnome
 MLINKS_ALT=		it no more
 USE_DOS2UNIX_ALT=	USES=dos2unix
 PYDISTUTILS_INSTALLNOSINGLE_ALT=	it no more
 INSTALLS_EGGINFO_ALT=	an entry in the plist
 WANT_SDL_ALT=		USE_SDL for SDL directly, if you need optional dependency, use options
 RUBYGEM_AUTOPLIST_ALT=	USES=gem
 USE_RUBYGEMS_ALT=	USES=gem
 USE_GHOSTSCRIPT_ALT=	USES=ghostscript
 USE_GHOSTSCRIPT_BUILD_ALT=	USES=ghostscript
 USE_GHOSTSCRIPT_RUN_ALT=	USES=ghostscript
 NO_STAGE_ALT=	https://wiki.freebsd.org/ports/StageDir to convert your port to staging
 USE_APACHE_ALT=		USES=apache:${USE_APACHE:C/2(0-9)/2.\1/g}
 USE_APACHE_BUILD_ALT=	USES=apache:build,${USE_APACHE_BUILD:C/2(0-9)/2.\1/g}
 USE_APACHE_RUN_ALT=	USES=apache:run,${USE_APACHE_RUN:C/2(0-9)/2.\1/g}
 APACHE_PORT_ALT=	DEFAULT_VERSIONS+=apache=${APACHE_PORT:S/www\/apache//:C/2(0-9)/2.\1/}
 USE_FPC_RUN_ALT=	USES=fpc:run
 WANT_FPC_BASE_ALT=	USES=fpc:base
 WANT_FPC_ALL_ALT=	USES=fpc:all
 USE_QT4_ALT=		USES=qt:5 and USE_QT=${USE_QT4} \(beware\) as Qt4 has been removed
 USE_QT5_ALT=		USES=qt:5 and USE_QT=${USE_QT5}
 QT_NONSTANDARD_ALT=	USES=qmake:no_env
 XORG_CAT_ALT=		USES=xorg-cat:${XORG_CAT}
 CARGO_USE_GITHUB_ALT=	CARGO_CRATES \(regenerate it with make cargo-crates\)
 CARGO_USE_GITLAB_ALT=	CARGO_CRATES \(regenerate it with make cargo-crates\)
 CARGO_GIT_SUBDIR_ALT=	CARGO_CRATES \(regenerate it with make cargo-crates\)
 USE_RUBY_ALT=		USES=ruby
 USE_RUBY_EXTCONF_ALT=	USES=ruby:extconf
 USE_RUBY_SETUP_ALT=	USES=ruby:setup
 RUBY_NO_BUILD_DEPENDS_ALT=	USES=ruby:run
 RUBY_NO_RUN_DEPENDS_ALT=	USES=ruby:build
 
 .for a in ${SANITY_DEPRECATED}
 .  if defined(${a})
 DEV_WARNING+=	"${a} is deprecated, please use ${${a}_ALT}"
 .  endif
 .endfor
 
 .for a in ${SANITY_NOTNEEDED}
 .  if defined(${a})
 DEV_WARNING+=	"${a} is not needed: ${${a}_REASON}"
 .  endif
 .endfor
 
 .for a in ${SANITY_UNSUPPORTED}
 .  if defined(${a})
 DEV_ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
 .  endif
 .endfor
 
 .endif # defined(DEVELOPER)
diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile
index 684b7f9e7217..ff476e0dc4c0 100644
--- a/databases/gnatsweb4/Makefile
+++ b/databases/gnatsweb4/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	gnatsweb
 PORTVERSION=	4.00
 PORTREVISION=	7
 CATEGORIES=	databases devel www
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnatsweb, a GNATS web interface
 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
 NO_ARCH=	yes
 
 CGI_DIR?=	${WWWDIR}/cgi-bin
 
 PLIST_SUB=	CGI_DIR="${CGI_DIR:S,^${PREFIX}/,,}"
 
 PORTDOCS=	CUSTOMIZE CUSTOMIZE.cb CUSTOMIZE.vars \
 		ChangeLog INSTALL NEWS README TROUBLESHOOTING
 
 PORTEXAMPLES=	gnatsweb-site-example.pl
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${CGI_DIR} \
 		${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl \
 		${STAGEDIR}${ETCDIR}/gnatsweb-site.pl.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${STAGEDIR}${CGI_DIR}
 	${LN} -s  ${ETCDIR}/gnatsweb-site.pl ${STAGEDIR}${CGI_DIR}
 	${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${STAGEDIR}${CGI_DIR}
 
 do-install-DOCS-on:
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 do-install-EXAMPLES-on:
 .for example in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${example} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile
index 7a23e2e48dc9..a25faf0111fe 100644
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -1,136 +1,136 @@
 PORTNAME=	bugzilla
 PORTVERSION=	4.4.13
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA/webtools MOZILLA/webtools/archived
 
 MAINTAINER=	bz-ports@FreeBSD.org
 COMMENT=	Bug-tracking system developed by Mozilla Project
 WWW=		https://www.bugzilla.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # see Bugzilla/Install/Requirements.pm
 # PR 194782: silence Module::Pluggable deprecated warnings
 # PR 196060,196100: explicitly depend on textproc/p5-Text-Tabv
 RUN_DEPENDS=	\
 		p5-CGI>=3.51:www/p5-CGI \
 		p5-DBI>=1.614:databases/p5-DBI \
 		p5-DateTime-TimeZone>=1.64:devel/p5-DateTime-TimeZone \
 		p5-DateTime>=0.75:devel/p5-DateTime \
 		p5-Email-MIME>=1.904:mail/p5-Email-MIME \
 		p5-Email-Send>=2.04:mail/p5-Email-Send \
 		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
 		p5-List-MoreUtils>=0.32:lang/p5-List-MoreUtils \
 		p5-Math-Random-ISAAC>=1.001:math/p5-Math-Random-ISAAC \
 		p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable \
 		p5-Template-Toolkit>=2.24:www/p5-Template-Toolkit \
 		p5-Text-Tabs+Wrap>=2013.0523:textproc/p5-Text-Tabs+Wrap \
 		p5-TimeDate>=2.23:devel/p5-TimeDate \
 		p5-URI>=1.55:net/p5-URI
 
 USES=		cpe perl5
 USE_PERL5=	run
 
 CPE_VENDOR=	mozilla
 
 SUB_FILES=	pkg-message
 
 DATA_DIRS_LIST=	images js skins
 
 # checksetup will fail if these directories are not present!
 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
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
 SQLITE_USES=		sqlite
 SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
 			sqlite3>=3:databases/sqlite3
 GRAPH_REPORTS_RUN_DEPENDS=	p5-GD>=1.20:graphics/p5-GD \
 				p5-GD-Graph>=0:graphics/p5-GD-Graph \
 				p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
 				p5-Template-GD>=0:www/p5-Template-GD
 CHARTING_MODULES_RUN_DEPENDS=	p5-Chart>=2.4.10:graphics/p5-Chart
 PATCH_VIEWER_RUN_DEPENDS=	p5-PatchReader>=0.9.6:devel/p5-PatchReader \
 				interdiff:misc/patchutils
 MORE_HTML_RUN_DEPENDS=	p5-HTML-Parser>=3.67:www/p5-HTML-Parser \
 			p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber
 INBOUND_EMAIL_RUN_DEPENDS=	p5-Email-MIME-Attachment-Stripper>=0:mail/p5-Email-MIME-Attachment-Stripper \
 				p5-Email-Reply>=0:mail/p5-Email-Reply \
 				p5-HTML-FormatText-WithLinks>=0.13:textproc/p5-HTML-FormatText-WithLinks
 MAIL_QUEUEING_RUN_DEPENDS=	p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
 				p5-Daemon-Generic>=0:net/p5-Daemon-Generic \
 				p5-File-Slurp>=9999.13:devel/p5-File-Slurp
 MOVE_BUGZ_RUN_DEPENDS=	p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \
 			p5-XML-Twig>=0:textproc/p5-XML-Twig
 BMP2PNG_USES=		magick:6,run
 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST
 # and will likely be removed in the Bugzilla 7.0 release.
 # XXX SOAP::Lite can be removed if upstream officially depends on
 # XMLRPC::Lite>=0.717, see Bugzilla/Install/Requirements.pm
 XMLRPC_RUN_DEPENDS=	p5-Test-Taint>=1.06:devel/p5-Test-Taint \
 			p5-XMLRPC-Lite>=0.712:net/p5-XMLRPC-Lite \
 			p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite
 JSONRPC_RUN_DEPENDS=	p5-Test-Taint>=1.06:devel/p5-Test-Taint \
 			p5-JSON-RPC>=0:devel/p5-JSON-RPC \
 			p5-JSON-XS>=2.0:converters/p5-JSON-XS
 MODPERL_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 			p5-Apache-DBI>=0:www/p5-Apache-DBI
 GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
 EXPORT_IMPORT_RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
 				p5-XML-Twig>=0:textproc/p5-XML-Twig
 LDAP_RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap
 RADIUS_RUN_DEPENDS=	p5-Authen-Radius>=0:security/p5-Authen-Radius
 SMTP_AUTH_RUN_DEPENDS=	p5-Authen-SASL>=2.16:security/p5-Authen-SASL
 MIME_SNIFF_RUN_DEPENDS=	p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
 			p5-IO-Stringy>=2.110:devel/p5-IO-Stringy
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	${RM} -r ${WRKSRC}/.git
 	${RM} ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \
 		${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc \
 		${WRKSRC}/.travis.yml ${WRKSRC}/Build.PL ${WRKSRC}/MANIFEST.SKIP \
 		${WRKSRC}/taskgraph.json
 
 post-patch:
 	${REINPLACE_CMD} -e 's/apache/www/' ${WRKSRC}/Bugzilla/Install/Localconfig.pm
 	${REINPLACE_CMD} -e 's|/opt/bugzilla|${WWWDIR}|' ${WRKSRC}/importxml.pl \
 		${WRKSRC}/docs/en/html/api/importxml.html
 	${FIND} ${WRKSRC} -type f \( -name \*.cgi -o -name \*.html -o -name \*.pl -o -name \*.pm -o -name \*.t -o -name \*.txt -o -name \*.xml \) \
 		-exec ${SED} -i '' -e "s=/usr/bin/perl=${PERL}=g; \
 			s!/usr/lib/sendmail!/usr/sbin/sendmail!g; \
 			s!/var/www/html/bugzilla!${WWWDIR}!" {} \+
 .if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL}
 	${REINPLACE_CMD} -e "s/'mysql'/'Pg'/" ${WRKSRC}/Bugzilla/Install/Localconfig.pm
 .endif
 
 pre-install:
 	${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bak" \) -delete
 
 do-install:	.SILENT
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
 		${INSTALL_SCRIPT} {} ${STAGEDIR}${WWWDIR} \;
 	@${MKDIR} ${DATA_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 .for D in ${DATA_DIRS_LIST}
 	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/${D})
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
 	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 do-install-CONTRIB-on:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/contrib
 	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/contrib)
 
 .include <bsd.port.mk>
diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile
index dbea1db374db..d98749921708 100644
--- a/devel/bugzilla50/Makefile
+++ b/devel/bugzilla50/Makefile
@@ -1,145 +1,145 @@
 PORTNAME=	bugzilla
 PORTVERSION=	5.0.4
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA/webtools MOZILLA/webtools/archived
 
 MAINTAINER=	bz-ports@FreeBSD.org
 COMMENT=	Bug-tracking system developed by Mozilla Project
 WWW=		https://www.bugzilla.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # see Bugzilla/Install/Requirements.pm
 # PR 194782: silence Module::Pluggable deprecated warnings
 # PR 196060,196100: explicitly depend on textproc/p5-Text-Tabv
 RUN_DEPENDS=	\
 		p5-CGI>=3.51:www/p5-CGI \
 		p5-DBI>=1.614:databases/p5-DBI \
 		p5-DateTime-TimeZone>=1.64:devel/p5-DateTime-TimeZone \
 		p5-DateTime>=0.75:devel/p5-DateTime \
 		p5-Email-MIME>=1.904:mail/p5-Email-MIME \
 		p5-Email-Sender>=1.300011:mail/p5-Email-Sender \
 		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
 		p5-JSON-XS>=2.01:converters/p5-JSON-XS \
 		p5-List-MoreUtils>=0.32:lang/p5-List-MoreUtils \
 		p5-Math-Random-ISAAC>=1.001:math/p5-Math-Random-ISAAC \
 		p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable \
 		p5-Template-Toolkit>=2.24:www/p5-Template-Toolkit \
 		p5-Text-Tabs+Wrap>=2013.0523:textproc/p5-Text-Tabs+Wrap \
 		p5-TimeDate>=2.23:devel/p5-TimeDate \
 		p5-URI>=1.55:net/p5-URI
 
 USES=		cpe perl5
 USE_PERL5=	run
 
 CPE_VENDOR=	mozilla
 
 SUB_FILES=	pkg-message
 
 DATA_DIRS_LIST=	images js skins
 
 # checksetup will fail if these directories are not present!
 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+
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
 SQLITE_USES=		sqlite
 SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
 			sqlite3>=3:databases/sqlite3
 GRAPH_REPORTS_RUN_DEPENDS=	p5-GD>=1.20:graphics/p5-GD \
 				p5-GD-Graph>=0:graphics/p5-GD-Graph \
 				p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
 				p5-Template-GD>=0:www/p5-Template-GD
 CHARTING_MODULES_RUN_DEPENDS=	p5-Chart>=2.4.10:graphics/p5-Chart
 PATCH_VIEWER_RUN_DEPENDS=	p5-PatchReader>=0.9.6:devel/p5-PatchReader \
 				interdiff:misc/patchutils
 MORE_HTML_RUN_DEPENDS=	p5-HTML-Parser>=3.67:www/p5-HTML-Parser \
 			p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber
 INBOUND_EMAIL_RUN_DEPENDS=	p5-Email-MIME-Attachment-Stripper>=0:mail/p5-Email-MIME-Attachment-Stripper \
 				p5-Email-Reply>=0:mail/p5-Email-Reply \
 				p5-HTML-FormatText-WithLinks>=0.13:textproc/p5-HTML-FormatText-WithLinks
 MAIL_QUEUEING_RUN_DEPENDS=	p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
 				p5-Daemon-Generic>=0:net/p5-Daemon-Generic
 MOVE_BUGZ_RUN_DEPENDS=	p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \
 			p5-XML-Twig>=0:textproc/p5-XML-Twig
 BMP2PNG_USES=		magick:6,run
 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST
 # and will likely be removed in the Bugzilla 7.0 release.
 # XXX SOAP::Lite can be removed if upstream officially depends on
 # XMLRPC::Lite>=0.717, see Bugzilla/Install/Requirements.pm
 XMLRPC_RUN_DEPENDS=	p5-Test-Taint>=1.06:devel/p5-Test-Taint \
 			p5-XMLRPC-Lite>=0.712:net/p5-XMLRPC-Lite \
 			p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite
 JSONRPC_RUN_DEPENDS=	p5-Test-Taint>=1.06:devel/p5-Test-Taint \
 			p5-JSON-RPC>=0:devel/p5-JSON-RPC
 REST_RUN_DEPENDS=	p5-Test-Taint>=1.06:devel/p5-Test-Taint \
 			p5-JSON-RPC>=0:devel/p5-JSON-RPC
 MODPERL_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 			p5-Apache-DBI>=0:www/p5-Apache-DBI
 GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
 EXPORT_IMPORT_RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
 				p5-XML-Twig>=0:textproc/p5-XML-Twig
 LDAP_RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap
 RADIUS_RUN_DEPENDS=	p5-Authen-Radius>=0:security/p5-Authen-Radius
 SMTP_AUTH_RUN_DEPENDS=	p5-Authen-SASL>=2.16:security/p5-Authen-SASL
 MIME_SNIFF_RUN_DEPENDS=	p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
 			p5-IO-Stringy>=2.110:devel/p5-IO-Stringy
 MEMCACHED_RUN_DEPENDS=	p5-Cache-Memcached>=1.30:databases/p5-Cache-Memcached
 
 .include <bsd.port.options.mk>
 
 post-extract:
 # The docs_urlbase parameter has been removed. If documentation has not been
 # compiled locally, the "Help" links and other documentation links will
 # redirect to bugzilla.readthedocs.org automatically.
 	${RM} -r ${WRKSRC}/docs
 	${RM} -r ${WRKSRC}/.git
 	${RM} ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \
 		${WRKSRC}/.travis.yml ${WRKSRC}/Build.PL ${WRKSRC}/MANIFEST.SKIP
 
 post-patch:
 	${REINPLACE_CMD} -e 's/apache/www/' ${WRKSRC}/Bugzilla/Install/Localconfig.pm
 	${REINPLACE_CMD} -e 's|/opt/bugzilla|${WWWDIR}|' ${WRKSRC}/importxml.pl
 	${FIND} ${WRKSRC} -type f \( -name \*.cgi -o -name \*.pl -o -name \*.pm -o -name \*.t \) \
 		-exec ${SED} -i '' -e "s=/usr/bin/perl=${PERL}=g; \
 			s!/usr/lib/sendmail!/usr/sbin/sendmail!g;" {} \+
 
 .if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL}
 	${REINPLACE_CMD} -e "s/'mysql'/'Pg'/" ${WRKSRC}/Bugzilla/Install/Localconfig.pm
 .endif
 
 pre-install:
 	${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bak" \) -delete
 
 do-install:	.SILENT
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${FIND} ${WRKSRC} \! -type d -maxdepth 1 \! -name "UPGRADING*" -exec \
 		${INSTALL_SCRIPT} {} ${STAGEDIR}${WWWDIR} \;
 	@${MKDIR} ${DATA_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 .for D in ${DATA_DIRS_LIST}
 	(cd ${WRKSRC}/${D} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/${D})
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
 	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
 
 do-install-CONTRIB-on:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/contrib
 	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/contrib)
 
 do-install-MOREBUGURL-on:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/extensions/MoreBugUrl
 	(cd ${WRKSRC}/extensions/MoreBugUrl && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/extensions/MoreBugUrl)
 
 do-install-VOTING-on:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/extensions/Voting
 	(cd ${WRKSRC}/extensions/Voting && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/extensions/Voting)
 
 .include <bsd.port.mk>
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
@@ -1,46 +1,46 @@
 PORTNAME=	Log-Dispatch
 PORTVERSION=	2.70
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Suite of OO modules for logging messages to multiple outputs
 WWW=		https://metacpan.org/release/Log-Dispatch
 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
 		p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
 		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
 		p5-Params-ValidationCompiler>=0:devel/p5-Params-ValidationCompiler \
 		p5-Specio>=0.32:devel/p5-Specio \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
 		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 TEST_DEPENDS=	p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
 		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
 		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		APACHELOG MIMELITE MAILSEND MAILSENDER MAILSENDMAIL
 OPTIONS_DEFAULT=	MAILSENDMAIL
 APACHELOG_DESC=		Apache::Log support
 MIMELITE_DESC=		MIME::Lite support
 MAILSEND_DESC=		Mail::Send support
 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
 MAILSENDMAIL_RUN_DEPENDS=	p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail
 
 .include <bsd.port.mk>
diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile
index 4e642df4bdd5..0a6ae19342fa 100644
--- a/devel/pushmi/Makefile
+++ b/devel/pushmi/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	pushmi
 PORTVERSION=	1.0.0
 PORTREVISION=	9
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CLKAO
 DISTNAME=	Pushmi-v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Subversion repository replication tool
 WWW=		https://metacpan.org/release/Pushmi
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
 		p5-RunApp>=0.13:devel/p5-RunApp \
 		p5-Test-Output>=0:devel/p5-Test-Output \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 RUN_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
 		p5-App-CLI>=0.06:devel/p5-App-CLI \
 		p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
 		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
 		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
@@ -1,72 +1,72 @@
 PORTNAME=	viewvc
 DISTVERSION=	1.3.0-20230104
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
 WWW=		https://www.viewvc.org/
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe python:3.6+
 USE_PYTHON=	flavors
 USE_GITHUB=	yes
 GH_TAGNAME=	a239c4a93093d9f3e0e34ea4d254bde463ad38b1
 USE_RC_SUBR=	viewvc
 
 NO_BUILD=		yes
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		APMOD SUBVERSION WEBSRV
 OPTIONS_DEFAULT=	APACHE SUBVERSION WEBSRV
 
 OPTIONS_SINGLE=		APMOD WEBSRV
 OPTIONS_SINGLE_WEBSRV=	APACHE LIGHTTPD
 OPTIONS_SINGLE_APMOD=	MODWSGI
 
 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}
 
 SUBVERSION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
 
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}pygments>=1.1:textproc/py-pygments@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=	viewvc-1.[12].[0-9]*
 
 .include <bsd.port.options.mk>
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \
 		CHOWN=${CHOWN} RM=${RM:Q}
 
 pre-everything::
 .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE}
 IGNORE=	apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE
 .endif
 
 post-patch:
 .for i in cvsgraph.conf mimetypes.conf viewvc.conf
 	${MV} ${WRKSRC}/conf/${i}.dist ${WRKSRC}/conf/${i}.sample
 	${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install
 .endfor
 	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
 		${WRKSRC}/viewvc-install \
 		${WRKSRC}/bin/standalone.py
 # to much files, use own shebangfix
 	${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \
 		| ${XARGS} ${SED} -i '' \
 		-e '1s|^\#![[:space:]]*/usr/bin/env python|\#!${PYTHON_CMD}|' \
 		-e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|'
 
 do-install:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${PORTNAME} --destdir="${STAGEDIR}" --clean-mode=false)
 
 .include <bsd.port.mk>
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
@@ -1,40 +1,40 @@
 PORTNAME=	dns-ui
 PORTREVISION=	1
 DISTVERSION=	v0.2.7
 CATEGORIES=	dns
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	LDAP-authenticated PowerDNS user interface by Opera
 WWW=		https://github.com/operasoftware/dns-ui/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		pgsql php:cli
 USE_GITHUB=	yes
 GH_ACCOUNT=	operasoftware
 USE_PHP=	curl intl json ldap mbstring pdo_pgsql
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		APACHE PGSQLSRV
 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
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	${MV} ${WRKSRC}/config/config-sample.ini \
 		${WRKSRC}/config/config.ini.sample
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile
index 542da29b52c4..ce2215df8699 100644
--- a/finance/frontaccounting/Makefile
+++ b/finance/frontaccounting/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	frontaccounting
 DISTVERSION=	2.3.25
 CATEGORIES=	finance www
 MASTER_SITES=	SF/${PORTNAME}/FrontAccounting-2.3/${PORTVERSION}
 
 MAINTAINER=	ek@purplehat.org
 COMMENT=	Simple, powerful system for the entire ERP chain
 WWW=		https://www.frontaccounting.com/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
 USES=		cpe
 USE_PHP+=	mysqli openssl session hash ctype zlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-deinstall pkg-message
 PORTDOCSARGS=
 
 OPTIONS_DEFINE=	APACHE LIGHTTPD NGINX MYSQL_SERVER NLS DOCS
 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
 NGINX_USES=		php:web
 MYSQL_SERVER_USES=	mysql:server
 NLS_USES=		gettext
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MAPACHE} && !${PORT_OPTIONS:MLIGHTTPD} && !{PORT_OPTIONS:MNGINX}
 USES+=		php
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
 PORTDOCSARGS=	'-not -path "./doc*"'
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${WWWDIR} ${PORTDOCSARGS})
 
 .include <bsd.port.mk>
diff --git a/finance/frontaccounting24/Makefile b/finance/frontaccounting24/Makefile
index a52bde4bb846..9e2caa235a58 100644
--- a/finance/frontaccounting24/Makefile
+++ b/finance/frontaccounting24/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=		frontaccounting24
 PORTVERSION=		2.4.11
 DISTVERSIONSUFFIX=	${PORTVERSION}
 CATEGORIES=		finance www
 MASTER_SITES=		SF/${DIST_SUBDIR}/FrontAccounting%202.4/${PORTVERSION}
 DISTNAME=		frontaccounting-${PORTVERSION}
 DIST_SUBDIR=		frontaccounting
 
 MAINTAINER=		james@elstone.net
 COMMENT=		Simple, powerful system for the entire ERP chain
 WWW=			https://www.frontaccounting.com/
 
 LICENSE=		GPLv3+
 LICENSE_FILE=		${WRKSRC}/doc/license.txt
 
 USES=			cpe
 USE_PHP+=		mysqli openssl session hash ctype zlib
 
 WRKSRC=			${WRKDIR}/${DIST_SUBDIR}
 NO_BUILD=		yes
 SUB_FILES=		pkg-deinstall pkg-message
 PORTDOCSARGS=
 DEFAULT_VERSIONS+=	php=8.0
 
 OPTIONS_DEFINE=		APACHE LIGHTTPD NGINX NLS DOCS
 OPTIONS_DEFAULT=	APACHE MYSQL_SERVER
 
 OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	MARIADB_CLIENT MYSQL_CLIENT MYSQL_SERVER PERCONA_CLIENT
 RG1_DESC=		Database Connectivity
 
 MARIADB_CLIENT_DESC=	MariaDB client connector support
 PERCONA_CLIENT_DESC=	Percona client connector support
 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
 NGINX_USES=		php:web
 MYSQL_SERVER_USES=	mysql:server
 MYSQL_CLIENT_USES=	mysql:client
 MARIADB_CLIENT_USES=	mysql:106m
 PERCONA_CLIENT_USES=	mysql:57p
 NLS_USES=		gettext
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MAPACHE} && !${PORT_OPTIONS:MLIGHTTPD} && !{PORT_OPTIONS:MNGINX}
 USES+=			php:cgi php:cli
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL_SERVER} || ${PORT_OPTIONS:MMARIADB_CLIENT} || ${PORT_OPTIONS:MPERCONA_CLIENT}
 USE_PHP+=		mysqli
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
 PORTDOCSARGS=		'-not -path "./doc*"'
 .endif
 
 do-install:
 			@${MKDIR} ${STAGEDIR}${WWWDIR}
 			(cd ${WRKSRC} && ${COPYTREE_SHARE} . \
 				${STAGEDIR}${WWWDIR} ${PORTDOCSARGS})
 
 .include <bsd.port.mk>
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index 482123554a95..182e8ab48209 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	neko
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2-2-0
 PORTREVISION=	12
 CATEGORIES=	lang
 
 MAINTAINER=	penzin.dev@gmail.com
 COMMENT=	Neko programming languages and virtual machine
 WWW=		https://nekovm.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	git:devel/git
 LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
 		libapr-1.so:devel/apr1 libaprutil-1.so:devel/apr1 \
 		libpcre.so:devel/pcre libpcreposix.so:devel/pcre \
 		libmbedtls.so:security/mbedtls libmbedcrypto.so:security/mbedtls libmbedx509.so:security/mbedtls \
 		libfontconfig.so:x11-fonts/fontconfig libfreetype.so:print/freetype2
 
 USES=		cmake mysql pkgconfig sqlite:3
 USE_GITHUB=	yes
 GH_ACCOUNT=	HaxeFoundation
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/neko
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	APACHE UI
 OPTIONS_DEFAULT=	APACHE
 OPTIONS_SUB=	yes
 APACHE_DESC=	Build Apache modules
 UI_DESC=	UI (GTK)
 
 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
@@ -1,180 +1,179 @@
 PORTNAME=	php80
 DISTVERSION=	8.0.27
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP
 DISTNAME=	php-${DISTVERSION}
 DIST_SUBDIR=	php
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	PHP Scripting Language
 WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
 USES+=		compiler:c11 tar:xz cpe gnome pkgconfig
 CPE_PRODUCT=	php
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libargon2.so:security/libargon2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
 		--disable-all \
 		--program-prefix="" \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--with-layout=GNU \
 		--with-libxml \
 		--with-openssl \
 		--with-password-argon2=${LOCALBASE}
 
 USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=		DTRACE FPM
 OPTIONS_EXCLUDE_mips64=		DTRACE FPM
 OPTIONS_EXCLUDE_powerpc64=		${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
 OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 OPTIONS_EXCLUDE_sparc64=	DTRACE
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 
 CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PHPDBG_DESC=	Interactive PHP debugger
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CGI_CONFIGURE_OFF=--disable-cgi
 CGI_VARS=	PHP_SAPI+=cgi
 CLI_CONFIGURE_OFF=--disable-cli
 CLI_VARS=	PHP_SAPI+=cli
 DEBUG_CONFIGURE_ON=--enable-debug
 DTRACE_CONFIGURE_ON=--enable-dtrace
 EMBED_CONFIGURE_ON=--enable-embed
 EMBED_VARS=	PHP_SAPI+=embed
 FPM_CONFIGURE_ON=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 FPM_VARS=	PHP_SAPI+=fpm USE_RC_SUBR+=php-fpm
 IPV6_CONFIGURE_OFF=--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 MYSQLND_CONFIGURE_ON=--enable-mysqlnd
 PHPDBG_CONFIGURE_ON=--enable-phpdbg
 PHPDBG_VARS=	PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 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
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp
 SHORTMODNAME=	php
 WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-phpdbg-debug
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
 		lt_cv_path_SED="sed" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 
 post-patch-FPM-on:
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=80" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
 	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 
 post-install-CLI-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php
 
 post-install-CGI-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php-cgi
 
 post-install-EMBED-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libphp.so
 
 post-install-FPM-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/sbin/php-fpm
 
 post-install-PHPDBG-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/phpdbg
 
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/php81/Makefile b/lang/php81/Makefile
index 5e7c20d97ab1..af232eed7af0 100644
--- a/lang/php81/Makefile
+++ b/lang/php81/Makefile
@@ -1,637 +1,636 @@
 PORTNAME=	php81
 DISTVERSION=	8.1.14
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PHP Scripting Language (8.1.X branch)
 WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
 USES+=		compiler:c11 cpe gnome pkgconfig tar:xz
 CPE_PRODUCT=	php
 PHP_VER=	81
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-all \
 			--program-prefix="" \
 			--with-config-file-scan-dir=${PREFIX}/etc/php \
 			--with-layout=GNU \
 			--with-libxml \
 			--with-openssl \
 			--with-password-argon2=${LOCALBASE}
 DESTDIRNAME=		INSTALL_ROOT
 
 USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
 CPPFLAGS=	-I${LOCALBASE}/include
 
 LDFLAGS=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=		CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQLND PHPDBG ZTS
 OPTIONS_DEFAULT=		CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=	DTRACE
 OPTIONS_EXCLUDE_armv7=	DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=	DTRACE FPM
 OPTIONS_EXCLUDE_mips64=	DTRACE FPM
 OPTIONS_EXCLUDE_powerpc64=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
 OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 OPTIONS_EXCLUDE_sparc64=	DTRACE
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=			yes
 
 CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PHPDBG_DESC=	Interactive PHP debugger
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CGI_CONFIGURE_OFF=	--disable-cgi
 CGI_VARS=		PHP_SAPI+=cgi
 CLI_CONFIGURE_OFF=	--disable-cli
 CLI_VARS=		PHP_SAPI+=cli
 DEBUG_CONFIGURE_ON=	--enable-debug
 DTRACE_CONFIGURE_ON=	--enable-dtrace
 EMBED_CONFIGURE_ON=	--enable-embed
 EMBED_VARS=		PHP_SAPI+=embed
 FPM_CONFIGURE_ON=	--enable-fpm \
 			--with-fpm-group=${WWWGRP} \
 			--with-fpm-user=${WWWOWN}
 FPM_VARS=		PHP_SAPI+=fpm \
 			USE_RC_SUBR+=php-fpm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
 PHPDBG_CONFIGURE_ON=	--enable-phpdbg
 PHPDBG_VARS=		PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=	--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 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
 CONFIGURE_ARGS+=	--with-apxs2=${APXS}
 .endif
 PLIST=			${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=		${PKGDIR}/pkg-message.mod
 MODULENAME=		libphp
 SHORTMODNAME=		php
 WARNING=		"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-phpdbg-debug
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
 		lt_cv_path_SED="sed" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 
 post-patch-FPM-on:
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=${PHP_VER}" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
 	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 
 post-install-CGI-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php-cgi
 
 post-install-PHPDBG-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/phpdbg
 
 post-install-CLI-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php
 
 post-install-FPM-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/php-fpm
 
 post-install-EMBED-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libphp.so
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USES+=		php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	81
 IGNORE_WITH_PHP=	80 82
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 TEST_TARGET=	test
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=	--enable-bcmath
 
 PHP_HEADER_DIRS=	libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=	--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=	--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=	--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=	--enable-dba
 
 OPTIONS_DEFINE=		CDB DB4 FLATFILE GDBM INIFILE LMDB QDBM TOKYO
 OPTIONS_DEFAULT=	CDB FLATFILE INIFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 FLATFILE_DESC=	flatfile support
 GDBM_DESC=	GDBM database support
 INIFILE_DESC=	INI file support
 LMDB_DESC=	LMDB database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 
 CDB_CONFIGURE_OFF=	--without-cdb
 DB4_CONFIGURE_ON=	--with-db4=${LOCALBASE}
 DB4_USES=		bdb
 DB4_VARS=		WITH_BDB_HIGHEST=yes
 FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 INIFILE_CONFIGURE_OFF=	--disable-inifile
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
 TOKYO_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYO_CONFIGURE_ON=	--with-tcadb=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=	--enable-dom
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "enchant"
 LIB_DEPENDS+=		libenchant.so:textproc/enchant
 CONFIGURE_ARGS+=	--with-enchant=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=	--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "ffi"
 LIB_DEPENDS=		libffi.so:devel/libffi
 CONFIGURE_ARGS+=	--with-ffi
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=	--enable-fileinfo
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=	--enable-filter
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=	--enable-ftp
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		pkgconfig ssl
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=	--enable-gd \
 			--with-external-gd
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions --exclude libgd \
 			php-${DISTVERSION}/ext/gd
 
 OPTIONS_DEFINE=	JIS WEBP X11
 
 JIS_DESC=		Enable JIS-mapped Japanese font support
 WEBP_DESC=		Enable WebP image format support
 X11_DESC=		Enable XPM support
 JIS_CONFIGURE_ON=	--enable-gd-jis-conv
 WEBP_CONFIGURE_ON=	--with-webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 X11_CONFIGURE_ON=	--with-xpm
 X11_USE=		XORG=xpm
 X11_USES=		xorg
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=	--with-iconv=${LOCALBASE}
 
 USES+=		iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=		30
 OPTIONS_RADIO=		CLIENT
 OPTIONS_RADIO_CLIENT=	CCLIENT PANDA
 OPTIONS_DEFAULT=	PANDA
 CCLIENT_DESC=		Uses the original but unmaintained cclient
 PANDA_DESC=		Uses the forked panda-cclient instead of the original cclient
 PANDA_LIB_DEPENDS=	libc-client.so.2010:mail/panda-cclient
 PANDA_LIB_DEPENDS_OFF=	libc-client4.so.9:mail/cclient
 
 CONFIGURE_ARGS+=	--with-imap-ssl=${OPENSSLBASE} \
 			--with-imap=${LOCALBASE}
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "intl"
 LIB_DEPENDS=	libicui18n.so:devel/icu
 USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
 .if ${PHP_MODNAME} == "json"
 CONFIGURE_ARGS+=	--enable-json
 BUILD_DEPENDS=		re2c:devel/re2c
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=	--with-ldap-sasl=${LOCALBASE} \
 			--with-ldap=${LOCALBASE}
 
 USE_OPENLDAP=	yes
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=	--enable-mbstring
 
 OPTIONS_DEFINE=		REGEX
 OPTIONS_DEFAULT=	REGEX
 
 REGEX_DESC=		Enable multibyte regex support
 REGEX_LIB_DEPENDS=	libonig.so:devel/oniguruma
 REGEX_CONFIGURE_OFF=	--disable-mbregex
 
 PHP_HEADER_DIRS=	libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 MYSQLND_CONFIGURE_ON=	--with-mysqli=mysqlnd
 MYSQLND_CONFIGURE_OFF=	--with-mysqli=${LOCALBASE}/bin/mysql_config
 MYSQLND_USES_OFF=	mysql
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+=	--enable-odbc \
 			--with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
 CONFIGURE_ARGS+=	--enable-opcache
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=	--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=	--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo:build
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=		Enable Microsoft SQL Server support
 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 MSSQL_LIB_DEPENDS_OFF=	libct.so:databases/freetds
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=	--with-pdo-firebird=${LOCALBASE}
 
 USES+=		firebird
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 
 MYSQLND_CONFIGURE_OFF=	--with-pdo-mysql=${LOCALBASE} \
 			--with-zlib-dir=/usr
 MYSQLND_USES_OFF=	mysql
 MYSQLND_CONFIGURE_ON=	--with-pdo-mysql=mysqlnd
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USES+=			localbase sqlite
 CONFIGURE_ARGS+=	--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=	--enable-phar
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=	--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=	--with-pspell=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=	--with-readline=/usr
 USES+=			readline
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=	--enable-session
 PHP_MOD_PRIO=		18
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=	--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=	--enable-simplexml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=	--enable-soap
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=	--enable-sockets
 .endif
 
 .if ${PHP_MODNAME} == "sodium"
 CONFIGURE_ARGS+=	--with-sodium=${LOCALBASE}
 LIB_DEPENDS+=		libsodium.so:security/libsodium
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USES+=			localbase pkgconfig sqlite
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=	--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=	--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=	--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=	--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy.so:www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=	--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=	--enable-xml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=	--enable-xmlreader
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=	--with-iconv-dir=${LOCALBASE} \
 			--with-xmlrpc
 
 USES+=		iconv:translit
 USE_GNOME=	libxml2
 
 PHP_HEADER_DIRS=	libxmlrpc
 
 USE_PHP=	xml:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=	--enable-xmlwriter
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=	--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom:build xml:build
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:archivers/libzip
 
 CONFIGURE_ARGS+=	--with-zip \
 			--with-zlib-dir=/usr
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=	--with-zlib=/usr
 USES+=			pkgconfig
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/php82/Makefile b/lang/php82/Makefile
index f61b12ec4766..ae4cdc3c2c66 100644
--- a/lang/php82/Makefile
+++ b/lang/php82/Makefile
@@ -1,639 +1,638 @@
 PORTNAME=	php82
 DISTVERSION=	8.2.1
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PHP Scripting Language (8.2.X branch)
 WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
 USES+=		compiler:c11 cpe gnome pkgconfig tar:xz
 CPE_PRODUCT=	php
 PHP_VER=	82
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-all \
 			--program-prefix="" \
 			--with-config-file-scan-dir=${PREFIX}/etc/php \
 			--with-layout=GNU \
 			--with-libxml \
 			--with-openssl \
 			--with-password-argon2=${LOCALBASE}
 DESTDIRNAME=		INSTALL_ROOT
 
 USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
 CPPFLAGS=	-I${LOCALBASE}/include
 
 LDFLAGS=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=		CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQLND PHPDBG ZTS
 OPTIONS_DEFAULT=		CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=	DTRACE
 OPTIONS_EXCLUDE_armv7=	DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=	DTRACE FPM
 OPTIONS_EXCLUDE_mips64=	DTRACE FPM
 OPTIONS_EXCLUDE_powerpc64=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
 OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 OPTIONS_EXCLUDE_sparc64=	DTRACE
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=			yes
 
 CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PHPDBG_DESC=	Interactive PHP debugger
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CGI_CONFIGURE_OFF=	--disable-cgi
 CGI_VARS=		PHP_SAPI+=cgi
 CLI_CONFIGURE_OFF=	--disable-cli
 CLI_VARS=		PHP_SAPI+=cli
 DEBUG_CONFIGURE_ON=	--enable-debug
 DTRACE_CONFIGURE_ON=	--enable-dtrace
 EMBED_CONFIGURE_ON=	--enable-embed
 EMBED_VARS=		PHP_SAPI+=embed
 FPM_CONFIGURE_ON=	--enable-fpm \
 			--with-fpm-group=${WWWGRP} \
 			--with-fpm-user=${WWWOWN}
 FPM_VARS=		PHP_SAPI+=fpm \
 			USE_RC_SUBR+=php-fpm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
 PHPDBG_CONFIGURE_ON=	--enable-phpdbg
 PHPDBG_VARS=		PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=	--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 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
 CONFIGURE_ARGS+=	--with-apxs2=${APXS}
 .endif
 PLIST=			${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=		${PKGDIR}/pkg-message.mod
 MODULENAME=		libphp
 SHORTMODNAME=		php
 WARNING=		"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-phpdbg-debug
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
 		lt_cv_path_SED="sed" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 
 post-patch-FPM-on:
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=${PHP_VER}" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
 	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre random spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 
 post-install-CLI-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php
 
 post-install-CGI-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php-cgi
 
 post-install-EMBED-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libphp.so
 
 post-install-FPM-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/sbin/php-fpm
 
 post-install-PHPDBG-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/phpdbg
 
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USES+=		php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	82
 IGNORE_WITH_PHP=	80 81
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 TEST_TARGET=	test
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=	--enable-bcmath
 
 PHP_HEADER_DIRS=	libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=	--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=	--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=	--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=	--enable-dba
 
 OPTIONS_DEFINE=		CDB DB4 FLATFILE GDBM INIFILE LMDB QDBM TOKYO
 OPTIONS_DEFAULT=	CDB FLATFILE INIFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 FLATFILE_DESC=	flatfile support
 GDBM_DESC=	GDBM database support
 INIFILE_DESC=	INI file support
 LMDB_DESC=	LMDB database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 
 CDB_CONFIGURE_OFF=	--without-cdb
 DB4_CONFIGURE_ON=	--with-db4=${LOCALBASE}
 DB4_USES=		bdb
 DB4_VARS=		WITH_BDB_HIGHEST=yes
 FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 INIFILE_CONFIGURE_OFF=	--disable-inifile
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
 TOKYO_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYO_CONFIGURE_ON=	--with-tcadb=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=	--enable-dom
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "enchant"
 LIB_DEPENDS+=		libenchant.so:textproc/enchant
 CONFIGURE_ARGS+=	--with-enchant=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=	--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "ffi"
 LIB_DEPENDS=		libffi.so:devel/libffi
 CONFIGURE_ARGS+=	--with-ffi
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=	--enable-fileinfo
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=	--enable-filter
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=	--enable-ftp
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		pkgconfig ssl
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=	--enable-gd \
 			--with-external-gd
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions --exclude libgd \
 			php-${DISTVERSION}/ext/gd
 
 OPTIONS_DEFINE=	JIS WEBP X11
 
 JIS_DESC=		Enable JIS-mapped Japanese font support
 WEBP_DESC=		Enable WebP image format support
 X11_DESC=		Enable XPM support
 JIS_CONFIGURE_ON=	--enable-gd-jis-conv
 WEBP_CONFIGURE_ON=	--with-webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 X11_CONFIGURE_ON=	--with-xpm
 X11_USE=		XORG=xpm
 X11_USES=		xorg
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=	--with-iconv=${LOCALBASE}
 
 USES+=		iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=		30
 OPTIONS_RADIO=		CLIENT
 OPTIONS_RADIO_CLIENT=	CCLIENT PANDA
 OPTIONS_DEFAULT=	PANDA
 CCLIENT_DESC=		Uses the original but unmaintained cclient
 PANDA_DESC=		Uses the forked panda-cclient instead of the original cclient
 PANDA_LIB_DEPENDS=	libc-client.so.2010:mail/panda-cclient
 PANDA_LIB_DEPENDS_OFF=	libc-client4.so.9:mail/cclient
 
 CONFIGURE_ARGS+=	--with-imap-ssl=${OPENSSLBASE} \
 			--with-imap=${LOCALBASE}
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "intl"
 LIB_DEPENDS=	libicui18n.so:devel/icu
 USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
 .if ${PHP_MODNAME} == "json"
 CONFIGURE_ARGS+=	--enable-json
 BUILD_DEPENDS=		re2c:devel/re2c
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=	--with-ldap-sasl=${LOCALBASE} \
 			--with-ldap=${LOCALBASE}
 
 USE_OPENLDAP=	yes
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=	--enable-mbstring
 
 OPTIONS_DEFINE=		REGEX
 OPTIONS_DEFAULT=	REGEX
 
 REGEX_DESC=		Enable multibyte regex support
 REGEX_LIB_DEPENDS=	libonig.so:devel/oniguruma
 REGEX_CONFIGURE_OFF=	--disable-mbregex
 
 PHP_HEADER_DIRS=	libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 MYSQLND_CONFIGURE_ON=	--with-mysqli=mysqlnd
 MYSQLND_CONFIGURE_OFF=	--with-mysqli=${LOCALBASE}/bin/mysql_config
 MYSQLND_USES_OFF=	mysql
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+=	--enable-odbc \
 			--with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
 CONFIGURE_ARGS+=	--enable-opcache
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=	--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=	--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo:build
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=		Enable Microsoft SQL Server support
 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 MSSQL_LIB_DEPENDS_OFF=	libct.so:databases/freetds
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=	--with-pdo-firebird=${LOCALBASE}
 
 USES+=		firebird
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 
 MYSQLND_CONFIGURE_OFF=	--with-pdo-mysql=${LOCALBASE} \
 			--with-zlib-dir=/usr
 MYSQLND_USES_OFF=	mysql
 MYSQLND_CONFIGURE_ON=	--with-pdo-mysql=mysqlnd
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USES+=			localbase sqlite
 CONFIGURE_ARGS+=	--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=	--enable-phar
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=	--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=	--with-pspell=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=	--with-readline=/usr
 USES+=			readline
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=	--enable-session
 PHP_MOD_PRIO=		18
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=	--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=	--enable-simplexml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=	--enable-soap
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=	--enable-sockets
 CONFIGURE_ENV+=	LOCAL_CREDS_PERSISTENT=yes
 .endif
 
 .if ${PHP_MODNAME} == "sodium"
 CONFIGURE_ARGS+=	--with-sodium=${LOCALBASE}
 LIB_DEPENDS+=		libsodium.so:security/libsodium
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USES+=			localbase pkgconfig sqlite
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=	--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=	--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=	--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=	--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy.so:www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=	--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=	--enable-xml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=	--enable-xmlreader
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=	--with-iconv-dir=${LOCALBASE} \
 			--with-xmlrpc
 
 USES+=		iconv:translit
 USE_GNOME=	libxml2
 
 PHP_HEADER_DIRS=	libxmlrpc
 
 USE_PHP=	xml:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=	--enable-xmlwriter
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=	--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom:build xml:build
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:archivers/libzip
 
 CONFIGURE_ARGS+=	--with-zip \
 			--with-zlib-dir=/usr
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=	--with-zlib=/usr
 USES+=			pkgconfig
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 .endif
 .include <bsd.port.post.mk>
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index cf79e22c0951..70c28d661d56 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,585 +1,585 @@
 # Note to committers: If don't commit a maintainer patch and as a result PKGNAME
 # or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING
 # Thanks.
 
 PORTNAME=	dspam
 PORTVERSION=	3.10.2
 PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	danny@dannywarren.com
 COMMENT=	Bayesian spam filter
 WWW=		http://dspam.sourceforge.net/
 
 LICENSE=	AGPLv3
 
 USERS=		dspam
 GROUPS=		dspam
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
 		CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \
 		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
 		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
 		QMAIL WEBUI LIGHTTPD DOCS EXAMPLES SETUID
 
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	HASH MYSQL MYSQL_COMPRESS MYSQL_LOCAL \
 			PGSQL PGSQL_LOCAL SQLITE2 SQLITE3
 
 OPTIONS_RADIO=		LDA
 OPTIONS_RADIO_LDA=	CYRUS23 CYRUS24 \
 			DOVECOT2 EXIM MAILDROP PROCMAIL SAFECAT SENDMAIL
 
 OPTIONS_DEFAULT=	SYSLOG DEBUG DAEMON CLAMAV CLAMAV_LOCAL \
 			HASH MYSQL MYSQL_COMPRESS PGSQL SQLITE3
 
 VERBOSE_DEBUG_DESC=	Debug in LOGDIR/dspam.debug
 BNR_DEBUG_DESC=		Debug for Bayesian Noise Reduction
 PREF_EXT_DESC=		Preferences in database not in files
 DAEMON_DESC=		Daemonize dspam; speaks LMTP or DLMTP
 CLAMAV_DESC=		ClamAV support
 CLAMAV_LOCAL_DESC=	RUN_DEPEND on ClamAV
 MYSQL_DESC=		MySQL 5.X.x as back-end
 MYSQL_COMPRESS_DESC=	Compress dspam <--> MySQL
 MYSQL_LOCAL_DESC=	RUN_DEPEND on MySQL server
 PGSQL_DESC=		PostgreSQL as back-end
 PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
 SQLITE2_DESC=		SQLite v2.x as back-end
 SQLITE3_DESC=		SQLite v3.x as back-end
 HASH_DESC=		Hash driver
 EXTERNAL_LOOKUP_DESC=	RCPT verification via extlookup
 USER_HOMEDIR_DESC=	Store user data in ~/.dspam
 TRUSTED_USERS_DESC=	Disable trusted user security
 VIRT_USERS_DESC=	Virtual users (needs SQL back-end)
 LONG_USERNAMES_DESC=	Usernames longer that OS supports
 LARGE_SCALE_DESC=	File structure for large scale
 DOMAIN_SCALE_DESC=	File structure for multiple domains
 CYRUS23_DESC=		Cyrus's 2.3 deliver as LDA
 CYRUS24_DESC=		Cyrus's 2.4 deliver as LDA
 DOVECOT2_DESC=		Dovecot 2.2 dovecot-lda as LDA
 EXIM_DESC=		Exim as local delivery agent
 MAILDROP_DESC=		Maildrop as local delivery agent
 PROCMAIL_DESC=		Procmail as local delivery agent
 SAFECAT_DESC=		Safecat as local delivery agent
 SENDMAIL_DESC=		Sendmail as local delivery agent
 NICESENDMAIL_DESC=	Play nice with sendmail server
 POSTFIX_MBC_DESC=	Dspam as mailbox_command in Postfix
 QMAIL_DESC=		Play nice with Qmail mail server
 WEBUI_DESC=		Install WebUI (RUN_DEPEND on Apache/Lighttpd)
 LIGHTTPD_DESC=		RUN_DEPEND on Lighttpd instead of Apache
 SETUID_DESC=		Run as root:mail with setuid (insecure)
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5 libtool pathfix shebangfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # Dead upstream. Don't expect a proper fix for clang11.
 CFLAGS+=	-fcommon
 
 SHEBANG_FILES=	src/tools/dspam_logrotate \
 		src/tools/dspam_notify.in \
 		src/tools/dspam_train.in \
 		webui/cgi-bin/templates/*/strings.pl \
 		webui/cgi-bin/templates/strings.pl \
 		webui/cgi-bin/*.cgi \
 		webui/cgi-bin/*.pl
 
 .ifdef(GDBS)
 CFLAGS+=	-g -DDEBUG
 STRIP=
 .endif
 
 PKGMESSAGE=	${WRKSRC}/README.FreeBSD
 
 CONFLICTS=	dspam-devel
 
 SIGNATURE_LIFE?=	15
 
 .include <bsd.port.options.mk>
 
 _VAR_DIR=	/var
 
 RUN_DIR?=	${_VAR_DIR}/run/dspam
 
 LOG_DIR?=	${_VAR_DIR}/log/dspam
 LOGFILE?=	${LOG_DIR}/dspam.log
 
 .if ${PORT_OPTIONS:MSETUID}
 DSPAM_OWNER?=	root
 DSPAM_GROUP?=	mail
 DSPAM_MODE?=	4510
 .else
 DSPAM_OWNER?=	${USERS}
 DSPAM_GROUP?=	${GROUPS}
 DSPAM_MODE?=	0555
 .endif
 
 DSPAM_ETC?=	${LOCALBASE}/etc
 DSPAM_HOME?=	${_VAR_DIR}/db/dspam
 DSPAM_HOME_OWNER?=	${DSPAM_OWNER}
 DSPAM_HOME_GROUP?=	${DSPAM_GROUP}
 DSPAM_HOME_MODE?=	0770
 DSPAM_SAMPLE_MODE?=	0640
 
 PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
 		DSPAM_OWNER=${DSPAM_OWNER} \
 		DSPAM_GROUP=${DSPAM_GROUP} \
 		DSPAM_MODE=${DSPAM_MODE} \
 		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
 		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
 		DSPAM_HOME_MODE=${DSPAM_HOME_MODE} \
 		DSPAM_SAMPLE_MODE=${DSPAM_SAMPLE_MODE}
 
 CONFIGURE_ARGS+=	--sysconfdir=${DSPAM_ETC}
 CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}
 PLIST_SUB+=	LOG_DIR=${LOG_DIR}
 PLIST_SUB+=	RUN_DIR=${RUN_DIR}
 
 CONFIGURE_ARGS+=	--with-dspam-home=${DSPAM_HOME}
 CONFIGURE_ARGS+=	--with-dspam-home-owner=${DSPAM_HOME_OWNER}
 CONFIGURE_ARGS+=	--with-dspam-home-group=${DSPAM_HOME_GROUP}
 CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
 PLIST_SUB+=	DSPAM_HOME=${DSPAM_HOME} \
 		DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \
 		DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \
 		DSPAM_HOME_MODE=${DSPAM_HOME_MODE}
 
 CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
 CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
 # we set DSPAM_MODE at the end as some LDAs want specific mode
 PLIST_SUB+=	DSPAM_OWNER=${DSPAM_OWNER} \
 		DSPAM_GROUP=${DSPAM_GROUP} \
 		DSPAM_MODE=${DSPAM_MODE}
 
 _SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
 		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' \
 		-e 's,%%PORTNAME%%,${PORTNAME},g' \
 		-e 's,%%_VAR_DIR%%,${_VAR_DIR},g' \
 		-e '/^%%FreeBSD/D'
 
 .if ${PORT_OPTIONS:MSYSLOG}
 CONFIGURE_ARGS+=	--enable-syslog
 .else
 CONFIGURE_ARGS+=	--disable-syslog
 CONFIGURE_ARGS+=	--with-logfile=${LOGFILE}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MVERBOSE_DEBUG}
 CONFIGURE_ARGS+=	--enable-verbose-debug
 .endif
 
 .if ${PORT_OPTIONS:MBNR_DEBUG}
 CONFIGURE_ARGS+=	--enable-bnr-debug
 .endif
 
 .if ${PORT_OPTIONS:MPREF_EXT}
 CONFIGURE_ARGS+=	--enable-preferences-extension
 .endif
 
 .if ${PORT_OPTIONS:MDAEMON}
 CONFIGURE_ARGS+=	--enable-daemon
 USE_RC_SUBR=	${PORTNAME}
 _SED_SCRIPT+=	-e 's,%%DAEMON%%,,g'
 SUB_LIST+=	DSPAM_HOME=${DSPAM_HOME}
 SUB_LIST+=	DSPAM_OWNER=${DSPAM_OWNER}
 SUB_LIST+=	DSPAM_GROUP=${DSPAM_GROUP}
 .else
 _SED_SCRIPT+=	-e '/%%DAEMON%%/D'
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
 CONFIGURE_ARGS+=	--enable-clamav
 .	if ${PORT_OPTIONS:MCLAMAV_LOCAL}
 RUN_DEPENDS+=	clamav>=0:security/clamav
 SUB_LIST+=	CLAMD=clamd
 .	else
 SUB_LIST+=	CLAMD=
 .	endif
 .endif
 
 # we need to know if we are building statically or dynamically for the plist
 _DBDRV_COUNT=	# blank, but defined so we can check against it
 _DBDRV=		pgsql_drv,sqlite3_drv,sqlite_drv,hash_drv,mysql_drv,
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 CONFIGURE_ARGS+=	--with-pgsql-includes=${LOCALBASE}/include \
 			--with-pgsql-libraries=${LOCALBASE}/lib
 PLIST_SUB+=	PGSQL=""
 #PKGNAMESUFFIX=	-pgsql
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .	if ${PORT_OPTIONS:MPGSQL_LOCAL}
 WANT_PGSQL=	server
 SUB_LIST+=	PGSQL=postgresql
 .	else
 SUB_LIST+=	PGSQL=
 .	endif
 .else
 PLIST_SUB+=	PGSQL="@comment "
 _DBDRV:=	${_DBDRV:S/pgsql_drv,//}
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE3}
 USES+=		sqlite:3
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 PLIST_SUB+=	SQLITE3=""
 .else
 _DBDRV:=	${_DBDRV:S/sqlite3_drv,//}
 PLIST_SUB+=	SQLITE3="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE2}
 USES+=		sqlite:2
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 PLIST_SUB+=	SQLITE2=""
 .else
 _DBDRV:=	${_DBDRV:S/sqlite_drv,//}
 PLIST_SUB+=	SQLITE2="@comment "
 .endif
 
 .if ${USES:Msqlite*}
 CONFIGURE_ARGS+=	--with-sqlite-includes=${LOCALBASE}/include \
 			--with-sqlite-libraries=${LOCALBASE}/lib
 PLIST_SUB+=	SQLITE=""
 .else
 PLIST_SUB+=	SQLITE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MHASH}
 PLIST_SUB+=	HASH=""
 #PKGNAMESUFFIX=	-css
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .else
 _DBDRV:=	${_DBDRV:S/hash_drv,//}
 PLIST_SUB+=	HASH="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USES+=		mysql
 CONFIGURE_ARGS+=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
 PLIST_SUB+=	MYSQL=""
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .	if ${PORT_OPTIONS:MMYSQL_COMPRESS}
 CONFIGURE_ARGS+=	--enable-client-compression
 .	endif
 .	if ${PORT_OPTIONS:MMYSQL_LOCAL}
 WANT_MYSQL=	server
 SUB_LIST+=	MYSQL=mysql
 .	else
 SUB_LIST+=	MYSQL=
 .	endif
 .else
 _DBDRV:=	${_DBDRV:S/mysql_drv,//}
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 # now we have all the db backends the user wants and we remove last ','
 CONFIGURE_ARGS+=	--with-storage-driver=${_DBDRV:S/,$//}
 
 .if ${_DBDRV_COUNT} != "o"
 PLIST_SUB+=	DYNAMIC=""
 .else
 PLIST_SUB+=	DYNAMIC="@comment "
 .endif
 
 .if %{PORT_OPTIONS:MSETUID}
 PLIST_SUB+=	SETUID=""
 PLIST_SUB+=	NOSETUID="@comment "
 .else
 PLIST_SUB+=	SETUID="@comment "
 PLIST_SUB+=	NOSETUID=""
 .endif
 
 .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP}
 CONFIGURE_ARGS+=	--enable-external-lookup
 USE_OPENLDAP=	YES
 .endif
 
 .if ${PORT_OPTIONS:MUSER_HOMEDIR}
 CONFIGURE_ARGS+=	--enable-homedir
 .endif
 
 .if ${PORT_OPTIONS:MTRUSTED_USERS}
 CONFIGURE_ARGS+=	--disable-trusted-user-security
 .endif
 
 .if ${PORT_OPTIONS:MVIRT_USERS}
 CONFIGURE_ARGS+=	--enable-virtual-users
 .endif
 
 .if ${PORT_OPTIONS:MLONG_USERNAMES}
 CONFIGURE_ARGS+=	--enable-long-usernames
 .endif
 .if ${PORT_OPTIONS:MLARGE_SCALE}
 CONFIGURE_ARGS+=	--enable-large-scale
 .endif
 .if ${PORT_OPTIONS:MDOMAIN_SCALE}
 CONFIGURE_ARGS+=	--enable-domain-scale
 .endif
 
 .if ${PORT_OPTIONS:MCYRUS23}
 RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:mail/cyrus-imapd23
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 .endif
 
 .if ${PORT_OPTIONS:MCYRUS24}
 RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:mail/cyrus-imapd24
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT2}
 RUN_DEPENDS+=	${LOCALBASE}/libexec/dovecot/dovecot-lda:mail/dovecot
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/libexec/dovecot/dovecot-lda'
 .endif
 
 .if ${PORT_OPTIONS:MEXIM}
 .	if ${PORT_OPTIONS:MMYSQL}
 _EXIM_EXT=	-mysql
 .	elif ${PORT_OPTIONS:MPGSQL}
 _EXIM_EXT=	-postgresql
 .	endif
 RUN_DEPENDS+=	exim:mail/exim${_EXIM_EXT}
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/exim'
 .endif
 
 .if ${PORT_OPTIONS:MMAILDROP}
 RUN_DEPENDS+=	maildrop:mail/maildrop
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/maildrop'
 .endif
 
 .if ${PORT_OPTIONS:MPROCMAIL}
 RUN_DEPENDS+=	procmail:mail/procmail
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/bin/procmail'
 .endif
 
 .if ${PORT_OPTIONS:MSAFECAT}
 RUN_DEPENDS+=	safecat:sysutils/safecat
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/safecat tmp new'
 .endif
 
 .if ${PORT_OPTIONS:MSENDMAIL} && exists(/usr/sbin/sendmail)
 CONFIGURE_ARGS+=	--with-delivery-agent=/usr/sbin/sendmail
 .else
 .if ${PORT_OPTIONS:MSENDMAIL} && exists(${LOCALBASE}/sbin/sendmail)
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/sbin/sendmail'
 .	endif
 .endif
 
 .if ${PORT_OPTIONS:MNICESENDMAIL}
 DSPAM_MODE=	4511
 .endif
 
 .if ${PORT_OPTIONS:MPOSTFIX_MBC}
 DSPAM_MODE=	4511
 .endif
 
 .if ${PORT_OPTIONS:MQMAIL}
 DSPAM_MODE=	4511
 .endif
 
 .ifdef(DSPAM_MODE)
 CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
 .endif
 
 .if ${PORT_OPTIONS:MWEBUI}
 .	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
 RUN_DEPENDS+=	p5-GD-Graph>=0:graphics/p5-GD-Graph
 RUN_DEPENDS+=	p5-GD-Graph3d>=0:graphics/p5-GD-Graph3d
 RUN_DEPENDS+=	p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
 CONFIGURE_ARGS+=--enable-logging
 CONFIGURE_ARGS+=--enable-user-logging
 PLIST_SUB+=	WebUI=""
 _SED_SCRIPT+=	-e 's/%%WebUI%%//g'
 _SED_SCRIPT+=	-e 's,%%WWWDIR%%,${WWWDIR},g'
 PLIST_SUB+=	WWWDIR=${WWWDIR_REL}
 .else
 PLIST_SUB+=	WebUI="@comment "
 _SED_SCRIPT+=	-e '/%%WebUI%%/D'
 .endif
 
 _DOCS=	CHANGELOG LICENSE README README.FreeBSD RELEASE.NOTES UPGRADING
 _DOCSL=	courier.txt exim.txt markov.txt mysql_drv.txt pgsql_drv.txt \
 	pop3filter.txt postfix.txt qmail.txt relay.txt sendmail.txt \
 	sqlite_drv.txt
 
 pre-everything::
 .ifndef(MAINT)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
 	@${ECHO_CMD} "###########################################################################"
 	@${SED} -n < ${FILESDIR}/UPDATING "/^# ${PORTNAME}-${PORTVERSION}/,/^#####/p"
 	@${ECHO_CMD} ""
 .endif
 
 pre-extract:
 .ifndef(MAINT)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Define vars below before make-ing if you need:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"
 	@${ECHO_CMD} "DSPAM_OWNER=${DSPAM_OWNER} (default: root)"
 	@${ECHO_CMD} "DSPAM_GROUP=${DSPAM_GROUP} (default: mail)"
 	@${ECHO_CMD} "DSPAM_MODE=${DSPAM_MODE}"
 	@${ECHO_CMD} "DSPAM_ETC=${DSPAM_ETC} (default: ${PREFIX}/etc"
 	@${ECHO_CMD} "DSPAM_HOME=${DSPAM_HOME} (default: ${_VAR_DIR}/db/dspam)"
 	@${ECHO_CMD} "DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER}"
 	@${ECHO_CMD} "DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP}"
 	@${ECHO_CMD} "DSPAM_HOME_MODE=${DSPAM_HOME_MODE} (default: 0770)"
 	@${ECHO_CMD} "LOG_DIR=${LOG_DIR} (default: ${_VAR_DIR}/log/dspam)"
 	@${ECHO_CMD} "RUN_DIR=${RUN_DIR} (default: ${_VAR_DIR}/run/dspam)"
 .	ifdef(WITHOUT_SYSLOG)
 	@${ECHO_CMD} "LOGFILE=${LOGFILE} (default: ${_VAR_DIR}/log/dspam/dspam.log)"
 .	endif
 .if ${PORT_OPTIONS:MWEBUI}
 		@${ECHO_CMD} "Define WWWDIR before making if you need the WebUI files"
 		@${ECHO_CMD} "installed in other place that this installation's default"
 		@${ECHO_CMD} "${WWWDIR}"
 .	endif
 	@${ECHO_CMD} ""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' \
 		${WRKSRC}/src/tools.mysql_drv/purge.sql
 	@${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' \
 		${WRKSRC}/src/tools.mysql_drv/purge-4.1.sql
 	@${REINPLACE_CMD} -e 's|WHERE CURRENT_DATE - created_on > 14;|WHERE CURRENT_DATE - created_on > ${SIGNATURE_LIFE};|' \
 		${WRKSRC}/src/tools.pgsql_drv/purge.sql
 	@${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|" \
 		${WRKSRC}/src/tools.sqlite_drv/purge-2.sql
 	@${REINPLACE_CMD} -e "s|where julianday('now')-julianday(created_on) > 14;|where julianday('now')-julianday(created_on) > ${SIGNATURE_LIFE};|" \
 		 ${WRKSRC}/src/tools.sqlite_drv/purge-3.sql
 	@${REINPLACE_CMD} -e "s^%%PERL%%^${PERL}^" \
 		${WRKSRC}/src/tools/dspam_train.in \
 		${WRKSRC}/src/tools/dspam_notify.in
 	@${TEST} ${MYSQL_FLAVOUR} == mariadb && ${REINPLACE_CMD} -e \
 		's,&& defined(CR_ERROR_FIRST),,' ${WRKSRC}/configure || :
 
 pre-configure:
 .if ${PORT_OPTIONS:MVIRT_USERS} && !( ${PORT_OPTIONS:MMYSQL} || \
 	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MHASH} )
 	@${ECHO_CMD} "You need MySQL, POSTGRESQL or HASH for virtual users."
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MPREF_EXT} && !( ${PORT_OPTIONS:MMYSQL} || \
 	${PORT_OPTIONS:MPGSQL} )
 	@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MDAEMON} && !( ${PORT_OPTIONS:MMYSQL} || \
 	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MHASH} )
 	@${ECHO_CMD} "You need MySQL, PostgreSQL or Hash for Daemon mode, because multithreading support is needed"
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP} && !( ${PORT_OPTIONS:MMYSQL} || \
 	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MSQLITE*} )
 	@${ECHO_CMD} "You need MySQL, Postgres or SQLite for EXTERNAL_LOOKUP."
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MUSER_HOMEDIR} && ${PORT_OPTIONS:MWEBUI}
 	@${ECHO_CMD} "USER_HOMEDIR and WebUI are incopatible"
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MDOMAIN_SCALE} && ${PORT_OPTIONS:MLARGE_SCALE}
 	@${ECHO_CMD} "DOMAIN_SCALE and LARGE_SCALE are incopatible"
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MLIGHTTPD} && ! ${PORT_OPTIONS:MWEBUI}
 	@${ECHO_CMD} "There's no reason to depend on LightHTTPD if you're not using WebUI"
 	@${FALSE}
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 .if ${PORT_OPTIONS:MMYSQL}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mysql
 	cd  ${WRKSRC}/src/tools.mysql_drv && \
 		${INSTALL_DATA} mysql_objects-4.1.sql \
 			mysql_objects-space.sql \
 			mysql_objects-speed.sql \
 			purge-4.1.sql purge.sql \
 			virtual_user_aliases.sql \
 			virtual_users.sql ${STAGEDIR}${EXAMPLESDIR}/mysql
 .endif
 .if ${PORT_OPTIONS:MPGSQL}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pgsql
 	@cd  ${WRKSRC}/src/tools.pgsql_drv && \
 		${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/pgsql
 .endif
 .if ${PORT_OPTIONS:MSQLITE*}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sqlite
 	cd ${WRKSRC}/src/tools.sqlite_drv && \
 		${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/sqlite
 .endif
 .endif	# PORT_OPTIONS:MEXAMPLES
 
 .if ${PORT_OPTIONS:MWEBUI}
 	${MV} ${WRKSRC}/webui/cgi-bin/configure.pl ${WRKSRC}/webui/cgi-bin/configure.pl.sample
 	cd ${WRKSRC}/webui/cgi-bin && ${MKDIR} ${STAGEDIR}${WWWDIR} && \
 		${INSTALL_SCRIPT} configure.pl.sample ${STAGEDIR}${WWWDIR}/ && \
 		${INSTALL_SCRIPT} *.cgi ${STAGEDIR}${WWWDIR} && \
 		${INSTALL_DATA} rgb.txt ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC}/webui/htdocs && \
 		${INSTALL_DATA} base.css dspam-logo-small.gif ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC}/webui/cgi-bin && \
 		${INSTALL_DATA} default.prefs ${STAGEDIR}${WWWDIR}/default.prefs.sample
 	cd ${WRKSRC}/webui/cgi-bin && \
 		${INSTALL_DATA} admins ${STAGEDIR}${WWWDIR}/admins.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}/templates && cd ${WRKSRC}/webui/cgi-bin/templates && \
 		${INSTALL_DATA} *.html ${STAGEDIR}${WWWDIR}/templates/ && \
 		${INSTALL_SCRIPT} strings.pl ${STAGEDIR}${WWWDIR}/templates/ && \
 		for _dir in de es-es fr he pt-br ro; do \
 			${INSTALL_DATA} -d ${STAGEDIR}${WWWDIR}/templates/$${_dir} && \
 			cd ${WRKSRC}/webui/cgi-bin/templates/$${_dir} && \
 				${INSTALL_DATA} *.html ${STAGEDIR}${WWWDIR}/templates/$${_dir}; \
 		done && \
 		for _dir in de es-es pt-br; do \
 			cd ${WRKSRC}/webui/cgi-bin/templates/$${_dir} && \
 				${INSTALL_SCRIPT} strings.pl ${STAGEDIR}${WWWDIR}/templates/$${_dir}/; \
 		done
 .endif
 
 	@${SED} ${_SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${STAGEDIR}${DOCSDIR}
 	@cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${STAGEDIR}${DOCSDIR}/UPDATING
 .endif
 
 	@${MKDIR} ${STAGEDIR}${DSPAM_HOME}
 .for _file in firstrun.txt firstspam.txt quarantinefull.txt
 	@if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\
 	then\
 		cd ${WRKSRC}/txt && \
 		${MV} ${_file} ${_file}.sample;\
 	fi
 	cd ${WRKSRC}/txt && \
 		${INSTALL_DATA} ${_file}.sample ${STAGEDIR}${DSPAM_HOME}
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${RUN_DIR}
 	@${MKDIR} ${STAGEDIR}${LOG_DIR}
 
 	@${CAT} ${WRKSRC}/README.FreeBSD
 
 .include <bsd.port.mk>
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
@@ -1,57 +1,57 @@
 PORTNAME=	qpsmtpd
 PORTVERSION=	0.93
 DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	mail perl5
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	noc-ports@biglist.com
 COMMENT=	Flexible SMTP daemon written in Perl and featuring a plugin API
 WWW=		https://smtpd.develooper.com/
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	spamd:mail/spamassassin \
 		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 		p5-Net-DNS>=0.39:dns/p5-Net-DNS \
 		p5-Net-IP>=0:net-mgmt/p5-Net-IP
 
 OPTIONS_DEFINE=	MODPERL DOCS EXAMPLES
 OPTIONS_DEFAULT=MODPERL
 MODPERL_DESC=	Apache Support via mod_perl
 
 USE_GITHUB=	yes
 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
 
 USES+=		perl5
 USE_PERL5=	configure
 NO_ARCH=	yes
 
 USE_RC_SUBR=	qpsmtpd
 
 SUB_LIST+=	PERL=${PERL}
 SUB_FILES+=	pkg-message
 
 pre-configure:
 	@${RM} ${WRKSRC}/plugins/milter
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins
 	(cd ${WRKSRC}/plugins && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugins)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/config.sample/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
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
@@ -1,43 +1,43 @@
 PORTNAME=	chillispot
 PORTVERSION=	1.0
 PORTREVISION=	12
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.chillispot.info/download/ \
 		http://www.geeklan.co.uk/files/ \
 		http://www.venture37.com/files/
 
 MAINTAINER=	venture37@geeklan.co.uk
 COMMENT=	Wireless LAN Access Point Controller
 WWW=		http://www.chillispot.info
 
 CONFLICTS=	coovachilli
 
 USES=		compiler:nestedfct shebangfix
 SHEBANG_FILES=	doc/hotspotlogin.cgi
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=-sysconfdir=${PREFIX}/etc
 USE_RC_SUBR=	chillispot
 SUB_FILES=	pkg-message installguide.txt
 
 OPTIONS_DEFINE=		APACHE RADIUS
 OPTIONS_SINGLE=		RADIUS
 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
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/chilli.conf ${STAGEDIR}${DATADIR}/chilli.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/dictionary.chillispot ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/freeradius.users ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/hotspotlogin.cgi ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/installguide.txt ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/pf.conf.sample ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/ipfw-config.sample ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
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
@@ -1,135 +1,135 @@
 # Observium version can be found by looking at ${WRKSRC}/includes/definitions/version.inc.php
 
 PORTNAME=	observium
 PORTVERSION=	0.19.8
 PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.observium.org/
 DISTNAME=	${PORTNAME}-community-latest
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Autodiscovering PHP/MySQL/SNMP based network monitoring
 WWW=		https://observium.org
 
 LICENSE=	EULA
 LICENSE_NAME=	"Observium License Version 1.0"
 LICENSE_FILE=	${WRKSRC}/LICENSE.COMMUNITY
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		cpe php:cli,flavors python:3.5+ shebangfix
 IGNORE_WITH_PHP=	82
 SHEBANG_FILES=	\
 		poller-wrapper.py \
 		poller.php \
 		scripts/
 
 USE_PHP=	ctype filter gd iconv json mcrypt mysqli openssl posix session snmp tokenizer xml zlib
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 RUN_DEPENDS+=	rrdtool:databases/rrdtool \
 		dot:graphics/graphviz \
 		mtr:net/mtr-nox11 \
 		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \
 		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \
 		snmpget:net-mgmt/net-snmp \
 		sudo:security/sudo
 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
 WMIC_DESC=	Enable support for WMI polling
 PYPOLLER_DESC=	Enable Python Poller Wrapper
 
 FPING_RUN_DEPENDS=	fping:net/fping
 IPMITOOL_RUN_DEPENDS=	ipmitool:sysutils/ipmitool
 LIBVIRT_RUN_DEPENDS=	virsh:devel/libvirt
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 NMAP_RUN_DEPENDS=	nmap:security/nmap
 PYPOLLER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR}
 SUBVERSION_RUN_DEPENDS=	svn:devel/subversion
 WMIC_RUN_DEPENDS=	wmic:net-mgmt/wmi-client
 
 .include <bsd.port.options.mk>
 
 SUB_FILES+=	pkg-message observium.conf.sample
 SUB_LIST+=	PHP="${PREFIX}/bin/php" PYTHON="${PYTHON_CMD}"
 
 ROOT_FILES=	add_device.php adduser.php alerter.php \
 		check-errors.php check-services.php config_to_json.php \
 		config.php.default delete_device.php discovery.php housekeeping.php \
 		irc.php poller-wrapper.py poller.php rename_device.php \
 		snmp.conf.example snmpd.conf.example \
 		snmptrap.php snmptrap.php syslog.php test_alert.php test_code.php VERSION
 ROOT_DIRS=	html includes libs logs mibs rrd scripts templates tests update
 
 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
 .else
 # Package builder doesn't create php5 with module
 USES+=	php:web
 .endif
 
 .if ${PORT_OPTIONS:MMYSQLD}
 USES+=	mysql:server
 .else
 USES+=	mysql:client
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php
 	${FIND} ${WRKSRC} -type d -empty -delete
 	${MKDIR} ${WRKSRC}/logs ${WRKSRC}/rrd
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${WWWDIR} ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes
 	${INSTALL_DATA} ${WRKDIR}/observium.conf.sample ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes
 .for dir in ${ROOT_DIRS}
 	${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir}
 	(cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir})
 .endfor
 .for f in ${ROOT_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR}
 .endfor
 # Files in scripts dir should be executable
 	${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \;
 # Ensure PHP and Python scripts are executable
 	${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \
 		'*.php' -exec ${CHMOD} +x {} \;
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR}
 .endfor
 
 post-install:
 	@${ECHO_CMD}  "@sample ${APACHEETCDIR}/Includes/observium.conf.sample" >> ${TMPPLIST}
 	@${FIND} -s ${STAGEDIR}${WWWDIR} -type f '(' -name '*.orig' -or -name '*.bak' ')' -delete
 	@${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/logs" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/rrd" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
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
@@ -1,60 +1,60 @@
 PORTNAME=	ocsinventory-server
 PORTVERSION=	2.11.1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Open Computer and Software Inventory Next Generation
 WWW=		https://www.ocsinventory-ng.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	p5-XML-Simple>=2.12:textproc/p5-XML-Simple \
 		p5-DBI>=1.40:databases/p5-DBI \
 		p5-DBD-mysql>=2.9004:databases/p5-DBD-mysql \
 		p5-Apache-DBI>=0.93:www/p5-Apache-DBI \
 		p5-Net-IP>=1.21:net-mgmt/p5-Net-IP \
 		p5-SOAP-Lite>=0.66:net/p5-SOAP-Lite \
 		p5-XML-Entities>=0.02:textproc/p5-XML-Entities \
 		p5-XML-Simple>=0:textproc/p5-XML-Simple \
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		p5-Apache2-SOAP>=0:net/p5-Apache2-SOAP \
 		p5-Mojolicious>=0:www/p5-Mojolicious \
 		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
 USE_GITHUB=	YES
 GH_TAGNAME=	7aff9af5d91a98fd6897afc2ea4b979464a88452
 GH_ACCOUNT=	OCSInventory-NG
 GH_PROJECT=	OCSInventory-Server
 
 OPTIONS_DEFINE=	DOCS OCSREPORTS
 OPTIONS_DEFAULT=	OCSREPORTS
 OCSREPORTS_DESC=	Install ocsreports admin console
 OCSREPORTS_RUN_DEPENDS=	ocsinventory-ocsreports>=0:net-mgmt/ocsinventory-ocsreports
 
 ETCDIR=	${PREFIX}/etc/ocsinventory-server
 
 post-patch:
 	${REINPLACE_CMD} -e 's|REST_API_LOADER_PATH|${SHAREDIR}/Api/Ocsinventory/Restapi/Loader.pm|g' ${WRKSRC}/etc/ocsinventory/ocsinventory-restapi.conf
 	${REINPLACE_CMD} -e 's|REST_API_PATH|${SHAREDIR}|g;' ${WRKSRC}/etc/ocsinventory/ocsinventory-restapi.conf
 	${REINPLACE_CMD} -e 's|LOCALBASE|${LOCALBASE}|g;' ${WRKSRC}/etc/ocsinventory/ocsinventory-server.conf
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "Apache Api binutils dtd" ${STAGEDIR}${DATADIR}/)
 	${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${STAGEDIR}${DATADIR}/
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for F in restapi server
 	${INSTALL_DATA} ${WRKSRC}/etc/ocsinventory/ocsinventory-${F}.conf ${STAGEDIR}${ETCDIR}/ocsinventory-${F}.conf.sample
 .endfor
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
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
@@ -1,73 +1,73 @@
 PORTNAME=	pandora_console
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	koichiro@rworks.jp
 COMMENT=	Pandora FMS console
 WWW=		https://pandorafms.com/
 
 LICENSE=	${PANDORA_LICENSE}
 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 \
 		include/languages/util-compile-mo \
 		include/languages/util-create-po \
 		include/languages/util-create-template \
 		include/languages/util-generate-tarball \
 		include/languages/util-update-po \
 		pandora_console_upgrade
 
 OPTIONS_DEFINE=	DOCS PGSQL
 DOCS_DESC=	Install AUTHORS and ChangeLog
 PGSQL_DESC=	Use PostgreSQL backend (experimental)
 
 USE_PHP=	curl filter gd gettext hash json ldap mbstring mysqli \
 		snmp session xml zip zlib
 
 SUB_FILES+=	pandora_console.conf pkg-message newsyslog.conf
 SUB_LIST+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 PGSQL_USE=	PHP=pgsql
 
 .include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk"
 
 PORTREVISION=	3
 
 PANDORA_INSTALLER_ARGS+=	--destdir ${STAGEDIR}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "\|PANDORA_HOME=|s|=[^;]*|=${WWWDIR}|g" \
 		${WRKSRC}/pandora_console_install
 	@${REINPLACE_CMD} \
 		-e "s|/usr/bin|${LOCALBASE}/bin|g" \
 		${WRKSRC}/pandoradb.data*.sql
 	@${REINPLACE_CMD} \
 		-e 's|/bin/bash|/bin/sh|g' \
 		${WRKSRC}/extras/check_other_languages.sh
 
 post-install:
 	@cd ${STAGEDIR}${WWWDIR} \
 		&& ${RM} -r pandora_console_[il]* DEBIAN/ *.spec \
 			attachment/downloads/.gitignore ${PORTDOCS} \
 			Dockerfile docker_entrypoint.sh \
 			*.sql.bak extras/check_other_languages.sh.bak
 	@cd ${STAGEDIR}${WWWDIR} && ${MV} install.php install_old.php
 	@(d=${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes; ${MKDIR} $$d; \
 		${INSTALL_DATA} ${WRKDIR}/pandora_console.conf \
 			$$d/pandora_console.conf.sample)
 	@(d=${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d; ${MKDIR} $$d; \
 		${INSTALL_DATA} ${WRKDIR}/newsyslog.conf \
 			$$d/pandora_console.conf)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
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
@@ -1,23 +1,23 @@
 PORTNAME=	Apache2-SOAP
 PORTVERSION=	0.73
 PORTREVISION=	4
 CATEGORIES=	net www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Apache2 mod_perl2 SOAP Server
 WWW=		https://metacpan.org/release/Apache2-SOAP
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 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
 
 .include <bsd.port.mk>
diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index ca3f91a1ec23..6b2f3d2f2661 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -1,119 +1,118 @@
 PORTNAME=	prosearch
 PORTVERSION=	0.19.4
 PORTREVISION=	10
 CATEGORIES=	net www
 MASTER_SITES=	http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful file search
 WWW=		https://sourceforge.net/projects/pro-search/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		perl5 shebangfix tar:bzip2
 USE_PERL5=	run
 SHEBANG_FILES=	crawler.pl web/index.cgi web/index.fcgi
 SUB_FILES=	pkg-message
 SUB_LIST=	SEARCHDIR=${SEARCHDIR}
 NO_BUILD=	yes
 NO_ARCH=	yes
 SEARCHDIR?=	www/search
 PLIST_SUB+=	SEARCHDIR=${SEARCHDIR} WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 #TODO user and group for crawler
 OPTIONS_DEFINE=	CRAWLER SAMBA RSYNC APACHE MOD_PERL2 MOD_FASTCGI \
 		DB MYSQL PGSQL PGPP SQLITE
 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
 PGPP_DESC=		postgres pure Perl connection driver
 #NGINX_DESC=		With web server (NGINX)
 
 .include <bsd.port.options.mk>
 
 RUN_DEPENDS+=\
 p5-lib-abs>=0:devel/p5-lib-abs
 
 .if ${PORT_OPTIONS:MCRAWLER}
 RUN_DEPENDS+=\
 p5-libwww>=0:www/p5-libwww \
 p5-URI>=0:net/p5-URI \
 p5-DBI>=0:databases/p5-DBI \
 p5-HTML-Parser>=0:www/p5-HTML-Parser \
 nmap:security/nmap \
 p5-Net-DirectConnect>=0:net-p2p/p5-Net-DirectConnect
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
 USES+=		samba:run # smbclient
 .endif
 
 .if ${PORT_OPTIONS:MRSYNC}
 RUN_DEPENDS+=	rsync:net/rsync
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
-USES+=		apache:run,2.2+
+USES+=		apache:run
 .endif
 
 .if ${PORT_OPTIONS:MNGINX}
 RUN_DEPENDS+=\
 nginx:www/nginx
 .endif
 
 .if ${PORT_OPTIONS:MMOD_PERL2}
 RUN_DEPENDS+=\
 ${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:www/mod_perl2
 .endif
 
 .if ${PORT_OPTIONS:MMOD_FASTCGI}
 RUN_DEPENDS+=\
 ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi	\
 p5-FCGI>=0:www/p5-FCGI
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USES+=	mysql
 RUN_DEPENDS+=\
 p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MDB} && ${PORT_OPTIONS:MMYSQL}
 USES+=	mysql:server
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 RUN_DEPENDS+=\
 p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MPGPP}
 RUN_DEPENDS+=\
 p5-DBD-PgPP>=0:databases/p5-DBD-PgPP
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MPGPP} || ${PORT_OPTIONS:MDB}
 USES+=		pgsql
 WANT_PGSQL=	client server
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 USES+=	sqlite
 RUN_DEPENDS+=\
 p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 .endif
 
 WRKSRC=	${WRKDIR}/search
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SEARCHDIR}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/${SEARCHDIR}/crawler.pl ${STAGEDIR}${PREFIX}/${SEARCHDIR}/010.search.purge ${STAGEDIR}${PREFIX}/${SEARCHDIR}/*.sh.* ${STAGEDIR}${PREFIX}/${SEARCHDIR}/web/*.*cgi
 
 .include <bsd.port.mk>
diff --git a/security/maia/Makefile b/security/maia/Makefile
index 611c4fed77e6..77fecd2366b5 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -1,339 +1,338 @@
 PORTNAME=	maia
 DISTVERSION=	1.0.4
 PORTREVISION=	11
 CATEGORIES=	security
 
 MAINTAINER=	ek@purplehat.org
 COMMENT=	Web-based management system based on amavisd-new and SpamAssassin
 WWW=		http://www.maiamailguard.com/
 
 LICENSE=GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	p5-Unix-Syslog>=0.94:sysutils/p5-Unix-Syslog \
 		p5-MIME-Tools>=4.116:mail/p5-MIME-Tools \
 		p5-Convert-TNEF>=0.08:converters/p5-Convert-TNEF \
 		p5-Convert-UUlib>=1.08,1:converters/p5-Convert-UUlib \
 		p5-Net-CIDR-Lite>=0.18:net/p5-Net-CIDR-Lite \
 		p5-forks>=0.34:devel/p5-forks \
 		p5-Archive-Zip>=0.10:archivers/p5-Archive-Zip \
 		p5-IO-Stringy>=1.203:devel/p5-IO-Stringy \
 		p5-IO-Socket-INET6>=1.27:net/p5-IO-Socket-INET6 \
 		p5-Text-CSV>=1.02:textproc/p5-Text-CSV \
 		p5-Data-UUID>=1.148:devel/p5-Data-UUID \
 		p5-Template-Toolkit>=2.13:www/p5-Template-Toolkit \
 		p5-Net-Server>=0.93:net/p5-Net-Server
 
 USES=		perl5 shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
 GH_PROJECT=	maia_mailguard
 GH_TAGNAME=	48df5fb
 USE_PERL5=	run
 NO_ARCH=	yes
 NO_BUILD=	yes
 DOCS=	LICENSE.txt README.md maiad.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist
 USERS=	vscan
 GROUPS=	vscan
 MAIAHOME=	/var/maiad
 MAIAQUARANTINE?=	/var/maiad/virusmails
 PEAR_DIR?=	${LOCALBASE}/share/pear
 PLIST_SUB+=	USERS="${USERS}" GROUPS="${GROUPS}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 OPTIONS_DEFINE=	APACHE LIGHTTPD NGINX WEBHOST MYSQL LOCAL PGSQL \
 		DOVECOT2 POSTFIX PFA CLAMAV SPAMASSASSIN BDB CRYPT \
 		IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB \
 		RPM ZOO UNZOO LZOP TNEF DOCS
 
 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
 MYSQL_DESC=		Use MySQL
 LOCAL_DESC=		All services/databases hosted locally
 PGSQL_DESC=		Use PgSQL
 DOVECOT2_DESC=		Use Dovecot 2.x IMAP/POP3
 POSTFIX_DESC=		Use Postfix MTA
 PFA_DESC=		Use Postfixadmin
 CLAMAV_DESC=		Use ClamAV anti-virus
 SPAMASSASSIN_DESC=	Use SpamAssassin
 BDB_DESC=		Use BerkeleyDB
 CRYPT_DESC=		Encryption support
 IPCOUNTRY_DESC=		SpamAssassin IP Country plugin
 DOMAINKEYS_DESC=	SpamAssassin DomainKey plugin
 SPF_DESC=		SpamAssassin SPF plugin
 DKIM_DESC=		SpamAssassin DKIM plugin
 FILE_DESC=		Use newer file(1) utility from ports
 RAR_DESC=		RAR support with archivers/rar
 UNRAR_DESC=		RAR support with archivers/unrar
 ARJ_DESC=		ARJ support with archivers/arj
 UNARJ_DESC=		ARJ support with archivers/unarj
 LHA_DESC=		LHA support with archivers/lha
 ARC_DESC=		ARC support with archivers/arc
 NOMARCH_DESC=		ARC support with archivers/nomarch
 CAB_DESC=		CAB support with archivers/cabextract
 RPM_DESC=		RPM support with archivers/rpm2cpio
 ZOO_DESC=		ZOO support with archivers/zoo
 UNZOO_DESC=		ZOO support with archivers/unzoo
 LZOP_DESC=		LZOP support with archivers/lzop
 TNEF_DESC=		Add external tnef decoder
 
 SUB_FILES=	maiad pkg-message
 SHEBANG_FILES=	maiad
 SUB_LIST+=	USERS=${USERS} \
 		GROUPS=${GROUPS} \
 		MAIAHOME=${MAIAHOME} \
 		MAIAQUARANTINE=${MAIAQUARANTINE} \
 		ETCDIR=${ETCDIR}
 USE_RC_SUBR+=	maiad
 
 .include <bsd.port.options.mk>
 
 # Code is a bit fiddly here; we can't use USE variables after pre.mk so we have
 # to duplicate some WITH_ parts like WEBHOST that use pre.mk vars as well as
 # setting USE_ variables. C'est la vie.
 
 .if ${PORT_OPTIONS:MAPACHE}
-USES+=		apache:run,2.4+
+USES+=		apache:run
 .endif
 
 .if ${PORT_OPTIONS:MWEBHOST}
 USES+=	php
 USE_PHP=	bcmath ctype dom gettext hash iconv imap json mbstring \
 		mcrypt pdo pdo_sqlite posix session simplexml sockets \
 		sqlite3 tokenizer xml xmlreader xmlwriter xmlrpc
 
 RUN_DEPENDS+=	${PEAR_DIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
 		${PEAR_DIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR} \
 		${PEAR_DIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
 		${PEAR_DIR}/Pager/Pager.php:devel/pear-Pager@${PHP_FLAVOR} \
 		${PEAR_DIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
 		${PEAR_DIR}/Net/SMTP.php:net/pear-Net_SMTP@${PHP_FLAVOR} \
 		${PEAR_DIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \
 		${PEAR_DIR}/HTMLPurifier.php:devel/pear-htmlpurifier@${PHP_FLAVOR} \
 		${PEAR_DIR}/Net/IMAP.php:mail/pear-Net_IMAP@${PHP_FLAVOR} \
 		${PEAR_DIR}/Net/POP3.php:net/pear-Net_POP3@${PHP_FLAVOR} \
 		${PEAR_DIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR} \
 		${PEAR_DIR}/Image/Color.php:graphics/pear-Image_Color@${PHP_FLAVOR} \
 		${PEAR_DIR}/Image/Canvas.php:graphics/pear-Image_Canvas@${PHP_FLAVOR} \
 		${PEAR_DIR}/Image/Graph.php:graphics/pear-Image_Graph@${PHP_FLAVOR} \
 		${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman@${PHP_FLAVOR} \
 		${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words@${PHP_FLAVOR} \
 		${PEAR_DIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
 		${PEAR_DIR}/MDB2/Driver/mysqli.php:databases/pear-MDB2_Driver_mysqli@${PHP_FLAVOR} \
 		${LOCALBASE}/share/smarty3-${PHP_FLAVOR}/Smarty.class.php:www/smarty3@${PHP_FLAVOR} \
 		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt@${PHP_FLAVOR}
 PLIST_SUB+=	WEBHOST=""
 .else
 PLIST_SUB+=	WEBHOST="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MLOCAL}
 USES+=		mysql:server,client
 RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MLOCAL}
 USES+=	mysql:client
 RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MWEBHOST}
 USE_PHP+=	mysqli
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL} && ${PORT_OPTIONS:MLOCAL}
 USES+=		pgsql
 WANT_PGSQL=	server
 RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MLOCAL}
 USES+=		pgsql
 RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL} && ${PORT_OPTIONS:MWEBHOST}
 USE_PHP+=	pgsql
 .endif
 
 .if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	lighttpd:www/lighttpd
 .endif
 
 .if ${PORT_OPTIONS:MNGINX}
 RUN_DEPENDS+=	nginx:www/nginx
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT2}
 RUN_DEPENDS+=	dovecot:mail/dovecot
 .endif
 
 .if ${PORT_OPTIONS:MPOSTFIX}
 RUN_DEPENDS+=	postfix:mail/postfix
 .endif
 
 .if ${PORT_OPTIONS:MPFA}
 USES+=	php
 RUN_DEPENDS+=	postfixadmin-${PHP_FLAVOR}>=0:mail/postfixadmin
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
 RUN_DEPENDS+=	clamd:security/clamav
 .endif
 
 .if ${PORT_OPTIONS:MSPAMASSASSIN}
 RUN_DEPENDS+=	spamassassin>=0:mail/spamassassin
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 RUN_DEPENDS+=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 .endif
 
 .if ${PORT_OPTIONS:MCRYPT}
 RUN_DEPENDS+=	p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
 		p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
 		p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 .endif
 
 .if ${PORT_OPTIONS:MIPCOUNTRY}
 RUN_DEPENDS+=	p5-IP-Country>=0:net/p5-IP-Country
 .endif
 
 .if ${PORT_OPTIONS:MDOMAINKEYS}
 RUN_DEPENDS+=	p5-Mail-DomainKeys>=0:mail/p5-Mail-DomainKeys
 .endif
 
 .if ${PORT_OPTIONS:MSPF}
 RUN_DEPENDS+=	p5-Mail-SPF>=0:mail/p5-Mail-SPF
 .endif
 
 .if ${PORT_OPTIONS:MDKIM}
 RUN_DEPENDS+=	p5-Mail-DKIM>=0:mail/p5-Mail-DKIM
 .endif
 
 .if ${PORT_OPTIONS:MFILE}
 # security fix, file > 4.21 needed
 RUN_DEPENDS+=	file>=4.21:sysutils/file
 .endif
 
 # archivers/rar is a 32-bit binary port, we don't want the install to fail
 # at that port, therefore we will block instantly here if the platform does
 # not suit rar.
 .if ${PORT_OPTIONS:MRAR}
 IA32_BINARY_PORT=	yes
 RUN_DEPENDS+=	rar:archivers/rar
 .endif
 
 .if ${PORT_OPTIONS:MUNRAR}
 RUN_DEPENDS+=	unrar:archivers/unrar
 .endif
 
 .if ${PORT_OPTIONS:MARJ}
 RUN_DEPENDS+=	arj:archivers/arj
 .endif
 
 .if ${PORT_OPTIONS:MUNARJ}
 RUN_DEPENDS+=	unarj:archivers/unarj
 .endif
 
 .if ${PORT_OPTIONS:MLHA}
 RUN_DEPENDS+=	lha:archivers/lha
 .endif
 
 .if ${PORT_OPTIONS:MARC}
 RUN_DEPENDS+=	arc:archivers/arc
 .endif
 
 .if ${PORT_OPTIONS:MNOMARCH}
 RUN_DEPENDS+=	nomarch:archivers/nomarch
 .endif
 
 .if ${PORT_OPTIONS:MCAB}
 RUN_DEPENDS+=	cabextract:archivers/cabextract
 .endif
 
 .if ${PORT_OPTIONS:MRPM}
 RUN_DEPENDS+=	rpm2cpio.pl:archivers/rpm2cpio
 .endif
 
 .if ${PORT_OPTIONS:MZOO}
 # DOS condition in 2.10.1_2
 RUN_DEPENDS+=	zoo>=2.10.1_2:archivers/zoo
 .endif
 
 .if ${PORT_OPTIONS:MUNZOO}
 RUN_DEPENDS+=	unzoo>=4.4_1:archivers/unzoo
 .endif
 
 .if ${PORT_OPTIONS:MLZOP}
 RUN_DEPENDS+=	lzop:archivers/lzop
 .endif
 
 .if ${PORT_OPTIONS:MTNEF}
 RUN_DEPENDS+=	tnef:converters/tnef
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .for m in scripts/configtest.pl scripts/expire-quarantine-cache.pl \
 	scripts/load-sa-rules.pl scripts/maiadbtool.pl \
 	scripts/process-quarantine.pl scripts/resend.pl scripts/send-quarantine-digests.pl \
 	scripts/send-quarantine-reminders.pl scripts/stats-snapshot.pl
 	@${REINPLACE_CMD} -e "s|/etc/maia/maia.conf|${ETCDIR}/maia.conf|" \
 		${WRKSRC}/${m}
 .endfor
 
 .for i in digest.tpl newuser.tpl reminder.tpl
 	${MV} ${WRKSRC}/templates/${i} ${WRKSRC}/templates/${i}.dist
 .endfor
 
 	@${REINPLACE_CMD} -e "s|daemon_user  = 'maia'|daemon_user  = '${USERS}'|" \
 		-e "s|daemon_group = 'maia'|daemon_group = '${GROUPS}'|" \
 		-e "s|/var/lib/maia|${MAIAHOME}|" \
 		${WRKSRC}/maiad.conf.dist
 
 	@${REINPLACE_CMD} -e "s|/etc/maia.conf|${ETCDIR}/maia.conf|" \
 		-e "s|username = 'maia'|username = '${USERS}'|" \
 		-e "s|/var/lib/maia|${DATADIR}|" \
 		-e "s|/usr/bin/sa-learn|${PREFIX}/bin/sa-learn|" \
 		-e "s|local_cf_dir = undef|local_cf_dir = '${PREFIX}/etc/mail/spamassassin'|" \
 		-e "s|user_rules_dir = undef|user_rules_dir = '${MAIAHOME}/.spamassassin'|" \
 		-e "s|template_dir = '/etc/maia/templates/'|template_dir = '${ETCDIR}/templates/'|" \
 		${WRKSRC}/maia.conf.dist
 
 	@${REINPLACE_CMD} -e "s|/etc/maia/maiad.conf|${ETCDIR}/maiad.conf|" \
 		-e "s|/var/lib/maia|${DATADIR}|" \
 		${WRKSRC}/maiad
 
 	@${FIND} -E ${WRKSRC} -iregex '.*(bak|~)$$' -delete
 	@${FIND} -E ${WRKSRC} -iregex '.*(gitkeep|~)$$' -delete
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web
 	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 .if ${PORT_OPTIONS:MWEBHOST}
 	${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty
 .endif
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
 	${MKDIR} ${STAGEDIR}${ETCDIR}/templates
 .for i in digest.tpl newuser.tpl reminder.tpl
 	${INSTALL} -m 644 ${WRKSRC}/templates/${i}.dist ${STAGEDIR}${ETCDIR}/templates
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/maiad ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL} -m 640 ${WRKSRC}/maiad.conf.dist ${STAGEDIR}${ETCDIR}/maiad.conf.dist
 	${INSTALL} -m 640 ${WRKSRC}/maia.conf.dist ${STAGEDIR}${ETCDIR}/maia.conf.dist
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index 1835c7ba6232..67fd39562883 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	openscep
 PORTVERSION=	0.4.2
 PORTREVISION=	11
 CATEGORIES=	security
 MASTER_SITES=	http://openscep.othello.ch/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source scep server
 WWW=		http://openscep.othello.ch/
 
 LICENSE=	GPLv2
 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
 IGNORE_SSL_REASON=	unknown ASN1 functions
 USE_LDCONFIG=	yes
 USE_OPENLDAP=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-install-dir="${PREFIX}/www/openscep" \
 		--with-cgi-install-dir="${PREFIX}/www/cgi-bin/openscep" \
 		--with-openscep-dir="${PREFIX}/etc/openscep" \
 		--with-pkiclientexe="${PREFIX}/www/cgi-bin/pkiclient.exe"
 
 CPPFLAGS+=	-I${OPENSSLINC} -I${LOCALBASE}/include
 LIBS+=		-L${OPENSSLLIB} -L${LOCALBASE}/lib
 
 CONF_DIR=	${PREFIX}/etc/${PORTNAME}
 LOCAL_CONF_FILES=	openscep.cnf openscep.ldif openscep.schema slapd.conf
 
 CONFLICTS_INSTALL=	nss-3.*
 
 SUB_FILES=	pkg-message
 SUB_LIST=	CONF_DIR="${CONF_DIR}" CONF_FILES="${LOCAL_CONF_FILES}"
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^subdirs=/ s|libltdl||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/ s|libltdl||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|^\(install-data-am:\) install-data-local$$|\1|' \
 		${WRKSRC}/ldap/Makefile.in ${WRKSRC}/openssl/Makefile.in
 	@${REINPLACE_CMD} 's,sbindir),DESTDIR)$$(&,' \
 		${WRKSRC}/openssl/Makefile.in
 	@${REINPLACE_CMD} -E -e 's,(bin|sbin)dir},DESTDIR}$${&,'  \
 		-e 's,-o \$$\(USER\) -g \$$\(GROUP\),,' \
 		${WRKSRC}/scep/Makefile.in \
 		${WRKSRC}/scepd/Makefile.in
 	@${REINPLACE_CMD} -E 's,(CGIINSTALLDIR|PKICLIENTEXE)),DESTDIR)$$(&,' \
 		${WRKSRC}/cgi-bin/Makefile.in
 	@${REINPLACE_CMD} 's|HTMLINSTALLDIR)|DESTDIR)$$(&|' \
 		${WRKSRC}/Makefile.in \
 		${WRKSRC}/doc/Makefile.in \
 		${WRKSRC}/html/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libscep.so
 	@${MKDIR} ${STAGEDIR}${CONF_DIR}
 	${INSTALL_DATA} ${WRKSRC}/openssl/openscep.cnf \
 		${STAGEDIR}${CONF_DIR}/openscep.cnf.sample
 .for f in openscep.ldif openscep.schema slapd.conf
 	${INSTALL_DATA} ${WRKSRC}/ldap/${f} ${STAGEDIR}${CONF_DIR}/${f}.sample
 .endfor
 
 .include <bsd.port.mk>
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
@@ -1,89 +1,89 @@
 PORTNAME=	shibboleth-sp
 PORTVERSION=	3.4.1
 CATEGORIES=	security www
 MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	C++ Shibboleth Service Provider (Internet2) for Apache
 WWW=		http://shibboleth.internet2.edu/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 LIB_DEPENDS=	libsaml.so:security/opensaml \
 		liblog4shib.so:devel/log4shib \
 		libxerces-c-3.2.so:textproc/xerces-c3 \
 		libxml-security-c.so:security/apache-xml-security-c \
 		libxmltooling.so:devel/xmltooling \
 		libapr-1.so:devel/apr1 \
 		libgdbm.so:databases/gdbm \
 		libexpat.so:textproc/expat2
 
 USES=		gmake tar:bzip2 cpe pkgconfig libtool bdb
 GNU_CONFIGURE=	yes
 MAKE_ENV=	NOKEYGEN=YES
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	shibboleth-sp
 DOCSDIR=	${PREFIX}/share/doc/shibboleth
 CPE_VENDOR=	shibboleth
 
 USERS=		shibd
 GROUPS=		shibd
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_GROUP=	CONNECT SESSION
 OPTIONS_GROUP_CONNECT=FASTCGI APACHE
 CONNECT_DESC=	Webserver modules
 
 OPTIONS_GROUP_SESSION=ODBC # broken MEMCACHED
 SESSION_DESC=	Optional session storage
 
 OPTIONS_DEFAULT=ODBC APACHE
 
 # Descriptions
 ODBC_DESC=	ODBC database backend - store sessions in a database
 # broken MEMCACHED_DESC=	Store sessions in memcached
 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
 
 FASTCGI_CONFIGURE_WITH=	fastcgi=${LOCALBASE}
 FASTCGI_LIB_DEPENDS=	libfcgi++.so:www/fcgi
 
 #MEMCACHED_CONFIGURE_WITH=	memcached=${LOCALBASE}
 #MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 
 OPTIONS_SUB=	yes
 
 SUB_LIST+=	SH=${SH} WWWGRP=${WWWGRP}
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 SUB_LIST+=	SHIBD_USER=${USERS}
 SUB_LIST+=	SHIBD_GROUP=${GROUPS}
 PLIST_SUB+=	SHIBD_USER=${USERS}
 PLIST_SUB+=	SHIBD_GROUP=${GROUPS}
 
 CONFIGURE_ARGS+=--localstatedir=/var \
 	       	--disable-doxygen-doc --disable-dependency-tracking
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MAPACHE} && "${APACHE_VERSION}" == 2.4
 CONFIGURE_ARGS+=--disable-apache-22 --enable-apache-24 --with-apxs24=${APXS}
 PLIST_SUB+=	WITH_APACHE_24=""
 .else
 CONFIGURE_ARGS+=--disable-apache-24 --disable-apache-22
 PLIST_SUB+=	WITH_APACHE_24="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \
 		-e 's,^pkgwebdir.*=.*,pkgwebdir = ${DOCSDIR},' \
 		${WRKSRC}/doc/Makefile.in ${WRKSRC}/configs/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index cbd3cf5cb7f1..8533687aba91 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	htdig
 PORTVERSION=	3.2.0.b6
 PORTREVISION=	6
 CATEGORIES=	textproc www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/3.2.0b6
 DISTNAME=	htdig-3.2.0b6
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WWW indexing and searching system
 WWW=		https://sourceforge.net/projects/htdig/
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-config-dir=${PREFIX}/etc/htdig \
 		--with-default-config-file=${PREFIX}/etc/htdig/htdig.conf \
 		--with-common-dir=${PREFIX}/share/htdig/common \
 		--with-database-dir=${PREFIX}/share/htdig/database \
 		--with-cgi-bin-dir=${PREFIX}/www/cgi-bin \
 		--with-search-dir=${PREFIX}/www/data \
 		--with-image-dir=${PREFIX}/www/icons/htdig \
 		--with-image-url-prefix=/icons/htdig \
 		--with-ssl
 USES=		alias cpe libtool ssl
 CPE_VENDOR=	${PORTNAME}_project
 USE_CXXSTD=	c++98
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 
 CONFLICTS_INSTALL=	htdump mifluz # bin/htdb_dump bin/htdb_load bin/htdb_stat bin/htdump
 
 OPTIONS_DEFINE=	APACHE DOCS
 OPTIONS_DEFAULT=	APACHE
 
-APACHE_USE=	APACHE=22+
+APACHE_USES=	apache
 APACHE_CONFIGURE_ON=	--with-apache=${LOCALBASE}/sbin
 
 PORTDOCS=	*
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/htdig/htdig.conf ${STAGEDIR}${PREFIX}/etc/htdig/htdig.conf.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for f in ChangeLog ChangeLog.0 README STATUS
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in *.html *.gif
 	${INSTALL_DATA} ${WRKSRC}/htdoc/${f} ${STAGEDIR}${DOCSDIR}/html
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/dojo/Makefile b/www/dojo/Makefile
index b53b62587715..e6fbac398dba 100644
--- a/www/dojo/Makefile
+++ b/www/dojo/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=		dojo
 PORTVERSION=		1.12.2
 CATEGORIES=		www
 MASTER_SITES=		http://download.dojotoolkit.org/release-${PORTVERSION}/
 DISTNAME=		dojo-release-${PORTVERSION}
 
 MAINTAINER=		bofh@FreeBSD.org
 COMMENT=		Open-source DHTML toolkit written in JavaScript
 WWW=		https://dojotoolkit.org/
 
 USES=			cpe
 CPE_VENDOR=		linuxfoundation
 
 NO_BUILD=		yes
 SHAREOWN=		www
 SHAREGRP=		www
 
 OPTIONS_DEFINE=		APACHE
 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
 PLIST_SUB+=		CONFDIR=${CONFDIR_REL}
 
 CONF=			dojo.conf
 SUB_FILES+=		pkg-message ${CONF}
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
 .if ${PORT_OPTIONS:MAPACHE}
 	@${MKDIR} ${STAGEDIR}${CONFDIR}
 	${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/dojo.conf.sample
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/formication/Makefile b/www/formication/Makefile
index b21e75f4de4d..87c8f4dc116c 100644
--- a/www/formication/Makefile
+++ b/www/formication/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	formication
 PORTVERSION=	1.0.b1
 PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.ranner.eu/stuff/ \
 		http://home.bluelife.at/ports/distfiles/
 
 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}
 
 PORTDOCS=	BLURB COPYING feedback.fcn feedback.html formication.txt
 PLIST_FILES=	www/cgi-bin/formication.pl
 SUB_FILES+=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,^#!/usr/local/bin/perl,#!${PERL},g" \
 		-e "s,authorized_uid = 1031;,authorized_uid = ${WWWOWN};,g" \
 		${WRKSRC}/formication.pl
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin
 	@${INSTALL_DATA} ${WRKSRC}/formication.pl ${STAGEDIR}${PREFIX}/www/cgi-bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 .	for i in ${PORTDOCS}
 	  @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .	endfor
 
 .include <bsd.port.mk>
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
@@ -1,18 +1,18 @@
 CATEGORIES=	www lang
 PKGNAMESUFFIX=	-httpd24
 
 COMMENT=	Free Pascal headers for Apache 2.4 series web server
 
 USES=		fpc
 USE_FPC=	rtl-extra
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 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
@@ -1,35 +1,35 @@
 PORTNAME=	gnome-user-share
 PORTVERSION=	3.14.0
 PORTREVISION=	5
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Personal file-sharing service for the GNOME Desktop
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 		libnotify.so:devel/libnotify \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libunique-1.0.so:x11-toolkits/unique
 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
 CONFIGURE_ARGS=	--with-modules-path=${LOCALBASE}/${APACHEMODDIR} \
 		--disable-bluetooth
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.desktop.file-sharing.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/httpd/modules|${LOCALBASE}/${APACHEMODDIR}|g' \
 		${WRKSRC}/data/dav_user_*.conf
 
 .include <bsd.port.mk>
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 1900c43fabcb..4161b0fe0453 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	libapreq2
 PORTVERSION=	2.13
 PORTREVISION=	5
 CATEGORIES=	www devel
 MASTER_SITES=	APACHE_HTTPD/libapreq
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Generic Apache2 Request Library
 WWW=		https://metacpan.org/dist/libapreq2
 
 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
 
 .include <bsd.port.mk>
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
@@ -1,53 +1,53 @@
 PORTNAME=	mod_amazon_proxy
 PORTVERSION=	20100913
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/tota/${PORTNAME}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Amazon Auth Proxy for Product Advertising API
 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
 
 CONFFILE=	httpd-amazon-proxy.conf
 CONFDIR=	${PREFIX}/${APACHEETCDIR}/Includes
 
 PORTDOCS=	README
 PORTEXAMPLES=	rpaproxy.yaml
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|modules|${APACHEMODDIR}|' ${WRKSRC}/${CONFFILE}.sample
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${CONFDIR}
 	${INSTALL_DATA} ${WRKSRC}/${CONFFILE}.sample ${STAGEDIR}${CONFDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 x-generate-tarball:
 	${SETENV} ${FETCH_ENV} ${FETCH_BINARY} -m -o ${PORTNAME}.tar.gz \
 		https://github.com/machu/mod_amazon_proxy/tarball/master
 	target=`${TAR} -tvf ${PORTNAME}.tar.gz | head -n 1`; \
 	dir=`${ECHO} $${target} | ${AWK} '{print $$9}' | ${SED} -e 's|/$$||'`; \
 	year=`${ECHO} $${target} | ${AWK} '{print $$8}'`; \
 	month=`${ECHO} $${target} | ${AWK} '{print $$6}'`; \
 	day=`${ECHO} $${target} | ${AWK} '{print $$7}'`; \
 	date=`date -j -f "%B %d %Y" "$${month} $${day} $${year}" +"%Y%m%d"`; \
 	${TAR} -zxf ${PORTNAME}.tar.gz; \
 	${RM} ${PORTNAME}.tar.gz; \
 	${RM} $${dir}/Makefile; \
 	${RM} $${dir}/modules.mk; \
 	${MV} $${dir} ${PORTNAME}-$${date}; \
 	${TAR} -zcf ${PORTNAME}-$${date}.tar.gz ${PORTNAME}-$${date}; \
 	${RM} -r ${PORTNAME}-$${date}
 
 .include <bsd.port.mk>
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
@@ -1,30 +1,30 @@
 PORTNAME=	mod_asn
 PORTVERSION=	1.7
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/kuriyama \
 		http://mirrorbrain.org/files/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Look up the AS and network prefix of IP address
 WWW=		https://mirrorbrain.org/mod_asn/
 
 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
 
 pre-build:
 	@[ -r ${LOCALBASE}/lib/apr-util-1/apr_dbd_pgsql.so ] || (${ECHO_MSG} "APR util with PostgreSQL required."; ${FALSE})
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/asn_import.py ${STAGEDIR}${PREFIX}/bin/asn_import
 	${INSTALL_SCRIPT} ${WRKSRC}/asn_get_routeviews.py ${STAGEDIR}${PREFIX}/bin/asn_get_routeviews
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/asn.sql ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/mod_asn.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
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
@@ -1,50 +1,50 @@
 PORTNAME=	mod_auth_cas
 PORTVERSION=	1.2
 DISTVERSIONPREFIX=	v
 PORTREVISION=	0
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache 2.x module that supports the CASv1 and CASv2 protocols
 WWW=		https://wiki.jasig.org/display/CASC/mod_auth_cas
 
 LICENSE=	APACHE20
 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
 
 HAS_CONFIGURE=	yes
 # configure requires LDFLAGS to find libpcre
 LDFLAGS+=	-L${AP_LIB}
 
 AP_LIB=		${LOCALBASE}/lib
 AP_EXTRAS=	-lpcre -lssl -lcrypto
 
 PLIST_FILES=	@sample\ %%APACHEETCDIR%%/modules.d/%%APMOD_FILE%% \
 		%%APACHEMODDIR%%/mod_auth_cas.so
 
 PORTDOCS=	README
 
 SUB_FILES=	${APMOD_FILE}
 APMOD_FILE=	250_${PORTNAME}.conf.sample
 PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${STAGEDIR}${DOCSDIR}
 	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
 		-i -n ${MODULENAME} ${WRKSRC}/src/${MODULENAME}.la
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,22 +1,22 @@
 PORTNAME=	mod_auth_cookie_mysql2
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/
 DISTNAME=	${PORTNAME}_1.0
 DIST_SUBDIR=	apache2
 
 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
 AP_EXTRAS=	-DMODULE_NAME=${SHORTMODNAME} -DMODULE_NAME_module=${SHORTMODNAME}_module
 AP_INC=		${LOCALBASE}/include/mysql
 AP_LIB=		${LOCALBASE}/lib/mysql -lmysqlclient
 SRC_FILE=	mod_auth_cookie_sql2.c mod_auth_cookie_sql2_mysql.c
 
 .include <bsd.port.mk>
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
@@ -1,38 +1,38 @@
 PORTNAME=	mod_auth_gssapi
 PORTVERSION=	1.6.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	chris@chrullrich.net
 COMMENT=	Apache module for authenticating users with GSSAPI
 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
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	KRB5_CONFIG=${KRB5CONFIG}
 CONFIGURE_ARGS+=	OPENSSL_CFLAGS=-I${OPENSSLINC}
 CONFIGURE_ARGS+=	OPENSSL_LIBS=-lcrypto
 
 PLIST_FILES=	@sample\ ${APACHEETCDIR}/modules.d/${APMOD_FILE} \
 		${APACHEMODDIR}/mod_auth_gssapi.so
 
 SUB_FILES=	${APMOD_FILE}
 APMOD_FILE=	240_${PORTNAME}.conf.sample
 PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
 		-i -n ${MODULENAME} ${WRKSRC}/src/${MODULENAME}.la
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 
 .include <bsd.port.mk>
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
@@ -1,35 +1,35 @@
 PORTNAME=	mod_auth_kerb
 PORTVERSION=	5.4
 PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	SF/modauthkerb/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for authenticating users with Kerberos v5
 WWW=		http://modauthkerb.sourceforge.net/
 
 LICENSE=	MIT BSD3CLAUSE
 LICENSE_COMB=	multi
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 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
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_DEFAULT=	GSSAPI_BASE
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_BASE_DESC=	Use Base version of GSS API
 GSSAPI_HEIMDAL_DESC=	Use Heimdal implementation of GSS API
 GSSAPI_MIT_DESC=	Use MIT implementation of GSS API
 GSSAPI_DESC=		Use Base version of GSS API
 GSSAPI_BASE_USES=	gssapi
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_USES=	gssapi:mit
 
 .include <bsd.port.mk>
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
@@ -1,44 +1,44 @@
 PORTNAME=	mod_auth_mellon
 PORTVERSION=	0.18.0
 PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DISTVERSIONPREFIX=	v
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Apache module with a simple SAML 2.0 service provider
 WWW=		https://github.com/latchset/mod_auth_mellon
 
 LICENSE=	GPLv2
 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
 GH_ACCOUNT=	latchset
 CPE_VENDOR=	mod_auth_mellon_project
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
 			PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_mellon.so ${DATADIR}/mellon_create_metadata.sh
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|@APXS2@ -i|@APXS2@ -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i|' \
 		${WRKSRC}/Makefile.in
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${STAGEDIR}${DATADIR}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${PORTNAME}.so
 	${INSTALL_SCRIPT} ${WRKSRC}/mellon_create_metadata.sh ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
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
@@ -1,33 +1,33 @@
 PORTNAME=	mod_auth_mysql
 PORTVERSION=	1.11
 CATEGORIES=	www
 MASTER_SITES=	http://www.heuer.org/mod_auth_mysql/old/
 PKGNAMESUFFIX=	2
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	MySQL-based authentication module with VirtualHost support
 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
 AP_INC+=	${LOCALBASE}/include/mysql
 AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 PORTDOCS=	INSTALL example_data.html htpasswd.sql
 
 OPTIONS_DEFINE=	DOCS OPENSSL
 
 OPENSSL_USES=		ssl
 OPENSSL_VARS=	AP_EXTRAS+=-DMYSQL_USE_SSL
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,31 +1,31 @@
 PORTNAME=	mod_auth_mysql
 PORTVERSION=	3.0.0
 PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	SF/modauthmysql/modauthmysql/${PORTVERSION}
 PKGNAMESUFFIX=	_another
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use MySQL databases for user authentication
 WWW=		http://modauthmysql.sourceforge.net/
 
 LICENSE=	APACHE10
 
-USES=		apache:2.2+ mysql
+USES=		apache mysql
 
 SHORTMODNAME=	mysql_auth
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_INC=	${LOCALBASE}/include/mysql
 AP_LIB=	${LOCALBASE}/lib/mysql
 AP_EXTRAS=	-lmysqlclient_r -lz -lm
 
 PORTDOCS=	CONFIGURE CHANGES
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,39 +1,39 @@
 PORTNAME=	mod_auth_openid
 PORTVERSION=	0.8
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Authentication module for the Apache 2 webserver with OpenID
 WWW=		https://findingscience.com/mod_auth_openid/
 
 LICENSE=	MIT
 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
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_openid.so
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcre=${LOCALBASE}
 CFLAGS+=	-I${LOCALBASE}/include -I/usr/include/openssl
 
 CPE_VENDOR=	findingscience
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${APXS} -i|$${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i|' \
 		${WRKSRC}/src/Makefile.am
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${PORTNAME}.so
 
 .include <bsd.port.mk>
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
@@ -1,51 +1,51 @@
 PORTNAME=	mod_auth_openidc
 PORTVERSION=	2.4.11.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	OpenID Connect Relying Party and OAuth 2.0 Resource Server for Apache
 WWW=		https://github.com/pingidentity/mod_auth_openidc/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libcjose.so:devel/cjose \
 		libcurl.so:ftp/curl \
 		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}
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_openidc.so
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
 		PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		HIREDIS
 HIREDIS_DESC=		Enable using redis to store session data
 HIREDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 HIREDIS_CONFIGURE_WITH=	hiredis
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|@APXS2@ @APXS2_OPTS@ -i|@APXS2@ @APXS2_OPTS@ -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i|' \
 		${WRKSRC}/Makefile.*
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
 		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${PORTNAME}.so
 	${INSTALL_DATA} ${WRKSRC}/auth_openidc.conf \
 		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes/auth_openidc.conf.sample
 
 .include <bsd.port.mk>
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
@@ -1,33 +1,33 @@
 PORTNAME=	mod_auth_pam
 PORTVERSION=	1.1.1
 PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
 
 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
 PORTEXAMPLES=	pam-httpd.sample
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
 AP_EXTRAS+=	-lpam
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/httpd ${STAGEDIR}${EXAMPLESDIR}/pam-httpd.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,26 +1,26 @@
 PORTNAME=	mod_auth_pgsql
 PORTVERSION=	2.0.3
 PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/
 PKGNAMESUFFIX=	2
 
 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
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 PORTDOCS=	mod_auth_pgsql.html
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,25 +1,19 @@
 PORTNAME=	mod_auth_pubtkt
 PORTVERSION=	0.13
 CATEGORIES=	www
 MASTER_SITES=	https://neon1.net/mod_auth_pubtkt/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DIST_SUBDIR=	apache2
 
 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
@@ -1,51 +1,51 @@
 PORTNAME=	mod_auth_tkt
 PORTVERSION=	2.1.0
 PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/kuriyama \
 		http://www.openfusion.com.au/labs/dist/mod_auth_tkt/
 
 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
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PATCH_STRIP=	-p1
 AP_FAST_BUILD=	yes
 SRC_FILE=	${PORTNAME}.c sha2.c
 AP_EXTRAS=	-DAPACHE22
 
 OPTIONS_DEFINE=	QUERY_SEP DOCS EXAMPLES
 QUERY_SEP_DESC=	Experimental TKTAuthQuerySeparator directive
 OPTIONS_DEFAULT=QUERY_SEP
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQUERY_SEP}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-query-separator
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|.usr/share/man|${STAGEDIR}${PREFIX}/man|' ${WRKSRC}/../Makedefs
 
 post-build:
 	cd ${WRKSRC}/../doc; ${MAKE} all
 
 post-install:
 	cd ${WRKSRC}/../doc; ${MAKE} ${.TARGET:S/post-//}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/cgi/Apache ${STAGEDIR}${EXAMPLESDIR}/conf
 .for i in cgi/AuthTktConfig.pm cgi/Apache/AuthTkt.pm cgi/tkt.css \
 	conf/02_auth_tkt.conf conf/auth_tkt_cgi.conf
 	${INSTALL_DATA} ${WRKSRC}/../${i} ${STAGEDIR}${EXAMPLESDIR}/${i}
 .endfor
 .for i in logout.cgi login.cgi
 	${INSTALL_SCRIPT} ${WRKSRC}/../cgi/${i} ${STAGEDIR}${EXAMPLESDIR}/cgi/${i}
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
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
@@ -1,21 +1,21 @@
 PORTNAME=	mod_auth_xradius
 PORTVERSION=	0.4.6
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.outoforder.cc/downloads/mod_auth_xradius/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Enables RADIUS authentication
 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
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_xradius.so
 
 .include <bsd.port.mk>
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
@@ -1,21 +1,21 @@
 PORTNAME=	mod_authn_dovecot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.4
 CATEGORIES=	www
 
 MAINTAINER=	florian@wagner-flo.net
 COMMENT=	Apache authentication against Dovecot
 WWW=		https://github.com/bmanojlovic/mod_authn_dovecot
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4
+USES=		apache
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bmanojlovic
 GH_PROJECT=	mod_authn_dovecot
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
 .include <bsd.port.mk>
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
@@ -1,29 +1,29 @@
 PORTNAME=	mod_authnz_external
 PORTVERSION=	3.3.2
 CATEGORIES=	www
 MASTER_SITES=	http://zhegan.in/files/
 PKGNAMESUFFIX=	24
 DIST_SUBDIR=	apache24
 
 MAINTAINER=	eugene@zhegan.in
 COMMENT=	Allows users authentication based on external mechanisms on apache 2.4
 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
 SHORTMODNAME=	authnz_external
 
 PORTDOCS=	AUTHENTICATORS INSTALL README	\
 		CHANGES UPGRADE INSTALL.HARDCODE
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,33 +1,33 @@
 PORTNAME=	mod_cfg_ldap
 PORTVERSION=	1.2
 PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	SF/modcfgldap/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows you to keep your virtual host configuration in a LDAP directory
 WWW=		https://sourceforge.net/projects/modcfgldap/
 
 LICENSE=	BSD3CLAUSE
 
-USES=		apache:2.2+
+USES=		apache
 USE_OPENLDAP=	yes
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
 LDAP_INC?=	${LOCALBASE}/include
 LDAP_LIB?=	${LOCALBASE}/lib -lldap
 AP_INC+=	${LDAP_INC}
 AP_LIB+=	${LDAP_LIB}
 
 PORTDOCS=	AUTHORS cfg_ldap.conf ChangeLog COPYING INSTALL \
 		mod_cfg_ldap.schema README TODO
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,24 +1,24 @@
 PORTNAME=	mod_cloudflare
 PORTVERSION=	2016.10.0
 CATEGORIES=	www
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Cloudflare fork of mod_remoteip
 WWW=		https://github.com/cloudflare/mod_cloudflare
 
 LICENSE=	APACHE20
 
 CONFLICTS_INSTALL=	${PKGNAMEPREFIX}mod_remoteip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudflare
 GH_TAGNAME=	98ab38a
 
-USES=		apache:2.4+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	cloudflare
 
 SRC_FILE=	mod_cloudflare.c
 
 .include <bsd.port.mk>
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
@@ -1,30 +1,30 @@
 PORTNAME=	mod_dav_svn
 DISTNAME=	subversion-${PORTVERSION}
 
 CATEGORIES=	www
 
 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"
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS} \
 			--with-apache-libexecdir \
 			--without-gnome-keyring \
 			--without-kwallet
 SUB_FILES+=	220_subversion.conf.sample
 
 PLIST_SUB+=	SED=${SED}
 
 ALL_TARGET=	apache-mod
 INSTALL_TARGET=	install-mods-shared
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/220_subversion.conf.sample \
 		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 
 .include <bsd.port.post.mk>
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
@@ -1,27 +1,27 @@
 PORTNAME=	mod_defensible
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5
 CATEGORIES=	www
 
 MAINTAINER=	peter@libassi.se
 COMMENT=	Apache 2.4 module aiming to block IP listed in DNSBL
 WWW=		https://github.com/jd/mod_defensible
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4+
+USES=		apache
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jd
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	defensible
 
 SRC_FILE=	mod_defensible.c
 
 post-patch:
 	${REINPLACE_CMD} 's,%%PORTVERSION%%,${PORTVERSION},' \
 		${WRKSRC}/mod_defensible.c
 
 .include <bsd.port.mk>
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
@@ -1,38 +1,38 @@
 PORTNAME=	mod_dnssd
 PORTVERSION=	0.6
 PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	http://0pointer.de/lennart/projects/mod_dnssd/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Apache module that provides DNS-SD capabilities
 WWW=		https://0pointer.de/lennart/projects/mod_dnssd/
 
 LICENSE=	APACHE20
 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`"
 CONFIGURE_ARGS=	--disable-lynx
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' ${WRKSRC}/src/Makefile
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
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
@@ -1,42 +1,42 @@
 PORTNAME=	mod_evasive
 PORTVERSION=	1.10.1
 PORTREVISION=	2
 CATEGORIES=	www security
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Apache module to try to protect the HTTP Server from DoS/DDoS attacks
 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
 GH_TAGNAME=	ad6e89f6c7d835945a7d329cc0f04adaefc3d114
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 MODULENAME=	${PORTNAME}20
 
 PORTDOCS=	README test.pl
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
 		${WRKSRC}/mod_evasive.c ${WRKSRC}/mod_evasive20.c \
 		${WRKSRC}/mod_evasiveNSAPI.c
 .if ${APACHE_VERSION:M2.4}
 	@${REINPLACE_CMD} -e 's/remote_ip/client_ip/g' ${WRKSRC}/mod_evasive20.c
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
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
@@ -1,26 +1,26 @@
 PORTNAME=	mod_fastcgi
 PORTVERSION=	2.4.7.1
 CATEGORIES=	www
 DIST_SUBDIR=	apache2
 
 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
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	*.c
 PORTDOCS=	mod_fastcgi.html
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,41 +1,41 @@
 PORTNAME=	mod_fcgid
 PORTVERSION=	2.3.9
 CATEGORIES=	www
 MASTER_SITES=		APACHE_HTTPD/${PORTNAME}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	freebsd.ports@webstyle.ch
 COMMENT=	Alternative FastCGI module for Apache2
 WWW=		https://httpd.apache.org/mod_fcgid/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+ cpe
+USES=		apache cpe
 CPE_VENDOR=	apache
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	configure.apxs
 
 INSTALL_WRKSRC=	${WRKSRC}/modules/fcgid
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	APACHEMODDIR=${APACHEMODDIR}
 PLIST_SUB+=	APACHEMODDIR=${APACHEMODDIR}
 
 MAKE_ARGS+=	top_dir="${LOCALBASE}/share/apache${APACHE_VERSION}"
 MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include/apache${APACHE_VERSION} -I${LOCALBASE}/include/apr-1"
 INSTALL_TARGET=	install-modules-yes
 DOCSDIR=	${PREFIX}/share/doc/apache${APACHE_VERSION}/mod
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/fcgidsock
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/manual/mod/mod_fcgid.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/manual/mod/mod_fcgid.html.en ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,19 +1,19 @@
 PORTNAME=	mod_fileiri
 PORTVERSION=	1.15
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/pgollucci
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache 2.x http IRIs module
 WWW=		https://www.w3.org/2003/06/mod_fileiri/
 
 #LICENSE=	AL11
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
 .include <bsd.port.mk>
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
@@ -1,37 +1,37 @@
 PORTNAME=	mod_gnutls
 PORTVERSION=	0.12.0
 CATEGORIES=	www security
 MASTER_SITES=	https://mod.gnutls.org/downloads/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Extension for Apache httpd using GnuTLS library to provide HTTPS
 WWW=		https://mod.gnutls.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 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}
 
 DBDIR=		${PREFIX}/var/db/${PORTNAME}
 PLIST_SUB=	SED="${SED}" WWWGRP=${WWWGRP} WWWOWN=${WWWOWN}
 SUB_FILES=	pkg-message
 SUB_LIST=	DBDIR="${DBDIR}"
 
 CFLAGS+=	-Wno-deprecated-declarations -Wno-null-pointer-subtraction
 CONFIGURE_ARGS=	--with-apxs="${APXS}"
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	${MKDIR} "${STAGEDIR}${DBDIR}"
 
 .include <bsd.port.mk>
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
@@ -1,29 +1,29 @@
 PORTNAME=	mod_h264_streaming
 PORTVERSION=	2.2.7
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://h264.code-shop.com/download/ \
 		https://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DISTNAME=	apache_${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Apache H264 streaming module
 WWW=		http://h264.code-shop.com/trac/wiki/Mod-H264-Streaming-Apache-Version2
 
 # Converted from RESTRICTED
 LICENSE=	h264
 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}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_SUB=	SED=${SED}
 
 .include <bsd.port.mk>
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
@@ -1,43 +1,43 @@
 PORTNAME=	mod_http2
 DISTVERSION=	2.0.7
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/icing/mod_h2/releases/download/v${DISTVERSION}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	HTTP/2 modules for Apache httpd
 WWW=		https://github.com/icing/mod_h2
 
 LICENSE=	APACHE20
 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
 
 MODULENAME=	mod_h2
 
 SUB_FILES=	200_mod_http2.conf 300_mod_proxy_http2.conf
 PORTDOCS=	README README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/200_mod_http2.conf \
 		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d/200_mod_h2.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/300_mod_proxy_http2.conf \
 		${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d/300_mod_proxy_h2.conf.sample
 	# Rename mod_http2 to mod_h2 to avoid conflict with Apache24
 	${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_http2.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 	${MV} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_http2.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_proxy_h2.so
 	${RM} ${STAGEDIR}${DOCSDIR}/LICENSE
 
 .include <bsd.port.mk>
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
@@ -1,36 +1,36 @@
 PORTNAME=	mod_jk
 PORTVERSION=	1.2.48
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	APACHE/tomcat/tomcat-connectors/jk/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DISTNAME=	tomcat-connectors-${PORTVERSION}-src
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	Apache JK module for connecting to Tomcat using AJP1X
 WWW=		https://tomcat.apache.org/connectors-doc/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+ gmake
+USES=		apache gmake
 APACHE_VER=	2.0
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 WRKSRC=		${WRKDIR}/tomcat-connectors-${PORTVERSION}-src/native
 
 SUB_FILES=	mod_jk.conf.sample pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|APXSLDFLAGS=@APXSLDFLAGS@|APXSLDFLAGS=@LDFLAGS@|g' \
 	  	${WRKSRC}/apache-2.0/Makefile.in
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${APXS} -i -n jk -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/${APACHEETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${STAGEDIR}${LOCALBASE}/${APACHEETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${STAGEDIR}${LOCALBASE}/${APACHEETCDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_jk.so
 
 .include <bsd.port.mk>
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
@@ -1,30 +1,30 @@
 PORTNAME=	mod_limitipconn
 PORTVERSION=	0.24
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://dominia.org/djao/limit/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Allows you to limit the number of simultaneous connexions
 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
 
 PORTDOCS=	ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
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
@@ -1,27 +1,27 @@
 PORTNAME=	mod_maxminddb
 PORTVERSION=	1.2.0
 PORTREVISION=	0
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	MaxMind DB Apache Module
 WWW=		https://github.com/maxmind/mod_maxminddb
 
 LICENSE=	APACHE20
 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
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LIBEXECDEST%%|${STAGEDIR}${PREFIX}/${APACHEMODDIR}|g' ${WRKSRC}/src/Makefile.am
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 .include <bsd.port.mk>
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
@@ -1,24 +1,24 @@
 PORTNAME=	mod_memcache
 PORTVERSION=	0.1.0
 PORTREVISION=	5
 CATEGORIES=	www
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Apache 2.2.x module to manage apr_memcache connections
 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
 GH_TAGNAME=	8e6d912
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	src/${PORTNAME}.c
 
 .include <bsd.port.mk>
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
@@ -1,22 +1,22 @@
 PORTNAME=	mod_memcache_block
 PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Apache 2.2 module to block IPs from lists stored in memcache
 WWW=		https://github.com/netik/mod_memcache_block
 
 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
 AP_LIB=		${LOCALBASE}/lib -lmemcached
 
 .include <bsd.port.mk>
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
@@ -1,32 +1,32 @@
 PORTNAME=	mod_mono
 PORTVERSION=	3.13
 CATEGORIES=	www
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Apache module for serving ASP.NET applications
 WWW=		https://www.mono-project.com/
 
 LICENSE=	APACHE20
 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
 INSTALL_TARGET=	install
 PLIST_SUB=	MOD_MONOCONFDIR=${MOD_MONOCONFDIR}
 
 MOD_MONOCONFDIR=${APACHEETCDIR}/Includes
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%MOD_MONOCONFDIR%%|${PREFIX}/${MOD_MONOCONFDIR}|g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} '/^mod_mono_la_LDFLAGS =/s/$$/ -avoid-version/' \
 		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
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
@@ -1,30 +1,30 @@
 PORTNAME=	mod_mpm_itk
 PORTVERSION=	2.4.7
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://mpm-itk.sesse.net/ \
 		http://lukasz.wasikowski.net/files/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DISTNAME=	mpm-itk-2.4.7-04
 
 MAINTAINER=	lukasz@wasikowski.net
 COMMENT=	Run each vhost under a separate uid and gid
 WWW=		http://mpm-itk.sesse.net/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4
+USES=		apache
 GNU_CONFIGURE=	yes
 
 AP_FAST_BUILD=	yes
 SRC_FILE=	*.c
 
 SUB_FILES+=	${APMOD_FILE}.sample
 APMOD_FILE=	200_${PORTNAME}.conf
 SUB_LIST+=	APMOD_FILE=${APMOD_FILE}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE}.sample ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 
 .include <bsd.port.mk>
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
@@ -1,87 +1,87 @@
 PORTNAME=	mod_perl
 PORTVERSION=	2.0.12
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	APACHE/perl
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Embeds a Perl interpreter in the Apache server
 WWW=		https://perl.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-BSD-Resource>=0:devel/p5-BSD-Resource
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-CGI>=4.15:www/p5-CGI \
 		p5-libwww>=6.13:www/p5-libwww
 
 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
 
 APMOD_FILE=	260_${PORTNAME}.conf.sample
 PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS=	PREFIX=${PREFIX} MP_APXS=${APXS} \
 		MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config
 
 post-patch:
 	${REINPLACE_CMD} -e 's/APR_INLINE//g' \
 		${PATCH_WRKSRC}/src/modules/perl/modperl_common_util.h
 	${REINPLACE_CMD} -e "s|/usr/local/apache/bin/apxs|${APXS}|" \
 		-e "s|'bin', 'apxs'|'sbin', 'apxs'|" \
 		${WRKSRC}/lib/Apache2/Build.pm
 
 pre-configure:
 	${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete
 
 # PR 200697: Test whether the system uses a multithreaded perl
 .if exists(${PERL})
 HAS_ITHREADS!=	${PERL} -e 'use Config; print $$Config{useithreads} ? 1 : 0'
 .else
 # Assume true when building packages.
 HAS_ITHREADS=	1
 .endif
 
 .if ${HAS_ITHREADS:M1}
 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
 
 post-configure:
 	${REINPLACE_CMD} -e 's/-pthread -Wl,-E//g' \
 		${PATCH_WRKSRC}/xs/APR/APR/Makefile
 	@${ECHO_CMD} == PERL: \"${PERL_VER}\", ITHREADS: \"${HAS_ITHREADS}\", Apache: \"${APACHE_VERSION}\"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
 	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
 		${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
 	${INSTALL_DATA} ${WRKSRC}/xs/*.h ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}
 	${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_perl.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 
 	-for f in `${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto -name \*.so` ; do \
 		${STRIP_CMD} $${f}; \
 	done;
 
 test:	build
 	-@(${MAKE} test -C ${WRKSRC})
 
 .include <bsd.port.post.mk>
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
@@ -1,22 +1,22 @@
 PORTNAME=	mod_qos
 DISTVERSION=	11.72
 CATEGORIES=	www
 MASTER_SITES=	SF/mod-qos
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	fax@nohik.ee
 COMMENT=	QoS for Apache
 WWW=		http://opensource.adnovum.ch/mod_qos/
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
-USES=		apache:2.2+
+USES=		apache
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/apache2
 
 .include <bsd.port.mk>
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
@@ -1,18 +1,18 @@
 PORTNAME=	mod_realdoc
 PORTVERSION=	20170405
 CATEGORIES=	www
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Apache module to support atomic deploys
 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
 GH_ACCOUNT=	etsy
 GH_TAGNAME=	f7fbf65
 
 .include <bsd.port.mk>
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
@@ -1,18 +1,18 @@
 PORTNAME=	mod_reproxy
 PORTVERSION=	0.02.20110826
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/kuriyama
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module to support x-reproxy-url header
 WWW=		https://github.com/kazuho/mod_reproxy
 
 LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/lestrrat-mod_reproxy-0f945ff
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
 .include <bsd.port.mk>
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
@@ -1,31 +1,31 @@
 PORTNAME=	mod_rivet
 PORTVERSION=	3.2.0
 CATEGORIES=	www tcl
 MASTER_SITES=	APACHE/tcl/rivet
 DISTNAME=	rivet-${PORTVERSION}
 
 MAINTAINER=	jeff.lawson@flightaware.com
 COMMENT=	Embeds a Tcl interpreter in the Apache server
 WWW=		https://tcl.apache.org/rivet/
 
 LICENSE=	APACHE20
 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
 
 INSTALL_TARGET=	install-strip
 
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS+=--with-apxs=${APXS} \
 		--with-rivet-target-dir=${PREFIX}/lib/rivet
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|`$${apxs_found} -q LIBEXECDIR`|${PREFIX}/${APACHEMODDIR}|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
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
@@ -1,41 +1,41 @@
 PORTNAME=	mod_rpaf
 PORTVERSION=	0.8.4
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Make proxied requests appear with client IP
 WWW=		https://github.com/gnif/mod_rpaf/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.4+ cpe
+USES=		apache cpe
 
 CPE_VENDOR=	thomas_eibner
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnif
 
 AP_FAST_BUILD=	yes
 SHORTMODNAME=	rpaf
 
 SRC_FILE=	mod_rpaf.c
 
 APMOD_FILE=	200_mod_rpaf.conf.sample
 PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
 PLIST_FILES=	@sample\ ${APACHEETCDIR}/modules.d/200_${PORTNAME}.conf.sample \
 		${APACHEMODDIR}/${PORTNAME}.so
 SUB_FILES=	${APMOD_FILE}
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,22 +1,22 @@
 PORTNAME=	mod_scgi
 PORTVERSION=	2.0
 CATEGORIES=	www
 MASTER_SITES=	http://python.ca/scgi/releases/
 DISTNAME=	scgi-${PORTVERSION:S/.a/a/}
 
 MAINTAINER=	w.schwarzenfeld@utanet.at
 COMMENT=	Apache module that implements the client side of the SCGI protocol
 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}
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
 .include <bsd.port.mk>
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
@@ -1,84 +1,84 @@
 PORTNAME=	mod_security
 DISTVERSIONPREFIX=	v
 PORTVERSION=	2.9.6
 CATEGORIES=	www security
 MASTER_SITES=	https://github.com/SpiderLabs/ModSecurity/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/_//:S/2//}-${PORTVERSION}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Intrusion detection and prevention engine
 WWW=		https://www.modsecurity.org/
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS+=	libpcre.so:devel/pcre \
 		libapr-1.so:devel/apr1 \
 		libyajl.so:devel/yajl \
 		libcurl.so:ftp/curl \
 		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
 perl_OLD_CMD=	@PERL@
 
 AP_INC=		${LOCALBASE}/include/libxml2
 AP_LIB=		${LOCALBASE}/lib
 MODULENAME=	mod_security2
 SRC_FILE=	*.c
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${MODULENAME}
 
 SUB_FILES+=	pkg-message
 SUB_FILES+=	README
 SUB_FILES+=	${APMOD_FILE}.sample
 APMOD_FILE=	280_${PORTNAME}.conf
 SUB_LIST+=	APMOD_FILE=${APMOD_FILE}
 
 OPTIONS_DEFINE=	DOCS FUZZYHASH LUA MLOGC
 OPTIONS_SUB=	yes
 
 LUA_CONFIGURE_ON=	--with-lua=${LOCALBASE}
 LUA_CONFIGURE_OFF+=	--without-lua
 LUA_USES=		lua:51+
 
 MLOGC_DESC=		Build ModSecurity Log Collector
 MLOGC_CONFIGURE_ON=	--disable-errors
 MLOGC_CONFIGURE_OFF=	--disable-mlogc
 
 FUZZYHASH_DESC=		Allow matching contents using fuzzy hashes with ssdeep
 FUZZYHASH_CONFIGURE_ON=	--with-ssdeep=${LOCALBASE}
 FUZZYHASH_CONFIGURE_OFF=--without-ssdeep
 FUZZYHASH_LIB_DEPENDS=	libfuzzy.so:security/ssdeep
 
 ETCDIR=		${PREFIX}/etc/modsecurity
 
 REINPLACE_ARGS=	-i ""
 AP_EXTRAS+=	-DWITH_LIBXML2
 CONFIGURE_ARGS+=--with-apxs=${APXS} --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} --with-curl=${LOCALBASE}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/lua5.1/lua-${LUA_VER}/g" ${WRKSRC}/configure
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/modsecurity.conf-recommended \
 		${STAGEDIR}${ETCDIR}/modsecurity.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/unicode.mapping \
 		${STAGEDIR}${ETCDIR}/unicode.mapping
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKDIR}/README ${STAGEDIR}${DOCSDIR}
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE}.sample ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 
 .include <bsd.port.mk>
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
@@ -1,20 +1,20 @@
 PORTNAME=	mod_setenvifplus
 PORTVERSION=	0.40
 CATEGORIES=	www
 MASTER_SITES=	SF/modsetenvifplus
 EXTRACT_SUFX=	-src.tar.gz
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Allows setting environment variables based on request attributes
 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
 
 .include <bsd.port.mk>
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
@@ -1,24 +1,24 @@
 PORTNAME=	mod_tidy
 PORTVERSION=	0.5.5
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://mod-tidy.sourceforge.net/src/
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Validates the HTML output of your apache2 webserver
 WWW=		http://mod-tidy.sourceforge.net/
 
 LICENSE=	APACHE20 MIT
 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
 AP_LIB+=	${LOCALBASE}/lib -ltidy
 
 .include <bsd.port.mk>
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
@@ -1,21 +1,21 @@
 PORTNAME=	mod_umask
 PORTVERSION=	0.1.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.outoforder.cc/downloads/mod_umask/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	gebhart@secnetix.de
 COMMENT=	Apache 2.x module to set umask of created files
 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
 AP_GENPLIST=	yes
 SRC_FILE=	src/${PORTNAME}.c
 
 .include <bsd.port.mk>
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
@@ -1,29 +1,29 @@
 PORTNAME=	mod_webauth
 PORTVERSION=	4.7.0
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://webauth.stanford.edu/dist/
 DISTNAME=	webauth-${PORTVERSION}
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for authenticating users with Kerberos v5
 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
 CONFIGURE_ARGS=	--with-ldap-lib=${LOCALBASE}/lib \
 		--with-ldap-include=${LOCALBASE}/include \
 		--with-openssl=${OPENSSLBASE}
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e '/typedef int sig_atomic_t/d' \
 		${WRKSRC}/portable/system.h
 
 .include <bsd.port.mk>
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
@@ -1,25 +1,25 @@
 PORTNAME=	mod_webkit
 PORTVERSION=	1.2.3
 CATEGORIES=	www
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for WebWare WebKit AppServer
 WWW=		https://cito.github.io/w4py/
 
 LICENSE=	PSFL
 
 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
 
 WRKSRC_SUBDIR=		WebKit/Adapters/${PORTNAME}2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/sbin/apxs|${APXS}|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
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
@@ -1,38 +1,38 @@
 PORTNAME=	mod_wsgi
 DISTVERSION=	4.9.2
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Python WSGI adapter module for Apache
 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
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
 
 SUB_FILES=	pkg-message ${APMOD_FILE}
 APMOD_FILE=	270_${PORTNAME}.conf.sample
 PLIST_SUB+=	APMOD_FILE=${APMOD_FILE}
 
 pre-everything::
 	@${ECHO_MSG} "======================= ATTENTION! ======================"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you want to use daemon mode you will need to make sure"
 	@${ECHO_MSG} "Apache and APR include thread support."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "========================================================="
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${PORTNAME}.so
 
 .include <bsd.port.mk>
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
@@ -1,19 +1,19 @@
 PORTNAME=	mod_xsendfile
 PORTVERSION=	0.12
 PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://tn123.org/mod_xsendfile/ GHC
 
 MAINTAINER=	potatosaladx@gmail.com
 COMMENT=	Apache2 module that processes X-SENDFILE headers
 WWW=		https://tn123.org/mod_xsendfile/
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+
+USES=		apache
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	potatosalad
 
 .include <bsd.port.mk>
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
@@ -1,48 +1,48 @@
 PORTNAME=	mythweb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	32.0-40
 DISTVERSIONSUFFIX=	-gb05906a6
 
 CATEGORIES=	www
 PKGNAMEPREFIX=	mythplugin-
 
 MAINTAINER=	ahicks@p-o.co.uk
 COMMENT=	Frontend for scheduling and managing recordings on your MythTV Box
 WWW=		https://www.mythtv.org/wiki/MythWeb
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		php shebangfix perl5
 USE_PERL5=	run
 USE_PHP=	json pcre posix mysqli session spl sockets
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 SHEBANG_FILES=	mythweb.pl modules/_shared/lang/build_translation.pl \
 		modules/coverart/handler.pl modules/stream/*.pl
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 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
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/www/html|${WWWDIR}|' \
 		${WRKSRC}/mythweb.conf.apache
 	@${REINPLACE_CMD} -e 's|/usr/bin/php-cgi|${LOCALBASE}/bin/php-cgi|' \
 		${WRKSRC}/mythweb.conf.lighttpd
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "*" ${STAGEDIR}${WWWDIR} \
 		"! -name *.orig -and ! -name LICENSE")
 
 .include <bsd.port.mk>
diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile
index e914e782d16d..311409024381 100644
--- a/www/nibbleblog/Makefile
+++ b/www/nibbleblog/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	nibbleblog
 PORTVERSION=	3.0.2
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/v${PORTVERSION}/
 DISTNAME=	nibbleblogv302
 
 MAINTAINER=	marekholienka@gmail.com
 COMMENT=	Lightweight blog system for general use
 WWW=		https://www.nibbleblog.com/
 
 RUN_DEPENDS=	pear:devel/pear@${PHP_FLAVOR}
 
 USES=		cpe php zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_PHP=	session filter xml simplexml gd
 IGNORE_WITH_PHP=	82
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 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:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${CP} -r ${WRKDIR}/${PORTNAME}/ ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/www/otrs/Makefile b/www/otrs/Makefile
index a9b29f7531f0..6f317aeb4cf2 100644
--- a/www/otrs/Makefile
+++ b/www/otrs/Makefile
@@ -1,189 +1,189 @@
 PORTNAME=	otrs
 DISTVERSIONPREFIX=	rel-
 DISTVERSION=	6_0_29
 PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Open Ticket Request System
 WWW=		https://www.otrs.com/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		p5-DBI>=0:databases/p5-DBI \
 		p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \
 		p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
 		p5-MIME-Tools>=5.427:mail/p5-MIME-Tools \
 		p5-libwww>=0:www/p5-libwww \
 		p5-Net-DNS>=0.66:dns/p5-Net-DNS \
 		p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
 		p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS \
 		p5-DateTime>=0:devel/p5-DateTime \
 		p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
 		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
 		p5-JSON-XS>=0:converters/p5-JSON-XS \
 		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
 		p5-IO-Interactive>=0:devel/p5-IO-Interactive \
 		p5-Email-Valid>=0:mail/p5-Email-Valid \
 		p5-JSON>=0:converters/p5-JSON \
 		p5-YAML>=0:textproc/p5-YAML \
 		p5-Date-Pcalc>=0:devel/p5-Date-Pcalc \
 		p5-Text-CSV>=0:textproc/p5-Text-CSV \
 		p5-Text-Diff>=0:textproc/p5-Text-Diff \
 		p5-XML-FeedPP>=0:textproc/p5-XML-FeedPP \
 		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML \
 		p5-JavaScript-Minifier>=0:textproc/p5-JavaScript-Minifier \
 		p5-CSS-Minifier>=0:textproc/p5-CSS-Minifier \
 		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
 		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
 		p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
 		p5-CGI>=0:www/p5-CGI \
 		p5-Lingua-Translit>=0:devel/p5-Lingua-Translit \
 		p5-Pod-Strip>=0:textproc/p5-Pod-Strip \
 		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
 		p5-Sisimai>=0:mail/p5-Sisimai \
 		p5-XML-Parser>=0:textproc/p5-XML-Parser \
 		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
 		p5-XML-LibXML-Simple>=0:textproc/p5-XML-LibXML-Simple \
 		p5-XML-LibXSLT>=0:textproc/p5-XML-LibXSLT \
 		p5-Locale-Codes>=0:misc/p5-Locale-Codes \
 		p5-Math-Random-Secure>=0:math/p5-Math-Random-Secure \
 		p5-Schedule-Cron-Events>=0:sysutils/p5-Schedule-Cron-Events
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cpe shebangfix perl5 tar:bzip2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OTRS
 
 SHEBANG_FILES=	bin/cgi-bin/*.pl bin/cgi-bin/app.psgi bin/fcgi-bin/*.pl bin/*.pl \
 		scripts/tools/*.pl scripts/*.pl
 
 OPTIONS_DEFINE=		MYSQL PGSQL REPORTS SMTP POP3 IMAP LDAP PDF \
 			GNUPG APACHE SSL
 OPTIONS_DEFAULT=	MYSQL REPORTS SMTP POP3 IMAP PDF ASPELL APACHE \
 			SSL
 OPTIONS_RADIO=		SPELL
 OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 
 IMAP_DESC=		Fetch email via IMAP
 POP3_DESC=		Fetch email via POP3
 SMTP_DESC=		Send email via SMTP
 REPORTS_DESC=		Reports support
 APACHE_DESC=		Apache and www/mod_perl2 support
 
 OTRSDIR=	${PREFIX}/otrs
 USERS=		${PORTNAME}
 GROUPS=		${USERS} www
 
 SUB_FILES=	pkg-message
 SUB_LIST=	OTRS_USER=${USERS} OTRS_GROUP=${USERS} WWWOWN=${WWWOWN}
 NO_ARCH=	YES
 
 ROOT_DIRS_LIST=	Kernel bin scripts doc
 BIN_DIRS_LIST=	"" cgi-bin fcgi-bin
 PM_DIRS_LIST=	Kernel Kernel/Config Kernel/Config/Files Kernel/Language \
 		Modules Kernel/Output/HTML Kernel/Output/HTML/Lite \
 		Kernel/Output/HTML/Standard System System/Auth System/AuthSession \
 		System/Crypt System/CustomerAuth System/CustomerUser \
 		System/CustomerUser/ System/
 
 SCRIPTS_DIRS_LIST=	"" database test tools DBUpdateTo6
 CRON_SCRIPTS=	${STAGEDIR}${OTRSDIR}/var/cron/
 CLEAN_FILES=	scripts/suse* scripts/redhat* \
 		var/httpd/htdocs/js/thirdparty/ckeditor-4.0/_source \
 		var/httpd/htdocs/skins/Agent/*/img/source
 
 PLIST_SUB=	VER_CKEDITOR="4.7.0" OTRS_USER=${USERS} WWWOWN=${WWWOWN}
 
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 PGSQL_USES=		pgsql
 
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 
 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 \
 			p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
 
 SMTP_RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
 			p5-Net-SSLGlue>=0:security/p5-Net-SSLGlue
 
 POP3_RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 			p5-Net-SSLGlue>=0:security/p5-Net-SSLGlue
 
 IMAP_RUN_DEPENDS=	p5-Mail-IMAPClient>=0:mail/p5-Mail-IMAPClient \
 			p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple
 
 LDAP_RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap
 
 PDF_RUN_DEPENDS=	p5-PDF-API2>=0.57:textproc/p5-PDF-API2
 
 ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 
 ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
 
 GNUPG_RUN_DEPENDS=	gpg:security/gnupg1
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.pm" | \
 		${XARGS} ${REINPLACE_CMD} -i '' \
 			-e 's|Digest::SHA::PurePerl|Digest::SHA|g'
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 	@${RM} -r ${WRKSRC}/Kernel/cpan-lib/ \
 		${CLEAN_FILES:S!^!${WRKSRC}/!}
 
 do-build:
 	@${FIND} ${WRKSRC}/Kernel -type d | ${XARGS} ${CHMOD} 0755
 	@${FIND} ${WRKSRC}/Kernel -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/opt/=${PREFIX}/=g;s=wwwrun=${WWWOWN}=g;"
 
 do-build-ISPELL-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/ispell=${PREFIX}/bin/ispell=g"
 do-build-ASPELL-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/ispell=${PREFIX}/bin/aspell=g"
 do-build-GNUPG-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/gpg=${PREFIX}/bin/gpg=g"
 
 do-install:
 .for D in ${ROOT_DIRS_LIST:S!^!${OTRSDIR}/!} ${BIN_DIRS_LIST:S!^!${OTRSDIR}/bin/!} ${SCRIPTS_DIRS_LIST:S!^!${OTRSDIR}/scripts/!}
 	${MKDIR} ${STAGEDIR}${D}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/.*.dist ${STAGEDIR}${OTRSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/RELEASE ${STAGEDIR}${OTRSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${OTRSDIR}/
 .for D in ${BIN_DIRS_LIST}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${D}/*.* ${STAGEDIR}${OTRSDIR}/bin/${D}/
 .endfor
 	(cd ${WRKSRC} && ${PAX} -r -w Kernel var ${STAGEDIR}${OTRSDIR})
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][lh] ${STAGEDIR}${OTRSDIR}/scripts/
 	${INSTALL_DATA} ${WRKSRC}/scripts/apache* \
 		${WRKSRC}/scripts/*.[pl][pm] ${STAGEDIR}${OTRSDIR}/scripts/
 	${INSTALL_DATA} ${WRKSRC}/scripts/database/*.* ${STAGEDIR}${OTRSDIR}/scripts/database/
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/test/*.t ${STAGEDIR}${OTRSDIR}/scripts/test/
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/tools/*.pl ${STAGEDIR}${OTRSDIR}/scripts/tools/
 	(cd ${WRKSRC}/scripts && ${PAX} -r -w DBUpdateTo6 ${STAGEDIR}${OTRSDIR}/scripts)
 	${FIND} ${CRON_SCRIPTS} -type f -name *.dist | ${SED} -e "p;s/\.dist//" | ${XARGS} -n2 ${MV}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/var/article
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/var/httpd/htdocs/js/js-cache/
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/var/tmp
 	# Attemt to set permissions for OTRS. It will fail if there is no pre-existing otrs user
 	cd ${STAGEDIR}/${OTRSDIR} && ${PERL} ./bin/otrs.SetPermissions.pl \
 	--web-group=${WWWOWN} \
 	--otrs-user=${PORTNAME} \
 	--admin-group=wheel  ${STAGEDIR}${OTRSDIR} || true
 
 .include <bsd.port.post.mk>
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
@@ -1,38 +1,38 @@
 PORTNAME=	Apache-AuthCookie
 PORTVERSION=	3.31
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to provide custom forms for reauthentication
 WWW=		https://metacpan.org/release/Apache-AuthCookie
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=1.39:www/mod_perl2 \
 		p5-Class-Load>=0.03:devel/p5-Class-Load \
 		p5-Hash-MultiValue>=0:devel/p5-Hash-MultiValue \
 		p5-HTTP-Body>=0:www/p5-HTTP-Body \
 		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
 
 .include <bsd.port.pre.mk>
 
 CURUSER?=	`whoami`
 CURGRP?=	`groups | ${AWK} '{print $$1}'`
 TESTPORT?=	8228
 CONFIGURE_ENV+=	APACHE="${HTTPD}" \
 		TESTUSER="${CURUSER}" \
 		TESTGRP="${CURGRP}" \
 		TESTPORT="${TESTPORT}"
 
 .include <bsd.port.post.mk>
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
@@ -1,33 +1,33 @@
 PORTNAME=	Apache-AuthTicket
 PORTVERSION=	0.94
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl modules that implement a cookie-based authentication system
 WWW=		https://metacpan.org/release/Apache-AuthTicket
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=1.9922:www/mod_perl2 \
 		p5-Apache-AuthCookie>=3.0:www/p5-Apache-AuthCookie \
 		p5-CGI>=3.12:www/p5-CGI \
 		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
 		p5-DBI>=0:databases/p5-DBI \
 		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
 		p5-ModPerl-VersionUtil>=0:www/p5-ModPerl-VersionUtil \
 		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
 post-patch:
 	@${RM} ${WRKSRC}/README.apache-2.4.pod
 
 .include <bsd.port.mk>
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
@@ -1,27 +1,27 @@
 PORTNAME=	Apache-Clean
 PORTVERSION=	2.00
 DISTVERSIONSUFFIX=	_7
 PORTREVISION=	4
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN/Apache/GEOFF
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mod_perl interface into HTML::Clean
 
 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}
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,23 +1,23 @@
 PORTNAME=	Apache-DB
 PORTVERSION=	0.18
 PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Debugging and profiling tools for mod_perl
 WWW=		https://metacpan.org/release/Apache-DB
 
 LICENSE=	ART10 GPLv1+
 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:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Apache/DB/DB.so
 
 .include <bsd.port.mk>
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
@@ -1,24 +1,24 @@
 PORTNAME=	Apache-DBI
 PORTVERSION=	1.12
 PORTREVISION=	2
 CATEGORIES=	www databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI persistent connection, authentication and authorization
 WWW=		https://metacpan.org/release/Apache-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
 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
@@ -1,27 +1,27 @@
 PORTNAME=	Apache-MP3
 PORTVERSION=	4.00
 PORTREVISION=	4
 CATEGORIES=	www audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MP3 browsing and streaming under mod_perl and Apache
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Audio-Wav>=0:audio/p5-Audio-Wav \
 		p5-CGI>=4.03:www/p5-CGI \
 		p5-CGI-Session>=0:www/p5-CGI-Session \
 		p5-MP3-Info>=0:audio/p5-MP3-Info \
 		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
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/apache_mp3/* ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
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
@@ -1,21 +1,21 @@
 PORTNAME=	Apache-ParseFormData
 PORTVERSION=	0.09
 PORTREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nistor@snickers.org
 COMMENT=	Module allows you to easily decode/parse form and query data
 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:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 .include <bsd.port.mk>
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
@@ -1,56 +1,56 @@
 PORTNAME=	CGI-SpeedyCGI
 PORTVERSION=	2.22
 PORTREVISION=	9
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Speed up perl CGI scripts by running them persistently
 WWW=		http://daemoninc.com/SpeedyCGI/
 
 LICENSE=	GPLv2
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
 USE_PERL5=	configure patch
 
 OPTIONS_DEFINE=	APACHE
 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:
 	@${REINPLACE_CMD} -e 's/__inline__//g' \
 		${WRKSRC}/src/speedy_inc.h
 	@${PERL} -pi -e 's,apxs -q,${APXS} -q,;' \
 		${WRKSRC}/src/SpeedyMake.pl
 	@${PERL} -pi -e 's,APXS=apxs,APXS=${APXS},;' \
 		${WRKSRC}/mod_speedycgi/Makefile.tmpl
 	${CP} ${FILESDIR}/speedy_dump.c ${WRKSRC}/speedy_dump/
 	@${REINPLACE_CMD} -i '' -e 's=New(123,=Newx(=g' \
 		${WRKSRC}/src/speedy_backend_main.h
 	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
 		${WRKSRC}/mod_speedycgi/Makefile.tmpl
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 
 post-configure:
 	@${PERL} -pi -e 's,^PREFIX = /usr$$,PREFIX = ${PREFIX},g;' \
 		${WRKSRC}/Makefile ${WRKSRC}/*/Makefile
 
 post-build:
 	@(cd ${WRKSRC}/speedy_dump && ${CC} ${CFLAGS} -o speedy_dump \
 		-I../src speedy_dump.c)
 
 post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/speedy/speedy ${STAGEDIR}${PREFIX}/bin/speedy_suidperl
 	@${CHMOD} 4755 ${STAGEDIR}${PREFIX}/bin/speedy_suidperl
 	@${INSTALL_PROGRAM} ${WRKSRC}/speedy_dump/speedy_dump \
 		${STAGEDIR}${PREFIX}/bin/speedy_dump
 
 .include <bsd.port.mk>
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
@@ -1,43 +1,43 @@
 PORTNAME=	HTML-Mason
 PORTVERSION=	1.59
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	High-performance, dynamic web site authoring system
 WWW=		https://metacpan.org/release/HTML-Mason
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Cache-Cache>=1:devel/p5-Cache-Cache \
 		p5-Class-Container>=0.07:devel/p5-Class-Container \
 		p5-Exception-Class>=1.15:devel/p5-Exception-Class \
 		p5-HTML-Parser>=0:www/p5-HTML-Parser \
 		p5-Log-Any>=0.08:devel/p5-Log-Any \
 		p5-Params-Validate>=0.70:devel/p5-Params-Validate
 TEST_DEPENDS=	p5-CHI>=0.210:devel/p5-CHI \
 		p5-Test-Deep>=0:devel/p5-Test-Deep \
 		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
 
 USES=		perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
 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
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/blib/script/mason.pl ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
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
@@ -1,26 +1,26 @@
 PORTNAME=	MasonX-WebApp
 PORTVERSION=	0.12
 PORTREVISION=	6
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Works with HTML::Mason to do processing before Mason is invoked
 WWW=		https://metacpan.org/release/MasonX-WebApp
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	mp2bug:www/mod_perl2 \
 		p5-HTML-Mason>=0:www/p5-HTML-Mason \
 		p5-Apache-Session-Wrapper>=0:www/p5-Apache-Session-Wrapper \
 		p5-Exception-Class>=0:devel/p5-Exception-Class \
 		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
 		p5-Class-Factory-Util>=0:devel/p5-Class-Factory-Util \
 		p5-URI>0:net/p5-URI
 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
@@ -1,72 +1,72 @@
 PORTNAME=	Maypole
 PORTVERSION=	2.13
 PORTREVISION=	6
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TEEJAY
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MVC web application framework
 WWW=		https://metacpan.org/release/Maypole
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-CGI-Simple>=0:www/p5-CGI-Simple \
 		p5-CGI-Untaint>=1.26:www/p5-CGI-Untaint \
 		p5-CGI-Untaint-date>=0:www/p5-CGI-Untaint-date \
 		p5-CGI-Untaint-email>=0:www/p5-CGI-Untaint-email \
 		p5-Class-DBI>=0.96:databases/p5-Class-DBI \
 		p5-Class-DBI-AbstractSearch>=0:databases/p5-Class-DBI-AbstractSearch \
 		p5-Class-DBI-Loader-Relationship>=0:databases/p5-Class-DBI-Loader-Relationship \
 		p5-Class-DBI-Loader>=0.02:databases/p5-Class-DBI-Loader \
 		p5-Class-DBI-Pager>=0:databases/p5-Class-DBI-Pager \
 		p5-Class-DBI-Plugin-RetrieveAll>=0:databases/p5-Class-DBI-Plugin-RetrieveAll \
 		p5-Class-DBI-Plugin-Type>=0:databases/p5-Class-DBI-Plugin-Type \
 		p5-File-MMagic-XS>=0.08:devel/p5-File-MMagic-XS \
 		p5-HTML-Tree>=0:www/p5-HTML-Tree \
 		p5-HTTP-Body>=0.5:www/p5-HTTP-Body \
 		p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number \
 		p5-Template-Plugin-Class>=0:www/p5-Template-Plugin-Class \
 		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
 		p5-UNIVERSAL-moniker>=0:devel/p5-UNIVERSAL-moniker \
 		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
 		p5-URI>=0:net/p5-URI \
 		p5-libwww>=0:www/p5-libwww
 TEST_DEPENDS=	p5-Test-MockModule>=0:devel/p5-Test-MockModule \
 		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 PORTSCOUT=	skipv:2.111,2.121
 
 OPTIONS_DEFINE=	MODPERL2 DOCS EXAMPLES
 OPTIONS_DEFAULT=MODPERL2
 MODPERL2_DESC=	mod_perl2 support
 
 USES=		perl5
 USE_PERL5=	configure
 
 SUB_FILES=	pkg-message
 DOC_FILES=	../Manual.pod \
 		About.pod \
 		Beer.pod \
 		BuySpy.pod \
 		Flox.pod \
 		Model.pod \
 		StandardTemplates.pod \
 		View.pod \
 		Workflow.pod
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-MODPERL2_USE=		APACHE_RUN=22+
+MODPERL2_USES=		apache:run
 MODPERL2_BUILD_DEPENDS=	p5-libapreq2>=0:www/p5-libapreq2
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/lib/Maypole/Manual/ && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR}/
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
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
@@ -1,24 +1,24 @@
 PORTNAME=	Text-MultiMarkdown-ApacheHandler
 PORTVERSION=	0.01
 PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for processing files with MultiMarkdown syntax for Apache
 WWW=		https://metacpan.org/release/Text-MultiMarkdown-ApacheHandler
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 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
 
 post-patch:
 	@${RM} ${WRKSRC}/lib/Text/MultiMarkdown/ApacheHandler.pm.orig
 
 .include <bsd.port.mk>
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
@@ -1,50 +1,50 @@
 PORTNAME=	libapreq2
 PORTVERSION=	2.16
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	APACHE_HTTPD/libapreq
 DISTFILE=	libapreq2-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Perl binding for the Generic Apache2 Request Library
 WWW=		https://metacpan.org/dist/libapreq2
 
 LICENSE=	APACHE20
 
 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
 
 BUILD_DEPENDS=	libapreq2>0:www/libapreq2 \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 		p5-ExtUtils-XSBuilder>=0:devel/p5-ExtUtils-XSBuilder \
 		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
 RUN_DEPENDS=	libapreq2>0:www/libapreq2 \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
 		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
 		${WRKSRC}/glue/perl/Makefile.PL
 post-install:
 	# remove all the non-perl stuff
 	${RM} ${STAGEDIR}${PREFIX}/bin/apreq2-config
 	${RM} -r ${STAGEDIR}${PREFIX}/include/apreq2
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/apreq2/apreq_module_apache2.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/libapreq2*
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_apreq2*
 	${RMDIR} -p ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/apreq2 \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR} 2>/dev/null || :
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/APR/Request/Request.so
 .for i in Apache2 CGI Cookie Error Hook Param Parser
 	${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/APR/Request/${i}/${i}.so
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/rt44/Makefile b/www/rt44/Makefile
index f1c7aeca0fb6..f97351728c68 100644
--- a/www/rt44/Makefile
+++ b/www/rt44/Makefile
@@ -1,174 +1,174 @@
 PORTNAME=	rt
 DISTVERSION=	4.4.6
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	44
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Industrial-grade ticketing system written in Perl
 WWW=		https://www.bestpractical.com/rt/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	rt42-4.2* brlcad
 
 NO_ARCH=	yes
 
 # See docs/web_deployment.pod for info on the choices of webserver /
 # webapp combinations.  Note: if using apache, apache-2.4+ is
 # recommended.  For deployment with nginx, use the SPAWN_FCGI method
 # or the builtin webserver with a FCGI handler.
 #
 # The builtin standalone PSGI based webserver is always available, no
 # matter what choice of web deployment platform, or none, that you
 # make.  Best Practical state that this is really only suitable for
 # development usage, although I have heard reports of people using it
 # successfully for medium sized deployments.  If you only want the
 # builtin webserver, simply deselect all of the web options.
 #
 # See docs/full_text_indexing.pod if you need to set up full text
 # indexes on your ticket database.  PostgreSQL is
 # recommended in this case: the MYSQL / SphinxSearch combination
 # mentioned in the docs is currently unsupported in the ports, but see
 # http://www.infracaninophile.co.uk/articles/sphinxse.html
 
 OPTIONS_DEFINE=		DEVELOPER GD GPG GRAPHVIZ SMIME DOCS
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
 OPTIONS_RADIO=		WEB
 OPTIONS_RADIO_WEB=	AP_MODFASTCGI AP_MODPERL LIGHTTPD SPAWN_FCGI
 
 OPTIONS_DEFAULT=	AP_MODFASTCGI GD GPG MYSQL
 
 USERS?=		www
 GROUPS?=	rt www
 
 .include "${.CURDIR}/Makefile.cpan"
 
 RUN_DEPENDS+=	${CLI_DEPS}        \
 		${CORE_DEPS}       \
 		${DASHBOARDS_DEPS} \
 		${ICAL_DEPS}       \
 		${MAILGATE_DEPS}   \
 		${USERLOGO_DEPS}   \
 		${HTML_DOC_DEPS}
 
 USES=		cpe perl5
 CPE_VENDOR=	bestpractical
 
 RT_LAYOUT=	FreeBSD
 RT_ETC_DIR?=	etc/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 RT_ETC_PATH=	${PREFIX}/${RT_ETC_DIR}
 
 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}
 
 LIGHTTPD_DESC=			Deploy with lighttpd and mod_fastcgi
 LIGHTTPD_RUN_DEPENDS=		${LOCALBASE}/sbin/lighttpd:www/lighttpd \
 				${FASTCGI_DEPS}
 
 SPAWN_FCGI_DESC=		Deploy with spawn_fcgi
 SPAWN_FCGI_RUN_DEPENDS=		${LOCALBASE}/bin/spawn-fcgi:www/spawn-fcgi \
 				${FASTCGI_DEPS}
 
 MYSQL_RUN_DEPENDS=		${MYSQL_DEPS}
 MYSQL_VARS=			DB_TYPE=mysql DB_DBA_USER=root
 
 PGSQL_RUN_DEPENDS=		${PGSQL_DEPS}
 PGSQL_VARS=			DB_TYPE=Pg DB_DBA_USER=pgsql
 
 SQLITE_RUN_DEPENDS=		${SQLITE_DEPS}
 SQLITE_VARS=			DB_TYPE=SQLite DB_DBA_USER=root
 
 DEVELOPER_DESC=			Configure for Developers
 DEVELOPER_RUN_DEPENDS=		${DEVELOPER_DEPS}
 DEVELOPER_CONFIGURE_ENABLE=	developer
 
 SMIME_DESC=			Enable Secure MIME support
 SMIME_RUN_DEPENDS=		${SMIME_DEPS}
 SMIME_CONFIGURE_ENABLE=		smime
 
 GRAPHVIZ_RUN_DEPENDS=		${GRAPHVIZ_DEPS}
 GRAPHVIZ_CONFIGURE_ENABLE=	graphviz
 
 GPG_DESC=			Enable GnuPG support
 GPG_RUN_DEPENDS=		${GPG_DEPS}
 GPG_CONFIGURE_ENABLE=		gpg
 
 GD_DESC=			Enable GD Graphs and Charts
 GD_RUN_DEPENDS=			${GD_DEPS}
 GD_CONFIGURE_ENABLE=		gd
 
 BUILD_DEPENDS+=	${RUN_DEPENDS}
 
 DB_DBA_PASSWORD?=
 DB_USER?=	rt_user
 DB_PASSWORD?=	rt_pass
 DB_HOST?=	localhost
 DB_DATABASE?=	rt4
 
 WEB_USER?=	${WWWOWN}
 WEB_GROUP?=	${WWWGRP}
 LIBS_GROUP?=	wheel
 
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 
 CONFIGURE_ARGS+=	--enable-layout=${RT_LAYOUT} \
 	--with-web-user=${WEB_USER} \
 	--with-web-group=${WEB_GROUP} \
 	--with-libs-group=${LIBS_GROUP} \
 	--with-db-host=${DB_HOST} \
 	--with-db-port=${DB_PORT} \
 	--with-db-type=${DB_TYPE} \
 	--with-db-rt-user=${DB_USER} \
 	--with-db-rt-pass=${DB_PASSWORD} \
 	--with-db-database=${DB_DATABASE} \
 	--with-db-dba=${DB_DBA_USER}
 
 CONFIGURE_ENV+=	PERL=${LOCALBASE}/bin/perl
 
 SUB_FILES=	pkg-message
 SUB_LIST=	RT_ETC_PATH=${RT_ETC_PATH}
 PLIST_SUB=	RT_ETC_DIR=${RT_ETC_DIR}
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "Additional database related settings you can use:"
 	@${ECHO} "      DB_HOST=hostname                The database host (localhost)"
 	@${ECHO} "      DB_PORT=port                    The database port"
 	@${ECHO} "      DB_DATABASE=dbname              The database name (rt4)"
 	@${ECHO} ""
 	@${ECHO} "      DB_DBA_USER=username            Name of database administrator (root)"
 	@${ECHO} "      DB_DBA_PASSWORD=password        Password of database administrator"
 	@${ECHO} "      DB_USER=username                Name of database user for RT (rt_user)"
 	@${ECHO} "      DB_PASSWORD=password            Name of database password for RT (rt_pass)"
 
 pre-fetch-SQLITE-on:
 	@${ECHO} ""
 	@${ECHO} "SQLITE is not recommended for production use"
 
 post-patch:
 	@${RM} ${WRKSRC}/lib/RT.pm.in.orig
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${PREFIX}/${SITE_PERL_REL}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
 
 pre-install:
 	@${RM} ${WRKSRC}/lib/RT.pm.in
 
 post-install:
 	@${RM} -r ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/upgrade
 	(cd ${WRKSRC}/etc && \
 	    ${COPYTREE_SHARE} upgrade ${STAGEDIR}${DOCSDIR} "! -name *\.in")
 
 .include <bsd.port.mk>
diff --git a/www/rt50/Makefile b/www/rt50/Makefile
index 599504ace8c3..8d130850df77 100644
--- a/www/rt50/Makefile
+++ b/www/rt50/Makefile
@@ -1,179 +1,179 @@
 PORTNAME=	rt
 DISTVERSION=	5.0.3
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	50
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Industrial-grade ticketing system written in Perl
 WWW=		https://www.bestpractical.com/rt/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	rt42-4.2* rt44-4.4* brlcad
 
 NO_ARCH=	yes
 
 # See docs/web_deployment.pod for info on the choices of webserver /
 # webapp combinations.  Note: if using apache, apache-2.4+ is
 # recommended.  For deployment with nginx, use the SPAWN_FCGI method
 # or the builtin webserver with a FCGI handler.
 #
 # The builtin standalone PSGI based webserver is always available, no
 # matter what choice of web deployment platform, or none, that you
 # make.  Best Practical state that this is really only suitable for
 # development usage, although I have heard reports of people using it
 # successfully for medium sized deployments.  If you only want the
 # builtin webserver, simply deselect all of the web options.
 #
 # See docs/full_text_indexing.pod if you need to set up full text
 # indexes on your ticket database.  PostgreSQL is
 # recommended in this case: the MYSQL / SphinxSearch combination
 # mentioned in the docs is currently unsupported in the ports, but see
 # http://www.infracaninophile.co.uk/articles/sphinxse.html
 
 OPTIONS_DEFINE=		DEVELOPER EXTERNALAUTH GD GPG GRAPHVIZ SMIME DOCS
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
 OPTIONS_RADIO=		WEB
 OPTIONS_RADIO_WEB=	AP_MODFASTCGI AP_MODPERL LIGHTTPD SPAWN_FCGI
 
 OPTIONS_DEFAULT=	AP_MODFASTCGI EXTERNALAUTH GD GPG MYSQL
 
 USERS?=		www
 GROUPS?=	rt www
 
 .include "${.CURDIR}/Makefile.cpan"
 
 RUN_DEPENDS+=	${CLI_DEPS}        \
 		${CORE_DEPS}       \
 		${DASHBOARDS_DEPS} \
 		${ICAL_DEPS}       \
 		${MAILGATE_DEPS}   \
 		${REST2_DEPS}   \
 		${USERLOGO_DEPS}   \
 		${HTML_DOC_DEPS}
 
 USES=		cpe perl5
 CPE_VENDOR=	bestpractical
 
 RT_LAYOUT=	FreeBSD
 RT_ETC_DIR?=	etc/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 RT_ETC_PATH=	${PREFIX}/${RT_ETC_DIR}
 
 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}
 
 EXTERNALAUTH_DESC=		Extension to authenticate users against an external source
 EXTERNALAUTH_RUN_DEPENDS=	${EXTERNALAUTH_DEPS}
 
 LIGHTTPD_DESC=			Deploy with lighttpd and mod_fastcgi
 LIGHTTPD_RUN_DEPENDS=		${LOCALBASE}/sbin/lighttpd:www/lighttpd \
 				${FASTCGI_DEPS}
 
 SPAWN_FCGI_DESC=		Deploy with spawn_fcgi
 SPAWN_FCGI_RUN_DEPENDS=		${LOCALBASE}/bin/spawn-fcgi:www/spawn-fcgi \
 				${FASTCGI_DEPS}
 
 MYSQL_RUN_DEPENDS=		${MYSQL_DEPS}
 MYSQL_VARS=			DB_TYPE=mysql DB_DBA_USER=root
 
 PGSQL_RUN_DEPENDS=		${PGSQL_DEPS}
 PGSQL_VARS=			DB_TYPE=Pg DB_DBA_USER=pgsql
 
 SQLITE_RUN_DEPENDS=		${SQLITE_DEPS}
 SQLITE_VARS=			DB_TYPE=SQLite DB_DBA_USER=root
 
 DEVELOPER_DESC=			Configure for Developers
 DEVELOPER_RUN_DEPENDS=		${DEVELOPER_DEPS}
 DEVELOPER_CONFIGURE_ENABLE=	developer
 
 SMIME_DESC=			Enable Secure MIME support
 SMIME_RUN_DEPENDS=		${SMIME_DEPS}
 SMIME_CONFIGURE_ENABLE=		smime
 
 GRAPHVIZ_RUN_DEPENDS=		${GRAPHVIZ_DEPS}
 GRAPHVIZ_CONFIGURE_ENABLE=	graphviz
 
 GPG_DESC=			Enable GnuPG support
 GPG_RUN_DEPENDS=		${GPG_DEPS}
 GPG_CONFIGURE_ENABLE=		gpg
 
 GD_DESC=			Enable GD Graphs and Charts
 GD_RUN_DEPENDS=			${GD_DEPS}
 GD_CONFIGURE_ENABLE=		gd
 
 BUILD_DEPENDS+=	${RUN_DEPENDS}
 
 DB_DBA_PASSWORD?=
 DB_USER?=	rt_user
 DB_PASSWORD?=	rt_pass
 DB_HOST?=	localhost
 DB_DATABASE?=	rt5
 
 WEB_USER?=	${WWWOWN}
 WEB_GROUP?=	${WWWGRP}
 LIBS_GROUP?=	wheel
 
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 
 CONFIGURE_ARGS+=	--enable-layout=${RT_LAYOUT} \
 	--with-web-user=${WEB_USER} \
 	--with-web-group=${WEB_GROUP} \
 	--with-libs-group=${LIBS_GROUP} \
 	--with-db-host=${DB_HOST} \
 	--with-db-port=${DB_PORT} \
 	--with-db-type=${DB_TYPE} \
 	--with-db-rt-user=${DB_USER} \
 	--with-db-rt-pass=${DB_PASSWORD} \
 	--with-db-database=${DB_DATABASE} \
 	--with-db-dba=${DB_DBA_USER}
 
 CONFIGURE_ENV+=	PERL=${LOCALBASE}/bin/perl
 
 SUB_FILES=	pkg-message
 SUB_LIST=	RT_ETC_PATH=${RT_ETC_PATH}
 PLIST_SUB=	RT_ETC_DIR=${RT_ETC_DIR}
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "Additional database related settings you can use:"
 	@${ECHO} "      DB_HOST=hostname                The database host (localhost)"
 	@${ECHO} "      DB_PORT=port                    The database port"
 	@${ECHO} "      DB_DATABASE=dbname              The database name (rt5)"
 	@${ECHO} ""
 	@${ECHO} "      DB_DBA_USER=username            Name of database administrator (root)"
 	@${ECHO} "      DB_DBA_PASSWORD=password        Password of database administrator"
 	@${ECHO} "      DB_USER=username                Name of database user for RT (rt_user)"
 	@${ECHO} "      DB_PASSWORD=password            Name of database password for RT (rt_pass)"
 
 pre-fetch-SQLITE-on:
 	@${ECHO} ""
 	@${ECHO} "SQLITE is not recommended for production use"
 
 post-patch:
 	@${RM} ${WRKSRC}/lib/RT.pm.in.orig
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${PREFIX}/${SITE_PERL_REL}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
 	@${REINPLACE_CMD} -e 's!RT_ETC_DIR!${RT_ETC_DIR}!' ${WRKSRC}/sbin/rt-test-dependencies.in
 
 pre-install:
 	@${RM} ${WRKSRC}/lib/RT.pm.in
 
 post-install:
 	@${RM} -r ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/upgrade
 	(cd ${WRKSRC}/etc && \
 	    ${COPYTREE_SHARE} upgrade ${STAGEDIR}${DOCSDIR} "! -name *\.in")
 
 .include <bsd.port.mk>
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
@@ -1,109 +1,109 @@
 PORTNAME=	passenger
 PORTVERSION=	6.0.16
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modules for running Ruby on Rails and Rack applications
 WWW=		https://www.phusionpassenger.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rake:devel/rubygem-rake
 
 CPE_VENDOR=	phusion
 CPE_PRODUCT=	passenger
 
 FLAVORS=	apache nginx
 FLAVOR?=	${FLAVORS:[1]}
 
 apache_PKGNAMESUFFIX=	-apache
 nginx_PKGNAMESUFFIX=	-nginx
 
 apache_CONFLICTS_INSTALL=	${PKGNAMEPREFIX}${PORTNAME}-nginx
 nginx_CONFLICTS_INSTALL=	${PKGNAMEPREFIX}${PORTNAME}-apache
 
 OPTIONS_DEFINE=	DEBUG SYMLINK
 OPTIONS_DEFAULT=SYMLINK
 OPTIONS_EXCLUDE=DOCS
 SYMLINK_DESC=	Create passenger symlink
 
 .if ${FLAVOR} == apache
-USES+=		apache:2.2+
+USES+=		apache
 .endif
 
 RAKE_BIN=	${LOCALBASE}/bin/rake
 USES+=		compiler:c++11-lang cpe gem libtool python:env shebangfix ssl
 SHEBANG_FILES=	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py
 
 LIB_DEPENDS+=	libuv.so:devel/libuv \
 		libcurl.so:ftp/curl \
 		libapr-1.so:devel/apr1
 
 BUILD_DEPENDS+=	rubygem-rack>=0:www/rubygem-rack
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		rubygem-etc>=0:devel/rubygem-etc
 
 SUB_LIST+=	GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY}
 SUB_FILES=	pkg-message-${FLAVOR}
 
 PLIST_FILES=	bin/passenger \
 		bin/passenger-config \
 		bin/passenger-memory-stats \
 		bin/passenger-status
 
 SYMLINK_PLIST_FILES=	${GEMS_DIR}/${PORTNAME}
 SYMLINK_SUB_LIST=	PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/${PORTNAME}"
 SYMLINK_SUB_LIST_OFF=	PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}"
 
 pre-patch:
 	@${REINPLACE_CMD} \
 		's!-Wall!!g; \
 		s!gcc!${CC}!g; \
 		s!g++!${CXX}!g; \
 		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
 		s!-O2!!g; \
 		s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \
 		170s!true!false!' \
 		${WRKSRC}/build/basics.rb
 	@${REINPLACE_CMD} '1s:python:python2:' \
 		${WRKSRC}/src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py
 
 pre-patch-DEBUG-off:
 	@${REINPLACE_CMD} \
 		's!-DPASSENGER_DEBUG!-DNDEBUG!g' \
 		${WRKSRC}/build/basics.rb
 
 post-build:
 .if ${FLAVOR} == apache
 	(CC=${CC} CXX=${CXX} ${WRKSRC}/bin/passenger-install-apache2-module --auto)
 .endif
 
 .if ${FLAVOR} == nginx
 	(cd ${WRKSRC} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx)
 .endif
 	${FIND} ${WRKSRC} -name '*.o' -o -name '*.bak' -o -name '*.orig' | ${XARGS} ${RM}
 
 post-install:
 	( cd ${WRKSRC} && \
 	${COPYTREE_SHARE} buildout ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION} )
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}-${PORTVERSION}/buildout/support-binaries/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/ruby/*/passenger_native_support.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/support-binaries/PassengerAgent
 	${FIND} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type d -empty -delete
 .if ${FLAVOR} == apache
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${LN} -sf ../../${GEM_LIB_DIR}/buildout/apache2/mod_passenger.so ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_passenger.so
 	@${ECHO} "${APACHEMODDIR}/mod_passenger.so" >> ${TMPPLIST}
 .endif
 	@${RM} ${STAGEDIR}${PREFIX}/bin/passenger-install-apache2-module \
 		${STAGEDIR}${PREFIX}/bin/passenger-install-nginx-module
 	@${RM} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/bin/passenger-install-apache2-module \
 		${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/bin/passenger-install-nginx-module
 
 post-install-SYMLINK-on:
 	${LN} -s ${GEM_NAME} ${STAGEDIR}${PREFIX}/${GEMS_DIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index a6f2b80d05af..2831eee1cd46 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	suphp
 PORTVERSION=	0.7.2
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/ \
 		LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Securely execute PHP scripts under Apache
 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
 USE_CSTD=	gnu89
 USE_CXXSTD=	gnu++98
 
 MYPORTDOCS=	apache/CONFIG \
 		apache/INSTALL \
 		apache/README \
 		CONFIG LICENSE \
 		INSTALL README
 
 CONFIGURE_ARGS=	CFLAGS="${CFLAGS} -I`${LOCALBASE}/bin/apr-1-config --includedir`" \
 		--with-apxs=${APXS}
 
 # WITH_SETID_MODE should be a value of "owner", "force", or "paranoid".
 # It's important that you understand the differences between each mode.
 # See /usr/local/share/doc/suphp/INSTALL for details.
 #
 WITH_SETID_MODE?=	owner
 CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}
 
 post-install:
 .if !defined(WITH_DEBUG)
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/suphp
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_suphp.so
 .endif
 	${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \
 	    ${STAGEDIR}${PREFIX}/etc/suphp.conf-example
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/apache
 .for f in ${MYPORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}/${f}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 1a98a4321e83..97d751b54c8f 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	thundercache
 PORTVERSION=	6.1
 PORTREVISION=	15
 CATEGORIES=	www
 MASTER_SITES=	http://www.thundercache.com.br/dist/ \
 		http://www.bmsoftware.org/packs/ \
 		http://www8.freebsdbrasil.com.br/~eksffa/thunder/ \
 		http://www6.freebsdbrasil.com.br/~eksffa/l/dev/thunder/ \
 		LOCAL/jmelo
 DISTNAME=	thundercache-6.1.201104260900-${BITS}-fbsd
 
 MAINTAINER=	eksffa@freebsdbrasil.com.br
 COMMENT=	High-performance and high-efficiency caching proxy system
 WWW=		https://www.bmsoftware.org
 
 LICENSE=	commercial
 LICENSE_NAME=	commercial
 LICENSE_TEXT=	Commercial software with shareware license to 50 threads
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 OPTIONS_DEFINE=	DEPENDACK APACHE PHP PGSQL
 OPTIONS_DEFAULT=DEPENDACK APACHE PHP PGSQL
 DEPENDACK_DESC=	I have read and understood the depends needs
 APACHE_DESC=	Install apache for reporting viewing
 PHP_DESC=	Install PHP for reporting generating
 PGSQL_DESC=	Install PostgreSQL (report data storing)
 
 USES=		php shebangfix tar:bzip2 ssl
 SHEBANG_FILES=	sbin/thunderlog.php
 USE_GCC=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_RC_SUBR=	thundercache
 
 NO_BUILD=	yes
 
 .include <bsd.port.options.mk>
 
 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}
 USES+=		pgsql
 WANT_PGSQL=	server
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
 USE_PHP+=	curl pcre bcmath pdo mcrypt hash session
 .  if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pdo_pgsql pgsql
 .  endif
 .endif
 
 LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libutil.so:misc/compat8x
 
 SUB_FILES=	pkg-message log.sh test-deps.sh
 SUB_LIST=	"GREP=${GREP}"
 
 show-info:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "ATTENTION:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " It is very important that you carefully read and respect"
 	@${ECHO_MSG} " the special build options for the following depends:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " ftp/curl		LIBSSH2=yes OPENSSL=yes PROXY=yes"
 	@${ECHO_MSG} " security/openssl	ZLIB=yes"
 	@${ECHO_MSG} " devel/php5-pcre	BUNDLED_PCRE=yes (for apache20)"
 	@${ECHO_MSG} " postgresql${PGSQL_VER}-server \
 					NLS=yes PAM=yes OPTIMIZED_CFLAGS=yes TZDATA=yes"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " After you understood it correctly, select DEPENDACK on"
 	@${ECHO_MSG} " the OPTIONS screen. Run ''make config'' to acknowledge"
 	@${ECHO_MSG} ""
 .if ! ${PORT_OPTIONS:MDEPENDACK}
 	@${FALSE}
 .endif
 
 pre-everything::show-info
 
 do-install:
 	@${CP} -r ${WRKSRC} ${STAGEDIR}${PREFIX}/
 	@${INSTALL_SCRIPT} ${WRKDIR}/log.sh ${STAGEDIR}${PREFIX}/thunder/sbin/
 	@${MKDIR} -m 755 ${STAGEDIR}/var/run/thunder
 
 	@(${CHMOD} +x ${WRKDIR}/test-deps.sh ; \
 	if ! ${WRKDIR}/test-deps.sh > /dev/null 2>&1 ; then \
 		${ECHO_MSG} "**** FATAL **** " ; \
 		${ECHO_MSG} "**** THIS PORT MAY NOT WORK PROPERLY **** " ; \
 		${ECHO_MSG} "Some depends are not built with required features." ; \
 		${ECHO_MSG} "You must always honor at least the following options" ; \
 		${ECHO_MSG} "depends as listed:" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "ftp/curl	   LIBSSH2=yes OPENSSL=yes PROXY=yes" ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Type ''make show-info'' to read further information." ; \
 		${ECHO_MSG} "" ; \
 	fi)
 
 .include <bsd.port.mk>
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index b9b9798a055f..917db96179e7 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	thundersnarf
 PORTVERSION=	1.3
 PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.tracanelli.com.br/l/dev/thunder/ \
 		LOCAL/jmelo
 
 MAINTAINER=	eksffa@freebsdbrasil.com.br
 COMMENT=	Web reporting and trending analysis for Thunder Cache Pro
 WWW=		http://www.thundercache.com.br
 
 OPTIONS_DEFINE=	APACHE PHP PGSQL DOCS
 OPTIONS_DEFAULT=APACHE PHP PGSQL
 APACHE_DESC=	Install apache for reporting viewing
 PHP_DESC=	Install PHP for reporting generating
 PGSQL_DESC=	Install PostgreSQL (report data storing)
 
 USES=		tar:bzip2
 
 PHP_USES=	php
 PHP_VARS=	IGNORE_WITH_PHP=81 82
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 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}
 USES+=		pgsql
 WANT_PGSQL=	server
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
 USE_PHP+=	curl pcre bcmath pdo mcrypt hash session pgsql spl dom xmlrpc ctype openssl simplexml soap json
 .  if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pdo_pgsql pgsql
 .  endif
 .endif
 
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 SUB_FILES=	pkg-message
 
 post-extract:
 	# Present on FreeBSD 8 and 9 after extraction
 	@${RM} ${WRKSRC}/protected/data/bin/._thundersnarf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/protected/data/bin/thundersnarf* \
 		${STAGEDIR}${PREFIX}/bin/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README.pt_BR
 
 .include <bsd.port.mk>