Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Mar 2018 17:38:46 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r464189 - in head/www: blogsum codeigniter dojo dotproject formication ftasv gnome-user-share libapreq2 mod_amazon_proxy mod_antiloris mod_asn mod_auth_cas mod_auth_cookie_mysql2 mod_au...
Message-ID:  <201803111738.w2BHckkZ086570@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sun Mar 11 17:38:45 2018
New Revision: 464189
URL: https://svnweb.freebsd.org/changeset/ports/464189

Log:
  Migrate USE_APACHE to USES= apache (category www)
  
   - Following migration of Mk/bsd.apache.mk to Mk/Uses/apache.mk
  
  With hat:	apache

Modified:
  head/www/blogsum/Makefile
  head/www/codeigniter/Makefile
  head/www/dojo/Makefile
  head/www/dotproject/Makefile
  head/www/formication/Makefile
  head/www/ftasv/Makefile
  head/www/gnome-user-share/Makefile
  head/www/libapreq2/Makefile
  head/www/mod_amazon_proxy/Makefile
  head/www/mod_antiloris/Makefile
  head/www/mod_asn/Makefile
  head/www/mod_auth_cas/Makefile
  head/www/mod_auth_cookie_mysql2/Makefile
  head/www/mod_auth_external2/Makefile
  head/www/mod_auth_gssapi/Makefile
  head/www/mod_auth_imap2/Makefile
  head/www/mod_auth_kerb2/Makefile
  head/www/mod_auth_mysql2/Makefile
  head/www/mod_auth_mysql_another/Makefile
  head/www/mod_auth_openid/Makefile
  head/www/mod_auth_openidc/Makefile
  head/www/mod_auth_pam2/Makefile
  head/www/mod_auth_pgsql2/Makefile
  head/www/mod_auth_pubtkt/Makefile
  head/www/mod_auth_tkt/Makefile
  head/www/mod_auth_xradius/Makefile
  head/www/mod_authn_sasl/Makefile
  head/www/mod_authnz_crowd/Makefile
  head/www/mod_authnz_external24/Makefile
  head/www/mod_backtrace/Makefile
  head/www/mod_bw/Makefile
  head/www/mod_cband/Makefile
  head/www/mod_cfg_ldap/Makefile
  head/www/mod_chroot/Makefile
  head/www/mod_clamav/Makefile
  head/www/mod_cloudflare/Makefile
  head/www/mod_cvs2/Makefile
  head/www/mod_dav_svn/Makefile
  head/www/mod_dnssd/Makefile
  head/www/mod_domaintree/Makefile
  head/www/mod_encoding/Makefile
  head/www/mod_evasive/Makefile
  head/www/mod_extract_forwarded/Makefile
  head/www/mod_fastcgi/Makefile
  head/www/mod_fcgid/Makefile
  head/www/mod_fileiri/Makefile
  head/www/mod_flickr/Makefile
  head/www/mod_geoip2/Makefile
  head/www/mod_gnutls/Makefile
  head/www/mod_gzip2/Makefile
  head/www/mod_h264_streaming/Makefile
  head/www/mod_hosts_access/Makefile
  head/www/mod_http2-devel/Makefile
  head/www/mod_layout22/Makefile
  head/www/mod_limitipconn2/Makefile
  head/www/mod_line_edit/Makefile
  head/www/mod_log_config-st/Makefile
  head/www/mod_log_mysql/Makefile
  head/www/mod_log_sql2-dtc/Makefile
  head/www/mod_log_sql2/Makefile
  head/www/mod_macro22/Makefile
  head/www/mod_memcache/Makefile
  head/www/mod_memcache_block/Makefile
  head/www/mod_mono/Makefile
  head/www/mod_mpm_itk/Makefile
  head/www/mod_musicindex/Makefile
  head/www/mod_ntlm2/Makefile
  head/www/mod_pagespeed/Makefile
  head/www/mod_perl2/Makefile
  head/www/mod_proctitle/Makefile
  head/www/mod_proxy_html/Makefile
  head/www/mod_proxy_uwsgi/Makefile
  head/www/mod_proxy_xml/Makefile
  head/www/mod_python33/Makefile
  head/www/mod_python35/Makefile
  head/www/mod_qos/Makefile
  head/www/mod_realdoc/Makefile
  head/www/mod_remoteip/Makefile
  head/www/mod_reproxy/Makefile
  head/www/mod_rivet/Makefile
  head/www/mod_rpaf2/Makefile
  head/www/mod_scgi/Makefile
  head/www/mod_security/Makefile
  head/www/mod_setenvifplus/Makefile
  head/www/mod_spdy/Makefile
  head/www/mod_tidy/Makefile
  head/www/mod_tsa/Makefile
  head/www/mod_uid/Makefile
  head/www/mod_umask/Makefile
  head/www/mod_vhost_ldap/Makefile
  head/www/mod_vhs/Makefile
  head/www/mod_webauth/Makefile
  head/www/mod_webkit/Makefile
  head/www/mod_whatkilledus/Makefile
  head/www/mod_wsgi4/Makefile
  head/www/mod_xml2enc/Makefile
  head/www/mod_xmlns/Makefile
  head/www/mod_xsendfile/Makefile
  head/www/nginx-devel/Makefile
  head/www/nginx/Makefile
  head/www/otrs/Makefile
  head/www/p5-Apache-AuthCookie/Makefile
  head/www/p5-Apache-AuthTicket/Makefile
  head/www/p5-Apache-Clean2/Makefile
  head/www/p5-Apache-DB/Makefile
  head/www/p5-Apache-Gallery/Makefile
  head/www/p5-Apache-MP3/Makefile
  head/www/p5-Apache-ParseFormData/Makefile
  head/www/p5-MasonX-WebApp/Makefile
  head/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile
  head/www/p5-libapreq2/Makefile
  head/www/photo_gallery/Makefile
  head/www/rubygem-passenger/Makefile
  head/www/suphp/Makefile
  head/www/thundercache/Makefile
  head/www/thundersnarf/Makefile
  head/www/websh/Makefile

