Convert USE_PHP*=yes into USES=php*

PR:		210529
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D6936

23 files changed, 37 insertions, 88 deletions

diff --git a/databases/pecl-chdb/Makefile b/databases/pecl-chdb/Makefile
index 1aa08e570331..7e310de7c651 100644
--- a/databases/pecl-chdb/Makefile
+++ b/databases/pecl-chdb/Makefile
@@ -16,11 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcmph.so:devel/cmph
 RUN_DEPENDS=	${LOCALBASE}/lib/libcmph.so:devel/cmph
 
-USE_PHP=	yes
-USE_PHP_BUILD=	yes
-USE_PHPIZE=	yes
-USE_PHPEXT=	yes
-PHP_MODNAME=	chdb
+USES=		php:ext
 IGNORE_WITH_PHP=	70
 
 CFLAGS+=	-L${LOCALBASE}/lib
diff --git a/databases/pecl-dbase/Makefile b/databases/pecl-dbase/Makefile
index ecf37df09efb..62c04e18d482 100644
--- a/databases/pecl-dbase/Makefile
+++ b/databases/pecl-dbase/Makefile
@@ -14,8 +14,7 @@ COMMENT=	dBase database file access functions for PHP
 
 LICENSE=	PHP301
 
-USE_PHP=	yes
-USE_PHPEXT=	yes
+USES=		php:ext
 IGNORE_WITH_PHP=	70
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-drizzle/Makefile b/databases/pecl-drizzle/Makefile
index 07a3aab3f391..08d7b586c5ce 100644
--- a/databases/pecl-drizzle/Makefile
+++ b/databases/pecl-drizzle/Makefile
@@ -15,9 +15,7 @@ LICENSE=	PHP301
 
 LIB_DEPENDS=	libdrizzle.so:databases/libdrizzle
 
-USES=		tar:tgz
-USE_PHP=	yes
-USE_PHPEXT=	yes
+USES=		php:ext tar:tgz
 IGNORE_WITH_PHP=	70
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/databases/pecl-leveldb/Makefile b/databases/pecl-leveldb/Makefile
index aa57b2e0a0a8..bb0b737bbd2f 100644
--- a/databases/pecl-leveldb/Makefile
+++ b/databases/pecl-leveldb/Makefile
@@ -15,11 +15,7 @@ LICENSE=	PHP301
 
 LIB_DEPENDS=	libleveldb.so:databases/leveldb
 
-USES=		tar:tgz
-USE_PHP=	yes
-USE_PHP_BUILD=	yes
-USE_PHPEXT=	yes
-USE_PHPIZE=	yes
+USES=		php:ext tar:tgz
 IGNORE_WITH_PHP=	70
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-mdbtools/Makefile b/databases/pecl-mdbtools/Makefile
index ce8131172d82..575467f257c7 100644
--- a/databases/pecl-mdbtools/Makefile
+++ b/databases/pecl-mdbtools/Makefile
@@ -17,10 +17,7 @@ LICENSE=	LGPL21
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmdb.a:databases/mdbtools
 RUN_DEPENDS=	${LOCALBASE}/lib/libmdb.a:databases/mdbtools
 
-USES=		pkgconfig tar:tgz
-USE_PHP=	yes
-USE_PHPEXT=	yes
-USE_PHP_BUILD=	yes
+USES=		php:ext pkgconfig tar:tgz
 IGNORE_WITH_PHP= 56 70
 
 CONFIGURE_ARGS=	--with-mdbtools=${LOCALBASE}
diff --git a/databases/pecl-memcache/Makefile b/databases/pecl-memcache/Makefile
index e9903917525f..e8e497530182 100644
--- a/databases/pecl-memcache/Makefile
+++ b/databases/pecl-memcache/Makefile
@@ -21,11 +21,8 @@ OPTIONS_DEFINE=	EXAMPLES
 CONFIGURE_ARGS=	--with-zlib-dir=/usr
 IGNORE_WITH_PHP=70
 USE_CSTD=	gnu89
