From a873d4b4acd5142a7a793d210406c8ef85c2c595 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Tue, 1 Jan 2019 13:19:23 +0000 Subject: [PATCH] Unregister PHP 5.6 which expired today. --- Mk/Uses/php.mk | 8 ++------ Mk/bsd.default-versions.mk | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index e9d5e2e202ea..92e9fffee3dd 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -96,7 +96,7 @@ DIST_SUBDIR= PECL PHPBASE?= ${LOCALBASE} -_ALL_PHP_VERSIONS= 56 71 72 73 +_ALL_PHP_VERSIONS= 71 72 73 # Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) @@ -169,9 +169,6 @@ PHP_EXT_INC= pcre spl . elif ${PHP_VER} == 71 PHP_EXT_DIR= 20160303 PHP_EXT_INC= pcre spl -. elif ${PHP_VER} == 56 -PHP_EXT_DIR= 20131226 -PHP_EXT_INC= pcre spl . else # (rene) default to DEFAULT_VERSIONS PHP_EXT_DIR= 20170718 @@ -208,7 +205,7 @@ PECL_PKGNAMEPREFIX= php${PHP_VER}-pecl- . if ${PHP_VER} == "${VER}" _IGNORE_PHP_SET= IGNORE= cannot be installed: doesn't work with lang/php${PHP_VER} port\ - (doesn't support PHP ${IGNORE_WITH_PHP:C/^([57])/\1./}) + (doesn't support PHP ${IGNORE_WITH_PHP:C/^(7)/\1./}) . endif . endfor . endif @@ -353,7 +350,6 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \ sockets spl sqlite3 sysvmsg sysvsem sysvshm \ tidy tokenizer wddx xml xmlreader xmlrpc xmlwriter xsl zip zlib # version specific components -_USE_PHP_VER56= ${_USE_PHP_ALL} mssql mysql sybase_ct _USE_PHP_VER71= ${_USE_PHP_ALL} _USE_PHP_VER72= ${_USE_PHP_ALL} sodium _USE_PHP_VER73= ${_USE_PHP_ALL} sodium diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 372e6260d994..4f7695204eb9 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -78,7 +78,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .endif # Possible values: 9.3, 9.4, 9.5, 9.6, 10, 11 PGSQL_DEFAULT?= 9.5 -# Possible values: 5.6, 7.1, 7.2, 7.3 +# Possible values: 7.1, 7.2, 7.3 PHP_DEFAULT?= 7.2 # Possible values: 2.7, 3.5, 3.6, 3.7 PYTHON_DEFAULT?= 2.7