14 files changed, 17 insertions, 19 deletions
diff --git a/www/ach/Makefile b/www/ach/Makefile
index a0f8544e5caf..9d33c3d6c8ad 100644
--- a/www/ach/Makefile
+++ b/www/ach/Makefile
@@ -14,8 +14,7 @@ BROKEN=		unfetchable
 
 LICENSE=	GPLv3
 
-USE_MYSQL=	yes
-USES=		php tar
+USES=		mysql php tar
 USE_GITHUB=	yes
 GH_ACCOUNT=	Burton
 GH_PROJECT=	Analysis-of-Competing-Hypotheses
diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile
index d341b1430e30..7e8101c62510 100644
--- a/www/bacula-web/Makefile
+++ b/www/bacula-web/Makefile
@@ -35,7 +35,7 @@ SQLITE_USES=	sqlite
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
+USES+=			mysql
 CONFIGURE_ARGS+=	--with-mysql=yes
 SUB_LIST+=		REQ_MYSQL=mysql
 USE_PHP+=		pdo_mysql
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index ff5b9a1eac3e..eb92c544a670 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -73,7 +73,7 @@ IPV6_CONFIGURE_OFF=	--disable-ipv6
 LDAP_USE=		openldap=yes
 LDAP_CONFIGURE_ON=	--with-ldap=yes
 LDAP_CONFIGURE_OFF=	--with-ldap=no
-MYSQL_USE=		mysql=yes
+MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
 MYSQL_CONFIGURE_OFF=	--with-mysql=no
 RRDTOOL_DESC=		Usage graphs support
diff --git a/www/mediawiki131/Makefile b/www/mediawiki131/Makefile
index 8c610249443f..0e07594dfc4c 100644
--- a/www/mediawiki131/Makefile
+++ b/www/mediawiki131/Makefile
@@ -41,7 +41,8 @@ MEMCACHED_DESC=	Use memcached
 IMAGICK_DESC=	Use ImageMagick
 SOCKETS_DESC=	Use sockets
 
-MYSQL_USE=	mysql=client php=mysqli
+MYSQL_USES=	mysql
+MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 SQLITE_USE=	php=sqlite3
 LDAP_USE=	php=ldap
diff --git a/www/mediawiki132/Makefile b/www/mediawiki132/Makefile
index 3fe90cb51780..b701933ced5a 100644
--- a/www/mediawiki132/Makefile
+++ b/www/mediawiki132/Makefile
@@ -41,7 +41,8 @@ MEMCACHED_DESC=	Use memcached
 IMAGICK_DESC=	Use ImageMagick
 SOCKETS_DESC=	Use sockets
 
-MYSQL_USE=	mysql=client php=mysqli
+MYSQL_USES=	mysql
+MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 SQLITE_USE=	php=sqlite3
 LDAP_USE=	php=ldap
diff --git a/www/mediawiki133/Makefile b/www/mediawiki133/Makefile
index 9c0cfec6a3ae..00f0d15c53d7 100644
--- a/www/mediawiki133/Makefile
+++ b/www/mediawiki133/Makefile
@@ -41,7 +41,8 @@ MEMCACHED_DESC=	Use memcached
 IMAGICK_DESC=	Use ImageMagick
 SOCKETS_DESC=	Use sockets
 
-MYSQL_USE=	mysql=client php=mysqli
+MYSQL_USES=	mysql
+MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 SQLITE_USE=	php=sqlite3
 LDAP_USE=	php=ldap
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 275f9436cc32..052213b8a18b 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=	--disable-syslog
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
+USES+=		mysql
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 .endif
 
diff --git a/www/mod_auth_cookie_mysql2/Makefile b/www/mod_auth_cookie_mysql2/Makefile
index 607ad5cacee2..297338d96bcb 100644
--- a/www/mod_auth_cookie_mysql2/Makefile
+++ b/www/mod_auth_cookie_mysql2/Makefile
@@ -12,8 +12,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows authentication against MySQL database via secure cookie
 
-USE_MYSQL=	yes
-USES=		apache:2.2+
+USES=		apache:2.2+ mysql
 
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index a4870da0f923..32485463bd30 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -14,9 +14,8 @@ COMMENT=	MySQL-based authentication module with VirtualHost support
 
 LICENSE=	APACHE20
 
-USES=		apache:2.2+ tar:tgz
+USES=		apache:2.2+ mysql tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_MYSQL=	yes
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 AP_INC+=	${LOCALBASE}/include/mysql
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index 8915ebe4b60e..843fa904405b 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Allows users to use MySQL databases for user authentication
 
 LICENSE=	APACHE10
 
-USE_MYSQL=	yes
-USES=		apache:2.2+
+USES=		apache:2.2+ mysql
 
 SHORTMODNAME=	mysql_auth
 AP_FAST_BUILD=	yes
diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index 12b531e65779..8c17422c0896 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-USES=		apache:2.2+ gmake tar:bzip2
-USE_MYSQL=	yes
+USES=		apache:2.2+ gmake mysql tar:bzip2
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
diff --git a/www/mod_tsa/Makefile b/www/mod_tsa/Makefile
index dc706d556255..3c5900265798 100644
--- a/www/mod_tsa/Makefile
+++ b/www/mod_tsa/Makefile
@@ -35,7 +35,7 @@ PORTEXAMPLES=	*.sql tsa.conf
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
+USES+=		mysql
 CONFIGURE_ARGS+=	--enable-mysql=yes
 SRC_FILE+=	db_mysql.c
 AP_INC+=	-I${LOCALBASE}/include/mysql
diff --git a/www/typo3-8/Makefile b/www/typo3-8/Makefile
index e1ba672cc854..b35b305531a3 100644
--- a/www/typo3-8/Makefile
+++ b/www/typo3-8/Makefile
@@ -51,7 +51,7 @@ CURL_USE=	PHP=curl
 GD_USE=		PHP=gd
 GMP_USE=	PHP=gmp
 MBSTRING_USE=	PHP=mbstring
-MYSQL_USE=	MYSQL=server
+MYSQL_USES=	mysql:server
 ZLIB_USE=	PHP=zlib
 
 .include <bsd.port.options.mk>
diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 5db638cda10c..2d9a341cf5f9 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -25,7 +25,7 @@ USES=		libtool
 OPTIONS_DEFINE=		MYSQL PGSQL DOCS
 OPTIONS_DEFAULT=	MYSQL
 
-MYSQL_USE=	MYSQL=YES
+MYSQL_USES=	mysql
 MYSQL_CONFIGURE_ON+=	--with-mysql=${LOCALBASE}
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_ON+=	--with-pgsql=${LOCALBASE}/pgsql