 @@ -1,14 +1,14 @@
-# $NetBSD: phpversion.mk,v 1.201 2018/01/05 03:12:12 taca Exp $
+# $NetBSD: phpversion.mk,v 1.202 2018/02/02 12:50:38 jdolecek 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 70 71 72
 #	Default: 56
 @@ -80,27 +80,27 @@
+#
 #	Example: lib/php/20140828
+#
 # Keywords: php
+#
 .if !defined(PHPVERSION_MK)
 PHPVERSION_MK=	defined
 # Define each PHP's version.
 PHP56_VERSION=	5.6.33
 PHP70_VERSION=	7.0.27
 PHP71_VERSION=	7.1.13
-PHP72_VERSION=	7.2.1
+PHP72_VERSION=	7.2.2
 # Define initial release of major version.
 PHP56_RELDATE=	20140828
 PHP70_RELDATE=	20151203
 PHP71_RELDATE=	20160303
 PHP72_RELDATE=	20170718
 _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,26 +1,22 @@
-$NetBSD: distinfo,v 1.12 2018/01/16 10:49:56 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2018/02/02 12:50:38 jdolecek Exp $
-SHA1 (php-7.2.1.tar.bz2) = 3e5ad89b44fb83b9c356ba11c1c62b9ff3fad633
+SHA1 (php-7.2.2.tar.bz2) = 69903dabf7ceb4a84620683092e235b29d2d1066
-RMD160 (php-7.2.1.tar.bz2) = 1959cd1fff0b222d20afd0aaf57f4c557ce72b51
+RMD160 (php-7.2.2.tar.bz2) = c7193e0298ae8e709ad19129023ff213085f50ca
-SHA512 (php-7.2.1.tar.bz2) = e9b6c013a06a771c2fa7581e49e6d6e019fe8fc6f8881a43905f7e87df5fc05420559fe40fb663d272ffc5cc188c4ef7c3ca835f5c542a28ca8de1cd42782865
+SHA512 (php-7.2.2.tar.bz2) = d2bc3725b51c61ded552cfde276bbe0f9e4cce3401303219d3784497d7f989e4a23c673fd2d2a827b7823664f922eededed0d242dc70a6f4863ce4f89573d211
-Size (php-7.2.1.tar.bz2) = 14980278 bytes
+Size (php-7.2.2.tar.bz2) = 14618006 bytes
-SHA1 (patch-configure) = 277e60446932fabb5ad1c696052de1c0a6248dc8
+SHA1 (patch-configure) = 5dad0ba760f5fb6aa55dc3136655b78c29e23bca
 SHA1 (patch-ext_curl_config.m4) = 86a293d57aafcd42d1feab4a6d0d4f88dbcfb5c8
 SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
 SHA1 (patch-ext_pdo__mysql_config.m4) = f7026001b9c40ae92f13400bd8002e59d4c17311
 SHA1 (patch-ext_pdo_config.m4) = 95f3c1ccf696f6686da320e309b48cfcaadb5e43
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
 SHA1 (patch-makedist) = 3e796ab59bece3f762f41fd0c6f142c88c2d88a8
 SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
 SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
 SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb
 SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
 SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7

 @@ -1,18 +1,18 @@
-$NetBSD: patch-configure,v 1.5 2018/01/16 10:49:57 jperkin Exp $
+$NetBSD: patch-configure,v 1.6 2018/02/02 12:50:38 jdolecek Exp $
 Don't automatically add libgcc on SunOS.
---- configure.orig	2018-01-02 22:35:52.000000000 +0000
+--- configure.orig	2018-01-30 10:33:52.000000000 +0000
 +++ configure
 @@ -5461,9 +5461,6 @@ fi
  case $host_alias in
    *solaris*)
      CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
 -    if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then
 -      enable_libgcc=yes
 -    fi
      ;;
    *dgux*)
      CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
 @@ -7007,27 +7004,6 @@ EOF
      ;;
 @@ -41,36 +41,27 @@ Don't automatically add libgcc on SunOS.
 -  fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
 @@ -21090,7 +21066,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
 -    for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
 +    for header_file; do
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -23626,7 +23602,7 @@ fi
+@@ -96116,12 +96092,7 @@ old_CC=$CC
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl.pc" >&5
  $as_echo_n "checking for libcurl.pc... " >&6; }
 -    if test "$PHP_CURL" == "yes" -o "$PHP_CURL" == "/usr"; then
 +    if test "$PHP_CURL" = "yes" -o "$PHP_CURL" = "/usr"; then
        PKNAME=libcurl
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: using default path" >&5
  $as_echo "using default path" >&6; }
@@ -95975,12 +95951,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
 -  cat >meta_ccld<<EOF
 -#! /bin/sh
 -exec $CC $ac_cv_pthreads_cflags \$@
 -EOF
 -  CC="$abs_builddir/meta_ccld"
 -  chmod +x meta_ccld
 +  CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
  fi
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then