CVS commit: pkgsrc/lang/php

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Dec 16 16:13:11 UTC 2019

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

Log Message:
lang/php: remove php71 support

Remove php71 (PHP 7.1.x) support.


To generate a diff of this commit:
cvs rdiff -u -r1.279 -r1.280 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.279 pkgsrc/lang/php/phpversion.mk:1.280
--- pkgsrc/lang/php/phpversion.mk:1.279 Mon Dec 16 15:58:18 2019
+++ pkgsrc/lang/php/phpversion.mk       Mon Dec 16 16:13:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.279 2019/12/16 15:58:18 taca Exp $
+# $NetBSD: phpversion.mk,v 1.280 2019/12/16 16:13:11 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 74
+#      Possible: 56 72 73 74
 #      Default: 73
 #
 # === Infrastructure variables ===
@@ -27,18 +27,18 @@
 # PHP_VERSIONS_ACCEPTED
 #      The PHP versions that are accepted by the package.
 #
-#      Possible: 56 71 72 73 74
-#      Default: 73 56 71 72 74
+#      Possible: 56 72 73 74
+#      Default: 73 56 72 74
 #
 # PHP_VERSIONS_INCOMPATIBLE
 #      The PHP versions that are not supported by the package.
 #
-#      Possible: 56 71 72 73 74
+#      Possible: 56 72 73 74
 #      Default: (empty)
 #
 # PHP_CHECK_INSTALLED
 #      Check installed version of PHP.  Should be used by lang/php56,
-#      lang/php71, lang/php72 or lang/php73 only.
+#      lang/php72, lang/php73 or lang/php74 only.
 #
 #      Possible: Yes No
 #      Default: Yes
@@ -48,7 +48,7 @@
 # PKG_PHP_VERSION
 #      The selected PHP version.
 #
-#      Possible: 56 71 72 73 74
+#      Possible: 56 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 php74
+#      Example: php56 php72 php73 php74
 #
 # PHP_EXTENSION_DIR
 #      Relative path to ${PREFIX} for PHP's extensions.  It is derived from
@@ -88,14 +88,12 @@ PHPVERSION_MK=      defined
 
 # Define each PHP's version.
 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
@@ -109,7 +107,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 74
+PHP_VERSIONS_ACCEPTED?=                73 56 72 74
 .for pv in ${PHP_VERSIONS_ACCEPTED}
 .  if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
 _PHP_VERSIONS_ACCEPTED+=       ${pv}
@@ -131,9 +129,6 @@ _PHP_INSTALLED=                     yes
 .elif exists(${LOCALBASE}/lib/php/${PHP72_RELDATE})
 _PHP_VERSION_72_INSTALLED=     yes
 _PHP_INSTALLED=                        yes
-.elif exists(${LOCALBASE}/lib/php/${PHP71_RELDATE})
-_PHP_VERSION_71_INSTALLED=     yes
-_PHP_INSTALLED=                        yes
 .elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE})
 _PHP_VERSION_56_INSTALLED=     yes
 _PHP_INSTALLED=                        yes
@@ -209,9 +204,6 @@ PHP_VERSION_REQD:=  ${PKG_PHP_VERSION}
 PHP_VERSION=           ${PHP56_VERSION}
 PHP_INITIAL_TEENY=     3
 PHP_EXTENSION_DIR=     lib/php/${PHP56_RELDATE}
-.elif ${_PHP_VERSION} == "71"
-PHP_VERSION=           ${PHP71_VERSION}
-PHP_EXTENSION_DIR=     lib/php/${PHP71_RELDATE}
 .elif ${_PHP_VERSION} == "72"
 PHP_VERSION=           ${PHP72_VERSION}
 PHP_EXTENSION_DIR=     lib/php/${PHP72_RELDATE}