Sat Jan 25 10:31:01 2014 UTC ()
Remove PYTHON_VERSIONS_INCLUDE_3X.
Allow python-3.x by default.


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

--- pkgsrc/lang/python/pyversion.mk 2014/01/18 19:51:28 1.112
+++ pkgsrc/lang/python/pyversion.mk 2014/01/25 10:31:01 1.113
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pyversion.mk,v 1.112 2014/01/18 19:51:28 wiz Exp $ 1# $NetBSD: pyversion.mk,v 1.113 2014/01/25 10:31:01 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: 26 27 33 11# Possible values: 26 27 33
12# Default: 27 12# Default: 27
13# 13#
14# === Infrastructure variables === 14# === Infrastructure variables ===
@@ -20,39 +20,31 @@ @@ -20,39 +20,31 @@
20# Possible: ${PYTHON_VERSIONS_ACCEPTED} 20# Possible: ${PYTHON_VERSIONS_ACCEPTED}
21# Default: ${PYTHON_VERSION_DEFAULT} 21# Default: ${PYTHON_VERSION_DEFAULT}
22# 22#
23# === Package-settable variables === 23# === Package-settable variables ===
24# 24#
25# PYTHON_VERSIONS_ACCEPTED 25# PYTHON_VERSIONS_ACCEPTED
26# The Python versions that are acceptable for the package. The 26# The Python versions that are acceptable for the package. The
27# order of the entries matters, since earlier entries are 27# order of the entries matters, since earlier entries are
28# preferred over later ones. 28# preferred over later ones.
29# 29#
30# Possible values: 33 27 26 30# Possible values: 33 27 26
31# Default: (33) 27 26 31# Default: (33) 27 26
32# 32#
33# PYTHON_VERSIONS_INCLUDE_3X 
34# Wether the default PYTHON_VERSIONS_ACCEPTED should include 
35# 3.x versions for for this package or not. 
36# This variable must be set before including bsd.prefs.mk. 
37# 
38# Possible values: yes no 
39# Default: no 
40# 
41# PYTHON_VERSIONS_INCOMPATIBLE 33# PYTHON_VERSIONS_INCOMPATIBLE
42# The Python versions that are NOT acceptable for the package. 34# The Python versions that are NOT acceptable for the package.
43# 35#
44# Possible values: 26 27 33 36# Possible values: 26 27 33
45# Default: (depends on the platform) 37# Default: (empty)
46# 38#
47# PYTHON_FOR_BUILD_ONLY 39# PYTHON_FOR_BUILD_ONLY
48# Whether Python is needed only at build time or at run time. 40# Whether Python is needed only at build time or at run time.
49# 41#
50# Possible values: yes no tool 42# Possible values: yes no tool
51# Default: no 43# Default: no
52# 44#
53# PYTHON_SELF_CONFLICT 45# PYTHON_SELF_CONFLICT
54# If set to "yes", additional CONFLICTS entries are added for 46# If set to "yes", additional CONFLICTS entries are added for
55# registering a conflict between pyNN-<modulename> packages. 47# registering a conflict between pyNN-<modulename> packages.
56# 48#
57# Possible values: yes no 49# Possible values: yes no
58# Default: no 50# Default: no
@@ -83,31 +75,27 @@ PYTHON_PYVERSION_MK= defined @@ -83,31 +75,27 @@ PYTHON_PYVERSION_MK= defined
83 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*) 75 defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
84PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 76PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
85.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \ 77.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
86 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*) 78 defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
87PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/} 79PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
88.endif 80.endif
89 81
90.include "../../mk/bsd.prefs.mk" 82.include "../../mk/bsd.prefs.mk"
91 83
92BUILD_DEFS+= PYTHON_VERSION_DEFAULT 84BUILD_DEFS+= PYTHON_VERSION_DEFAULT
93BUILD_DEFS_EFFECTS+= PYPACKAGE 85BUILD_DEFS_EFFECTS+= PYPACKAGE
94 86
95PYTHON_VERSION_DEFAULT?= 27 87PYTHON_VERSION_DEFAULT?= 27
96.if ${PYTHON_VERSIONS_INCLUDE_3X:U:tl} == "yes" 
97PYTHON_VERSIONS_ACCEPTED?= 33 27 26 88PYTHON_VERSIONS_ACCEPTED?= 33 27 26
98.else 
99PYTHON_VERSIONS_ACCEPTED?= 27 26 
100.endif 
101PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default 89PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
102 90
103BUILDLINK_API_DEPENDS.python26?= python26>=2.6 91BUILDLINK_API_DEPENDS.python26?= python26>=2.6
104BUILDLINK_API_DEPENDS.python27?= python27>=2.7 92BUILDLINK_API_DEPENDS.python27?= python27>=2.7
105BUILDLINK_API_DEPENDS.python33?= python33>=3.3 93BUILDLINK_API_DEPENDS.python33?= python33>=3.3
106 94
107# transform the list into individual variables 95# transform the list into individual variables
108.for pv in ${PYTHON_VERSIONS_ACCEPTED} 96.for pv in ${PYTHON_VERSIONS_ACCEPTED}
109.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv}) 97.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
110_PYTHON_VERSION_${pv}_OK= yes 98_PYTHON_VERSION_${pv}_OK= yes
111_PYTHON_VERSIONS_ACCEPTED+= ${pv} 99_PYTHON_VERSIONS_ACCEPTED+= ${pv}
112.endif 100.endif
113.endfor 101.endfor