Mon Nov 13 16:33:10 2023 UTC ()
lang/php: switch default PHP's version to 8.1

Switch default PHP's version to 8.1 after discussion on tech-pkg@.


(taca)
diff -r1.412 -r1.413 pkgsrc/lang/php/phpversion.mk
cvs diff -r1.412 -r1.413 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2023/10/27 15:04:30 1.412
+++ pkgsrc/lang/php/phpversion.mk 2023/11/13 16:33:10 1.413
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: phpversion.mk,v 1.412 2023/10/27 15:04:30 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.413 2023/11/13 16:33:10 taca 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 74 80 81 82 13# Possible: 56 74 80 81 82
14# Default: 74 14# Default: 81
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
28# The PHP versions that are accepted by the package. 28# The PHP versions that are accepted by the package.
29# 29#
30# Possible: 56 74 80 81 82 30# Possible: 56 74 80 81 82
31# Default: 74 56 80 81 82 31# Default: 81 82 74 56 80
32# 32#
33# PHP_VERSIONS_INCOMPATIBLE 33# PHP_VERSIONS_INCOMPATIBLE
34# The PHP versions that are not supported by the package. 34# The PHP versions that are not supported by the package.
35# 35#
36# Possible: 56 74 80 81 82 36# Possible: 56 74 80 81 82
37# Default: (empty) 37# Default: (empty)
38# 38#
39# PHP_CHECK_INSTALLED 39# PHP_CHECK_INSTALLED
40# Check installed version of PHP. Should be used by lang/php56, 40# Check installed version of PHP. Should be used by lang/php56,
41# lang/php74, lang/php80, and lang/php81 only. 41# lang/php74, lang/php80, and lang/php81 only.
42# 42#
43# Possible: Yes No 43# Possible: Yes No
44# Default: Yes 44# Default: Yes
@@ -48,36 +48,36 @@ @@ -48,36 +48,36 @@
48# PKG_PHP_VERSION 48# PKG_PHP_VERSION
49# The selected PHP version. 49# The selected PHP version.
50# 50#
51# Possible: 56 74 80 81 82 51# Possible: 56 74 80 81 82
52# Default: ${PHP_VERSION_DEFAULT} 52# Default: ${PHP_VERSION_DEFAULT}
53# 53#
54# PHP_BASE_VERS 54# PHP_BASE_VERS
55# The selected PHP's full version depends on PKG_PHP_VERSION 55# The selected PHP's full version depends on PKG_PHP_VERSION
56# 56#
57# PKG_PHP_MAJOR_VERS 57# PKG_PHP_MAJOR_VERS
58# The selected PHP's major version. 58# The selected PHP's major version.
59# 59#
60# Possible: 5 7 8 60# Possible: 5 7 8
61# Default: 7 61# Default: 8
62# 62#
63# PKG_PHP 63# PKG_PHP
64# The same as ${PKG_PHP_VERSION}, prefixed with "php-". 64# The same as ${PKG_PHP_VERSION}, prefixed with "php-".
65# 65#
66# PHPPKGSRCDIR 66# PHPPKGSRCDIR
67# The directory of the PHP implementation, relative to the 67# The directory of the PHP implementation, relative to the
68# package directory. 68# package directory.
69# 69#
70# Example: ../../lang/php74 70# Example: ../../lang/php81
71# 71#
72# PHP_PKG_PREFIX 72# PHP_PKG_PREFIX
73# The prefix that is prepended to the package name. 73# The prefix that is prepended to the package name.
74# 74#
75# Example: php56 php74 php80 php81 75# Example: php56 php74 php80 php81
76# 76#
77# PHP_EXTENSION_DIR 77# PHP_EXTENSION_DIR
78# Relative path to ${PREFIX} for PHP's extensions. It is derived from 78# Relative path to ${PREFIX} for PHP's extensions. It is derived from
79# initial release of major version. 79# initial release of major version.
80# 80#
81# Example: lib/php/20181200 81# Example: lib/php/20181200
82# 82#
83# Keywords: php 83# Keywords: php
@@ -98,28 +98,28 @@ PHP56_RELDATE= 20140828 @@ -98,28 +98,28 @@ PHP56_RELDATE= 20140828
98PHP74_RELDATE= 20191128 98PHP74_RELDATE= 20191128
99PHP80_RELDATE= 20201124 99PHP80_RELDATE= 20201124
100PHP81_RELDATE= 20211125 100PHP81_RELDATE= 20211125
101PHP82_RELDATE= 20220829 101PHP82_RELDATE= 20220829
102 102
103_VARGROUPS+= php 103_VARGROUPS+= php
104_USER_VARS.php= PHP_VERSION_DEFAULT 104_USER_VARS.php= PHP_VERSION_DEFAULT
105_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 105_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
106_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 106_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
107 PKG_PHP_MAJOR_VERS 107 PKG_PHP_MAJOR_VERS
108 108
109.include "../../mk/bsd.prefs.mk" 109.include "../../mk/bsd.prefs.mk"
110 110
111PHP_VERSION_DEFAULT?= 74 111PHP_VERSION_DEFAULT?= 81
112PHP_VERSIONS_ACCEPTED?= 74 56 80 81 82 112PHP_VERSIONS_ACCEPTED?= 81 82 74 56 80
113.for pv in ${PHP_VERSIONS_ACCEPTED} 113.for pv in ${PHP_VERSIONS_ACCEPTED}
114. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv}) 114. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
115_PHP_VERSIONS_ACCEPTED+= ${pv} 115_PHP_VERSIONS_ACCEPTED+= ${pv}
116. endif 116. endif
117.endfor 117.endfor
118 118
119# transform the list into individual variables 119# transform the list into individual variables
120.for pv in ${_PHP_VERSIONS_ACCEPTED} 120.for pv in ${_PHP_VERSIONS_ACCEPTED}
121_PHP_VERSION_${pv}_OK= yes 121_PHP_VERSION_${pv}_OK= yes
122.endfor 122.endfor
123 123
124# check what is installed 124# check what is installed
125.if exists(${LOCALBASE}/lib/php/${PHP82_RELDATE}) 125.if exists(${LOCALBASE}/lib/php/${PHP82_RELDATE})