summaryrefslogtreecommitdiff
path: root/lang/python
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-01-18 19:50:27 +0000
committerwiz <wiz@pkgsrc.org>2014-01-18 19:50:27 +0000
commitf2b9618b69ed5fd4e9555356a5ea55c1749f5bbb (patch)
treeee1c78802233bb30ec8949616da2caaf71541e1b /lang/python
parentabd2e128784b86373014d551b1ce1ac69016387d (diff)
downloadpkgsrc-f2b9618b69ed5fd4e9555356a5ea55c1749f5bbb.tar.gz
Support Pmw.
Diffstat (limited to 'lang/python')
-rw-r--r--lang/python/pyversion.mk16
-rw-r--r--lang/python/versioned_dependencies.mk3
2 files changed, 4 insertions, 15 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index a48da079329..4c58a58191a 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.110 2014/01/12 09:01:50 wiz Exp $
+# $NetBSD: pyversion.mk,v 1.111 2014/01/18 19:50:27 wiz Exp $
# This file determines which Python version is used as a dependency for
# a package.
@@ -30,19 +30,11 @@
# Possible values: 33 27 26
# Default: (33) 27 26
#
-# PYTHON_VERSIONS_INCLUDE_3X
-# Wether the default PYTHON_VERSIONS_ACCEPTED should include
-# 3.x versions for for this package or not.
-# This variable must be set before including bsd.prefs.mk.
-#
-# Possible values: yes no
-# Default: no
-#
# PYTHON_VERSIONS_INCOMPATIBLE
# The Python versions that are NOT acceptable for the package.
#
# Possible values: 26 27 33
-# Default: (depends on the platform)
+# Default: (empty)
#
# PYTHON_FOR_BUILD_ONLY
# Whether Python is needed only at build time or at run time.
@@ -93,11 +85,7 @@ BUILD_DEFS+= PYTHON_VERSION_DEFAULT
BUILD_DEFS_EFFECTS+= PYPACKAGE
PYTHON_VERSION_DEFAULT?= 27
-.if ${PYTHON_VERSIONS_INCLUDE_3X:U:tl} == "yes"
PYTHON_VERSIONS_ACCEPTED?= 33 27 26
-.else
-PYTHON_VERSIONS_ACCEPTED?= 27 26
-.endif
PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
BUILDLINK_API_DEPENDS.python26?= python26>=2.6
diff --git a/lang/python/versioned_dependencies.mk b/lang/python/versioned_dependencies.mk
index 6e3f30a5bae..c6f446ba3e1 100644
--- a/lang/python/versioned_dependencies.mk
+++ b/lang/python/versioned_dependencies.mk
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.5 2014/01/18 19:05:56 wiz Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.6 2014/01/18 19:50:27 wiz Exp $
#
# This file determines which separate distribution of a Python
# package is used as dependency, depending on the Python version
@@ -16,6 +16,7 @@
.include "../../lang/python/pyversion.mk"
_SUPPORTED_PACKAGES=# empty
+_SUPPORTED_PACKAGES+=Pmw x11/py-Pmw x11/py-Pmw2
#_SUPPORTED_PACKAGES+=cairo graphics/py-cairo graphics/py-cairo3
_SUPPORTED_PACKAGES+=dateutil time/py-dateutil time/py-dateutil2
_SUPPORTED_PACKAGES+=dns net/py-dns net/py-dns3