diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 7a0bf584e..06c46e54a 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -187,8 +187,8 @@ PHP_EXT_DIR= 20180731 PHP_EXT_INC= pcre spl . else # (rene) default to DEFAULT_VERSIONS -PHP_EXT_DIR= 20190902 -PHP_EXT_INC= hash pcre spl +PHP_EXT_DIR= 20200930 +PHP_EXT_INC= hash json pcre spl . endif # Try to figure out what the PHP_EXT_DIR should be WRT the @@ -374,12 +374,12 @@ _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \ openssl pcntl pcre pdo pdo_dblib pdo_firebird pdo_mysql \ pdo_odbc pdo_pgsql pdo_sqlite phar pgsql posix \ pspell radius readline redis session shmop simplexml snmp soap\ - sockets spl sqlite3 sysvmsg sysvsem sysvshm \ + sockets sodium spl sqlite3 sysvmsg sysvsem sysvshm \ tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib # version specific components -_USE_PHP_VER73= ${_USE_PHP_ALL} interbase pdf recode sodium wddx -_USE_PHP_VER74= ${_USE_PHP_ALL} ffi pdf sodium -_USE_PHP_VER80= ${_USE_PHP_ALL} ffi sodium +_USE_PHP_VER73= ${_USE_PHP_ALL} interbase pdf recode wddx +_USE_PHP_VER74= ${_USE_PHP_ALL} ffi pdf +_USE_PHP_VER80= ${_USE_PHP_ALL} ffi bcmath_DEPENDS= math/php${PHP_VER}-bcmath bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 461bc25cf..0f6993f41 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -108,7 +108,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} # Possible values: 9.6, 10, 11, 12, 13, 14 PGSQL_DEFAULT?= 13 # Possible values: 7.3, 7.4, 8.0 -PHP_DEFAULT?= 7.4 +PHP_DEFAULT?= 8.0 # Possible values: 2.7, 3.7, 3.8, 3.9, 3.10, 3.11 PYTHON_DEFAULT?= 3.8 # Possible values: 2.7 diff --git a/UPDATING b/UPDATING index 4cd4afe8b..84f1c1420 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,22 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20220104: + AFFECTS: users of lang/php74 + AUTHOR: tz@FreeBSD.org + + The default version of PHP has been switched from 7.4 to 8.0. + + If you use binary packages you should make a list of php packages + before running 'pkg upgrade': + + # pkg info php7\* > ~/installed-php-ports-list + + After the upgrade, check with such list if all your php extensions + are still installed, and reinstall them if needed. + + If you use mod_php74 you need to deinstall it and install mod_php80. + 20220104: AFFECTS: users of security/bastillion AUTHOR: netchild@FreeBSD.org diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile index 4aa2a56c5..8ed42907c 100644 --- a/databases/xapian-bindings/Makefile +++ b/databases/xapian-bindings/Makefile @@ -14,7 +14,9 @@ USES= metaport PORTSCOUT= limitw:1,even OPTIONS_DEFINE= LUA PERL PHP PYTHON RUBY -OPTIONS_DEFAULT=LUA PERL PHP PYTHON RUBY +# While switching php DEFAULT OPTION PHP is creating circular +# dependency. For now remove default OPTION PHP +OPTIONS_DEFAULT=LUA PERL PYTHON RUBY LUA_RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/lua-xapian@${LUA_FLAVOR} LUA_USES= lua:run