 @@ -1,268 +1,269 @@
-# $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
 SUBDIR+=	baci
 SUBDIR+=	basic256
 SUBDIR+=	boomerang
 SUBDIR+=	brandybasic
 SUBDIR+=	bwbasic
 SUBDIR+=	caml-light
 SUBDIR+=	camlp4
 SUBDIR+=	camlp5
 SUBDIR+=	ccsh
 SUBDIR+=	cdl3
 SUBDIR+=	chicken
 SUBDIR+=	cim
 SUBDIR+=	cint
 SUBDIR+=	clang
 SUBDIR+=	clang-static-analyzer
 SUBDIR+=	classpath
 SUBDIR+=	classpath-gui
 SUBDIR+=	clisp
 SUBDIR+=	clojure
 SUBDIR+=	coq
 SUBDIR+=	coreclr
 SUBDIR+=	cparser
 SUBDIR+=	cu-prolog
 SUBDIR+=	duktape
 SUBDIR+=	eag
 SUBDIR+=	ecl
 SUBDIR+=	eieio
 SUBDIR+=	elisp-manual
 SUBDIR+=	elk
 SUBDIR+=	embryo
 SUBDIR+=	erlang
 SUBDIR+=	erlang-doc
 SUBDIR+=	erlang-luerl
 SUBDIR+=	erlang-man
 SUBDIR+=	f2c
 SUBDIR+=	ficl
 SUBDIR+=	focal
 SUBDIR+=	fort77
 SUBDIR+=	g95
 SUBDIR+=	gambc
 SUBDIR+=	gauche
 SUBDIR+=	gawk
 SUBDIR+=	gcc-aux
 SUBDIR+=	gcc2
 SUBDIR+=	gcc3
 SUBDIR+=	gcc3-c
 SUBDIR+=	gcc3-c++
 SUBDIR+=	gcc3-f77
 SUBDIR+=	gcc3-objc
 SUBDIR+=	gcc34
 SUBDIR+=	gcc44
 SUBDIR+=	gcc48
 SUBDIR+=	gcc48-libs
 SUBDIR+=	gcc49
 SUBDIR+=	gcc49-libs
 SUBDIR+=	gcc5
 SUBDIR+=	gcc5-aux
 SUBDIR+=	gcc5-libs
 SUBDIR+=	gcc6
 SUBDIR+=	gcc6-aux
 SUBDIR+=	gcc6-libs
 SUBDIR+=	gcc7
 SUBDIR+=	gforth
 SUBDIR+=	ghc
 SUBDIR+=	ghc-bootstrap
 SUBDIR+=	ghc7
 SUBDIR+=	gnat_util
 SUBDIR+=	gnucobol
 SUBDIR+=	go
 SUBDIR+=	go-hcl
 SUBDIR+=	go14
 SUBDIR+=	gpc
 SUBDIR+=	gprolog
 SUBDIR+=	guile
 SUBDIR+=	guile20
 SUBDIR+=	guile22
 SUBDIR+=	gwydion-dylan
 SUBDIR+=	heirloom-awk
 SUBDIR+=	hugs
 SUBDIR+=	icon
 SUBDIR+=	inform
 SUBDIR+=	intercal
 SUBDIR+=	ja-gawk
 SUBDIR+=	jamvm
 SUBDIR+=	japhar
 SUBDIR+=	jasmin
 SUBDIR+=	java-lang-spec
 SUBDIR+=	java-vm-spec
 SUBDIR+=	jikes
 SUBDIR+=	jimtcl
 SUBDIR+=	jini
 SUBDIR+=	joos
 SUBDIR+=	js
 SUBDIR+=	kaffe
 SUBDIR+=	kaffe-esound
 SUBDIR+=	kaffe-x11
 SUBDIR+=	kali
 SUBDIR+=	konoha
 SUBDIR+=	ksi
 SUBDIR+=	libLLVM
 SUBDIR+=	libLLVM34
 SUBDIR+=	libduktape
 SUBDIR+=	librep
 SUBDIR+=	libtcl-nothread
 SUBDIR+=	libunwind
 SUBDIR+=	likepython
 SUBDIR+=	llvm
 #SUBDIR+=	lua		# only contains Makefile fragments
 SUBDIR+=	lua51
 SUBDIR+=	lua52
 SUBDIR+=	lua53
 SUBDIR+=	lush
 SUBDIR+=	maude
 SUBDIR+=	mawk
 SUBDIR+=	mercury
 SUBDIR+=	micropython
 SUBDIR+=	minischeme
 SUBDIR+=	mit-scheme-bin
 SUBDIR+=	mono
 SUBDIR+=	mono-basic
 SUBDIR+=	mono2
 SUBDIR+=	moscow_ml
 SUBDIR+=	mpd
 SUBDIR+=	nawk
 SUBDIR+=	newlisp
 SUBDIR+=	newsqueak
 SUBDIR+=	nhc98
 SUBDIR+=	nim
 SUBDIR+=	nodejs
 SUBDIR+=	nodejs4
 SUBDIR+=	nodejs6
 SUBDIR+=	nodejs8
 SUBDIR+=	nqp
 SUBDIR+=	nuitka
 SUBDIR+=	objc
 SUBDIR+=	ocaml
 SUBDIR+=	oo2c
 SUBDIR+=	open-cobol-ce
 SUBDIR+=	opencobol
 SUBDIR+=	openjdk7
 SUBDIR+=	openjdk8
 SUBDIR+=	opensource-cobol
 SUBDIR+=	oracle-jdk8
 SUBDIR+=	oracle-jre8
 SUBDIR+=	ossp-js
 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
 SUBDIR+=	py-pythonz
 SUBDIR+=	py-six
 SUBDIR+=	py27-html-docs
 SUBDIR+=	py34-html-docs
 SUBDIR+=	py35-html-docs
 SUBDIR+=	py36-html-docs
 #SUBDIR+=	python		# only contains Makefile fragments
 SUBDIR+=	python27
 SUBDIR+=	python34
 SUBDIR+=	python35
 SUBDIR+=	python36
 SUBDIR+=	qore
 SUBDIR+=	racket
 SUBDIR+=	racket-textual
 SUBDIR+=	rakudo
 SUBDIR+=	rakudo-star
 SUBDIR+=	rcfunge
 SUBDIR+=	rexx-imc
 SUBDIR+=	rexx-regina
 SUBDIR+=	ruby
 SUBDIR+=	ruby-coffee-script
 SUBDIR+=	ruby-coffee-script-source
 SUBDIR+=	ruby-doc-stdlib
 SUBDIR+=	ruby-execjs
 SUBDIR+=	ruby-gherkin
 SUBDIR+=	ruby-rkelly-remix
 SUBDIR+=	ruby22
 SUBDIR+=	ruby22-base
 SUBDIR+=	ruby23
 SUBDIR+=	ruby23-base
 SUBDIR+=	ruby24
 SUBDIR+=	ruby24-base
 SUBDIR+=	runawk
 SUBDIR+=	rust
 SUBDIR+=	sablevm
 SUBDIR+=	sablevm-classpath
 SUBDIR+=	sablevm-classpath-gui
 SUBDIR+=	sather
 SUBDIR+=	sbcl
 SUBDIR+=	scala
 SUBDIR+=	scheme48
 SUBDIR+=	scm
 SUBDIR+=	see
 SUBDIR+=	sigscheme
 SUBDIR+=	siod
 SUBDIR+=	smalltalk
 SUBDIR+=	smlnj
 SUBDIR+=	smlnj11072
 SUBDIR+=	snobol
 SUBDIR+=	spidermonkey
 SUBDIR+=	spidermonkey17
 SUBDIR+=	spidermonkey185
 SUBDIR+=	spl
 SUBDIR+=	squeak
 SUBDIR+=	squeak-vm
 SUBDIR+=	sr
 SUBDIR+=	sr-examples
 SUBDIR+=	stalin
 SUBDIR+=	sun-jdk6
 SUBDIR+=	sun-jdk7
 SUBDIR+=	sun-jre6
 SUBDIR+=	sun-jre7
 SUBDIR+=	swi-prolog
 SUBDIR+=	swi-prolog-jpl
 SUBDIR+=	swi-prolog-lite
 SUBDIR+=	swi-prolog-packages
 SUBDIR+=	tcl
 SUBDIR+=	tcl-expect
 SUBDIR+=	tcl-otcl
 SUBDIR+=	tcl85
 SUBDIR+=	tinyscheme
 SUBDIR+=	ucblogo
 SUBDIR+=	umb-scheme
 SUBDIR+=	utilisp
 SUBDIR+=	vala
 SUBDIR+=	vscm
 SUBDIR+=	vslisp
 SUBDIR+=	wsbasic
 SUBDIR+=	yabasic
 SUBDIR+=	yap
 .include "../mk/misc/category.mk"

 @@ -1,235 +1,246 @@
-# $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}
 .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} == "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:
+#
 .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