Thu Mar 8 11:44:06 2012 UTC ()
Update python default version to 2.7, per announcement on pkgsrc-users
last week.


(wiz)
diff -r1.95 -r1.96 pkgsrc/lang/python/pyversion.mk
cvs diff -r1.95 -r1.96 pkgsrc/lang/python/pyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/pyversion.mk 2012/02/26 09:17:41 1.95
+++ pkgsrc/lang/python/pyversion.mk 2012/03/08 11:44:06 1.96
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: pyversion.mk,v 1.95 2012/02/26 09:17:41 sbd Exp $ 1# $NetBSD: pyversion.mk,v 1.96 2012/03/08 11:44:06 wiz 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 27 31 11# Possible values: 24 25 26 27 31
12# Default: 26 12# Default: 27
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: 31 27 26 25 24 21# Possible values: 31 27 26 25 24
22# Default: (31) 27 26 25 24 22# Default: (31) 27 26 25 24
23# 23#
24# PYTHON_VERSIONS_INCLUDE_3X 24# PYTHON_VERSIONS_INCLUDE_3X
25# Wether the default PYTHON_VERSIONS_ACCEPTED should include 25# Wether the default PYTHON_VERSIONS_ACCEPTED should include
@@ -37,56 +37,56 @@ @@ -37,56 +37,56 @@
37# 37#
38# PYTHON_FOR_BUILD_ONLY 38# PYTHON_FOR_BUILD_ONLY
39# Whether Python is needed only at build time or at run time. 39# Whether Python is needed only at build time or at run time.
40# 40#
41# Possible values: (defined) (undefined) 41# Possible values: (defined) (undefined)
42# Default: (undefined) 42# Default: (undefined)
43# 43#
44# === Defined variables === 44# === Defined variables ===
45# 45#
46# PYPKGPREFIX 46# PYPKGPREFIX
47# The prefix to use in PKGNAME for extensions which are meant 47# The prefix to use in PKGNAME for extensions which are meant
48# to be installed for multiple Python versions. 48# to be installed for multiple Python versions.
49# 49#
50# Example: py26 50# Example: py27
51# 51#
52# PYVERSSUFFIX 52# PYVERSSUFFIX
53# The suffix to executables and in the library path, equal to 53# The suffix to executables and in the library path, equal to
54# sys.version[0:3]. 54# sys.version[0:3].
55# 55#
56# Example: 2.6 56# Example: 2.7
57# 57#
58# Keywords: python 58# Keywords: python
59# 59#
60 60
61.if !defined(PYTHON_PYVERSION_MK) 61.if !defined(PYTHON_PYVERSION_MK)
62PYTHON_PYVERSION_MK= defined 62PYTHON_PYVERSION_MK= defined
63 63
64# derive a python version from the package name if possible 64# derive a python version from the package name if possible
65# optionally handled quoted package names 65# optionally handled quoted package names
66.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \ 66.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \
67 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*) 67 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
68PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 68PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
69.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \ 69.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
70 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*) 70 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
71PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 71PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
72.endif 72.endif
73 73
74.include "../../mk/bsd.prefs.mk" 74.include "../../mk/bsd.prefs.mk"
75 75
76BUILD_DEFS+= PYTHON_VERSION_DEFAULT 76BUILD_DEFS+= PYTHON_VERSION_DEFAULT
77BUILD_DEFS_EFFECTS+= PYPACKAGE 77BUILD_DEFS_EFFECTS+= PYPACKAGE
78 78
79PYTHON_VERSION_DEFAULT?= 26 79PYTHON_VERSION_DEFAULT?= 27
80.if ${PYTHON_VERSIONS_INCLUDE_3X:U:tl} == "yes" 80.if ${PYTHON_VERSIONS_INCLUDE_3X:U:tl} == "yes"
81PYTHON_VERSIONS_ACCEPTED?= 31 27 26 25 24 81PYTHON_VERSIONS_ACCEPTED?= 31 27 26 25 24
82.else 82.else
83PYTHON_VERSIONS_ACCEPTED?= 27 26 25 24 83PYTHON_VERSIONS_ACCEPTED?= 27 26 25 24
84.endif 84.endif
85PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default 85PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
86 86
87BUILDLINK_API_DEPENDS.python24?= python24>=2.4 87BUILDLINK_API_DEPENDS.python24?= python24>=2.4
88BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1 88BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1
89BUILDLINK_API_DEPENDS.python26?= python26>=2.6 89BUILDLINK_API_DEPENDS.python26?= python26>=2.6
90BUILDLINK_API_DEPENDS.python27?= python27>=2.7 90BUILDLINK_API_DEPENDS.python27?= python27>=2.7
91BUILDLINK_API_DEPENDS.python31?= python31>=3.1 91BUILDLINK_API_DEPENDS.python31?= python31>=3.1
92 92