diff options
author | tnn <tnn@pkgsrc.org> | 2008-04-25 16:11:11 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2008-04-25 16:11:11 +0000 |
commit | 40e0e535acb9b0dc62e42601834b99705a7dde9c (patch) | |
tree | a8408cf6b0dbeddf8841c0c9f8d25bf36e804f76 /lang/python | |
parent | 1fdaa2fe77cdec75f3f9ba9aeca7a2dfdf3e06ef (diff) | |
download | pkgsrc-40e0e535acb9b0dc62e42601834b99705a7dde9c.tar.gz |
De-orbit support for python 2.0 and python 2.2 under the "three major
releases is enough" rule of thumb. (python 2.3 was released 5 years ago.)
Keep python 1.5 and 2.1 though, because there are a handful of packages
that still need them.
Diffstat (limited to 'lang/python')
-rw-r--r-- | lang/python/pyversion.mk | 26 | ||||
-rw-r--r-- | lang/python/srcdist.mk | 24 |
2 files changed, 7 insertions, 43 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 0eaa8db3ffc..57fe9edafef 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.57 2008/04/24 02:02:04 tnn Exp $ +# $NetBSD: pyversion.mk,v 1.58 2008/04/25 16:11:11 tnn 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: 15 20 21 22 23 24 25 +# Possible values: 15 21 23 24 25 # Default: 24 # # === Package-settable variables === @@ -21,13 +21,13 @@ # PYTHON_VERSIONS_INCOMPATIBLE instead, since it will # automatically include future versions. # -# Possible values: 25 24 23 22 21 20 15 +# Possible values: 25 24 23 21 15 # Default: (all) # # PYTHON_VERSIONS_INCOMPATIBLE # The Python versions that are NOT acceptable for the package. # -# Possible values: 15 20 21 22 23 24 25 +# Possible values: 15 21 23 24 25 # Default: (depends on the platform) # # PYTHON_FOR_BUILD_ONLY @@ -62,17 +62,15 @@ BUILD_DEFS+= PYTHON_VERSION_DEFAULT BUILD_DEFS_EFFECTS+= PYPACKAGE PYTHON_VERSION_DEFAULT?= 24 -PYTHON_VERSIONS_ACCEPTED?= 25 24 23 22 21 20 +PYTHON_VERSIONS_ACCEPTED?= 25 24 23 21 PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default .if ${OPSYS} == "Darwin" -PYTHON_VERSIONS_INCOMPATIBLE+= 22 21 20 15 +PYTHON_VERSIONS_INCOMPATIBLE+= 21 15 .endif BUILDLINK_API_DEPENDS.python15?= python15>=1.5 -BUILDLINK_API_DEPENDS.python20?= python20>=2.0 BUILDLINK_API_DEPENDS.python21?= python21>=2.1 -BUILDLINK_API_DEPENDS.python22?= python22>=2.2 BUILDLINK_API_DEPENDS.python23?= python23>=2.3 BUILDLINK_API_DEPENDS.python24?= python24>=2.4 BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1 @@ -135,24 +133,12 @@ PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python23}:${PYPKGSRCDIR} PYPACKAGE= python23 PYVERSSUFFIX= 2.3 PYPKGPREFIX= py23 -.elif ${_PYTHON_VERSION} == "22" -PYPKGSRCDIR= ../../lang/python22 -PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python22}:${PYPKGSRCDIR} -PYPACKAGE= python22 -PYVERSSUFFIX= 2.2 -PYPKGPREFIX= py22 .elif ${_PYTHON_VERSION} == "21" PYPKGSRCDIR= ../../lang/python21 PYPACKAGE= python21 PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python21}:${PYPKGSRCDIR} PYVERSSUFFIX= 2.1 PYPKGPREFIX= py21 -.elif ${_PYTHON_VERSION} == "20" -PYPKGSRCDIR= ../../lang/python20 -PYPACKAGE= python20 -PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python20}:${PYPKGSRCDIR} -PYVERSSUFFIX= 2.0 -PYPKGPREFIX= py20 .elif ${_PYTHON_VERSION} == "15" PYPKGSRCDIR= ../../lang/python15 PYPACKAGE= python15 diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk index 33ae6bbf9a7..5ca3c729830 100644 --- a/lang/python/srcdist.mk +++ b/lang/python/srcdist.mk @@ -1,4 +1,4 @@ -# $NetBSD: srcdist.mk,v 1.21 2008/04/24 01:39:25 tnn Exp $ +# $NetBSD: srcdist.mk,v 1.22 2008/04/25 16:11:11 tnn Exp $ .include "../../lang/python/pyversion.mk" @@ -32,16 +32,6 @@ PYSUBDIR= Python-2.3.5 WRKSRC= ${WRKDIR}/${PYSUBDIR} MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.5/ -.elif ${_PYTHON_VERSION} == "22" - -DISTNAME= Python-2.2.3 -EXTRACT_SUFX= .tgz -DISTINFO_FILE= ${.CURDIR}/../../lang/python22/distinfo -PATCHDIR= ${.CURDIR}/../../lang/python22/patches -PYSUBDIR= Python-2.2.3 -WRKSRC= ${WRKDIR}/${PYSUBDIR} -MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.3/ - .elif ${_PYTHON_VERSION} == "21" DISTNAME= Python-2.1.3 @@ -52,18 +42,6 @@ PYSUBDIR= Python-2.1.3 WRKSRC= ${WRKDIR}/${PYSUBDIR} MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/ -.elif ${_PYTHON_VERSION} == "20" - -DISTNAME= Python-2.0.1 -# for historical reasons -DIST_SUBDIR= python -EXTRACT_SUFX= .tgz -DISTINFO_FILE= ${.CURDIR}/../../lang/python20/distinfo -PATCHDIR= ${.CURDIR}/../../lang/python20/patches -PYSUBDIR= Python-2.0.1 -WRKSRC= ${WRKDIR}/${PYSUBDIR} -MASTER_SITES= ftp://ftp.python.org/pub/python/2.0.1/ - .elif ${_PYTHON_VERSION} == "15" DISTNAME= py152 |