diff options
| author | joerg <joerg> | 2009-09-07 18:21:43 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-09-07 18:21:43 +0000 |
| commit | df067cc41ca609f6c9a1e097603b0744654befb2 (patch) | |
| tree | 426a5eec5ef98b0cdb8d86747caf33e9ce45f7c4 /lang/python | |
| parent | 94176de19f3535e3cbfa8d40f8cb20a01cb32e4d (diff) | |
| download | pkgsrc-df067cc41ca609f6c9a1e097603b0744654befb2.tar.gz | |
Retire Python 2.3 support.
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/pyversion.mk | 19 | ||||
| -rw-r--r-- | lang/python/srcdist.mk | 12 |
2 files changed, 7 insertions, 24 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 0547bcfe6a6..46996d15973 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.73 2009/07/08 13:55:59 joerg Exp $ +# $NetBSD: pyversion.mk,v 1.74 2009/09/07 18:21:43 joerg 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: 23 24 25 26 +# Possible values: 24 25 26 # Default: 25 # # === Package-settable variables === @@ -18,13 +18,13 @@ # order of the entries matters, since earlier entries are # preferred over later ones. # -# Possible values: 26 25 24 23 -# Default: 26 25 24 23 +# Possible values: 26 25 24 +# Default: 26 25 24 # # PYTHON_VERSIONS_INCOMPATIBLE # The Python versions that are NOT acceptable for the package. # -# Possible values: 23 24 25 26 +# Possible values: 24 25 26 # Default: (depends on the platform) # # PYTHON_FOR_BUILD_ONLY @@ -69,10 +69,9 @@ BUILD_DEFS+= PYTHON_VERSION_DEFAULT BUILD_DEFS_EFFECTS+= PYPACKAGE PYTHON_VERSION_DEFAULT?= 25 -PYTHON_VERSIONS_ACCEPTED?= 26 25 24 23 +PYTHON_VERSIONS_ACCEPTED?= 26 25 24 PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default -BUILDLINK_API_DEPENDS.python23?= python23>=2.3 BUILDLINK_API_DEPENDS.python24?= python24>=2.4 BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1 BUILDLINK_API_DEPENDS.python26?= python26>=2.6 @@ -135,12 +134,6 @@ PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python24}:${PYPKGSRCDIR} PYPACKAGE= python24 PYVERSSUFFIX= 2.4 PYPKGPREFIX= py24 -.elif ${_PYTHON_VERSION} == "23" -PYPKGSRCDIR= ../../lang/python23 -PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python23}:${PYPKGSRCDIR} -PYPACKAGE= python23 -PYVERSSUFFIX= 2.3 -PYPKGPREFIX= py23 .else PKG_FAIL_REASON+= "No valid Python version" .endif diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk index a36c4446ed6..667904faef1 100644 --- a/lang/python/srcdist.mk +++ b/lang/python/srcdist.mk @@ -1,4 +1,4 @@ -# $NetBSD: srcdist.mk,v 1.27 2009/04/19 14:46:21 wiz Exp $ +# $NetBSD: srcdist.mk,v 1.28 2009/09/07 18:21:43 joerg Exp $ .include "../../lang/python/pyversion.mk" @@ -32,16 +32,6 @@ PYSUBDIR= Python-2.4.5 WRKSRC= ${WRKDIR}/${PYSUBDIR} MASTER_SITES= ftp://ftp.python.org/pub/python/2.4/ -.elif ${_PYTHON_VERSION} == "23" - -DISTNAME= Python-2.3.7 -EXTRACT_SUFX= .tgz -DISTINFO_FILE= ${.CURDIR}/../../lang/python23/distinfo -PATCHDIR= ${.CURDIR}/../../lang/python23/patches -PYSUBDIR= Python-2.3.7 -WRKSRC= ${WRKDIR}/${PYSUBDIR} -MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.7/ - .endif .if defined(PYDISTUTILSPKG) |