Date: Mon, 10 Jan 2022 10:47:55 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c5a743203c5c - main - Welcome php81 to the tree Message-ID: <202201101047.20AAltF3072616@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5a743203c5c76c2b8bc427c22c2ac3bfffd37f8 commit c5a743203c5c76c2b8bc427c22c2ac3bfffd37f8 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-01-10 10:45:26 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-01-10 10:47:32 +0000 Welcome php81 to the tree - Move extension sodium to common as all current supported php versions in the tree supports it PR: 260774 Approved by: ale Sponsored by: Bounce Experts --- Mk/Uses/php.mk | 16 ++++++++++------ Mk/bsd.default-versions.mk | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 7a0bf584efdd..ab8d54ec0e00 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -108,7 +108,7 @@ DIST_SUBDIR= PECL PHPBASE?= ${LOCALBASE} -_ALL_PHP_VERSIONS= 73 74 80 +_ALL_PHP_VERSIONS= 73 74 80 81 # Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) @@ -176,7 +176,10 @@ PHP_VER= ${FLAVOR:S/^php//} (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]}) # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -. if ${PHP_VER} == 80 +. if ${PHP_VER} == 81 +PHP_EXT_DIR= 20210902 +PHP_EXT_INC= hash json pcre spl +. elif ${PHP_VER} == 80 PHP_EXT_DIR= 20200930 PHP_EXT_INC= hash json pcre spl . elif ${PHP_VER} == 74 @@ -374,12 +377,13 @@ _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 +_USE_PHP_VER81= ${_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 461bc25cfcaa..c09e3c31eb21 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -107,7 +107,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .endif # Possible values: 9.6, 10, 11, 12, 13, 14 PGSQL_DEFAULT?= 13 -# Possible values: 7.3, 7.4, 8.0 +# Possible values: 7.3, 7.4, 8.0, 8.1 PHP_DEFAULT?= 7.4 # Possible values: 2.7, 3.7, 3.8, 3.9, 3.10, 3.11 PYTHON_DEFAULT?= 3.8
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201101047.20AAltF3072616>