diff options
| author | rodent <rodent> | 2015-04-13 23:12:40 +0000 |
|---|---|---|
| committer | rodent <rodent> | 2015-04-13 23:12:40 +0000 |
| commit | 58315a81fc520a127a5644e31f88b1f6764964c4 (patch) | |
| tree | 0a02a5deb14850f2bb33cc45a035c29ba28ecaf5 /lang/python | |
| parent | 702c3bab8a743d3270f8185eb14e063be7a0c1bb (diff) | |
| download | pkgsrc-58315a81fc520a127a5644e31f88b1f6764964c4.tar.gz | |
Removing python26. EOL'd quite some ago and discussed a couple times on
tech-pkg@ and pkgsrc-users@.
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/extension.mk | 3 | ||||
| -rw-r--r-- | lang/python/pyversion.mk | 12 | ||||
| -rw-r--r-- | lang/python/versioned_dependencies.mk | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/lang/python/extension.mk b/lang/python/extension.mk index af75b0207c4..84315fa87bf 100644 --- a/lang/python/extension.mk +++ b/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.38 2015/04/13 23:12:44 rodent Exp $ .include "../../lang/python/pyversion.mk" @@ -53,7 +53,6 @@ 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 INSTALL_ENV+= PKGSRC_PYTHON_NO_EGG=defined .endif diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 6945bf0e5d1..28320a9ba17 100644 --- a/lang/python/pyversion.mk +++ b/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 diff --git a/lang/python/versioned_dependencies.mk b/lang/python/versioned_dependencies.mk index e293889dc63..b9aaa288e1f 100644 --- a/lang/python/versioned_dependencies.mk +++ b/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.19 2015/04/13 23:12:44 rodent Exp $ # # This file determines which separate distribution of a Python # package is used as dependency, depending on the Python version @@ -34,7 +34,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} |