 @@ -1,246 +1,246 @@
-# $NetBSD: phpversion.mk,v 1.265 2019/08/01 14:20:58 taca Exp $
+# $NetBSD: phpversion.mk,v 1.266 2019/09/01 13:02:05 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 71 72 73
 #	Default: 71
+#
 # === Infrastructure variables ===
+#
 # PHP_VERSION_REQD
 #	PHP version to use. This variable should not be set in
 #	packages.  Normally it is used by bulk build tools.
+#
 #	Possible: ${PHP_VERSIONS_ACCEPTED}
 #	Default:  ${PHP_VERSION_DEFAULT}
+#
 # === Package-settable variables ===
+#
 # PHP_VERSIONS_ACCEPTED
 #	The PHP versions that are accepted by the package.
+#
 #	Possible: 56 71 72 73
 #	Default: 71
+#
 # PHP_VERSIONS_INCOMPATIBLE
 #	The PHP versions that are not supported by the package.
+#
 #	Possible: 56 71 72 73
 #	Default: (empty)
+#
 # PHP_CHECK_INSTALLED
 #	Check installed version of PHP.  Should be used by lang/php56,
 #	lang/php71, lang/php72 or lang/php73 only.
+#
 #	Possible: Yes No
 #	Default: Yes
+#
 # === Variables defined by this file ===
+#
 # PKG_PHP_VERSION
 #	The selected PHP version.
+#
 #	Possible: 56 71 72 73
 #	Default: ${PHP_VERSION_DEFAULT}
+#
 # PHP_BASE_VERS
 #	The selected PHP's full version depends on PKG_PHP_VERSION
+#
 # PKG_PHP_MAJOR_VERS
 #	The selected PHP's major version.
+#
 #	Possible: 5 7
 #	Default: 7
+#
 # PKG_PHP
 #	The same as ${PKG_PHP_VERSION}, prefixed with "php-".
+#
 # PHPPKGSRCDIR
 #	The directory of the PHP implementation, relative to the
 #	package directory.
+#
 #	Example: ../../lang/php71
+#
 # PHP_PKG_PREFIX
 #	The prefix that is prepended to the package name.
+#
 #	Example: php56 php71 php72 php73
+#
 # PHP_EXTENSION_DIR
 #	Relative path to ${PREFIX} for PHP's extensions.  It is derived from
 #	initial release of major version.
+#
 #	Example: lib/php/20140828
+#
 # Keywords: php
+#
 .if !defined(PHPVERSION_MK)
 PHPVERSION_MK=	defined
 # Define each PHP's version.
 PHP56_VERSION=	5.6.40
 PHP71_VERSION=	7.1.31
-PHP72_VERSION=	7.2.21
+PHP72_VERSION=	7.2.22
 PHP73_VERSION=	7.3.8
 # Define initial release of major version.
 PHP56_RELDATE=	20140828
 PHP71_RELDATE=	20160303
 PHP72_RELDATE=	20170718
 PHP73_RELDATE=	20181200
 _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
 .include "../../mk/bsd.prefs.mk"
 PHP_VERSION_DEFAULT?=		71
 PHP_VERSIONS_ACCEPTED?=		56 71 72 73
 .for pv in ${PHP_VERSIONS_ACCEPTED}
 .  if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
 _PHP_VERSIONS_ACCEPTED+=	${pv}
 .  endif
 .endfor
 # transform the list into individual variables
 .for pv in ${_PHP_VERSIONS_ACCEPTED}
 _PHP_VERSION_${pv}_OK=	yes
 .endfor
 # check what is installed
 .if exists(${LOCALBASE}/lib/php/${PHP73_RELDATE})
 _PHP_VERSION_73_INSTALLED=	yes
 _PHP_INSTALLED=			yes
 .elif exists(${LOCALBASE}/lib/php/${PHP72_RELDATE})
 _PHP_VERSION_72_INSTALLED=	yes
 _PHP_INSTALLED=			yes
 .elif exists(${LOCALBASE}/lib/php/${PHP71_RELDATE})
 _PHP_VERSION_71_INSTALLED=	yes
 _PHP_INSTALLED=			yes
 .elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE})
 _PHP_VERSION_56_INSTALLED=	yes
 _PHP_INSTALLED=			yes
 .endif
 # if a version is explicitely required, take it
 .if defined(PHP_VERSION_REQD)
 _PHP_VERSION=	${PHP_VERSION_REQD}
 .endif
 # if the default is already installed, it is first choice
 .if !defined(_PHP_VERSION)
 .if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
 .if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
 _PHP_VERSION=	${PHP_VERSION_DEFAULT}
 .endif
 .endif
 .endif
 # prefer an already installed version, in order of "accepted"
 .if !defined(_PHP_VERSION)
 .for pv in ${_PHP_VERSIONS_ACCEPTED}
 .if defined(_PHP_VERSION_${pv}_INSTALLED)
 _PHP_VERSION?=	${pv}
 .else
 # keep information as last resort - see below
 _PHP_VERSION_FIRSTACCEPTED?=	${pv}
 .endif
 .endfor
 .endif
 # if the default is OK for the addon pkg, take this
 .if !defined(_PHP_VERSION)
 .if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
 _PHP_VERSION=	${PHP_VERSION_DEFAULT}
 .endif
 .endif
 # take the first one accepted by the package
 .if !defined(_PHP_VERSION)
 _PHP_VERSION=	${_PHP_VERSION_FIRSTACCEPTED}
 .endif
