 @@ -1,14 +1,14 @@
-# $NetBSD: phpversion.mk,v 1.413 2023/11/13 16:33:10 taca Exp $
+# $NetBSD: phpversion.mk,v 1.414 2023/11/24 06:01:26 taca 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
 # package.
+#
 # === User-settable variables ===
+#
 # PHP_VERSION_DEFAULT
 #	The PHP version to choose when more than one is acceptable to
 #	the package.
+#
 #	Possible: 56 74 80 81 82
 #	Default: 81
 @@ -81,27 +81,27 @@
 #	Example: lib/php/20181200
+#
 # Keywords: php
+#
 .if !defined(PHPVERSION_MK)
 PHPVERSION_MK=	defined
 # Define each PHP's version.
 PHP56_VERSION=	5.6.40
 PHP74_VERSION=	7.4.33
 PHP80_VERSION=	8.0.30
 PHP81_VERSION=	8.1.25
-PHP82_VERSION=	8.2.12
+PHP82_VERSION=	8.2.13
 # Define API version or initial release of major version.
 PHP56_RELDATE=	20140828
 PHP74_RELDATE=	20191128
 PHP80_RELDATE=	20201124
 PHP81_RELDATE=	20211125
 PHP82_RELDATE=	20220829
 _VARGROUPS+=	php
 _USER_VARS.php=	PHP_VERSION_DEFAULT
 _PKG_VARS.php=	PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
 _SYS_VARS.php=	PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
 		PKG_PHP_MAJOR_VERS

 @@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2023/11/08 13:19:51 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2023/11/24 06:01:26 taca Exp $
+#
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
+#
 PKGNAME=		php-${PHP_VERSION:S/RC/rc/}
 PKGREVISION=		1
 COMMENT=		PHP Hypertext Preprocessor version 8.2
 LICENSE=		php
 TEST_TARGET=		test
 USE_TOOLS+=		gmake lex
 LIBTOOL_OVERRIDE=	# empty
 PHP_CHECK_INSTALLED=	No
 PHP_VERSIONS_ACCEPTED=		82
 .include "Makefile.php"

 @@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.14 2023/10/27 15:02:43 taca Exp $
+$NetBSD: distinfo,v 1.15 2023/11/24 06:01:26 taca Exp $
-BLAKE2s (php-8.2.12.tar.xz) = 9aa2c22e92bfdf90f289d2272a1ad7796c1b1e8aa3010ae33b58fd76c1cfe694
+BLAKE2s (php-8.2.13.tar.xz) = 166a7dad259a21763ccace43350e136db5829bb003c39ca33bbd9317d71cddb4
-SHA512 (php-8.2.12.tar.xz) = d3fa01ade4094cb2a1b36f1d0bbfdf7c590997e13566ffcfdbd5a307b30ad9456099116f44fe2d612158a0017d9f05346932ce47768c760c7cfacfa56acf294e
+SHA512 (php-8.2.13.tar.xz) = 8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af
-Size (php-8.2.12.tar.xz) = 12048788 bytes
+Size (php-8.2.13.tar.xz) = 12069092 bytes
-SHA1 (patch-configure) = c8578bf4893665cb8dee242bbdc866d100912436
+SHA1 (patch-configure) = e9fd05416c4780cb9ce74cda32b0166186eb1d48
 SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 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_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0

 @@ -1,59 +1,59 @@
-$NetBSD: patch-configure,v 1.12 2023/10/27 15:02:43 taca Exp $
+$NetBSD: patch-configure,v 1.13 2023/11/24 06:01:26 taca Exp $
 * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
 * Don't autodetect maintainer-zts.
 * Shell portability.
---- configure.orig	2023-10-24 19:22:16.000000000 +0000
+--- configure.orig	2023-11-21 09:55:59.000000000 +0000
 +++ configure
-@@ -3732,6 +3732,10 @@ EOF
+@@ -4323,6 +4323,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
+    printf "%s\n" "$CURRENT_ARG \\" >>config.nice
     CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
    done
-@@ -7023,30 +7027,6 @@ EOF
+@@ -7554,30 +7558,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
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
+-printf "%s\n" "yes" >&6; }
+-
    PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
  else
-@@ -78641,7 +78621,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" >
+@@ -81253,7 +81233,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H
    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
+ printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h