From nobody Thu Nov 23 22:03:09 2023 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 4SbsYp3N4Dz529TY; Thu, 23 Nov 2023 22:03:10 +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 4SbsYp2BDRz4WWr; Thu, 23 Nov 2023 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700776990; 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=xtNUzpRTSiACSmZdFtZWOEH8Wo4UgZxRlsMOIJHOLxI=; b=JIpwxOXYnyw5IOvzk7hbTqhLbTEQX4sGapcAwb4UgmBKTEfLDKptsFEF0by18UGDwKHemL I5/BD/94MnT/U06nPd2ZRk+4ZfStXEiFRVfJ0uZy4eOMMU98peIr66EYkPgw9Fe2YmtKxp WFaX5Zkb0hiIfwHf0uPkEhV3Ki4RvtfLqaiJWaeHs7XBdS3cK/v6WKcurVl9qVrLw6kuWK uClPpPFpj01byb/qlBsmDJM/2ux5giUEPFiEksnfkr84Nxh4rWKsfdFQvz9yjrLkXbwBLr KqUYjvB7LfGqN+uydPCtO4ruL8swMP5HrHvncMPcilcAa9ScPjfdEqkiebSjCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700776990; 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=xtNUzpRTSiACSmZdFtZWOEH8Wo4UgZxRlsMOIJHOLxI=; b=tAI04OjvvKlpyfOqykU18r0a0nAqlPiyw3g0CDXqgXA9H/ZslW/Z1zu+QKRNgwi3iQzouA bEGV07amGEnLaBaztNcPJt+cUvyXy5xdMwxqZu7DPiQW+pu6M4gOFplZag4M7WYlRBErn+ 0WFm23kYRaIWJj/420FtDfsNEbH2a3Q9m1Wr9UgrmAYNMqkszlGvwJoIRBVazIASwPHa/5 AQ4wpSrNOXpR9sjtO8M4XE4R76Px63FhJIbArxsBaDnlR2P7l+aVBNSqd//ME4L5kjX8wm QUALAe7d3C7t+6Fd0h2kn4BAjKtV7DUqpvs4MyGNa4cnA+uoJjHBb9cgHcafGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700776990; a=rsa-sha256; cv=none; b=oFIg+gNdhzmjy/gSVf/ndsaZzpBvTFxTziCA2fSyIPrZJwx5Zit+mcmU2MvfoKBVMfxOem kwGMsFmaB2zPvF3JXOO2i+cbjHCLQZ3x36fbWnQCeGrAAd5Jt7leXhaHePKNoNmsmyRNmU P03UKjkNxa70JmHveRsoKsj86iALdxQBs+39FdXh1mcWNwMuKtaKksgxRkNxvqbLuKAoj6 OImQKCUVIVdglyFhFgM9ygDpPHloCJ8ane7aeAs87UhVtQNj+kNMCtIraoAYjXIEae9QX3 VHdkLtD48FV/a5VS8MMDsvGt2ylzvB5X5ZLCHh59HVTO5Xu6jZUIqXOC77dlGw== 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 4SbsYp03Jzz4RN; Thu, 23 Nov 2023 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ANM39bS010946; Thu, 23 Nov 2023 22:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANM39vq010943; Thu, 23 Nov 2023 22:03:09 GMT (envelope-from git) Date: Thu, 23 Nov 2023 22:03:09 GMT Message-Id: <202311232203.3ANM39vq010943@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: cea1194ae5f2 - main - lang/php82: Update version 8.2.12=>8.2.13 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: cea1194ae5f2bfa34526d25e6908fcd9d1698c0c Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=cea1194ae5f2bfa34526d25e6908fcd9d1698c0c commit cea1194ae5f2bfa34526d25e6908fcd9d1698c0c Author: Muhammad Moinur Rahman AuthorDate: 2023-11-23 13:59:17 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-11-23 22:02:57 +0000 lang/php82: Update version 8.2.12=>8.2.13 - Switch to system pcre - Switch to libenchant-2 for enchant extension - Remove OPTIONS for using the deprecated cclient library for imap extension - mysqli no longer supports building with external mysql libraries so remove the options for MYSQLND - Switch to libedit for readline extension Changelog: https://www.php.net/ChangeLog-8.php#8.2.13 --- lang/php82/Makefile | 45 +++++++++++++++++---------------------------- lang/php82/distinfo | 6 +++--- lang/php82/pkg-plist | 7 ------- 3 files changed, 20 insertions(+), 38 deletions(-) diff --git a/lang/php82/Makefile b/lang/php82/Makefile index ba4329806f88..11d8c1102f8d 100644 --- a/lang/php82/Makefile +++ b/lang/php82/Makefile @@ -1,5 +1,5 @@ PORTNAME= php82 -DISTVERSION= 8.2.12 +DISTVERSION= 8.2.13 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions @@ -11,13 +11,14 @@ WWW= https://www.php.net/ LICENSE= PHP301 -USES+= compiler:c11 cpe gnome pkgconfig tar:xz +USES+= compiler:c11 cpe gnome localbase pkgconfig tar:xz CPE_PRODUCT= php PHP_VER= 82 CONFLICTS_INSTALL?= php[0-9][0-9]${PKGNAMESUFFIX} .if !defined(PKGNAMESUFFIX) +BUILD_DEPENDS= re2c>0:devel/re2c LIB_DEPENDS= libargon2.so:security/libargon2 \ libpcre2-8.so:devel/pcre2 @@ -28,14 +29,12 @@ CONFIGURE_ARGS+= --disable-all \ --with-layout=GNU \ --with-libxml \ --with-openssl \ - --with-password-argon2=${LOCALBASE} -DESTDIRNAME= INSTALL_ROOT + --with-password-argon2=${LOCALBASE} \ + --with-external-pcre=${LOCALBASE} USES+= autoreconf:build ssl USE_GNOME= libxml2 -CPPFLAGS= -I${LOCALBASE}/include - LDFLAGS= -L${OPENSSLLIB} -lcrypto -lssl # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext @@ -89,6 +88,8 @@ PHPDBG_VARS= PHP_SAPI+=phpdbg ZTS_CONFIGURE_ON= --enable-zts ZTS_CONFIGURE_ENV= pthreads_working="yes" +DESTDIRNAME= INSTALL_ROOT + .if defined(PKGNAMEPREFIX) USES+= apache PLIST= ${PKGDIR}/pkg-plist.mod @@ -146,12 +147,12 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc -post-install-CLI-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php - post-install-CGI-on: ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php-cgi +post-install-CLI-on: + ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php + post-install-EMBED-on: ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libphp.so @@ -230,8 +231,8 @@ DB4_CONFIGURE_ON= --with-db4=${LOCALBASE} DB4_USES= bdb DB4_VARS= WITH_BDB_HIGHEST=yes FLATFILE_CONFIGURE_ON= --disable-flatfile -GDBM_CONFIGURE_ARGS= --with-gdbm=${LOCALBASE} GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm +GDBM_CONFIGURE_ARGS= --with-gdbm=${LOCALBASE} INIFILE_CONFIGURE_OFF= --disable-inifile LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb LMDB_CONFIGURE_ARGS= --with-lmdb=${LOCALBASE} @@ -251,7 +252,7 @@ USE_GNOME= libxml2 .endif .if ${PHP_MODNAME} == "enchant" -LIB_DEPENDS+= libenchant.so:textproc/enchant +LIB_DEPENDS+= libenchant-2.so:textproc/enchant2 CONFIGURE_ARGS+= --with-enchant=${LOCALBASE} USES+= pkgconfig .endif @@ -331,13 +332,7 @@ USES+= iconv:translit .if ${PHP_MODNAME} == "imap" PHP_MOD_PRIO= 30 -OPTIONS_RADIO= CLIENT -OPTIONS_RADIO_CLIENT= CCLIENT PANDA -OPTIONS_DEFAULT= PANDA -CCLIENT_DESC= Uses the original but unmaintained cclient -PANDA_DESC= Uses the forked panda-cclient instead of the original cclient -PANDA_LIB_DEPENDS= libc-client.so.2010:mail/panda-cclient -PANDA_LIB_DEPENDS_OFF= libc-client4.so.9:mail/cclient +LIB_DEPENDS+= libc-client.so.2010:mail/panda-cclient CONFIGURE_ARGS+= --with-imap-ssl=${OPENSSLBASE} \ --with-imap=${LOCALBASE} @@ -382,13 +377,7 @@ PHP_HEADER_DIRS= libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls .endif .if ${PHP_MODNAME} == "mysqli" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT= MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver -MYSQLND_CONFIGURE_ON= --with-mysqli=mysqlnd -MYSQLND_CONFIGURE_OFF= --with-mysqli=${LOCALBASE}/bin/mysql_config -MYSQLND_USES_OFF= mysql +CONFIGURE_ARGS+= --with-mysqli .endif .if ${PHP_MODNAME} == "odbc" @@ -444,10 +433,10 @@ OPTIONS_DEFAULT= MYSQLND MYSQLND_DESC= Use MySQL Native Driver +MYSQLND_CONFIGURE_ON= --with-pdo-mysql=mysqlnd MYSQLND_CONFIGURE_OFF= --with-pdo-mysql=${LOCALBASE} \ --with-zlib-dir=/usr MYSQLND_USES_OFF= mysql -MYSQLND_CONFIGURE_ON= --with-pdo-mysql=mysqlnd USE_PHP= pdo:build .endif @@ -488,8 +477,8 @@ CONFIGURE_ARGS+= --with-pspell=${LOCALBASE} .endif .if ${PHP_MODNAME} == "readline" -CONFIGURE_ARGS+= --with-readline=/usr -USES+= readline +CONFIGURE_ARGS+=--with-libedit +USES+= libedit .endif .if ${PHP_MODNAME} == "session" diff --git a/lang/php82/distinfo b/lang/php82/distinfo index ab36cb22c7ab..122e2bc243d9 100644 --- a/lang/php82/distinfo +++ b/lang/php82/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698354721 -SHA256 (php-8.2.12.tar.xz) = e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132 -SIZE (php-8.2.12.tar.xz) = 12048788 +TIMESTAMP = 1700689026 +SHA256 (php-8.2.13.tar.xz) = 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b +SIZE (php-8.2.13.tar.xz) = 12069092 diff --git a/lang/php82/pkg-plist b/lang/php82/pkg-plist index 7014f48f577c..2653280ebfc1 100644 --- a/lang/php82/pkg-plist +++ b/lang/php82/pkg-plist @@ -165,13 +165,6 @@ include/php/ext/libxml/php_libxml.h %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h %%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h -include/php/ext/pcre/pcre2lib/config.h -include/php/ext/pcre/pcre2lib/pcre2.h -include/php/ext/pcre/pcre2lib/pcre2_internal.h -include/php/ext/pcre/pcre2lib/pcre2_intmodedep.h -include/php/ext/pcre/pcre2lib/pcre2_jit_neon_inc.h -include/php/ext/pcre/pcre2lib/pcre2_jit_simd_inc.h -include/php/ext/pcre/pcre2lib/pcre2_ucp.h include/php/ext/pcre/php_pcre.h include/php/ext/random/php_random.h include/php/ext/spl/php_spl.h