diff options
| author | wiz <wiz@pkgsrc.org> | 2012-10-03 22:03:41 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-10-03 22:03:41 +0000 |
| commit | e125115b76dfa259b53cad6bd5a2b73eef4f12da (patch) | |
| tree | 0b72546a0f0ada817cdcfa8d3694d8bb7e843845 /lang/python | |
| parent | 318446307559eb62a25905911b5e04c7006159b4 (diff) | |
| download | pkgsrc-e125115b76dfa259b53cad6bd5a2b73eef4f12da.tar.gz | |
Remove python25, as promised in March. EOL'd last year.
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/extension.mk | 4 | ||||
| -rw-r--r-- | lang/python/pyversion.mk | 22 |
2 files changed, 9 insertions, 17 deletions
diff --git a/lang/python/extension.mk b/lang/python/extension.mk index 4bcea26e245..468298325dc 100644 --- a/lang/python/extension.mk +++ b/lang/python/extension.mk @@ -1,4 +1,4 @@ -# $NetBSD: extension.mk,v 1.30 2012/05/13 12:54:54 obache Exp $ +# $NetBSD: extension.mk,v 1.31 2012/10/03 22:03:41 wiz Exp $ .include "../../lang/python/pyversion.mk" @@ -44,7 +44,7 @@ do-install: # 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 python25/patches/patch-av +# 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 dddfcae19d7..c3618da8a39 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.101 2012/09/16 20:03:50 cheusov Exp $ +# $NetBSD: pyversion.mk,v 1.102 2012/10/03 22:03:41 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: 25 26 27 31 32 +# Possible values: 26 27 31 32 # Default: 27 # # PYTHON_VERSION_REQD @@ -26,8 +26,8 @@ # order of the entries matters, since earlier entries are # preferred over later ones. # -# Possible values: 32 31 27 26 25 -# Default: (32 31) 27 26 25 +# Possible values: 32 31 27 26 +# Default: (32 31) 27 26 # # PYTHON_VERSIONS_INCLUDE_3X # Wether the default PYTHON_VERSIONS_ACCEPTED should include @@ -40,7 +40,7 @@ # PYTHON_VERSIONS_INCOMPATIBLE # The Python versions that are NOT acceptable for the package. # -# Possible values: 25 26 27 31 32 +# Possible values: 26 27 31 32 # Default: (depends on the platform) # # PYTHON_FOR_BUILD_ONLY @@ -86,13 +86,12 @@ BUILD_DEFS_EFFECTS+= PYPACKAGE PYTHON_VERSION_DEFAULT?= 27 .if ${PYTHON_VERSIONS_INCLUDE_3X:U:tl} == "yes" -PYTHON_VERSIONS_ACCEPTED?= 32 31 27 26 25 +PYTHON_VERSIONS_ACCEPTED?= 32 31 27 26 .else -PYTHON_VERSIONS_ACCEPTED?= 27 26 25 +PYTHON_VERSIONS_ACCEPTED?= 27 26 .endif PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default -BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1 BUILDLINK_API_DEPENDS.python26?= python26>=2.6 BUILDLINK_API_DEPENDS.python27?= python27>=2.7 BUILDLINK_API_DEPENDS.python31?= python31>=3.1 @@ -172,13 +171,6 @@ PYPACKAGE= python26 PYVERSSUFFIX= 2.6 PYPKGPREFIX= py26 PLIST.py2x= yes -.elif ${_PYTHON_VERSION} == "25" -PYPKGSRCDIR= ../../lang/python25 -PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python25}:${PYPKGSRCDIR} -PYPACKAGE= python25 -PYVERSSUFFIX= 2.5 -PYPKGPREFIX= py25 -PLIST.py2x= yes .else PKG_FAIL_REASON+= "No valid Python version" PYPKGPREFIX= |