From owner-svn-ports-all@freebsd.org Thu Dec 31 11:46:53 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 75DB14BE1DB; Thu, 31 Dec 2020 11:46:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D65wY2mJ6z4dv4; Thu, 31 Dec 2020 11:46:53 +0000 (UTC) (envelope-from rene@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 4D99F7D8F; Thu, 31 Dec 2020 11:46:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BVBkrMV063993; Thu, 31 Dec 2020 11:46:53 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BVBkqlv063991; Thu, 31 Dec 2020 11:46:52 GMT (envelope-from rene@FreeBSD.org) Message-Id: <202012311146.0BVBkqlv063991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 31 Dec 2020 11:46:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559720 - in head/Mk: . Uses X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in head/Mk: . Uses X-SVN-Commit-Revision: 559720 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2020 11:46:53 -0000 Author: rene Date: Thu Dec 31 11:46:52 2020 New Revision: 559720 URL: https://svnweb.freebsd.org/changeset/ports/559720 Log: Unregister expired PHP 7.2 While here ensure the default versions/values match with each other. Modified: head/Mk/Uses/php.mk head/Mk/bsd.default-versions.mk Modified: head/Mk/Uses/php.mk ============================================================================== --- head/Mk/Uses/php.mk Thu Dec 31 11:38:47 2020 (r559719) +++ head/Mk/Uses/php.mk Thu Dec 31 11:46:52 2020 (r559720) @@ -110,7 +110,7 @@ DIST_SUBDIR= PECL PHPBASE?= ${LOCALBASE} -_ALL_PHP_VERSIONS= 72 73 74 80 +_ALL_PHP_VERSIONS= 73 74 80 # Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) @@ -187,13 +187,10 @@ PHP_EXT_INC= hash pcre spl . elif ${PHP_VER} == 73 PHP_EXT_DIR= 20180731 PHP_EXT_INC= pcre spl -. elif ${PHP_VER} == 72 -PHP_EXT_DIR= 20170718 -PHP_EXT_INC= pcre spl . else # (rene) default to DEFAULT_VERSIONS -PHP_EXT_DIR= 20170718 -PHP_EXT_INC= pcre spl +PHP_EXT_DIR= 20190902 +PHP_EXT_INC= hash pcre spl . endif # Try to figure out what the PHP_EXT_DIR should be WRT the @@ -382,7 +379,6 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl db sockets spl sqlite3 sysvmsg sysvsem sysvshm \ tidy tokenizer xml xmlreader xmlwriter xsl zip zlib # version specific components -_USE_PHP_VER72= ${_USE_PHP_ALL} interbase pdf recode sodium xmlrpc wddx _USE_PHP_VER73= ${_USE_PHP_ALL} interbase pdf recode sodium xmlrpc wddx _USE_PHP_VER74= ${_USE_PHP_ALL} ffi pdf sodium xmlrpc _USE_PHP_VER80= ${_USE_PHP_ALL} ffi sodium Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Thu Dec 31 11:38:47 2020 (r559719) +++ head/Mk/bsd.default-versions.mk Thu Dec 31 11:46:52 2020 (r559720) @@ -98,7 +98,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .endif # Possible values: 9.5, 9.6, 10, 11, 12, 13 PGSQL_DEFAULT?= 12 -# Possible values: 7.2, 7.3, 7.4 +# Possible values: 7.3, 7.4 8.0 PHP_DEFAULT?= 7.4 # Possible values: 2.7, 3.6, 3.7, 3.8, 3.9 PYTHON_DEFAULT?= 3.7