[pkgsrc/trunk]: pkgsrc Add PHP_VERSIONS_INCOMPATIBLE to filter out unsupporte...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c9e520a099ba
branches:  trunk
changeset: 352156:c9e520a099ba
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Sep 08 09:40:11 2016 +0000

description:
Add PHP_VERSIONS_INCOMPATIBLE to filter out unsupported versions,
especially if a package requires newer versions.

diffstat:

 lang/php/phpversion.mk  |  17 ++++++++++++++---
 mk/pbulk/pbulk-index.mk |   4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diffs (65 lines):

diff -r 24afaf67da8f -r c9e520a099ba lang/php/phpversion.mk
--- a/lang/php/phpversion.mk    Thu Sep 08 09:38:08 2016 +0000
+++ b/lang/php/phpversion.mk    Thu Sep 08 09:40:11 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.151 2016/08/22 03:21:17 taca Exp $
+# $NetBSD: phpversion.mk,v 1.152 2016/09/08 09:40:11 joerg 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
@@ -30,6 +30,12 @@
 #      Possible: 55 56 70 71
 #      Default: 55 56
 #
+# PHP_VERSIONS_INCOMPATIBLE
+#      The PHP versions that are not supported by the package.
+#
+#      Possible: 55 56 70 71
+#      Default: (empty)
+#
 # PHP_CHECK_INSTALLED
 #      Check installed version of PHP.  Should be used by lang/php55,
 #      lang/php56, lang/php70, or lang/php71 only.
@@ -102,9 +108,14 @@
 
 PHP_VERSION_DEFAULT?=          56
 PHP_VERSIONS_ACCEPTED?=                55 56 70 71
+.for pv in ${PHP_VERSIONS_ACCEPTED}
+.  if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
+_PHP_VERSIONS_ACCEPTED+=       ${pv}
+.  endif
+.endfor
 
 # transform the list into individual variables
-.for pv in ${PHP_VERSIONS_ACCEPTED}
+.for pv in ${_PHP_VERSIONS_ACCEPTED}
 _PHP_VERSION_${pv}_OK= yes
 .endfor
 
@@ -137,7 +148,7 @@
 .endif
 # prefer an already installed version, in order of "accepted"
 .if !defined(_PHP_VERSION)
-.for pv in ${PHP_VERSIONS_ACCEPTED}
+.for pv in ${_PHP_VERSIONS_ACCEPTED}
 .if defined(_PHP_VERSION_${pv}_INSTALLED)
 _PHP_VERSION?= ${pv}
 .else
diff -r 24afaf67da8f -r c9e520a099ba mk/pbulk/pbulk-index.mk
--- a/mk/pbulk/pbulk-index.mk   Thu Sep 08 09:38:08 2016 +0000
+++ b/mk/pbulk/pbulk-index.mk   Thu Sep 08 09:40:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: pbulk-index.mk,v 1.20 2014/06/10 15:22:14 joerg Exp $
+#      $NetBSD: pbulk-index.mk,v 1.21 2016/09/08 09:40:11 joerg Exp $
 
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to the parallel bulk build
@@ -30,7 +30,7 @@
 _PBULK_MULTI_VAR.mysql=                MYSQL_VERSION_REQD
 _PBULK_MULTI_DEFAULT.mysql=    MYSQL_VERSION_DEFAULT
 
-_PBULK_MULTI_LIST.php=         PHP_VERSIONS_ACCEPTED
+_PBULK_MULTI_LIST.php=         _PHP_VERSIONS_ACCEPTED
 _PBULK_MULTI_VAR.php=          PHP_VERSION_REQD
 _PBULK_MULTI_DEFAULT.php=      PHP_VERSION_DEFAULT