Sun Jan 3 15:21:04 2021 UTC ()
lang/php: remove php72 support

Remove php72 (PHP 7.2) support.


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

--- pkgsrc/lang/php/phpversion.mk 2020/11/26 14:45:15 1.315
+++ pkgsrc/lang/php/phpversion.mk 2021/01/03 15:21:04 1.316
@@ -1,144 +1,139 @@ @@ -1,144 +1,139 @@
1# $NetBSD: phpversion.mk,v 1.315 2020/11/26 14:45:15 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.316 2021/01/03 15:21:04 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 72 73 74 13# Possible: 56 73 74
14# Default: 73 14# Default: 73
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 72 73 74 30# Possible: 56 73 74
31# Default: 73 56 72 74 31# Default: 73 56 74
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 72 73 74 36# Possible: 56 73 74
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/php72, lang/php73 or lang/php74 only. 41# lang/php73 or lang/php74 only.
42# 42#
43# Possible: Yes No 43# Possible: Yes No
44# Default: Yes 44# Default: Yes
45# 45#
46# === Variables defined by this file === 46# === Variables defined by this file ===
47# 47#
48# PKG_PHP_VERSION 48# PKG_PHP_VERSION
49# The selected PHP version. 49# The selected PHP version.
50# 50#
51# Possible: 56 72 73 74 51# Possible: 56 73 74
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 60# Possible: 5 7
61# Default: 7 61# Default: 7
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/php73 70# Example: ../../lang/php73
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 php72 php73 php74 75# Example: php56 php73 php74
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
84# 84#
85 85
86.if !defined(PHPVERSION_MK) 86.if !defined(PHPVERSION_MK)
87PHPVERSION_MK= defined 87PHPVERSION_MK= defined
88 88
89# Define each PHP's version. 89# Define each PHP's version.
90PHP56_VERSION= 5.6.40 90PHP56_VERSION= 5.6.40
91PHP72_VERSION= 7.2.34 
92PHP73_VERSION= 7.3.25 91PHP73_VERSION= 7.3.25
93PHP74_VERSION= 7.4.13 92PHP74_VERSION= 7.4.13
94 93
95# Define initial release of major version. 94# Define initial release of major version.
96PHP56_RELDATE= 20140828 95PHP56_RELDATE= 20140828
97PHP72_RELDATE= 20170718 
98PHP73_RELDATE= 20181200 96PHP73_RELDATE= 20181200
99PHP74_RELDATE= 20191128 97PHP74_RELDATE= 20191128
100 98
101_VARGROUPS+= php 99_VARGROUPS+= php
102_USER_VARS.php= PHP_VERSION_DEFAULT 100_USER_VARS.php= PHP_VERSION_DEFAULT
103_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 101_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
104_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 102_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
105 PKG_PHP_MAJOR_VERS 103 PKG_PHP_MAJOR_VERS
106 104
107.include "../../mk/bsd.prefs.mk" 105.include "../../mk/bsd.prefs.mk"
108 106
109PHP_VERSION_DEFAULT?= 73 107PHP_VERSION_DEFAULT?= 73
110PHP_VERSIONS_ACCEPTED?= 73 56 72 74 108PHP_VERSIONS_ACCEPTED?= 73 74 56
111.for pv in ${PHP_VERSIONS_ACCEPTED} 109.for pv in ${PHP_VERSIONS_ACCEPTED}
112. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv}) 110. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
113_PHP_VERSIONS_ACCEPTED+= ${pv} 111_PHP_VERSIONS_ACCEPTED+= ${pv}
114. endif 112. endif
115.endfor 113.endfor
116 114
117# transform the list into individual variables 115# transform the list into individual variables
118.for pv in ${_PHP_VERSIONS_ACCEPTED} 116.for pv in ${_PHP_VERSIONS_ACCEPTED}
119_PHP_VERSION_${pv}_OK= yes 117_PHP_VERSION_${pv}_OK= yes
120.endfor 118.endfor
121 119
122# check what is installed 120# check what is installed
123.if exists(${LOCALBASE}/lib/php/${PHP74_RELDATE}) 121.if exists(${LOCALBASE}/lib/php/${PHP74_RELDATE})
124_PHP_VERSION_74_INSTALLED= yes 122_PHP_VERSION_74_INSTALLED= yes
125_PHP_INSTALLED= yes 123_PHP_INSTALLED= yes
126.elif exists(${LOCALBASE}/lib/php/${PHP73_RELDATE}) 124.elif exists(${LOCALBASE}/lib/php/${PHP73_RELDATE})
127_PHP_VERSION_73_INSTALLED= yes 125_PHP_VERSION_73_INSTALLED= yes
128_PHP_INSTALLED= yes 126_PHP_INSTALLED= yes
129.elif exists(${LOCALBASE}/lib/php/${PHP72_RELDATE}) 
130_PHP_VERSION_72_INSTALLED= yes 
131_PHP_INSTALLED= yes 
132.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE}) 127.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE})
133_PHP_VERSION_56_INSTALLED= yes 128_PHP_VERSION_56_INSTALLED= yes
134_PHP_INSTALLED= yes 129_PHP_INSTALLED= yes
135.endif 130.endif
136 131
137# if a version is explicitely required, take it 132# if a version is explicitely required, take it
138.if defined(PHP_VERSION_REQD) 133.if defined(PHP_VERSION_REQD)
139_PHP_VERSION= ${PHP_VERSION_REQD} 134_PHP_VERSION= ${PHP_VERSION_REQD}
140.endif 135.endif
141# if the default is already installed, it is first choice 136# if the default is already installed, it is first choice
142.if !defined(_PHP_VERSION) 137.if !defined(_PHP_VERSION)
143.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 138.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
144.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED) 139.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
@@ -194,29 +189,26 @@ PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP @@ -194,29 +189,26 @@ PLIST_SUBST+= PKG_PHP_VERSION=${PKG_PHP
194 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \ 189 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
195 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 190 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
196 191
197# force the selected PHP version for recursive builds 192# force the selected PHP version for recursive builds
198PHP_VERSION_REQD:= ${PKG_PHP_VERSION} 193PHP_VERSION_REQD:= ${PKG_PHP_VERSION}
199 194
200# 195#
201# set variables for the version we decided to use: 196# set variables for the version we decided to use:
202# 197#
203.if ${_PHP_VERSION} == "56" 198.if ${_PHP_VERSION} == "56"
204PHP_VERSION= ${PHP56_VERSION} 199PHP_VERSION= ${PHP56_VERSION}
205PHP_INITIAL_TEENY= 3 200PHP_INITIAL_TEENY= 3
206PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE} 201PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE}
207.elif ${_PHP_VERSION} == "72" 
208PHP_VERSION= ${PHP72_VERSION} 
209PHP_EXTENSION_DIR= lib/php/${PHP72_RELDATE} 
210.elif ${_PHP_VERSION} == "73" 202.elif ${_PHP_VERSION} == "73"
211PHP_VERSION= ${PHP73_VERSION} 203PHP_VERSION= ${PHP73_VERSION}
212PHP_EXTENSION_DIR= lib/php/${PHP73_RELDATE} 204PHP_EXTENSION_DIR= lib/php/${PHP73_RELDATE}
213.elif ${_PHP_VERSION} == "74" 205.elif ${_PHP_VERSION} == "74"
214PHP_VERSION= ${PHP74_VERSION} 206PHP_VERSION= ${PHP74_VERSION}
215PHP_EXTENSION_DIR= lib/php/${PHP74_RELDATE} 207PHP_EXTENSION_DIR= lib/php/${PHP74_RELDATE}
216.else 208.else
217# force an error 209# force an error
218PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package" 210PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package"
219.endif 211.endif
220 212
221PHP_INITIAL_TEENY?= 0 213PHP_INITIAL_TEENY?= 0
222PHPPKGSRCDIR= ../../lang/php${PKG_PHP_VERSION} 214PHPPKGSRCDIR= ../../lang/php${PKG_PHP_VERSION}