Import of pkgsrc-2015Q2

lang/python/extension.mk

@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.37 2014/01/24 12:42:52 obache Exp $
+# $NetBSD: extension.mk,v 1.39 2015/04/14 11:40:31 wiz Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -53,7 +53,7 @@ do-test:
 # appears to be that creating egg info files was new in Python 2.5.
 PY_NO_EGG?=		yes
 .if !empty(PY_NO_EGG:M[yY][eE][sS])
-# see python26/patches/patch-av
+# see python*/patches/patch-av
 INSTALL_ENV+=		PKGSRC_PYTHON_NO_EGG=defined
 .endif
 

lang/python/pyversion.mk

@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.116 2015/01/27 06:33:46 dbj Exp $
+# $NetBSD: pyversion.mk,v 1.117 2015/04/13 23:12:44 rodent 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: 26 27 33 34
+#	Possible values: 27 33 34
 #	Default: 27
 #
 # === Infrastructure variables ===
@@ -27,13 +27,13 @@
 #	order of the entries matters, since earlier entries are
 #	preferred over later ones.
 #
-#	Possible values: 34 33 27 26
-#	Default: 34 33 27 26
+#	Possible values: 34 33 27
+#	Default: 34 33 27
 #
 # PYTHON_VERSIONS_INCOMPATIBLE
 #	The Python versions that are NOT acceptable for the package.
 #
-#	Possible values: 26 27 33 34
+#	Possible values: 27 33 34
 #	Default: (empty)
 #
 # PYTHON_FOR_BUILD_ONLY
@@ -85,7 +85,7 @@ BUILD_DEFS+=		PYTHON_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+=	PYPACKAGE
 
 PYTHON_VERSION_DEFAULT?=		27
-PYTHON_VERSIONS_ACCEPTED?=		34 33 27 26
+PYTHON_VERSIONS_ACCEPTED?=		34 33 27
 PYTHON_VERSIONS_INCOMPATIBLE?=		# empty by default
 
 # transform the list into individual variables

lang/python/versioned_dependencies.mk

@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.18 2014/12/14 02:34:52 obache Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.20 2015/05/03 16:22:26 bsiegert Exp $
 #
 # This file determines which separate distribution of a Python
 # package is used as dependency, depending on the Python version
@@ -20,6 +20,7 @@ _SUPPORTED_PACKAGES+=Pmw x11/py-Pmw x11/py-Pmw2
 _SUPPORTED_PACKAGES+=X textproc/py-X2 textproc/py-X
 _SUPPORTED_PACKAGES+=cairo graphics/py-cairo graphics/py-cairo3
 _SUPPORTED_PACKAGES+=dateutil time/py-dateutil time/py-dateutil
+_SUPPORTED_PACKAGES+=dialog devel/py-dialog2 devel/py-dialog
 _SUPPORTED_PACKAGES+=dns net/py-dns net/py-dns3
 _SUPPORTED_PACKAGES+=ephem math/py-ephem math/py-ephem3
 _SUPPORTED_PACKAGES+=flup www/py-flup www/py-flup3
@@ -34,7 +35,7 @@ type:=	${pattern:C/[^:]*//}
 .for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
 .if "${pkg}" == "${name}"
 _PKG_MATCHED=	yes
-.if ${PYPKGPREFIX} == "py26" || ${PYPKGPREFIX} == "py27"
+.if ${PYPKGPREFIX} == "py27"
 dir:=	${py2dir}
 .else
 dir:=	${py3dir}