diff options
author | Rene Ladan <rene@FreeBSD.org> | 2020-12-31 11:46:52 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2020-12-31 11:46:52 +0000 |
commit | 16127537c4f36493d62b8235ef2f09efb3276f75 (patch) | |
tree | 42d02ebd5fd79f805b6b26f53d7701a7087e13a9 /Mk | |
parent | 96b39eea6cb9684d7250419e1c0a02a16192bf81 (diff) | |
download | ports-16127537c4f36493d62b8235ef2f09efb3276f75.tar.gz ports-16127537c4f36493d62b8235ef2f09efb3276f75.zip |
Unregister expired PHP 7.2
While here ensure the default versions/values match with each other.
Notes
Notes:
svn path=/head/; revision=559720
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/Uses/php.mk | 10 | ||||
-rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 92963ddbfa6b..293454216712 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -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 dba dom \ 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 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index da153de197b4..2b56ef7ff676 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -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 |