Date: Fri, 13 Sep 2024 14:53:52 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: e2bfd26e66de - main - lang/php84: Update version 8.4.0beta4 => 8.4.0beta5 Message-ID: <202409131453.48DErqN1033186@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=e2bfd26e66def6edb7c671fa3264897c7cd6614b commit e2bfd26e66def6edb7c671fa3264897c7cd6614b Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-09-13 14:44:33 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-09-13 14:46:19 +0000 lang/php84: Update version 8.4.0beta4 => 8.4.0beta5 Please DO NOT use this version in production, it is an early test version. Changelog: https://github.com/php/php-src/blob/php-8.4.0beta5/NEWS --- databases/php84-dba/files/patch-config.m4 | 21 +++--- databases/php84-odbc/files/patch-config.m4 | 103 +++++++++++++---------------- lang/php84/Makefile | 3 +- lang/php84/distinfo | 6 +- lang/php84/files/patch-configure.ac | 10 +-- lang/php84/pkg-plist | 1 + 6 files changed, 68 insertions(+), 76 deletions(-) diff --git a/databases/php84-dba/files/patch-config.m4 b/databases/php84-dba/files/patch-config.m4 index 52274722f660..7449b1a88029 100644 --- a/databases/php84-dba/files/patch-config.m4 +++ b/databases/php84-dba/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2023-11-07 20:02:05 UTC +--- config.m4.orig 2024-09-10 16:10:06 UTC +++ config.m4 -@@ -387,6 +387,14 @@ if test "$PHP_DB4" != "no"; then +@@ -433,6 +433,14 @@ if test "$PHP_DB4" != "no"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db5.3/db.h break @@ -15,12 +15,11 @@ elif test -f "$i/include/db5.1/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db5.1/db.h -@@ -429,7 +437,7 @@ if test "$PHP_DB4" != "no"; then - break - fi - done -- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) -+ PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db-18 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) - fi - PHP_DBA_STD_RESULT(db4,Berkeley DB4) - +@@ -480,6 +488,7 @@ if test "$PHP_DB4" != "no"; then + db-5.3 + db-5.1 + db-5.0 ++ db-5 + db-4.8 + db-4.7 + db-4.6 diff --git a/databases/php84-odbc/files/patch-config.m4 b/databases/php84-odbc/files/patch-config.m4 index 7cb9492b32f9..55e3fb3aea0c 100644 --- a/databases/php84-odbc/files/patch-config.m4 +++ b/databases/php84-odbc/files/patch-config.m4 @@ -1,101 +1,92 @@ ---- config.m4.orig 2023-11-07 20:02:05 UTC +--- config.m4.orig 2024-09-10 16:10:06 UTC +++ config.m4 -@@ -102,7 +102,7 @@ PHP_ARG_WITH([adabas],, - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH([adabas],, +@@ -117,7 +117,7 @@ PHP_ARG_WITH([adabas], + PHP_ARG_WITH([adabas], + [for Adabas support], [AS_HELP_STRING([[--with-adabas[=DIR]]], - [Include Adabas D support [/usr/local]])]) + [Include Adabas D support [/usr/local]])], [no], [no]) - AC_MSG_CHECKING([for Adabas support]) - if test "$PHP_ADABAS" != "no"; then -@@ -132,7 +132,7 @@ PHP_ARG_WITH([sapdb],, - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH([sapdb],, + AS_VAR_IF([PHP_ADABAS], [no], [], [ + AS_VAR_IF([PHP_ADABAS], [yes], [PHP_ADABAS=/usr/local]) +@@ -143,7 +143,7 @@ PHP_ARG_WITH([sapdb], + PHP_ARG_WITH([sapdb], + [for SAP DB support], [AS_HELP_STRING([[--with-sapdb[=DIR]]], - [Include SAP DB support [/usr/local]])]) + [Include SAP DB support [/usr/local]])], [no], [no]) - AC_MSG_CHECKING([for SAP DB support]) - if test "$PHP_SAPDB" != "no"; then -@@ -153,7 +153,7 @@ PHP_ARG_WITH([solid],, - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH([solid],, + AS_VAR_IF([PHP_SAPDB], [no], [], [ + AS_VAR_IF([PHP_SAPDB], [yes], [PHP_SAPDB=/usr/local]) +@@ -160,7 +160,7 @@ PHP_ARG_WITH([solid], + PHP_ARG_WITH([solid], + [for Solid support], [AS_HELP_STRING([[--with-solid[=DIR]]], - [Include Solid support [/usr/local/solid]])]) + [Include Solid support [/usr/local/solid]])], [no], [no]) - AC_MSG_CHECKING(for Solid support) - if test "$PHP_SOLID" != "no"; then -@@ -181,7 +181,7 @@ PHP_ARG_WITH([ibm-db2],, - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH([ibm-db2],, + AS_VAR_IF([PHP_SOLID], [no], [], [ + AS_VAR_IF([PHP_SOLID], [yes], [PHP_SOLID=/usr/local/solid]) +@@ -184,7 +184,7 @@ PHP_ARG_WITH([ibm-db2], + PHP_ARG_WITH([ibm-db2], + [for IBM DB2 support], [AS_HELP_STRING([[--with-ibm-db2[=DIR]]], - [Include IBM DB2 support [/home/db2inst1/sqllib]])]) + [Include IBM DB2 support [/home/db2inst1/sqllib]])], [no], [no]) - AC_MSG_CHECKING(for IBM DB2 support) - if test "$PHP_IBM_DB2" != "no"; then -@@ -222,7 +222,7 @@ PHP_ARG_WITH([empress],, - PHP_ARG_WITH([empress],, + AS_VAR_IF([PHP_IBM_DB2], [no], [], [ + AS_VAR_IF([PHP_IBM_DB2], [yes], [ +@@ -222,7 +222,7 @@ PHP_ARG_WITH([empress], + [for Empress support], [AS_HELP_STRING([[--with-empress[=DIR]]], [Include Empress support $EMPRESSPATH (Empress Version >= 8.60 - required)])]) + required)])], [no], [no]) - AC_MSG_CHECKING(for Empress support) - if test "$PHP_EMPRESS" != "no"; then -@@ -248,7 +248,7 @@ PHP_ARG_WITH([empress-bcs],, - PHP_ARG_WITH([empress-bcs],, + AS_VAR_IF([PHP_EMPRESS], [no], [], [ + AS_VAR_IF([PHP_EMPRESS], [yes], [ +@@ -246,7 +246,7 @@ PHP_ARG_WITH([empress-bcs], + [for Empress local access support], [AS_HELP_STRING([[--with-empress-bcs[=DIR]]], [Include Empress Local Access support $EMPRESSPATH (Empress Version >= - 8.60 required)])]) + 8.60 required)])], [no], [no]) - AC_MSG_CHECKING(for Empress local access support) - if test "$PHP_EMPRESS_BCS" != "no"; then -@@ -294,7 +294,7 @@ PHP_ARG_WITH([custom-odbc],, + AS_VAR_IF([PHP_EMPRESS_BCS], [no], [], [ + AS_VAR_IF([PHP_EMPRESS_BCS], [yes], [ +@@ -290,7 +290,7 @@ PHP_ARG_WITH([custom-odbc], your include dirs. For example, you should define following for Sybase SQL Anywhere 5.5.00 on QNX, prior to running this configure script: CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix - CUSTOM_ODBC_LIBS="-ldblib -lodbc"])]) + CUSTOM_ODBC_LIBS="-ldblib -lodbc"])], [no], [no]) - AC_MSG_CHECKING(for a custom ODBC support) - if test "$PHP_CUSTOM_ODBC" != "no"; then -@@ -317,7 +317,7 @@ PHP_ARG_WITH([iodbc],, - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH([iodbc],, + AS_VAR_IF([PHP_CUSTOM_ODBC], [no], [], [ + AS_VAR_IF([PHP_CUSTOM_ODBC], [yes], [PHP_CUSTOM_ODBC=/usr/local]) +@@ -309,7 +309,7 @@ PHP_ARG_WITH([iodbc], + PHP_ARG_WITH([iodbc], + [whether to build with iODBC support], [AS_HELP_STRING([--with-iodbc], - [Include iODBC support])]) + [Include iODBC support])], [no], [no]) - AC_MSG_CHECKING(whether to build with iODBC support) - if test "$PHP_IODBC" != "no"; then -@@ -335,7 +335,7 @@ PHP_ARG_WITH([esoob],, - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH([esoob],, + AS_VAR_IF([PHP_IODBC], [no], [], [ + PKG_CHECK_MODULES([ODBC], [libiodbc]) +@@ -324,7 +324,7 @@ PHP_ARG_WITH([esoob], + PHP_ARG_WITH([esoob], + [for Easysoft ODBC-ODBC Bridge support], [AS_HELP_STRING([[--with-esoob[=DIR]]], - [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])]) + [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])], [no], [no]) - AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) - if test "$PHP_ESOOB" != "no"; then -@@ -358,7 +358,7 @@ PHP_ARG_WITH([unixODBC],, - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH([unixODBC],, - [AS_HELP_STRING([--with-unixODBC], -- [Include unixODBC support])]) -+ [Include unixODBC support])], [no], [no]) - - AC_MSG_CHECKING(whether to build with unixODBC support) - if test "$PHP_UNIXODBC" != "no"; then -@@ -386,7 +386,7 @@ PHP_ARG_WITH([dbmaker],, - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH([dbmaker],, + AS_VAR_IF([PHP_ESOOB], [no], [], [ + AS_VAR_IF([PHP_ESOOB], [yes], [PHP_ESOOB=/usr/local/easysoft/oob/client]) +@@ -371,7 +371,7 @@ PHP_ARG_WITH([dbmaker], + PHP_ARG_WITH([dbmaker], + [for DBMaker support], [AS_HELP_STRING([[--with-dbmaker[=DIR]]], - [Include DBMaker support])]) + [Include DBMaker support])], [no], [no]) - AC_MSG_CHECKING(for DBMaker support) - if test "$PHP_DBMAKER" != "no"; then + AS_VAR_IF([PHP_DBMAKER], [no], [], [ + AS_VAR_IF([PHP_DBMAKER], [yes], [ diff --git a/lang/php84/Makefile b/lang/php84/Makefile index fc31eb12f23a..ac0b813d093c 100644 --- a/lang/php84/Makefile +++ b/lang/php84/Makefile @@ -1,5 +1,5 @@ PORTNAME= php84 -DISTVERSION= 8.4.0beta4 +DISTVERSION= 8.4.0beta5 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= https://downloads.php.net/~saki/ \ @@ -168,6 +168,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/Zend/zend_property_hooks.h ${STAGEDIR}${PREFIX}/include/php/Zend + ${INSTALL_DATA} ${WRKSRC}/Zend/zend_lazy_objects.h ${STAGEDIR}${PREFIX}/include/php/Zend post-install-CGI-on: ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php-cgi diff --git a/lang/php84/distinfo b/lang/php84/distinfo index c6272d2e44b5..77c39bef672a 100644 --- a/lang/php84/distinfo +++ b/lang/php84/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725002588 -SHA256 (php-8.4.0beta4.tar.xz) = bafb6f5c10a0b34ed5f2ff28eb12bc4154ffef4c04534c03e993e1c951fb9d22 -SIZE (php-8.4.0beta4.tar.xz) = 13459160 +TIMESTAMP = 1726217958 +SHA256 (php-8.4.0beta5.tar.xz) = 86c9e6fe9b4ab2046832ab65f955c50d663a6fccb3f6d6fbddc4aa9b96a561b7 +SIZE (php-8.4.0beta5.tar.xz) = 13498220 diff --git a/lang/php84/files/patch-configure.ac b/lang/php84/files/patch-configure.ac index fab6ce14c9dd..e9c038fd5b15 100644 --- a/lang/php84/files/patch-configure.ac +++ b/lang/php84/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2024-08-27 14:33:48 UTC +--- configure.ac.orig 2024-09-10 16:10:06 UTC +++ configure.ac @@ -55,6 +55,7 @@ AH_BOTTOM([ @@ -8,7 +8,7 @@ #endif /* PHP_CONFIG_H */ ]) -@@ -248,7 +249,6 @@ AS_VAR_APPEND([CPPFLAGS], [" -D_GNU_SOURCE"]) +@@ -249,7 +250,6 @@ AS_VAR_APPEND([CPPFLAGS], [" -D_GNU_SOURCE"]) dnl require extensions to C and POSIX. AS_VAR_APPEND([CPPFLAGS], [" -D_GNU_SOURCE"]) @@ -16,10 +16,10 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -1371,7 +1371,7 @@ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CON +@@ -1368,7 +1368,7 @@ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=$(eval echo "$PHP_CO EXPANDED_DATADIR=$datadir - EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` - EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` + EXPANDED_PHP_CONFIG_FILE_PATH=$(eval echo "$PHP_CONFIG_FILE_PATH") + EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=$(eval echo "$PHP_CONFIG_FILE_SCAN_DIR") -INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR +INCLUDE_PATH=.:${prefix}/share/pear diff --git a/lang/php84/pkg-plist b/lang/php84/pkg-plist index 2404c05fa040..a6b59fdc9a59 100644 --- a/lang/php84/pkg-plist +++ b/lang/php84/pkg-plist @@ -75,6 +75,7 @@ include/php/Zend/zend_iterators.h include/php/Zend/zend_language_parser.h include/php/Zend/zend_language_scanner.h include/php/Zend/zend_language_scanner_defs.h +include/php/Zend/zend_lazy_objects.h include/php/Zend/zend_list.h include/php/Zend/zend_llist.h include/php/Zend/zend_long.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409131453.48DErqN1033186>