-USE_PHP=	zlib session
-USE_PHP_BUILD=	yes
-USE_PHPEXT=	yes
-USE_PHPIZE=	yes
-USES=		dos2unix tar:tgz
+USE_PHP=	zlib:build session:build
+USES=		dos2unix php:ext tar:tgz
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/databases/pecl-memcached/Makefile b/databases/pecl-memcached/Makefile
index 64c7b0080503..0d013433334f 100644
--- a/databases/pecl-memcached/Makefile
+++ b/databases/pecl-memcached/Makefile
@@ -24,11 +24,8 @@ IGBINARY_DESC=	Binary serializer support
 
 CONFIGURE_ARGS=	--with-libmemcached-dir=${LOCALBASE}
 IGNORE_WITH_PHP=70
-USE_PHP=	json session
-USE_PHPEXT=	yes
-USE_PHPIZE=	yes
-USE_PHP_BUILD=	yes
-USES=		pkgconfig tar:tgz
+USE_PHP=	json:build session:build
+USES=		php:ext pkgconfig tar:tgz
 
 IGBINARY_CONFIGURE_ENABLE=	memcached-igbinary
 IGBINARY_USE=		PHP=igbinary
diff --git a/databases/pecl-mongo/Makefile b/databases/pecl-mongo/Makefile
index 27343b5079a9..8ce20e24277a 100644
--- a/databases/pecl-mongo/Makefile
+++ b/databases/pecl-mongo/Makefile
@@ -15,10 +15,8 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	re2c>=0.13.4:devel/re2c
 
-USES=		tar:tgz
-USE_PHP=	spl
-USE_PHP_BUILD=	yes
-USE_PHPEXT=	yes
+USES=		php:ext tar:tgz
+USE_PHP=	spl:build
 CONFIGURE_ARGS=	--enable-mongo
 SUB_FILES=	pkg-message
 IGNORE_WITH_PHP=	70
diff --git a/databases/pecl-mongodb/Makefile b/databases/pecl-mongodb/Makefile
index d1f918910de8..683d0956ff41 100644
--- a/databases/pecl-mongodb/Makefile
+++ b/databases/pecl-mongodb/Makefile
@@ -12,9 +12,7 @@ COMMENT=	PECL classes for MongoDB
 
 LICENSE=	APACHE20
 
-USES=		tar:tgz
-USE_PHP=	spl
-USE_PHP_BUILD=	yes
-USE_PHPEXT=	yes
+USES=		php:ext tar:tgz
+USE_PHP=	spl:build
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-mysqlnd_ms/Makefile b/databases/pecl-mysqlnd_ms/Makefile
index acd50e884da2..30bf645ec493 100644
--- a/databases/pecl-mysqlnd_ms/Makefile
+++ b/databases/pecl-mysqlnd_ms/Makefile
@@ -12,10 +12,8 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	johnpupu@gmail.com
 COMMENT=	Replication and load balancing plugin for mysqlnd
 
-USE_PHP=	json
-USE_PHP_BUILD=	yes
-USE_PHPEXT=	yes
-USE_PHPIZE=	yes
+USES=		php:ext
+USE_PHP=	json:build
 IGNORE_WITH_PHP=	56 70
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-mysqlnd_qc/Makefile b/databases/pecl-mysqlnd_qc/Makefile
index ada9828fd480..8d1aca962b21 100644
--- a/databases/pecl-mysqlnd_qc/Makefile
+++ b/databases/pecl-mysqlnd_qc/Makefile
@@ -12,9 +12,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	johnpupu@gmail.com
 COMMENT=	Query cache plugin for mysqlnd
 
-USE_PHP=	yes
-USE_PHPEXT=	yes
-USE_PHPIZE=	yes
+USES=		php:ext
 IGNORE_WITH_PHP=	56 70
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-pdo_user/Makefile b/databases/pecl-pdo_user/Makefile
index 6e083af7a5a7..7d35dc5015ed 100644
--- a/databases/pecl-pdo_user/Makefile
+++ b/databases/pecl-pdo_user/Makefile
@@ -17,11 +17,8 @@ BROKEN_powerpc64=	Does not build
 
 WRKSRC=		${WRKDIR}/PDO_USER-${PORTVERSION}
 
