3 files changed, 16 insertions, 36 deletions

diff --git a/CHANGES b/CHANGES
index e16e1f2ccf17..cc40b0631577 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,15 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20180506:
+AUTHOR: brnrd@FreeBSD.org
+
+  All USE_ and WANT_ variables for PHP have been removed and marked
+  UNSUPPORTED. Use USES= php:<feature> as a replacement.
+
+  USE_PHPIZE, USE_PHPEXT, USE_ZENDEXT, USE_PHP_BUILD,
+  WANT_PHP_CLI, WANT_PHP_CGI, WANT_PHP_MOD, WANT_PHP_WEB, WANT_PHP_EMB
+
 20180311:
 AUTHOR: brnrd@FreeBSD.org
 
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index 5833502546e7..6ddd284cfcbb 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -48,8 +48,8 @@
 #
 # IGNORE_WITH_PHP=N - The port doesn't work with PHP version N.
 #
-# You may combine multiple WANT_PHP_* knobs.
-# Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
+# You may combine multiple php:* arguments.
+# Don't specify any php:* argument if your port will work with every PHP SAPI.
 #
 # If you are building PHP-based ports in poudriere(8) with ZTS enabled,
 # add WITH_MPM=event to /etc/make.conf to prevent build failures.
@@ -60,25 +60,6 @@ PHP_Include_MAINTAINER=	ale@FreeBSD.org
 
 _INCLUDE_USES_PHP_MK=	yes
 
-.  if defined(USE_PHPIZE) && empty(php_ARGS:Mphpize)
-php_ARGS+=	phpize
-.  endif
-.  if defined(WANT_PHP_CLI) && empty(php_ARGS:Mcli)
-php_ARGS+=	cli
-.  endif
-.  if defined(WANT_PHP_CGI) && empty(php_ARGS:Mcgi)
-php_ARGS+=	cgi
-.  endif
-.  if defined(WANT_PHP_MOD) && empty(php_ARGS:Mmod)
-php_ARGS+=	mod
-.  endif
-.  if defined(WANT_PHP_WEB) && empty(php_ARGS:Mweb)
-php_ARGS+=	web
-.  endif
-.  if defined(WANT_PHP_EMB) && empty(php_ARGS:Membed)
-php_ARGS+=	embed
-.  endif
-
 .  if ${php_ARGS:Mbuild} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} )
 DEV_WARNING+=	"USES=php:build is included in USES=php:phpize, USES=php:ext, and USES=php:zend, so it is not needed"
 .  endif
@@ -103,7 +84,6 @@ php_ARGS+=	flavors
 php_ARGS:=	${php_ARGS:Nflavors}
 .  endif
 
-
 .  if ${php_ARGS:Mpecl}
 php_ARGS+=	ext
 .    if !defined(USE_GITHUB)
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index 81711ca5c0d5..661de374cb02 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -162,15 +162,15 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		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_BDB PLIST_DIRSTRY USE_RCORDER \
-		USE_OPENSSL WANT_GNOME RUBYGEM_AUTOPLIST WANT_SDL INSTALLS_EGGINFO \
-		USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
+		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
 SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX MLINKS \
 			USE_MYSQL WANT_MYSQL_VER \
-			USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI WANT_PHP_MOD \
-			WANT_PHP_WEB WANT_PHP_EMB PYDISTUTILS_INSTALLNOSINGLE \
+			PYDISTUTILS_INSTALLNOSINGLE \
 			USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN
 SANITY_NOTNEEDED=	CMAKE_NINJA WX_UNICODE USE_KDEBASE_VER \
 			USE_KDELIBS_VER USE_QT_VER
@@ -223,15 +223,6 @@ 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