Tue Feb 20 13:22:42 2018 UTC ()
php: bump default to 70.


(wiz)
diff -r1.203 -r1.204 pkgsrc/lang/php/phpversion.mk
cvs diff -r1.203 -r1.204 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2018/02/02 12:53:39 1.203
+++ pkgsrc/lang/php/phpversion.mk 2018/02/20 13:22:42 1.204
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: phpversion.mk,v 1.203 2018/02/02 12:53:39 jdolecek Exp $ 1# $NetBSD: phpversion.mk,v 1.204 2018/02/20 13:22:42 wiz Exp $
2# 2#
3# This file selects a PHP version, based on the user's preferences and 3# This file selects a PHP version, based on the user's preferences and
4# the installed packages. It does not add a dependency on the PHP 4# the installed packages. It does not add a dependency on the PHP
5# package. 5# package.
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# PHP_VERSION_DEFAULT 9# PHP_VERSION_DEFAULT
10# The PHP version to choose when more than one is acceptable to 10# The PHP version to choose when more than one is acceptable to
11# the package. 11# the package.
12# 12#
13# Possible: 56 70 71 72 13# Possible: 56 70 71 72
14# Default: 56 14# Default: 70
15# 15#
16# === Infrastructure variables === 16# === Infrastructure variables ===
17# 17#
18# PHP_VERSION_REQD 18# PHP_VERSION_REQD
19# PHP version to use. This variable should not be set in 19# PHP version to use. This variable should not be set in
20# packages. Normally it is used by bulk build tools. 20# packages. Normally it is used by bulk build tools.
21# 21#
22# Possible: ${PHP_VERSIONS_ACCEPTED} 22# Possible: ${PHP_VERSIONS_ACCEPTED}
23# Default: ${PHP_VERSION_DEFAULT} 23# Default: ${PHP_VERSION_DEFAULT}
24# 24#
25# === Package-settable variables === 25# === Package-settable variables ===
26# 26#
27# PHP_VERSIONS_ACCEPTED 27# PHP_VERSIONS_ACCEPTED
@@ -96,27 +96,27 @@ PHP72_VERSION= 7.2.2 @@ -96,27 +96,27 @@ PHP72_VERSION= 7.2.2
96PHP56_RELDATE= 20140828 96PHP56_RELDATE= 20140828
97PHP70_RELDATE= 20151203 97PHP70_RELDATE= 20151203
98PHP71_RELDATE= 20160303 98PHP71_RELDATE= 20160303
99PHP72_RELDATE= 20170718 99PHP72_RELDATE= 20170718
100 100
101_VARGROUPS+= php 101_VARGROUPS+= php
102_USER_VARS.php= PHP_VERSION_DEFAULT 102_USER_VARS.php= PHP_VERSION_DEFAULT
103_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 103_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
104_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 104_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
105 PKG_PHP_MAJOR_VERS 105 PKG_PHP_MAJOR_VERS
106 106
107.include "../../mk/bsd.prefs.mk" 107.include "../../mk/bsd.prefs.mk"
108 108
109PHP_VERSION_DEFAULT?= 56 109PHP_VERSION_DEFAULT?= 70
110PHP_VERSIONS_ACCEPTED?= 56 70 71 72 110PHP_VERSIONS_ACCEPTED?= 56 70 71 72
111.for pv in ${PHP_VERSIONS_ACCEPTED} 111.for pv in ${PHP_VERSIONS_ACCEPTED}
112. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv}) 112. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
113_PHP_VERSIONS_ACCEPTED+= ${pv} 113_PHP_VERSIONS_ACCEPTED+= ${pv}
114. endif 114. endif
115.endfor 115.endfor
116 116
117# transform the list into individual variables 117# transform the list into individual variables
118.for pv in ${_PHP_VERSIONS_ACCEPTED} 118.for pv in ${_PHP_VERSIONS_ACCEPTED}
119_PHP_VERSION_${pv}_OK= yes 119_PHP_VERSION_${pv}_OK= yes
120.endfor 120.endfor
121 121
122# check what is installed 122# check what is installed