-USE_PHP=	pdo
-USE_PHP_BUILD=	yes
-USE_PHPIZE=	yes
-USE_PHPEXT=	yes
-PHP_MODNAME=	pdo_user
+USES=		php:ext
+USE_PHP=	pdo:build
 IGNORE_WITH_PHP=	70
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-rrd/Makefile b/databases/pecl-rrd/Makefile
index 250b7b14012f..6c5c9970791a 100644
--- a/databases/pecl-rrd/Makefile
+++ b/databases/pecl-rrd/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	librrd.so:databases/rrdtool
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-USE_PHP=	yes
-USE_PHPEXT=	yes
+USES=		php:ext
 IGNORE_WITH_PHP=	70
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-tokyo_tyrant/Makefile b/databases/pecl-tokyo_tyrant/Makefile
index fdfdc67782c7..a63fecc37a2a 100644
--- a/databases/pecl-tokyo_tyrant/Makefile
+++ b/databases/pecl-tokyo_tyrant/Makefile
@@ -17,11 +17,8 @@ BROKEN_powerpc64=	Does not build
 
 LIB_DEPENDS=	libtokyotyrant.so:databases/tokyotyrant
 
-USES=		pkgconfig tar:tgz
-USE_PHP=	session
-USE_PHP_BUILD=	spl
-USE_PHPIZE=	yes
-USE_PHPEXT=	yes
+USES=		php:ext pkgconfig tar:tgz
+USE_PHP=	session:build
 IGNORE_WITH_PHP=	70
 
 .include <bsd.port.mk>
diff --git a/databases/php-adodb-ext/Makefile b/databases/php-adodb-ext/Makefile
index b4a6ec97f159..f39940af79de 100644
--- a/databases/php-adodb-ext/Makefile
+++ b/databases/php-adodb-ext/Makefile
@@ -14,17 +14,14 @@ COMMENT=	ADOdb Extension
 
 WRKSRC=		${WRKDIR}/adodb-${PORTVERSION:S/.//}
 
-USES=		dos2unix zip
-USE_PHP=	yes
-USE_PHPEXT=	yes
-PHP_MODNAME=	adodb
+USES=		dos2unix php:ext zip
 IGNORE_WITH_PHP=56 70
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if ${PHP_VER} == "5" || ${PHP_VER} == "54" || ${PHP_VER} == "55"
+.if ${PHP_VER} == "55"
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-php54-adodb.c
 .endif
 
diff --git a/databases/php-mdcached/Makefile b/databases/php-mdcached/Makefile
index f3f62c4d623b..e755fa7369d7 100644
--- a/databases/php-mdcached/Makefile
+++ b/databases/php-mdcached/Makefile
@@ -15,10 +15,9 @@ LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libmdcached.so:databases/mdcached
 
-USE_PHP=	yes
-USE_PHPEXT=	yes
+USES=		php:ext
 IGNORE_WITH_PHP=	70
 CONFIGURE_ARGS=	--enable-mdcached
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}/client_php/${PORTNAME}
+WRKSRC_SUBDIR=		${PORTNAME}/client_php/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/databases/php5-pdo_cassandra/Makefile b/databases/php5-pdo_cassandra/Makefile
index 10bfb7eb32fb..74b99bd75c9d 100644
--- a/databases/php5-pdo_cassandra/Makefile
+++ b/databases/php5-pdo_cassandra/Makefile
@@ -21,11 +21,9 @@ GH_ACCOUNT=	mkoppanen
 GH_PROJECT=	php-${PORTNAME}
 GH_TAGNAME=	7debd5b
 
-USES=		compiler:c++11-lib pkgconfig
+USES=		compiler:c++11-lib php:ext pkgconfig
 USE_CXXSTD=	c++11
-USE_PHP_BUILD=	yes
-USE_PHP=	pdo
-USE_PHPEXT=	yes
+USE_PHP=	pdo:build
 
 IGNORE_WITH_PHP=	70
 
diff --git a/databases/php5-tarantool/Makefile b/databases/php5-tarantool/Makefile
index b442778f4a02..078a31473b32 100644
--- a/databases/php5-tarantool/Makefile
+++ b/databases/php5-tarantool/Makefile
@@ -9,12 +9,9 @@ PKGNAMEPREFIX=	php5-
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	PECL PHP driver for Tarantool/Box
 
