 @@ -1,239 +1,239 @@
-# $NetBSD: phpversion.mk,v 1.294 2020/04/18 05:01:44 taca Exp $
+# $NetBSD: phpversion.mk,v 1.295 2020/04/19 02:34:58 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 72 73 74
 #	Default: 73
+#
 # === 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 72 73 74
 #	Default: 73 56 72 74
+#
 # PHP_VERSIONS_INCOMPATIBLE
 #	The PHP versions that are not supported by the package.
+#
 #	Possible: 56 72 73 74
 #	Default: (empty)
+#
 # PHP_CHECK_INSTALLED
 #	Check installed version of PHP.  Should be used by lang/php56,
 #	lang/php72, lang/php73 or lang/php74 only.
+#
 #	Possible: Yes No
 #	Default: Yes
+#
 # === Variables defined by this file ===
+#
 # PKG_PHP_VERSION
 #	The selected PHP version.
+#
 #	Possible: 56 72 73 74
 #	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/php73
+#
 # PHP_PKG_PREFIX
 #	The prefix that is prepended to the package name.
+#
 #	Example: php56 php72 php73 php74
+#
 # PHP_EXTENSION_DIR
 #	Relative path to ${PREFIX} for PHP's extensions.  It is derived from
 #	initial release of major version.
+#
 #	Example: lib/php/20181200
+#
 # Keywords: php
+#
 .if !defined(PHPVERSION_MK)
 PHPVERSION_MK=	defined
 # Define each PHP's version.
 PHP56_VERSION=	5.6.40
-PHP72_VERSION=	7.2.29
+PHP72_VERSION=	7.2.30
 PHP73_VERSION=	7.3.17
 PHP74_VERSION=	7.4.5
 # Define initial release of major version.
 PHP56_RELDATE=	20140828
 PHP72_RELDATE=	20170718
 PHP73_RELDATE=	20181200
 PHP74_RELDATE=	20191128
 _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?=		73
 PHP_VERSIONS_ACCEPTED?=		73 56 72 74
 .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/${PHP74_RELDATE})
 _PHP_VERSION_74_INSTALLED=	yes
 _PHP_INSTALLED=			yes
 .elif 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/${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"
 PHP_VERSION=		${PHP56_VERSION}
 PHP_INITIAL_TEENY=	3
 PHP_EXTENSION_DIR=	lib/php/${PHP56_RELDATE}
 .elif ${_PHP_VERSION} == "72"
 PHP_VERSION=		${PHP72_VERSION}
 PHP_EXTENSION_DIR=	lib/php/${PHP72_RELDATE}
 .elif ${_PHP_VERSION} == "73"
 PHP_VERSION=		${PHP73_VERSION}
 PHP_EXTENSION_DIR=	lib/php/${PHP73_RELDATE}
 .elif ${_PHP_VERSION} == "74"
 PHP_VERSION=		${PHP74_VERSION}
 PHP_EXTENSION_DIR=	lib/php/${PHP74_RELDATE}
 .else
 # force an error
 PKG_FAIL_REASON+=	"${PKG_PHP} is not a valid package"
 .endif
 PHP_INITIAL_TEENY?=	0
 PHPPKGSRCDIR=		../../lang/php${PKG_PHP_VERSION}
 PHP_PKG_PREFIX=		php${PKG_PHP_VERSION}
 _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,18 +1,18 @@
-$NetBSD: distinfo,v 1.53 2020/03/20 08:14:44 taca Exp $
+$NetBSD: distinfo,v 1.54 2020/04/19 02:34:58 taca Exp $
-SHA1 (php-7.2.29.tar.xz) = 910952c26c51a5fcc97e0306e7921efeb5d18379
+SHA1 (php-7.2.30.tar.xz) = 45e70f84a69fc1d9811f51f74516ebf8f00d1c53
-RMD160 (php-7.2.29.tar.xz) = 2e0bfdbf9b325b02f1a18a2b832d83e002dc49b1
+RMD160 (php-7.2.30.tar.xz) = eb49ad8a8d23ad6bac4261414405be497b16ac89
-SHA512 (php-7.2.29.tar.xz) = 16e516b5aa22e18b31f1a988149035c4a405dffd9ebe78dfddc39b8d3b2e096dbbf5162f402dc4a0eb7a4a3376b11073b8c5ade13ff08e1e4ea828ee78756c20
+SHA512 (php-7.2.30.tar.xz) = 92e79cdd0e8b925012235375ebece19038b42f3751e9623beda5807e3a07484d0faaabb58227c67abb515c188c09c215c9b00cc8dadffc90f0dd09f8f5dd126f
-Size (php-7.2.29.tar.xz) = 12308380 bytes
+Size (php-7.2.30.tar.xz) = 12283804 bytes
 SHA1 (patch-configure) = 6e66a79e691a84aa7ae461f8dec1752443ad6b61
 SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
 SHA1 (patch-php.ini-development) = 3b21def5e80441c9f8a97a0723a325245bd62c44
 SHA1 (patch-php.ini-production) = 58261628364ade763e7e67f2b6226412a386afb7
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
 SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0