From owner-svn-ports-head@freebsd.org Mon May 7 18:18:19 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8B9AFB8E29; Mon, 7 May 2018 18:18:18 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 96EAB84CB4; Mon, 7 May 2018 18:18:18 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DD1B1EE12; Mon, 7 May 2018 18:18:18 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w47IIIND031690; Mon, 7 May 2018 18:18:18 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w47IIHpK031687; Mon, 7 May 2018 18:18:17 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201805071818.w47IIHpK031687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 7 May 2018 18:18:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469307 - in head: . Mk Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head: . Mk Mk/Uses X-SVN-Commit-Revision: 469307 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2018 18:18:19 -0000 Author: brnrd Date: Mon May 7 18:18:17 2018 New Revision: 469307 URL: https://svnweb.freebsd.org/changeset/ports/469307 Log: Mk/Uses/php.mk: Drop support for WANT_ and USE_ PHP vars Approved by: portmgr (rene) Differential Revision: https://reviews.freebsd.org/D15014 Modified: head/CHANGES head/Mk/Uses/php.mk head/Mk/bsd.sanity.mk Modified: head/CHANGES ============================================================================== --- head/CHANGES Mon May 7 18:05:48 2018 (r469306) +++ head/CHANGES Mon May 7 18:18:17 2018 (r469307) @@ -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: 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 Modified: head/Mk/Uses/php.mk ============================================================================== --- head/Mk/Uses/php.mk Mon May 7 18:05:48 2018 (r469306) +++ head/Mk/Uses/php.mk Mon May 7 18:18:17 2018 (r469307) @@ -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 @@ -102,7 +83,6 @@ php_ARGS+= flavors . if ${php_ARGS:Mnoflavors} && ${php_ARGS:Mflavors} php_ARGS:= ${php_ARGS:Nflavors} . endif - . if ${php_ARGS:Mpecl} php_ARGS+= ext Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Mon May 7 18:05:48 2018 (r469306) +++ head/Mk/bsd.sanity.mk Mon May 7 18:18:17 2018 (r469307) @@ -162,15 +162,15 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF US 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