Sun Jul 31 15:39:27 2016 UTC ()
make PHP 5.6 the default if it's still not installed; active support ends on 2016-12-31, but quite a few modules don't have versions with PHP7 support yet, so 7.0 is not quite good default yet


(jdolecek)
diff -r1.144 -r1.145 pkgsrc/lang/php/phpversion.mk
cvs diff -r1.144 -r1.145 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2016/07/24 02:20:16 1.144
+++ pkgsrc/lang/php/phpversion.mk 2016/07/31 15:39:27 1.145
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.144 2016/07/24 02:20:16 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.145 2016/07/31 15:39:27 jdolecek 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: 55 56 70 13# Possible: 55 56 70
14# Default: 55 14# Default: 55
@@ -88,27 +88,27 @@ PHP70_VERSION= 7.0.9 @@ -88,27 +88,27 @@ PHP70_VERSION= 7.0.9
88# Define initial release of major version. 88# Define initial release of major version.
89PHP55_RELDATE= 20130620 89PHP55_RELDATE= 20130620
90PHP56_RELDATE= 20140828 90PHP56_RELDATE= 20140828
91PHP70_RELDATE= 20151203 91PHP70_RELDATE= 20151203
92 92
93_VARGROUPS+= php 93_VARGROUPS+= php
94_USER_VARS.php= PHP_VERSION_DEFAULT 94_USER_VARS.php= PHP_VERSION_DEFAULT
95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 95_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 96_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
97 PKG_PHP_MAJOR_VERS 97 PKG_PHP_MAJOR_VERS
98 98
99.include "../../mk/bsd.prefs.mk" 99.include "../../mk/bsd.prefs.mk"
100 100
101PHP_VERSION_DEFAULT?= 55 101PHP_VERSION_DEFAULT?= 56
102PHP_VERSIONS_ACCEPTED?= 55 56 70 102PHP_VERSIONS_ACCEPTED?= 55 56 70
103 103
104# transform the list into individual variables 104# transform the list into individual variables
105.for pv in ${PHP_VERSIONS_ACCEPTED} 105.for pv in ${PHP_VERSIONS_ACCEPTED}
106_PHP_VERSION_${pv}_OK= yes 106_PHP_VERSION_${pv}_OK= yes
107.endfor 107.endfor
108 108
109# check what is installed 109# check what is installed
110.if exists(${LOCALBASE}/lib/php/20151203) 110.if exists(${LOCALBASE}/lib/php/20151203)
111_PHP_VERSION_70_INSTALLED= yes 111_PHP_VERSION_70_INSTALLED= yes
112_PHP_INSTALLED= yes 112_PHP_INSTALLED= yes
113.elif exists(${LOCALBASE}/lib/php/20140828) 113.elif exists(${LOCALBASE}/lib/php/20140828)
114_PHP_VERSION_56_INSTALLED= yes 114_PHP_VERSION_56_INSTALLED= yes