Modified: head/www/blogsum/Makefile
==============================================================================
--- head/www/blogsum/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/blogsum/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -18,10 +18,9 @@ RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
-USES=		perl5
+USES=		apache:run,2.2+ perl5
 NO_BUILD=	yes
 USE_PERL5=	run
-USE_APACHE_RUN=	22+
 
 .include <bsd.port.pre.mk>
 

Modified: head/www/codeigniter/Makefile
==============================================================================
--- head/www/codeigniter/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/codeigniter/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -82,7 +82,7 @@ ODBC_DESC=	Install ODBC support for PHP
 PGSQL_DESC=	Install PostgreSQL support for PHP
 SQLITE_DESC=	Install SQLite support for PHP
 
-APACHE_VARS=	USE_APACHE_RUN=22+
+APACHE_USES=	apache:run,2.2+
 DOCS_VARS=	SUB_LIST+=HASHMARK=
 DOCS_VARS_OFF=	SUB_LIST+=HASHMARK=\#
 MSSQL_VARS=	USE_PHP+=mssql

Modified: head/www/dojo/Makefile
==============================================================================
--- head/www/dojo/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/dojo/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -19,7 +19,7 @@ OPTIONS_SUB=		yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=		22+
+USES=			apache:run,2.2+
 CONFDIR=		${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=		${APACHEETCDIR}/Includes
 PLIST_SUB+=		CONFDIR=${CONFDIR_REL}

Modified: head/www/dotproject/Makefile
==============================================================================
--- head/www/dotproject/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/dotproject/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,12 +13,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 IGNORE_WITH_PHP=	70 71 72
 
-USES=		cpe shebangfix php:web
+USES=		apache:run,2.2+ cpe shebangfix php:web
 SHEBANG_FILES=	misc/cvs2cl/cvs2cl.pl
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 USE_PHP=	gd mysql session zlib
-USE_APACHE_RUN=	22+
 
 SUB_FILES=	pkg-message
 

Modified: head/www/formication/Makefile
==============================================================================
--- head/www/formication/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/formication/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -11,8 +11,7 @@ MASTER_SITES=	http://www.ranner.eu/stuff/ \
 MAINTAINER=	michael@ranner.eu
 COMMENT=	Formular processing tool written in perl
 
-USES=		perl5
-USE_APACHE_RUN=	22+
+USES=		apache:run,2.2+ perl5
 USE_PERL5=	run
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/www/ftasv/Makefile
==============================================================================
--- head/www/ftasv/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/ftasv/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 PLIST_FILES=	sbin/ftasv
 PORTDOCS=	AUTHORS ChangeLog README

Modified: head/www/gnome-user-share/Makefile
==============================================================================
--- head/www/gnome-user-share/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/gnome-user-share/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -20,8 +20,7 @@ LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 RUN_DEPENDS=	ap*-mod_dnssd>=0:www/mod_dnssd \
 		console-kit-daemon:sysutils/consolekit2
 
-USES=		gettext gmake libtool pkgconfig tar:xz
-USE_APACHE=	22+
+USES=		apache:2.2+ gettext gmake libtool pkgconfig tar:xz
 USE_XORG=	sm
 USE_GNOME=	gnomeprefix gtk30 intlhack nautilus3
 GNU_CONFIGURE=	yes

Modified: head/www/libapreq2/Makefile
==============================================================================
--- head/www/libapreq2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/libapreq2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,8 +15,7 @@ LICENSE=	APACHE20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 INSTALL_TARGET=	install-strip
-USES=		libtool
-USE_APACHE=	22+
+USES=		apache:2.2+ libtool
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>

Modified: head/www/mod_amazon_proxy/Makefile
==============================================================================
--- head/www/mod_amazon_proxy/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_amazon_proxy/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -12,7 +12,7 @@ COMMENT=	Amazon Auth Proxy for Product Advertising API
 
 LIB_DEPENDS=	libapreq2.so:www/libapreq2
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_LIB=	${LOCALBASE}/lib -lcrypto
 

Modified: head/www/mod_antiloris/Makefile
==============================================================================
--- head/www/mod_antiloris/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_antiloris/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -12,8 +12,7 @@ COMMENT=	Protect Apache 2.x against the Slowloris HTTP
 
 LICENSE=	APACHE20
 
-USES=		tar:bzip2
-USE_APACHE=	22
+USES=		apache:2.2 tar:bzip2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS+=	-a

Modified: head/www/mod_asn/Makefile
==============================================================================
--- head/www/mod_asn/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_asn/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 MANUAL_PACKAGE_BUILD=	devel/apr1 with pgsql option required
 

Modified: head/www/mod_auth_cas/Makefile
==============================================================================
--- head/www/mod_auth_cas/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_cas/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -17,13 +17,12 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jasig
-USES=		ssl
+USES=		apache:2.2+ ssl
 
 HAS_CONFIGURE=	yes
 # configure requires LDFLAGS to find libpcre
 LDFLAGS+=	-L${AP_LIB}
 
-USE_APACHE=	22+
 AP_LIB=		${LOCALBASE}/lib
 AP_EXTRAS=	-lpcre -lssl -lcrypto
 

Modified: head/www/mod_auth_cookie_mysql2/Makefile
==============================================================================
--- head/www/mod_auth_cookie_mysql2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_cookie_mysql2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows authentication against MySQL database via secure cookie
 
 USE_MYSQL=	yes
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes

Modified: head/www/mod_auth_external2/Makefile
==============================================================================
--- head/www/mod_auth_external2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_external2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -14,7 +14,7 @@ COMMENT=	Allows users authentication based on external
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	auth_external

Modified: head/www/mod_auth_gssapi/Makefile
==============================================================================
--- head/www/mod_auth_gssapi/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_gssapi/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -12,8 +12,7 @@ COMMENT=	Apache module for authenticating users with G
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf bison gssapi:mit,flags libtool ssl
-USE_APACHE=	24+
+USES=		autoreconf apache:2.4+ bison gssapi:mit,flags libtool ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	modauthgssapi
 GNU_CONFIGURE=	yes

Modified: head/www/mod_auth_imap2/Makefile
==============================================================================
--- head/www/mod_auth_imap2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_imap2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -16,7 +16,7 @@ COMMENT=	Apache 2 module to provide authentication via
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2-${PORTVERSION}
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_auth_kerb2/Makefile
==============================================================================
--- head/www/mod_auth_kerb2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_kerb2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -19,7 +19,7 @@ LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE
 
 PORTSCOUT=	limit:^5.4
 
-USE_APACHE=	22+
+USES		apache:2.2+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	-with-krb5=${GSSAPIBASEDIR} --without-krb4
 

Modified: head/www/mod_auth_mysql2/Makefile
==============================================================================
--- head/www/mod_auth_mysql2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_mysql2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -14,10 +14,9 @@ COMMENT=	MySQL-based authentication module with Virtua
 
 LICENSE=	APACHE20
 
-USES=		tar:tgz
+USES=		apache:2.2+ tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_MYSQL=	yes
-USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_INC+=	${LOCALBASE}/include/mysql

Modified: head/www/mod_auth_mysql_another/Makefile
==============================================================================
--- head/www/mod_auth_mysql_another/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_mysql_another/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -14,7 +14,7 @@ COMMENT=	Allows users to use MySQL databases for user 
 LICENSE=	APACHE10
 
 USE_MYSQL=	yes
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 SHORTMODNAME=	mysql_auth
 AP_FAST_BUILD=	yes

Modified: head/www/mod_auth_openid/Makefile
==============================================================================
--- head/www/mod_auth_openid/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_openid/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -19,8 +19,7 @@ BROKEN_powerpc64=	Does not build
 LIB_DEPENDS=	libopkele.so:devel/libopkele \
 		libsqlite3.so:databases/sqlite3
 
-USES=		autoreconf cpe gmake libtool pkgconfig
-USE_APACHE=	22+
+USES=		apache:2.2+ autoreconf cpe gmake libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	bmuller
 

Modified: head/www/mod_auth_openidc/Makefile
==============================================================================
--- head/www/mod_auth_openidc/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_openidc/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libcjose.so:devel/cjose \
 		libjansson.so:devel/jansson \
 		libpcre.so:devel/pcre
 
-USES=		autoreconf cpe gmake libtool pkgconfig ssl
-USE_APACHE=	22+
+USES=		apache:2.2+ autoreconf cpe gmake libtool pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	pingidentity
 CPE_VENDOR=	${GH_ACCOUNT}

Modified: head/www/mod_auth_pam2/Makefile
==============================================================================
--- head/www/mod_auth_pam2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_pam2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PAM modules for user authentication
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	*.html

Modified: head/www/mod_auth_pgsql2/Makefile
==============================================================================
--- head/www/mod_auth_pgsql2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_pgsql2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -11,8 +11,7 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
-USES=		pgsql
-USE_APACHE=	22+
+USES=		apache:2.2+ pgsql
 
 AP_INC?=	${LOCALBASE}/include
 AP_LIB?=	${LOCALBASE}/lib -lpq

Modified: head/www/mod_auth_pubtkt/Makefile
==============================================================================
--- head/www/mod_auth_pubtkt/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_pubtkt/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -11,7 +11,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	mk@neon1.net
 COMMENT=	Apache module to provide public key ticket based authentication
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	src/mod_auth_pubtkt.c

Modified: head/www/mod_auth_tkt/Makefile
==============================================================================
--- head/www/mod_auth_tkt/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_tkt/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -10,10 +10,9 @@ MASTER_SITES=	LOCAL/kuriyama \
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Lightweight single-sign-on authentication module for apache
 
-USES=		shebangfix
+USES=		apache:2.2+ shebangfix
 SHEBANG_FILES=	../cgi/login.cgi \
 		../cgi/logout.cgi
-USE_APACHE=	22+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PATCH_STRIP=	-p1

Modified: head/www/mod_auth_xradius/Makefile
==============================================================================
--- head/www/mod_auth_xradius/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_auth_xradius/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,8 +13,7 @@ COMMENT=	Enables RADIUS authentication
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
-USES=	tar:bzip2
+USES=		apache:2.2+ tar:bzip2
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_xradius.so

Modified: head/www/mod_authn_sasl/Makefile
==============================================================================
--- head/www/mod_authn_sasl/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_authn_sasl/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -20,8 +20,7 @@ SASLAUTHD_DESC=	cyrus-sasl2-saslauthd support
 SASLAUTHD_RUN_DEPENDS=	saslauthd:security/cyrus-sasl2-saslauthd
 .include <bsd.port.options.mk>
 
-USES=		tar:bzip2
-USE_APACHE=	22
+USES=		apache:2.2 tar:bzip2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_LIB=		${LOCALBASE}/lib -lsasl2

Modified: head/www/mod_authnz_crowd/Makefile
==============================================================================
--- head/www/mod_authnz_crowd/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_authnz_crowd/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -21,10 +21,9 @@ BROKEN_powerpc64=	Does not build: error: curl/curl.h: 
 
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib
-USES=		autoreconf libtool
+USES=		apache:2.2+ autoreconf libtool
 USE_GNOME=	libxml2
 USE_GCC=	any
-USE_APACHE=	22+
 
 SUB_FILES=	pkg-message zzz_authnz_crowd.conf
 SUB_LIST+=	APACHEETCDIR=${APACHEETCDIR} \

Modified: head/www/mod_authnz_external24/Makefile
==============================================================================
--- head/www/mod_authnz_external24/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_authnz_external24/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ COMMENT=	Allows users authentication based on external
 
 LICENSE=	APACHE20
 
-USE_APACHE=	24
+USES=		apache:2.4
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	authnz_external

Modified: head/www/mod_backtrace/Makefile
==============================================================================
--- head/www/mod_backtrace/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_backtrace/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -18,7 +18,7 @@ LICENSE=	APACHE20
 
 MANUAL_PACKAGE_BUILD=	requires apache WITH_EXCEPTION_HOOK=yes
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_EXTRAS+=	-lexecinfo

Modified: head/www/mod_bw/Makefile
==============================================================================
--- head/www/mod_bw/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_bw/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,7 +15,7 @@ COMMENT=	Bandwidth and Connection control per Virtual 
 LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/mod_bw
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_cband/Makefile
==============================================================================
--- head/www/mod_cband/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_cband/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -18,8 +18,7 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSE
 LICENSE_FILE_BSD4CLAUSE=	${WRKSRC}/libpatricia.copyright
 
-USES=		tar:tgz
-USE_APACHE=	22
+USES=		apache:2.2 tar:tgz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apxs=${APXS}
 ALL_TARGET=	#

Modified: head/www/mod_cfg_ldap/Makefile
==============================================================================
--- head/www/mod_cfg_ldap/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_cfg_ldap/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ COMMENT=	Allows you to keep your virtual host configur
 
 LICENSE=	BSD3CLAUSE
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 USE_OPENLDAP=	yes
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes

Modified: head/www/mod_chroot/Makefile
==============================================================================
--- head/www/mod_chroot/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_chroot/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -10,9 +10,8 @@ MASTER_SITES=	http://core.segfault.pl/~hobbit/mod_chro
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	The mod_chroot makes running Apache in a chroot easy
 
-USES=		cpe
+USES=		apache:2.2+ cpe
 CPE_VENDOR=	marek_gutkowski
-USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_clamav/Makefile
==============================================================================
--- head/www/mod_clamav/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_clamav/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -14,8 +14,7 @@ COMMENT=	Scans content delivered by the Apache20 proxy
 
 LICENSE=	GPLv2
 
-USE_APACHE=	22
-USES=		libtool
+USES=		apache:2.2 libtool
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.options.mk>

Modified: head/www/mod_cloudflare/Makefile
==============================================================================
--- head/www/mod_cloudflare/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_cloudflare/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -16,7 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	cloudflare
 GH_TAGNAME=	340fa0a
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	cloudflare

Modified: head/www/mod_cvs2/Makefile
==============================================================================
--- head/www/mod_cvs2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_cvs2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -16,7 +16,7 @@ LICENSE_NAME=	Academic Free License 1.2
 LICENSE_FILE=	${WRKSRC}/LICENSE.AFL
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_dav_svn/Makefile
==============================================================================
--- head/www/mod_dav_svn/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_dav_svn/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -18,7 +18,7 @@ PKGDIR=		${.CURDIR}
 
 SVN_BUILD_ADDONS=	yes
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 .include "${MASTERDIR}/Makefile.common"
 

Modified: head/www/mod_dnssd/Makefile
==============================================================================
--- head/www/mod_dnssd/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_dnssd/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -16,8 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
-USES=		gmake pkgconfig
-USE_APACHE=	22+
+USES=		apache:2.2+ gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \
 		APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`"

Modified: head/www/mod_domaintree/Makefile
==============================================================================
--- head/www/mod_domaintree/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_domaintree/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -12,7 +12,7 @@ MAINTAINER=	danger@FreeBSD.org
 COMMENT=	Hostname to filesystem mapper for Apache 2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_encoding/Makefile
==============================================================================
--- head/www/mod_encoding/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_encoding/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,8 +13,7 @@ COMMENT=	Apache module for non-ASCII filename interope
 
 LICENSE=	APACHE11
 
-USE_APACHE=	22+
-USES=		iconv gmake
+USES=		apache:2.2+ iconv gmake
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \

Modified: head/www/mod_evasive/Makefile
==============================================================================
--- head/www/mod_evasive/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_evasive/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 MODULENAME=	${PORTNAME}20

Modified: head/www/mod_extract_forwarded/Makefile
==============================================================================
--- head/www/mod_extract_forwarded/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_extract_forwarded/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,7 +15,7 @@ OPTIONS_DEFINE=	YOSHFUJI
 YOSHFUJI_DESC=	yoshfuji patch (support IPv6 addr in config, etc)
 #OPTIONS_DEFAULT=	YOSHFUJI
 
-USE_APACHE=	22
+USES=		apache:2.2
 WRKSRC=		${WRKDIR}/extract_forwarded
 PORTDOCS=	INSTALL README
 PATCH_STRIP=	-p1

Modified: head/www/mod_fastcgi/Makefile
==============================================================================
--- head/www/mod_fastcgi/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_fastcgi/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache 2.2 fast-cgi module
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	*.c

Modified: head/www/mod_fcgid/Makefile
==============================================================================
--- head/www/mod_fcgid/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_fcgid/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,8 +13,7 @@ COMMENT=	Alternative FastCGI module for Apache2
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
-USES=		cpe
+USES=		apache:2.2+ cpe
 CPE_VENDOR=	apache
 
 HAS_CONFIGURE=		yes

Modified: head/www/mod_fileiri/Makefile
==============================================================================
--- head/www/mod_fileiri/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_fileiri/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -14,7 +14,7 @@ COMMENT=	Apache 2.x http IRIs module
 
 #LICENSE=	AL11
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_flickr/Makefile
==============================================================================
--- head/www/mod_flickr/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_flickr/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -24,7 +24,7 @@ XTRA_FLAGS+=	-DDEBUG
 AP_EXTRAS=	${XTRA_FLAGS}
 USE_LDCONFIG=	yes
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_geoip2/Makefile
==============================================================================
--- head/www/mod_geoip2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_geoip2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	GeoIP>=1.4.4:net/GeoIP
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 GH_PROJECT=	geoip-api-mod_geoip2
-USE_APACHE=	22+
+USES=		apache:2.2+
 MODULENAME=	mod_geoip
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes

Modified: head/www/mod_gnutls/Makefile
==============================================================================
--- head/www/mod_gnutls/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_gnutls/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 GNU_CONFIGURE=	yes
-USES=		libtool pkgconfig tar:bzip2
-USE_APACHE=	24
+USES=		apache:2.4 libtool pkgconfig tar:bzip2
 
 DBDIR=		${PREFIX}/var/db/${PORTNAME}
 PLIST_SUB=	SED="${SED}" WWWGRP=${WWWGRP} WWWOWN=${WWWOWN}

Modified: head/www/mod_gzip2/Makefile
==============================================================================
--- head/www/mod_gzip2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_gzip2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,11 +13,10 @@ COMMENT=	Apache 2.x Internet Content Acceleration modu
 
 #LICENSE=	AL11
 
-USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 MAKE_ENV+=	"APXS=${APXS}"
-USES=		gmake
+USES=		apache:2.2+ gmake
 
 PORTDOCS=	commands.txt samples.txt
 PORTEXAMPLES=	mod_gzip2.conf.sample

Modified: head/www/mod_h264_streaming/Makefile
==============================================================================
--- head/www/mod_h264_streaming/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_h264_streaming/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Apache H264 streaming module
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apxs="${APXS}"

Modified: head/www/mod_hosts_access/Makefile
==============================================================================
--- head/www/mod_hosts_access/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_hosts_access/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -12,7 +12,7 @@ COMMENT=	Apache module that makes Apache respect hosts
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_http2-devel/Makefile
==============================================================================
--- head/www/mod_http2-devel/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_http2-devel/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -16,9 +16,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 
-USES=		autoreconf libtool ssl
+USES=		apache:2.4+ autoreconf libtool ssl
 USE_GITHUB=	yes
-USE_APACHE=	24+
 
 GH_ACCOUNT=	icing
 GH_PROJECT=	mod_h2

Modified: head/www/mod_layout22/Makefile
==============================================================================
--- head/www/mod_layout22/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_layout22/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,7 +15,7 @@ CONFLICTS=	mod_layout-3.* mod_layout-4.*
 
 PORTSCOUT=	limit:^5
 
-USE_APACHE=	22
+USES=		apache:2.2+
 
 MAKE_ARGS+=	builddir=${WRKSRC}
 

Modified: head/www/mod_limitipconn2/Makefile
==============================================================================
--- head/www/mod_limitipconn2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_limitipconn2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,8 +15,7 @@ COMMENT=	Allows you to limit the number of simultaneou
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
-USES=		tar:bzip2
+USES=		apache:2.2+ tar:bzip2
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes

Modified: head/www/mod_line_edit/Makefile
==============================================================================
--- head/www/mod_line_edit/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_line_edit/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,7 +15,7 @@ COMMENT=	Apache module for simple text rewriting
 
 LICENSE=	GPLv2
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_log_config-st/Makefile
==============================================================================
--- head/www/mod_log_config-st/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_log_config-st/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,8 +13,7 @@ COMMENT=	Modified version of mod_log_config for Apache
 
 LICENSE=	APACHE11
 
-USES=		tar:xz
-USE_APACHE=	22
+USES=		apache:2.2 tar:xz
 AP_FAST_BUILD=	yes
 SRC_FILE=	mod_log_config.c
 SHORTMODNAME=	log_config

Modified: head/www/mod_log_mysql/Makefile
==============================================================================
--- head/www/mod_log_mysql/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_log_mysql/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -14,10 +14,9 @@ COMMENT=	Allows Apache 2.2.x to log to a MySQL databas
 LICENSE=	PD APACHE11
 LICENSE_COMB=	multi
 
-USES=		tar:xz
+USES=		apache:2.2 tar:xz
 RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:www/mod_log_config-st
 
-USE_APACHE=	22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 USE_MYSQL=	yes

Modified: head/www/mod_log_sql2-dtc/Makefile
==============================================================================
--- head/www/mod_log_sql2-dtc/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_log_sql2-dtc/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -21,8 +21,7 @@ DBI_CONFIGURE_OFF=	--without-dbi
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 
 GNU_CONFIGURE=	yes
-USES=		gmake tar:bzip2
-USE_APACHE=	22
+USES=		apache:2.2 gmake tar:bzip2
 USE_MYSQL=	yes
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS}

Modified: head/www/mod_log_sql2/Makefile
==============================================================================
--- head/www/mod_log_sql2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_log_sql2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-USES=		gmake tar:bzip2
-USE_APACHE=	22+
+USES=		apache:2.2+ gmake tar:bzip2
 USE_MYSQL=	yes
 GNU_CONFIGURE=	yes
 

Modified: head/www/mod_macro22/Makefile
==============================================================================
--- head/www/mod_macro22/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_macro22/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 PORTDOCS=	${PORTNAME}.html

Modified: head/www/mod_memcache/Makefile
==============================================================================
--- head/www/mod_memcache/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_memcache/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ COMMENT=	Apache 2.2.x module to manage apr_memcache co
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 USE_GITHUB=	yes
 GH_ACCOUNT=	joshrotenberg
 GH_PROJECT=	modmemcache

Modified: head/www/mod_memcache_block/Makefile
==============================================================================
--- head/www/mod_memcache_block/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_memcache_block/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -16,7 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	netik
 GH_TAGNAME=	7b1fcec
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_INC=		${LOCALBASE}/include/libmemcached

Modified: head/www/mod_mono/Makefile
==============================================================================
--- head/www/mod_mono/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_mono/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -21,8 +21,7 @@ RUN_DEPENDS=	mono:lang/mono \
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --man=${PREFIX}/man
 INSTALL_TARGET=	install
-USES=		libtool mono pkgconfig
-USE_APACHE=	22+
+USES=		apache:2.2+ libtool mono pkgconfig
 
 .include <bsd.port.pre.mk>
 

Modified: head/www/mod_mpm_itk/Makefile
==============================================================================
--- head/www/mod_mpm_itk/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_mpm_itk/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,7 +15,7 @@ COMMENT=	This MPM allows you to run each vhost under a
 
 LICENSE=	APACHE20
 
-USE_APACHE=	24
+USES=		apache:2.4
 GNU_CONFIGURE=	yes
 
 AP_FAST_BUILD=	yes

Modified: head/www/mod_musicindex/Makefile
==============================================================================
--- head/www/mod_musicindex/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_musicindex/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -14,8 +14,7 @@ COMMENT=	Apache module that allows downloading and str
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libarchive localbase:ldflags
-USE_APACHE=	22
+USES=		apache:2.2 libarchive localbase:ldflags
 
 OPTIONS_DEFINE=	NLS FLAC MP3 MP4 VORBIS LIBARCHIVE FILECACHE MYSQLCACHE DOCS
 OPTIONS_DEFAULT=MP3 LIBARCHIVE FILECACHE

Modified: head/www/mod_ntlm2/Makefile
==============================================================================
--- head/www/mod_ntlm2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_ntlm2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -12,8 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	NTLM authentication module for the Apache2 webserver
 
-USES=		samba:build
-USE_APACHE=	22
+USES=		apache:2.2 samba:build
 MAKE_ENV=	APXS=${APXS}
 
 do-install:

Modified: head/www/mod_pagespeed/Makefile
==============================================================================
--- head/www/mod_pagespeed/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_pagespeed/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -32,9 +32,8 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libicutu.so:devel/icu \
 		libopencv_legacy.so:graphics/opencv
 
-USES=		compiler:c++14-lang gperf jpeg gmake localbase pkgconfig \
-		python:2.7 shebangfix ssl tar:xz
-USE_APACHE=	22+
+USES=		apache:2.2+ compiler:c++14-lang gperf jpeg gmake localbase \
+		pkgconfig python:2.7 shebangfix ssl tar:xz
 SHEBANG_GLOB=	*.gyp *.gypi *.py *.sh
 SHEBANG_FILES=	build/fix_proto_and_invoke_protoc
 

Modified: head/www/mod_perl2/Makefile
==============================================================================
--- head/www/mod_perl2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_perl2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -22,8 +22,7 @@ TEST_DEPENDS=	p5-CGI>=4.15:www/p5-CGI \
 
 SUB_FILES=	pkg-message ${APMOD_FILE}
 SUB_LIST=	APACHEMODDIR=${APACHEMODDIR}
-USE_APACHE=	22+
-USES=		cpe gmake perl5
+USES=		apache:2.2+ cpe gmake perl5
 USE_PERL5=	configure
 USE_CSTD=	gnu89
 CPE_VENDOR=	apache

Modified: head/www/mod_proctitle/Makefile
==============================================================================
--- head/www/mod_proctitle/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_proctitle/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,9 +13,8 @@ COMMENT=	Set httpd process titles to reflect currently
 
 LICENSE=	BSD2CLAUSE
 
-USE_APACHE=	22+
 GNU_CONFIGURE=	yes
-USES=		tar:bzip2
+USES=		apache:2.2+ tar:bzip2
 
 CFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/apr-1

Modified: head/www/mod_proxy_html/Makefile
==============================================================================
--- head/www/mod_proxy_html/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_proxy_html/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -17,11 +17,10 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:www/mod_xml2enc
 
 SUB_FILES=	pkg-message
-USE_APACHE=	22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SHORTMODNAME=	proxy_html
-USES=		tar:bzip2
+USES=		apache:2.2 tar:bzip2
 USE_GNOME=	libxml2
 
 AP_INC+=	${LOCALBASE}/include/libxml2 -I${WRKSRC}

Modified: head/www/mod_proxy_uwsgi/Makefile
==============================================================================
--- head/www/mod_proxy_uwsgi/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_proxy_uwsgi/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}mod_proxy_
 MAINTAINER=	schmidt@ze.tum.de
 COMMENT=	Apache proxy module to pass requests to uwsgi
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_proxy_xml/Makefile
==============================================================================
--- head/www/mod_proxy_xml/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_proxy_xml/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for rewriting URI references in XML
 
 USE_GNOME=	libxml2
-USE_APACHE=	22+
+USES=		apache:2.2+
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes

Modified: head/www/mod_python33/Makefile
==============================================================================
--- head/www/mod_python33/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_python33/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -17,8 +17,7 @@ LICENSE=	APACHE20
 
 CONFLICTS_INSTALL=	ap2[24]-mod_python3[^3]*
 
-USE_APACHE=	22
-USES=		cpe python:2.7 tar:tgz
+USES=		apache:2.2 cpe python:2.7 tar:tgz
 CPE_VENDOR=	apache
 
 GNU_CONFIGURE=		yes

Modified: head/www/mod_python35/Makefile
==============================================================================
--- head/www/mod_python35/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_python35/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -18,8 +18,7 @@ LICENSE=	APACHE20
 
 CONFLICTS_INSTALL=	ap2[24]-mod_python3[^5]*
 
-USE_APACHE=	22+
-USES=		cpe python:2.7 tar:tgz
+USES=		apache:2.2+ cpe python:2.7 tar:tgz
 CPE_VENDOR=	apache
 SUB_FILES=	pkg-message 270_mod_python.conf.sample
 

Modified: head/www/mod_qos/Makefile
==============================================================================
--- head/www/mod_qos/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_qos/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -12,7 +12,7 @@ COMMENT=	QoS for Apache
 
 LICENSE=	GPLv2+
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_GENPLIST=	yes
 AP_FAST_BUILD=	yes
 

Modified: head/www/mod_realdoc/Makefile
==============================================================================
--- head/www/mod_realdoc/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_realdoc/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -10,7 +10,7 @@ COMMENT=	Apache module to support atomic deploys
 
 LICENSE=	MIT
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 USE_GITHUB=	yes

Modified: head/www/mod_remoteip/Makefile
==============================================================================
--- head/www/mod_remoteip/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_remoteip/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -11,7 +11,7 @@ DISTNAME=	httpd-2.3.5-alpha
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Replaces the client IP address/hostname with that given by a proxy
 
-USE_APACHE=	22
+USES=		apache:2.2
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_reproxy/Makefile
==============================================================================
--- head/www/mod_reproxy/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_reproxy/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -12,7 +12,7 @@ LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/lestrrat-mod_reproxy-0f945ff
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_rivet/Makefile
==============================================================================
--- head/www/mod_rivet/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_rivet/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libitcl.so:lang/itcl
 
-USES+=		gmake libtool tcl:85+,tea
-USE_APACHE=	22-24
+USES+=		apache:2.2-2.4 gmake libtool tcl:85+,tea
 USE_LDCONFIG=	${PREFIX}/lib/rivet
 
 INSTALL_TARGET=	install-strip

Modified: head/www/mod_rpaf2/Makefile
==============================================================================
--- head/www/mod_rpaf2/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_rpaf2/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -17,7 +17,7 @@ GH_ACCOUNT=	gnif
 
 DOCS=	README.md
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 SHORTMODNAME=	rpaf
 

Modified: head/www/mod_scgi/Makefile
==============================================================================
--- head/www/mod_scgi/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_scgi/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE.txt
 SCGI_DIR=	apache2
 WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 

Modified: head/www/mod_security/Makefile
==============================================================================
--- head/www/mod_security/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_security/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -19,8 +19,7 @@ LIB_DEPENDS+=	libpcre.so:devel/pcre \
 		libgdbm.so:databases/gdbm \
 		libexpat.so:textproc/expat2
 
-USES=		perl5 pkgconfig shebangfix bdb
-USE_APACHE=	22+
+USES=		apache:2.2+ perl5 pkgconfig shebangfix bdb
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	tools/rules-updater.pl.in mlogc/mlogc-batch-load.pl.in

Modified: head/www/mod_setenvifplus/Makefile
==============================================================================
--- head/www/mod_setenvifplus/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_setenvifplus/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -13,7 +13,7 @@ COMMENT=	Allows setting environment variables based on
 
 LICENSE=	APACHE20
 
-USE_APACHE=	22+
+USES=		apache:2.2+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	${WRKSRC}/apache2/${MODULENAME}.c

Modified: head/www/mod_spdy/Makefile
==============================================================================
--- head/www/mod_spdy/Makefile	Sun Mar 11 17:38:02 2018	(r464188)
+++ head/www/mod_spdy/Makefile	Sun Mar 11 17:38:45 2018	(r464189)
@@ -24,8 +24,7 @@ BUILD_DEPENDS=	greadlink:sysutils/coreutils \
 		bash:shells/bash
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803111738.w2BHckkZ086570>