From 2bdd4daeaad1e0cc0a7b7b19b7d5cd4b7a555795 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 18 Apr 2008 12:24:21 +0000 Subject: 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. --- mk/pbulk/pbulk-index.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk/pbulk') diff --git a/mk/pbulk/pbulk-index.mk b/mk/pbulk/pbulk-index.mk index f55eb4ddad7..4f4fa4f9737 100644 --- a/mk/pbulk/pbulk-index.mk +++ b/mk/pbulk/pbulk-index.mk @@ -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_LIST.php= PHP_VERSIONS_ACCEPTED _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 -- cgit v1.2.3