Tue Jun 13 14:43:49 2023 UTC ()
lang/php: properly passing PHP_VERSION_REQD

Properly passing PHP_VERSION_REQD, fixing some dependency problem noted by
wen@ via private mail.


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

--- pkgsrc/lang/php/phpversion.mk 2023/06/09 13:18:55 1.400
+++ pkgsrc/lang/php/phpversion.mk 2023/06/13 14:43:49 1.401
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.400 2023/06/09 13:18:55 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.401 2023/06/13 14:43:49 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: 74
@@ -235,14 +235,16 @@ _PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+ @@ -235,14 +235,16 @@ _PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+
235_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 235_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
236 236
237PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY} 237PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY}
238 238
239# 239#
240# check installed version against required: 240# check installed version against required:
241# 241#
242.if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) 242.if !empty(PHP_CHECK_INSTALLED:M[nN][oO])
243.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED} 243.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED}
244PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed." 244PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed."
245.endif 245.endif
246.endif 246.endif
247 247
 248MAKEFLAGS+= PHP_VERSION_REQD=${PHP_VERSION_REQD}
 249
248.endif # PHPVERSION_MK 250.endif # PHPVERSION_MK