From nobody Mon Jan 10 10:47:55 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7ABDE1950A41; Mon, 10 Jan 2022 10:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXVsS1K10z3sW9; Mon, 10 Jan 2022 10:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 025C823B54; Mon, 10 Jan 2022 10:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20AAltrv072617; Mon, 10 Jan 2022 10:47:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AAltF3072616; Mon, 10 Jan 2022 10:47:55 GMT (envelope-from git) Date: Mon, 10 Jan 2022 10:47:55 GMT Message-Id: <202201101047.20AAltF3072616@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: c5a743203c5c - main - Welcome php81 to the tree List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5a743203c5c76c2b8bc427c22c2ac3bfffd37f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641811676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3orPFjP8Y59in/qFOyWS/NNDxozhM6a5r8npvGTDauQ=; b=ptqlN1YYgLwh+/VA0s6FiCbLV9S+C4QFIeZIwpQRWppbmBQKPvSrFXvEsvyUy5u7GsGYFD 9lLlG0rtivinGj9cJAatKaM/7fX1jjqhisKdn+9GwkJicjIfC89s++VMf7LnfgT/Ddl9ts Vlhfw5GUiNcKH4fYOL54nHEf/zsmbIxi+waBI3lL/V5OXUIieVwQ59d5myz5W5aVpCcOxA vqTL61MuFMM2/ig0/dhJ+8zBNWDvoFM8VzCZMpe3SP+vDs7rOAKIQuRz+KZQnEUFdrlIqg KxQI0N+P83yCoq84DdCu6X4O9Plsz50PtGzNHCJDuccejiPPIWJozIumN6Mqew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641811676; a=rsa-sha256; cv=none; b=MxjB8ZppZicrBa3yitZp6WI3I6s2oDgJdG/O30iKqBo4o/ej2LDFNl6vQzpevF7L6ycA+M 0Xpyc60Rd0GhQVaIO5UCZC4TVrYs1xBv0gG9IxeKxcokZ5+oD0LbiakSrSyigfwxqvBUcL Jvf7nf3CI7Tw3yAYUOeEED4azdoMMGPFJYUWZ3J9Az00H55JH3kSSF+MlBhy2QhG6rv7vG FvCFaymTJog74acA1Lg2RnG2A0HZUxir9Jr9WF6Gx/N5wg52rvGbvpLrY5Yi+tT3qzXetN EFLrN4BCBKlZyXUtA3uJwmBDqozA/aGNBfO0MRrWrFLAZ71O9AJeX05ee2e98g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5a743203c5c76c2b8bc427c22c2ac3bfffd37f8 commit c5a743203c5c76c2b8bc427c22c2ac3bfffd37f8 Author: Muhammad Moinur Rahman AuthorDate: 2022-01-10 10:45:26 +0000 Commit: Muhammad Moinur Rahman 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