summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorwiz <wiz>2009-04-19 14:48:17 +0000
committerwiz <wiz>2009-04-19 14:48:17 +0000
commit26675606bf53318f145f3b7793cff70ba2af5668 (patch)
treee45a01402888dd1521abe4e5f8865c6b051e95ff /lang
parentaf02b47cb7f0d9412ed1830a025b20b4392436ab (diff)
downloadpkgsrc-26675606bf53318f145f3b7793cff70ba2af5668.tar.gz
Add untested entries for python26.
Diffstat (limited to 'lang')
-rw-r--r--lang/python/egg.mk4
-rw-r--r--lang/python/pyversion.mk22
2 files changed, 16 insertions, 10 deletions
diff --git a/lang/python/egg.mk b/lang/python/egg.mk
index 0b4872f84f9..6db1053f4a7 100644
--- a/lang/python/egg.mk
+++ b/lang/python/egg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.8 2009/02/17 17:32:38 joerg Exp $
+# $NetBSD: egg.mk,v 1.9 2009/04/19 14:48:17 wiz Exp $
#
# Common logic to handle Python Eggs
#
@@ -9,7 +9,7 @@ EGG_NAME?= ${DISTNAME}
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
# Only Python 2.4+ supported by devel/py-setuptools right now
-PYTHON_VERSIONS_ACCEPTED?= 25 24
+PYTHON_VERSIONS_ACCEPTED?= 26 25 24
PLIST_SUBST+= EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
PLIST_SUBST+= EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index 61519ef3739..86ccee21cb8 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.67 2009/03/21 06:24:48 snj Exp $
+# $NetBSD: pyversion.mk,v 1.68 2009/04/19 14:48:17 wiz Exp $
# This file determines which Python version is used as a dependency for
# a package.
@@ -8,7 +8,7 @@
# PYTHON_VERSION_DEFAULT
# The preferred Python version to use.
#
-# Possible values: 23 24 25
+# Possible values: 23 24 25 26
# Default: 25
#
# === Package-settable variables ===
@@ -18,13 +18,13 @@
# order of the entries matters, since earlier entries are
# preferred over later ones.
#
-# Possible values: 25 24 23
-# Default: 25 24 23
+# Possible values: 26 25 24 23
+# Default: 26 25 24 23
#
# PYTHON_VERSIONS_INCOMPATIBLE
# The Python versions that are NOT acceptable for the package.
#
-# Possible values: 23 24 25
+# Possible values: 23 24 25 26
# Default: (depends on the platform)
#
# PYTHON_FOR_BUILD_ONLY
@@ -39,13 +39,13 @@
# The prefix to use in PKGNAME for extensions which are meant
# to be installed for multiple Python versions.
#
-# Example: py24
+# Example: py25
#
# PYVERSSUFFIX
# The suffix to executables and in the library path, equal to
# sys.version[0:3].
#
-# Example: 2.4
+# Example: 2.5
#
# Keywords: python
#
@@ -116,7 +116,13 @@ _PYTHON_VERSION?= ${pv}
_PYTHON_VERSION= none
.endif
-.if ${_PYTHON_VERSION} == "25"
+.if ${_PYTHON_VERSION} == "26"
+PYPKGSRCDIR= ../../lang/python26
+PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python26}:${PYPKGSRCDIR}
+PYPACKAGE= python26
+PYVERSSUFFIX= 2.6
+PYPKGPREFIX= py26
+.elif ${_PYTHON_VERSION} == "25"
PYPKGSRCDIR= ../../lang/python25
PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python25}:${PYPKGSRCDIR}
PYPACKAGE= python25