 @@ -1,134 +1,139 @@
-# $NetBSD: phpversion.mk,v 1.193 2017/10/27 08:47:49 taca Exp $
+# $NetBSD: phpversion.mk,v 1.194 2017/11/15 08:56:12 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
+#	Possible: 56 70 71 72
 #	Default: 56
+#
 # === 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 70 71
+#	Possible: 56 70 71 72
 #	Default: 56
+#
 # PHP_VERSIONS_INCOMPATIBLE
 #	The PHP versions that are not supported by the package.
+#
-#	Possible: 56 70 71
+#	Possible: 56 70 71 72
 #	Default: (empty)
+#
 # PHP_CHECK_INSTALLED
 #	Check installed version of PHP.  Should be used by lang/php56,
 #	lang/php70, or lang/php71 only.
+#
 #	Possible: Yes No
 #	Default: Yes
+#
 # === Variables defined by this file ===
+#
 # PKG_PHP_VERSION
 #	The selected PHP version.
+#
-#	Possible: 56 70 71
+#	Possible: 56 70 71 72
 #	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: 5
+#
 # 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/php56
+#
 # PHP_PKG_PREFIX
 #	The prefix that is prepended to the package name.
+#
-#	Example: php56 php70 php71
+#	Example: php56 php70 php71 php72
+#
 # 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.32
 PHP70_VERSION=	7.0.25
 PHP71_VERSION=	7.1.11
 PHP72_VERSION=	7.2.0RC6
 # 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
 .include "../../mk/bsd.prefs.mk"
 PHP_VERSION_DEFAULT?=		56
-PHP_VERSIONS_ACCEPTED?=		56 70 71
+PHP_VERSIONS_ACCEPTED?=		56 70 71 72
 .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/${PHP71_RELDATE})
+.if 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/${PHP70_RELDATE})
 _PHP_VERSION_70_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}
 @@ -203,26 +208,32 @@ PHP_PKG_PREFIX=		php56
 PHP_EXTENSION_DIR=	lib/php/${PHP56_RELDATE}
 .elif ${_PHP_VERSION} == "70"
 PHPPKGSRCDIR=		../../lang/php70
 PHP_VERSION=		${PHP70_VERSION}
 PHP_INITIAL_TEENY=	0
 PHP_PKG_PREFIX=		php70
 PHP_EXTENSION_DIR=	lib/php/${PHP70_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}
 .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:
+#

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.469 2017/11/01 12:07:31 fhajny Exp $
+# $NetBSD: Makefile,v 1.470 2017/11/15 08:56:12 jdolecek Exp $
+#
 COMMENT=	Programming languages
 SUBDIR+=	Cg-compiler
 SUBDIR+=	LuaJIT
 SUBDIR+=	LuaJIT2
 SUBDIR+=	STk
 SUBDIR+=	a60
 SUBDIR+=	abcl
 SUBDIR+=	algol68g
 SUBDIR+=	asn1c
 SUBDIR+=	awka
 @@ -161,26 +161,27 @@ SUBDIR+=	owl-lisp
 SUBDIR+=	p2c
 SUBDIR+=	p5-Switch
 SUBDIR+=	parrot
 SUBDIR+=	pcc
 SUBDIR+=	pcc-current
 SUBDIR+=	pear
 SUBDIR+=	perl5
 SUBDIR+=	pfe
 SUBDIR+=	pforth
 #SUBDIR+=	php		# only contains Makefile fragments
 SUBDIR+=	php56
 SUBDIR+=	php70
 SUBDIR+=	php71
 SUBDIR+=	php72
 SUBDIR+=	picoc
 SUBDIR+=	pict
 SUBDIR+=	polyml
 SUBDIR+=	py-asttokens
 SUBDIR+=	py-basicproperty
 SUBDIR+=	py-byterun
 SUBDIR+=	py-cxfreeze
 SUBDIR+=	py-execjs
 SUBDIR+=	py-hy
 SUBDIR+=	py-js2py
 SUBDIR+=	py-jsparser
 SUBDIR+=	py-parso
 SUBDIR+=	py-pyrex