[pkgsrc/trunk]: pkgsrc As all Python packages are required to include lang/py...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/54b961ebb6d6
branches:  trunk
changeset: 541287:54b961ebb6d6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Apr 18 12:24:21 2008 +0000

description:
As all Python packages are required to include lang/python/pyversion.mk
anyway, simplify logic a bit:
Add Python 2.5 to the default list, but also mark it as incompatible if
wip/python25 is not present. Move the Darwin handling after setting a
default value.
Provide a new variable _PYTHON_VERSIONS_ACCEPTED that is filtered by
PYTHON_VERSIONS_INCOMPATIBLE. This helps to avoid providing broken
dependencies when a version is not supported as PYPKGPREFIX wouldn't be
set in that case.

diffstat:

 lang/python/pyversion.mk |  14 ++++++++------
 mk/pbulk/pbulk-index.mk  |   4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 40d3007c24b4 -r 54b961ebb6d6 lang/python/pyversion.mk
--- a/lang/python/pyversion.mk  Fri Apr 18 12:02:52 2008 +0000
+++ b/lang/python/pyversion.mk  Fri Apr 18 12:24:21 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.55 2008/04/11 15:37:30 abs Exp $
+# $NetBSD: pyversion.mk,v 1.56 2008/04/18 12:24:21 joerg Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -62,15 +62,16 @@
 BUILD_DEFS_EFFECTS+=   PYPACKAGE
 
 PYTHON_VERSION_DEFAULT?=               24
+PYTHON_VERSIONS_ACCEPTED?=             25 24 23 22 21 20
+PYTHON_VERSIONS_INCOMPATIBLE?=         # empty by default
+
 .if ${OPSYS} == "Darwin"
 PYTHON_VERSIONS_INCOMPATIBLE+=         22 21 20 15
 .endif
-.if exists(../../wip/python25/Makefile)
-PYTHON_VERSIONS_ACCEPTED?=             25 24 23 22 21 20
-.else
-PYTHON_VERSIONS_ACCEPTED?=             24 23 22 21 20
+
+.if !exists(../../wip/python25/Makefile)
+PYTHON_VERSIONS_INCOMPATIBLE+=         25
 .endif
-PYTHON_VERSIONS_INCOMPATIBLE?=         # empty by default
 
 BUILDLINK_API_DEPENDS.python15?=               python15>=1.5
 BUILDLINK_API_DEPENDS.python20?=               python20>=2.0
@@ -84,6 +85,7 @@
 .for pv in ${PYTHON_VERSIONS_ACCEPTED}
 .if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
 _PYTHON_VERSION_${pv}_OK=      yes
+_PYTHON_VERSIONS_ACCEPTED+=    ${pv}
 .endif
 .endfor
 
diff -r 40d3007c24b4 -r 54b961ebb6d6 mk/pbulk/pbulk-index.mk
--- a/mk/pbulk/pbulk-index.mk   Fri Apr 18 12:02:52 2008 +0000
+++ b/mk/pbulk/pbulk-index.mk   Fri Apr 18 12:24:21 2008 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: pbulk-index.mk,v 1.7 2008/01/15 22:04:57 joerg Exp $
+#      $NetBSD: pbulk-index.mk,v 1.8 2008/04/18 12:24:21 joerg Exp $
 
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to the parallel bulk build
@@ -26,7 +26,7 @@
 _PBULK_MULTI_VAR.php=          PHP_VERSION_REQD
 _PBULK_MULTI_DEFAULT.php=      PHP_VERSION_DEFAULT
 
-_PBULK_MULTI_LIST.python=      PYTHON_VERSIONS_ACCEPTED
+_PBULK_MULTI_LIST.python=      _PYTHON_VERSIONS_ACCEPTED
 _PBULK_MULTI_VAR.python=       PYTHON_VERSION_REQD
 _PBULK_MULTI_DEFAULT.python=   PYTHON_VERSION_DEFAULT