svn commit: r559720 - in head/Mk: . Uses

[Rene Ladan]

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