+#
 # Variable assignment for multi-PHP packages
 MULTI+=	PHP_VERSION_REQD=${_PHP_VERSION}
 # export some of internal variables
 PKG_PHP_VERSION:=	${_PHP_VERSION:C/\.[0-9]//}
 PKG_PHP:=		PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
 # Major version
 PKG_PHP_MAJOR_VERS:=	${_PHP_VERSION:C/^([0-9]).*/\1/}
 PHP_CHECK_INSTALLED?=	Yes
 # if installed PHP isn't compatible with required PHP, bail out
 .if empty(PHP_CHECK_INSTALLED:M[nN][oO])
 .if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
 PKG_FAIL_REASON+=	"Package accepts ${PKG_PHP}, but different version is installed"
 .endif
 .endif
 MESSAGE_SUBST+=		PKG_PHP_VERSION=${PKG_PHP_VERSION} \
 			PKG_PHP=${PKG_PHP}
 PLIST_SUBST+=		PKG_PHP_VERSION=${PKG_PHP_VERSION} \
 			PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
 			PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 # force the selected PHP version for recursive builds
 PHP_VERSION_REQD:=	${PKG_PHP_VERSION}
+#
 # set variables for the version we decided to use:
+#
 .if ${_PHP_VERSION} == "56"
 PHPPKGSRCDIR=		../../lang/php56
 PHP_VERSION=		${PHP56_VERSION}
 PHP_INITIAL_TEENY=	3
 PHP_PKG_PREFIX=		php56
 PHP_EXTENSION_DIR=	lib/php/${PHP56_RELDATE}
 .elif ${_PHP_VERSION} == "71"
 PHPPKGSRCDIR=		../../lang/php71
 PHP_VERSION=		${PHP71_VERSION}
 PHP_INITIAL_TEENY=	0
 PHP_PKG_PREFIX=		php71
 PHP_EXTENSION_DIR=	lib/php/${PHP71_RELDATE}
 .elif ${_PHP_VERSION} == "72"
 PHPPKGSRCDIR=		../../lang/php72
 PHP_VERSION=		${PHP72_VERSION}
 PHP_INITIAL_TEENY=	0
 PHP_PKG_PREFIX=		php72
 PHP_EXTENSION_DIR=	lib/php/${PHP72_RELDATE}
 .elif ${_PHP_VERSION} == "73"
 PHPPKGSRCDIR=		../../lang/php73
 PHP_VERSION=		${PHP73_VERSION}
 PHP_INITIAL_TEENY=	0
 PHP_PKG_PREFIX=		php73
 PHP_EXTENSION_DIR=	lib/php/${PHP73_RELDATE}
 .else
 # force an error
 PKG_FAIL_REASON+=	"${PKG_PHP} is not a valid package"
 .endif
 _PHP_VER_MAJOR=		${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
 _PHP_VER_MINOR=		${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
 PHP_BASE_VERS=	${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY}
+#
 # check installed version aginst required:
+#
 .if !empty(PHP_CHECK_INSTALLED:M[nN][oO])
 .if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED}
 PKG_FAIL_REASON+=	"${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed."
 .endif
 .endif
 .endif	# PHPVERSION_MK

 @@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.43 2019/08/01 14:19:39 taca Exp $
+$NetBSD: distinfo,v 1.44 2019/09/01 13:02:05 taca Exp $
-SHA1 (php-7.2.21.tar.bz2) = 71355854d784dee14eff83102ee227e283ed48c3
+SHA1 (php-7.2.22.tar.bz2) = 6763a52d0b72b171aa134a4c6a6942d350689ee3
-RMD160 (php-7.2.21.tar.bz2) = c7458d6f6bc2e73fd01e24df468751ad69561746
+RMD160 (php-7.2.22.tar.bz2) = fedb26056aca4a935170bf70185ab05601e5f142
-SHA512 (php-7.2.21.tar.bz2) = b234305f04bd621d355450ba38b34558a5b08403571749ac3b04ffa60d7639e847750109bef09a14f616110ba175b970d68cbae0d0b671c2dfeac6917f12f21d
+SHA512 (php-7.2.22.tar.bz2) = edb8d47e94f68eea26cce06c679cbf9570a5863f3c2528df0aebc99552fef66c46bc4c8315d36869c246c3d46e724f381e02c57bcd050c7161c6b713f6ff19ec
-Size (php-7.2.21.tar.bz2) = 15198366 bytes
+Size (php-7.2.22.tar.bz2) = 15230705 bytes
 SHA1 (patch-configure) = 6e66a79e691a84aa7ae461f8dec1752443ad6b61
 SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
 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_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
 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) = b82b7caffffde1343190fae430a68eb411b5cf8a
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7