+USES=		php:ext
 USE_GITHUB=	yes
-USE_PHP=	yes
-USE_PHPEXT=	yes
-USE_PHPIZE=	yes
 
-PHP_MODNAME=	${PORTNAME}
 GH_PROJECT=	${PORTNAME}-php
 GH_TAGNAME=	c1c5d5f
 TR_VER=		20151222
diff --git a/databases/php55-redis/Makefile b/databases/php55-redis/Makefile
index 1bdb20d391e0..9acaee43d470 100644
--- a/databases/php55-redis/Makefile
+++ b/databases/php55-redis/Makefile
@@ -17,21 +17,18 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	nicolasff
 GH_PROJECT=	phpredis
 
-USE_PHP=	session
-USE_PHP_BUILD=	yes
-USE_PHPEXT=	yes
+USES=		php:ext
+USE_PHP=	session:build
 PHP_DEFAULT=	5.5
 IGNORE_WITH_PHP=	56 70
 
-PHP_MODNAME=	redis
-
 OPTIONS_DEFINE=	IGBINARY
 IGBINARY_DESC=	Build with Igbinary serializer
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIGBINARY}
-USE_PHP+=	igbinary
+USE_PHP+=	igbinary:build
 CONFIGURE_ARGS+=--enable-redis-igbinary
 .else
 CONFIGURE_ARGS+=--disable-redis-igbinary
diff --git a/databases/php56-redis/Makefile b/databases/php56-redis/Makefile
index 629138314c61..c45e806e4b19 100644
--- a/databases/php56-redis/Makefile
+++ b/databases/php56-redis/Makefile
@@ -13,9 +13,8 @@ LICENSE=	PHP301
 
 BROKEN_powerpc64=	Does not build
 
-USE_PHP=	session
-USE_PHP_BUILD=	yes
-USE_PHPEXT=	yes
+USES=		php:ext
+USE_PHP=	session:build
 PHP_DEFAULT=	5.6
 IGNORE_WITH_PHP=	55 70
 
@@ -23,8 +22,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	nicolasff
 GH_PROJECT=	phpredis
 
-PHP_MODNAME=	redis
-
 OPTIONS_DEFINE=	IGBINARY
 IGBINARY_DESC=	Build with Igbinary serializer
 
diff --git a/databases/php70-redis/Makefile b/databases/php70-redis/Makefile
index f025a68148e8..e78e5b34b606 100644
--- a/databases/php70-redis/Makefile
+++ b/databases/php70-redis/Makefile
@@ -10,9 +10,8 @@ COMMENT=	PHP7 extension for Redis
 
 LICENSE=	PHP301
 
-USE_PHP=	session
-USE_PHP_BUILD=	yes
-USE_PHPEXT=	yes
+USES=		php:ext
+USE_PHP=	session:build
 PHP_DEFAULT=	7.0
 IGNORE_WITH_PHP=	55 56
 
diff --git a/databases/vfront/Makefile b/databases/vfront/Makefile
index d9f31066bc85..a8d6573b44df 100644
--- a/databases/vfront/Makefile
+++ b/databases/vfront/Makefile
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 PLIST=		${WRKDIR}/pkg-plist
 
-USE_PHP=	yes
+USES=		php
 
 OPTIONS_MULTI=	database
 OPTIONS_MULTI_database=	MYSQL PGSQL
diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile
index ac006b8e808b..86367c176ad4 100644
--- a/databases/xapian-bindings/Makefile
+++ b/databases/xapian-bindings/Makefile
@@ -34,7 +34,7 @@ LUA_CONFIGURE_WITH=	lua
 LUA_USES=		lua
 PHP_CONFIGURE_ENV=	PHP_CONFIG=${LOCALBASE}/bin/php-config
 PHP_CONFIGURE_WITH=	php
-PHP_USE=		PHP=yes PHP_BUILD=yes
+PHP_USES=		php:build
 PYTHON_CONFIGURE_ENV=	PYTHON_LIB=${PYTHON_SITELIBDIR}
 PYTHON_CONFIGURE_WITH=	python
 PYTHON_USES=		python:2