CVS commit: pkgsrc/lang/php

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Dec 15 17:54:58 UTC 2019

Modified Files:
        pkgsrc/lang/php: phpversion.mk

Log Message:
lang/php: add support for PHP 7.4

Add support for PHP 7.4.


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 pkgsrc/lang/php/phpversion.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php/phpversion.mk
diff -u pkgsrc/lang/php/phpversion.mk:1.277 pkgsrc/lang/php/phpversion.mk:1.278
--- pkgsrc/lang/php/phpversion.mk:1.277 Mon Dec  9 14:23:45 2019
+++ pkgsrc/lang/php/phpversion.mk       Sun Dec 15 17:54:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.277 2019/12/09 14:23:45 taca Exp $
+# $NetBSD: phpversion.mk,v 1.278 2019/12/15 17:54:58 taca Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -10,7 +10,7 @@
 #      The PHP version to choose when more than one is acceptable to
 #      the package.
 #
-#      Possible: 56 71 72 73
+#      Possible: 56 71 72 73 74
 #      Default: 73
 #
 # === Infrastructure variables ===
@@ -27,13 +27,13 @@
 # PHP_VERSIONS_ACCEPTED
 #      The PHP versions that are accepted by the package.
 #
-#      Possible: 56 71 72 73
-#      Default: 73 56 71 72
+#      Possible: 56 71 72 73 74
+#      Default: 73 56 71 72 74
 #
 # PHP_VERSIONS_INCOMPATIBLE
 #      The PHP versions that are not supported by the package.
 #
-#      Possible: 56 71 72 73
+#      Possible: 56 71 72 73 74
 #      Default: (empty)
 #
 # PHP_CHECK_INSTALLED
@@ -48,7 +48,7 @@
 # PKG_PHP_VERSION
 #      The selected PHP version.
 #
-#      Possible: 56 71 72 73
+#      Possible: 56 71 72 73 74
 #      Default: ${PHP_VERSION_DEFAULT}
 #
 # PHP_BASE_VERS
@@ -72,7 +72,7 @@
 # PHP_PKG_PREFIX
 #      The prefix that is prepended to the package name.
 #
-#      Example: php56 php71 php72 php73
+#      Example: php56 php71 php72 php73 php74
 #
 # PHP_EXTENSION_DIR
 #      Relative path to ${PREFIX} for PHP's extensions.  It is derived from
@@ -91,12 +91,14 @@ PHP56_VERSION=      5.6.40
 PHP71_VERSION= 7.1.33
 PHP72_VERSION= 7.2.25
 PHP73_VERSION= 7.3.12
+PHP74_VERSION= 7.4.0
 
 # Define initial release of major version.
 PHP56_RELDATE= 20140828
 PHP71_RELDATE= 20160303
 PHP72_RELDATE= 20170718
 PHP73_RELDATE= 20181200
+PHP74_RELDATE= 20191128
 
 _VARGROUPS+=   php
 _USER_VARS.php=        PHP_VERSION_DEFAULT
@@ -107,7 +109,7 @@ _SYS_VARS.php=      PKG_PHP_VERSION PKG_PHP P
 .include "../../mk/bsd.prefs.mk"
 
 PHP_VERSION_DEFAULT?=          73
-PHP_VERSIONS_ACCEPTED?=                73 56 71 72
+PHP_VERSIONS_ACCEPTED?=                73 56 71 72 74
 .for pv in ${PHP_VERSIONS_ACCEPTED}
 .  if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
 _PHP_VERSIONS_ACCEPTED+=       ${pv}
@@ -120,7 +122,10 @@ _PHP_VERSION_${pv}_OK=     yes
 .endfor
 
 # check what is installed
-.if exists(${LOCALBASE}/lib/php/${PHP73_RELDATE})
+.if exists(${LOCALBASE}/lib/php/${PHP74_RELDATE})
+_PHP_VERSION_74_INSTALLED=     yes
+_PHP_INSTALLED=                        yes
+.elif exists(${LOCALBASE}/lib/php/${PHP73_RELDATE})
 _PHP_VERSION_73_INSTALLED=     yes
 _PHP_INSTALLED=                        yes
 .elif exists(${LOCALBASE}/lib/php/${PHP72_RELDATE})
@@ -224,6 +229,12 @@ PHP_VERSION=               ${PHP73_VERSION}
 PHP_INITIAL_TEENY=     0
 PHP_PKG_PREFIX=                php73
 PHP_EXTENSION_DIR=     lib/php/${PHP73_RELDATE}
+.elif ${_PHP_VERSION} == "74"
+PHPPKGSRCDIR=          ../../lang/php74
+PHP_VERSION=           ${PHP74_VERSION}
+PHP_INITIAL_TEENY=     0
+PHP_PKG_PREFIX=                php74
+PHP_EXTENSION_DIR=     lib/php/${PHP74_RELDATE}
 .else
 # force an error
 PKG_FAIL_REASON+=      "${PKG_PHP} is not a valid package"