Wed Feb 10 19:16:49 2010 UTC ()
Make Python 2.6 the default version.


(joerg)
diff -r1.78 -r1.79 pkgsrc/lang/python/pyversion.mk
cvs diff -r1.78 -r1.79 pkgsrc/lang/python/pyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/pyversion.mk 2010/02/09 22:55:16 1.78
+++ pkgsrc/lang/python/pyversion.mk 2010/02/10 19:16:48 1.79
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: pyversion.mk,v 1.78 2010/02/09 22:55:16 joerg Exp $ 1# $NetBSD: pyversion.mk,v 1.79 2010/02/10 19:16:48 joerg 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: 24 25 26 11# Possible values: 24 25 26
12# Default: 25 12# Default: 26
13# 13#
14# === Package-settable variables === 14# === Package-settable variables ===
15# 15#
16# PYTHON_VERSIONS_ACCEPTED 16# PYTHON_VERSIONS_ACCEPTED
17# The Python versions that are acceptable for the package. The 17# The Python versions that are acceptable for the package. The
18# order of the entries matters, since earlier entries are 18# order of the entries matters, since earlier entries are
19# preferred over later ones. 19# preferred over later ones.
20# 20#
21# Possible values: 26 25 24 21# Possible values: 26 25 24
22# Default: 26 25 24 22# Default: 26 25 24
23# 23#
24# PYTHON_VERSIONS_INCOMPATIBLE 24# PYTHON_VERSIONS_INCOMPATIBLE
25# The Python versions that are NOT acceptable for the package. 25# The Python versions that are NOT acceptable for the package.
@@ -58,31 +58,27 @@ PYTHON_PYVERSION_MK= defined @@ -58,31 +58,27 @@ PYTHON_PYVERSION_MK= defined
58.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \ 58.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \
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
71.if empty(MACHINE_PLATFORM:MDarwin-*-x86_64) 
72PYTHON_VERSION_DEFAULT?= 25 
73.else 
74PYTHON_VERSION_DEFAULT?= 26 71PYTHON_VERSION_DEFAULT?= 26
75.endif 
76PYTHON_VERSIONS_ACCEPTED?= 26 25 24 72PYTHON_VERSIONS_ACCEPTED?= 26 25 24
77PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default 73PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
78 74
79BUILDLINK_API_DEPENDS.python24?= python24>=2.4 75BUILDLINK_API_DEPENDS.python24?= python24>=2.4
80BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1 76BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1
81BUILDLINK_API_DEPENDS.python26?= python26>=2.6 77BUILDLINK_API_DEPENDS.python26?= python26>=2.6
82 78
83# transform the list into individual variables 79# transform the list into individual variables
84.for pv in ${PYTHON_VERSIONS_ACCEPTED} 80.for pv in ${PYTHON_VERSIONS_ACCEPTED}
85.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv}) 81.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
86_PYTHON_VERSION_${pv}_OK= yes 82_PYTHON_VERSION_${pv}_OK= yes
87_PYTHON_VERSIONS_ACCEPTED+= ${pv} 83_PYTHON_VERSIONS_ACCEPTED+= ${pv}
88.endif 84.endif