CVS commit: pkgsrc

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Sep  8 09:40:11 UTC 2016

Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/mk/pbulk: pbulk-index.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mk/pbulk/pbulk-index.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.151 pkgsrc/lang/php/phpversion.mk:1.152
--- pkgsrc/lang/php/phpversion.mk:1.151 Mon Aug 22 03:21:17 2016
+++ pkgsrc/lang/php/phpversion.mk       Thu Sep  8 09:40:11 2016
@@ -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 @@ _SYS_VARS.php=     PKG_PHP_VERSION PKG_PHP P
 
 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 @@ _PHP_VERSION=       ${PHP_VERSION_DEFAULT}
 .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

Index: pkgsrc/mk/pbulk/pbulk-index.mk
diff -u pkgsrc/mk/pbulk/pbulk-index.mk:1.20 pkgsrc/mk/pbulk/pbulk-index.mk:1.21
--- pkgsrc/mk/pbulk/pbulk-index.mk:1.20 Tue Jun 10 15:22:14 2014
+++ pkgsrc/mk/pbulk/pbulk-index.mk      Thu Sep  8 09:40:11 2016
@@ -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_LIST.mysql=      MYSQL_VERSIONS_
 _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