Sun Apr 19 15:09:51 2009 UTC ()
Add py26 to default list of PYTHON_VERSIONS_ACCEPTED and set
BUILDLINK_API_DEPENDS.python26.


(snj)
diff -r1.68 -r1.69 pkgsrc/lang/python/pyversion.mk
cvs diff -r1.68 -r1.69 pkgsrc/lang/python/pyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/pyversion.mk 2009/04/19 14:48:17 1.68
+++ pkgsrc/lang/python/pyversion.mk 2009/04/19 15:09:51 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pyversion.mk,v 1.68 2009/04/19 14:48:17 wiz Exp $ 1# $NetBSD: pyversion.mk,v 1.69 2009/04/19 15:09:51 snj Exp $
2 2
3# This file determines which Python version is used as a dependency for 3# This file determines which Python version is used as a dependency for
4# a package. 4# a package.
5# 5#
6# === User-settable variables === 6# === User-settable variables ===
7# 7#
8# PYTHON_VERSION_DEFAULT 8# PYTHON_VERSION_DEFAULT
9# The preferred Python version to use. 9# The preferred Python version to use.
10# 10#
11# Possible values: 23 24 25 26 11# Possible values: 23 24 25 26
12# Default: 25 12# Default: 25
13# 13#
14# === Package-settable variables === 14# === Package-settable variables ===
@@ -59,32 +59,33 @@ PYTHON_PYVERSION_MK= defined @@ -59,32 +59,33 @@ PYTHON_PYVERSION_MK= defined
59 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*) 59 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
60PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 60PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
61.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \ 61.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
62 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*) 62 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
63PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 63PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
64.endif 64.endif
65 65
66.include "../../mk/bsd.prefs.mk" 66.include "../../mk/bsd.prefs.mk"
67 67
68BUILD_DEFS+= PYTHON_VERSION_DEFAULT 68BUILD_DEFS+= PYTHON_VERSION_DEFAULT
69BUILD_DEFS_EFFECTS+= PYPACKAGE 69BUILD_DEFS_EFFECTS+= PYPACKAGE
70 70
71PYTHON_VERSION_DEFAULT?= 25 71PYTHON_VERSION_DEFAULT?= 25
72PYTHON_VERSIONS_ACCEPTED?= 25 24 23 72PYTHON_VERSIONS_ACCEPTED?= 26 25 24 23
73PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default 73PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
74 74
75BUILDLINK_API_DEPENDS.python23?= python23>=2.3 75BUILDLINK_API_DEPENDS.python23?= python23>=2.3
76BUILDLINK_API_DEPENDS.python24?= python24>=2.4 76BUILDLINK_API_DEPENDS.python24?= python24>=2.4
77BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1 77BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1
 78BUILDLINK_API_DEPENDS.python26?= python26>=2.6.2
78 79
79# transform the list into individual variables 80# transform the list into individual variables
80.for pv in ${PYTHON_VERSIONS_ACCEPTED} 81.for pv in ${PYTHON_VERSIONS_ACCEPTED}
81.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv}) 82.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
82_PYTHON_VERSION_${pv}_OK= yes 83_PYTHON_VERSION_${pv}_OK= yes
83_PYTHON_VERSIONS_ACCEPTED+= ${pv} 84_PYTHON_VERSIONS_ACCEPTED+= ${pv}
84.endif 85.endif
85.endfor 86.endfor
86 87
87# 88#
88# choose a python version where to add, 89# choose a python version where to add,
89# try to be intelligent 90# try to be intelligent
90# 91#