diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 4b8a9a851fce..4b17025ce244 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.426.2.7 2024/06/24 18:04:51 bsiegert Exp $ +# $NetBSD: phpversion.mk,v 1.426.2.8 2024/06/24 18:12:30 bsiegert Exp $ # # This file selects a PHP version, based on the user's preferences and # the installed packages. It does not add a dependency on the PHP @@ -92,7 +92,7 @@ PHP56_VERSION= 5.6.40 PHP74_VERSION= 7.4.33 PHP80_VERSION= 8.0.30 PHP81_VERSION= 8.1.29 -PHP82_VERSION= 8.2.18 +PHP82_VERSION= 8.2.20 PHP83_VERSION= 8.3.8 # Define API version or initial release of major version. diff --git a/lang/php82/Makefile b/lang/php82/Makefile index 6acb2c72d6f1..2ed5cd51b24e 100644 --- a/lang/php82/Makefile +++ b/lang/php82/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2023/11/24 06:01:26 taca Exp $ +# $NetBSD: Makefile,v 1.7.4.1 2024/06/24 18:12:30 bsiegert Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -10,7 +10,7 @@ LICENSE= php TEST_TARGET= test -USE_TOOLS+= gmake lex +USE_TOOLS+= autoconf gmake lex LIBTOOL_OVERRIDE= # empty PHP_CHECK_INSTALLED= No @@ -45,7 +45,7 @@ REPLACE_PHP= ext/phar/phar/phar.php run-tests.php SUBST_CLASSES+= path SUBST_MESSAGE.path= Fixing common paths. SUBST_STAGE.path= pre-configure -SUBST_FILES.path= configure +SUBST_FILES.path= build/php.m4 SUBST_FILES.path+= php.ini-development php.ini-production SUBST_FILES.path+= sapi/cgi/Makefile.frag SUBST_VARS.path= CGIDIR @@ -65,6 +65,9 @@ INSTALL_UNSTRIPPED= yes CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC .endif +pre-configure: + cd ${WRKSRC} && autoconf -f + post-install: cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ ${DESTDIR}${EGDIR} diff --git a/lang/php82/distinfo b/lang/php82/distinfo index c332629b5fb4..3affd1f45357 100644 --- a/lang/php82/distinfo +++ b/lang/php82/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19.2.1 2024/04/22 12:36:39 bsiegert Exp $ +$NetBSD: distinfo,v 1.19.2.2 2024/06/24 18:12:30 bsiegert Exp $ -BLAKE2s (php-8.2.18.tar.xz) = 6571715c96a8064a61bd868f483f27a85ce0594cb540cd7c28a226abe1eb29c0 -SHA512 (php-8.2.18.tar.xz) = 8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f -Size (php-8.2.18.tar.xz) = 12089400 bytes -SHA1 (patch-configure) = 80256ba9788c66d960954516394620c9f789d744 +BLAKE2s (php-8.2.20.tar.xz) = a8407aabb71ce0540f0545c0048ce5ef3744033b2b1517c51fe4c98333d4f02b +SHA512 (php-8.2.20.tar.xz) = c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5 +Size (php-8.2.20.tar.xz) = 12097568 bytes +SHA1 (patch-build_php.m4) = 4743b23e479c4ac904f18def41d5577f3a965af0 SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640 @@ -12,6 +12,7 @@ SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483 SHA1 (patch-php.ini-development) = 373d76cc7a022b578f1d5e296d1f0ac88bc26b72 SHA1 (patch-php.ini-production) = 5ab7fa6bf8403907160b0a62b56c1ee527f8eda6 +SHA1 (patch-sapi_apache2handler_config.m4) = 5f98557568cc2abc34fab5d3f123803c9a81c0af SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0 diff --git a/lang/php82/patches/patch-build_php.m4 b/lang/php82/patches/patch-build_php.m4 new file mode 100644 index 000000000000..8c73c901474f --- /dev/null +++ b/lang/php82/patches/patch-build_php.m4 @@ -0,0 +1,17 @@ +$NetBSD: patch-build_php.m4,v 1.1.2.2 2024/06/24 18:12:31 bsiegert Exp $ + +Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS. + +--- build/php.m4.orig 2024-06-04 13:22:51.000000000 +0000 ++++ build/php.m4 +@@ -2151,6 +2151,10 @@ EOF + else + break + fi ++ case "$CURRENT_ARG" in ++ \'PKG_CONFIG\=*) CURRENT_ARG="'PKG_CONFIG=@TOOLS_PATH.pkg-config@'";; ++ \'PKG_CONFIG_LIBDIR\=*) CURRENT_ARG="'PKG_CONFIG_LIBDIR=@PHP_PKGCONFIG_PATH@'";; ++ esac + AS_ECHO(["$CURRENT_ARG \\"]) >>$1 + CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG" + done diff --git a/lang/php82/patches/patch-configure b/lang/php82/patches/patch-configure deleted file mode 100644 index 4385efb0396a..000000000000 --- a/lang/php82/patches/patch-configure +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-configure,v 1.17.2.1 2024/04/22 12:36:39 bsiegert Exp $ - -* Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS. -* Don't autodetect maintainer-zts. -* Shell portability. - ---- configure.orig 2024-04-09 18:46:23.000000000 +0000 -+++ configure -@@ -3732,6 +3732,10 @@ EOF - else - break - fi -+ case "$CURRENT_ARG" in -+ \'PKG_CONFIG\=*) CURRENT_ARG="'PKG_CONFIG=@TOOLS_PATH.pkg-config@'";; -+ \'PKG_CONFIG_LIBDIR\=*) CURRENT_ARG="'PKG_CONFIG_LIBDIR=@PHP_PKGCONFIG_PATH@'";; -+ esac - $as_echo "$CURRENT_ARG \\" >>config.nice - CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG" - done -@@ -7023,30 +7027,6 @@ EOF - ;; - esac - -- if test "$APACHE_VERSION" -lt 2004001; then -- APXS_MPM=`$APXS -q MPM_NAME` -- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then -- -- enable_zts=yes -- if test "$pthreads_working" != "yes"; then -- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 -- fi -- -- fi -- else -- APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'` -- if test -n "$APACHE_THREADED_MPM"; then -- -- enable_zts=yes -- if test "$pthreads_working" != "yes"; then -- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 -- fi -- -- fi -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- - PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" - - else -@@ -78313,7 +78293,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" > - fi - - TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR -- if test "$TIDY_LIB_NAME" == 'tidyp'; then -+ if test "$TIDY_LIB_NAME" = 'tidyp'; then - - $as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h - diff --git a/lang/php82/patches/patch-sapi_apache2handler_config.m4 b/lang/php82/patches/patch-sapi_apache2handler_config.m4 new file mode 100644 index 000000000000..e736220bce99 --- /dev/null +++ b/lang/php82/patches/patch-sapi_apache2handler_config.m4 @@ -0,0 +1,25 @@ +$NetBSD: patch-sapi_apache2handler_config.m4,v 1.1.2.2 2024/06/24 18:12:31 bsiegert Exp $ + +Don't autodetect maintainer-zts. + +--- sapi/apache2handler/config.m4.orig 2024-06-04 13:22:51.000000000 +0000 ++++ sapi/apache2handler/config.m4 +@@ -108,18 +108,6 @@ if test "$PHP_APXS2" != "no"; then + ;; + esac + +- if test "$APACHE_VERSION" -lt 2004001; then +- APXS_MPM=`$APXS -q MPM_NAME` +- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then +- PHP_BUILD_THREAD_SAFE +- fi +- else +- APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'` +- if test -n "$APACHE_THREADED_MPM"; then +- PHP_BUILD_THREAD_SAFE +- fi +- fi +- AC_MSG_RESULT(yes) + PHP_SUBST(APXS) + else + AC_MSG_RESULT(no)