Date: Sat, 11 May 2024 23:24:02 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: e792b33abed9 - main - lang/php82: Update version 8.2.18=>8.2.19 Message-ID: <202405112324.44BNO2oL032651@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=e792b33abed93888717b7b7f8ba42a6396578a8a commit e792b33abed93888717b7b7f8ba42a6396578a8a Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-05-11 20:02:44 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-05-11 23:06:47 +0000 lang/php82: Update version 8.2.18=>8.2.19 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_2 --- devel/php82-intl/Makefile | 1 - devel/php82-intl/files/patch-config.m4 | 22 ------------ lang/php82/Makefile | 30 +++++----------- lang/php82/distinfo | 6 ++-- sysutils/php82-posix/files/patch-posix.c | 62 -------------------------------- 5 files changed, 12 insertions(+), 109 deletions(-) diff --git a/devel/php82-intl/Makefile b/devel/php82-intl/Makefile index ee29a2235e91..ed4b8c995619 100644 --- a/devel/php82-intl/Makefile +++ b/devel/php82-intl/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php82 diff --git a/devel/php82-intl/files/patch-config.m4 b/devel/php82-intl/files/patch-config.m4 deleted file mode 100644 index e78dbf7844e7..000000000000 --- a/devel/php82-intl/files/patch-config.m4 +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/php/php-src/commit/037855fcd3f2 - ---- config.m4.orig 2024-04-09 18:46:23 UTC -+++ config.m4 -@@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then - breakiterator/codepointiterator_methods.cpp" - - PHP_REQUIRE_CXX() -- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) -+ -+ AC_MSG_CHECKING([if intl requires -std=gnu++17]) -+ AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[ -+ AC_MSG_RESULT([yes]) -+ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX) -+ ],[ -+ AC_MSG_RESULT([no]) -+ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) -+ ]) -+ - PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" - case $host_alias in - *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L" diff --git a/lang/php82/Makefile b/lang/php82/Makefile index 0d5321f6a083..cc489dda671e 100644 --- a/lang/php82/Makefile +++ b/lang/php82/Makefile @@ -1,5 +1,5 @@ PORTNAME= php82 -DISTVERSION= 8.2.18 +DISTVERSION= 8.2.19 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions @@ -36,7 +36,7 @@ USE_GNOME= libxml2 LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl # PR230207 Allow relocations against read-only segments (override lld default) -LDFLAGS_i386= -Wl,-z,notext +LDFLAGS_i386+= -Wl,-z,notext OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \ MYSQLND PCRE PHPDBG ZTS @@ -150,19 +150,19 @@ post-install: ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc post-install-CGI-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php-cgi + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php-cgi post-install-CLI-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php post-install-EMBED-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libphp.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libphp.so post-install-FPM-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/sbin/php-fpm + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/php-fpm post-install-PHPDBG-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/phpdbg + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/phpdbg .else do-install: @@ -254,7 +254,7 @@ USE_GNOME= libxml2 .endif .if ${PHP_MODNAME} == "enchant" -LIB_DEPENDS+= libenchant-2.so:textproc/enchant2 +LIB_DEPENDS+= libenchant-2.so:textproc/enchant2 CONFIGURE_ARGS+=--with-enchant=${LOCALBASE} USES+= pkgconfig .endif @@ -385,7 +385,7 @@ CONFIGURE_ARGS+= --enable-odbc --with-unixODBC=${LOCALBASE} .if ${PHP_MODNAME} == "opcache" # This is needed by Zend extensions, keep before everything. PHP_MOD_PRIO= 10 -CONFIGURE_ARGS+= --enable-opcache +CONFIGURE_ARGS+= --enable-opcache .endif .if ${PHP_MODNAME} == "pcntl" @@ -561,18 +561,6 @@ USE_GNOME= libxml2 USE_PHP= dom:build .endif -.if ${PHP_MODNAME} == "xmlrpc" -CONFIGURE_ARGS+= --with-iconv-dir=${LOCALBASE} \ - --with-xmlrpc - -USES+= iconv:translit -USE_GNOME= libxml2 - -PHP_HEADER_DIRS= libxmlrpc - -USE_PHP= xml:build -.endif - .if ${PHP_MODNAME} == "xmlwriter" CONFIGURE_ARGS+= --enable-xmlwriter diff --git a/lang/php82/distinfo b/lang/php82/distinfo index 6600f3d313f6..bac297569965 100644 --- a/lang/php82/distinfo +++ b/lang/php82/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712934471 -SHA256 (php-8.2.18.tar.xz) = 44b306fc021e56441f691da6c3108788bd9e450f293b3bc70fcd64b08dd41a50 -SIZE (php-8.2.18.tar.xz) = 12089400 +TIMESTAMP = 1715457677 +SHA256 (php-8.2.19.tar.xz) = aecd63f3ebea6768997f5c4fccd98acbf897762ed5fc25300e846197a9485c13 +SIZE (php-8.2.19.tar.xz) = 12094184 diff --git a/sysutils/php82-posix/files/patch-posix.c b/sysutils/php82-posix/files/patch-posix.c deleted file mode 100644 index 8d54d8ebd935..000000000000 --- a/sysutils/php82-posix/files/patch-posix.c +++ /dev/null @@ -1,62 +0,0 @@ ---- posix.c.orig 2024-01-17 22:35:53 UTC -+++ posix.c -@@ -465,7 +465,11 @@ PHP_FUNCTION(posix_ttyname) - #if defined(ZTS) && defined(HAVE_TTYNAME_R) && defined(_SC_TTY_NAME_MAX) - buflen = sysconf(_SC_TTY_NAME_MAX); - if (buflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ buflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - p = emalloc(buflen); - -@@ -728,7 +732,11 @@ PHP_FUNCTION(posix_getgrnam) - #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX) - buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (buflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ buflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - buf = emalloc(buflen); - try_again: -@@ -784,7 +792,11 @@ PHP_FUNCTION(posix_getgrgid) - - grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (grbuflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ grbuflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - - grbuf = emalloc(grbuflen); -@@ -858,7 +870,11 @@ PHP_FUNCTION(posix_getpwnam) - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R) - buflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (buflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ buflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - buf = emalloc(buflen); - pw = &pwbuf; -@@ -913,7 +929,11 @@ PHP_FUNCTION(posix_getpwuid) - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R) - pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (pwbuflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ pwbuflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - pwbuf = emalloc(pwbuflen); -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405112324.44BNO2oL032651>