diff options
| author | joerg <joerg> | 2009-02-09 21:09:20 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-02-09 21:09:20 +0000 |
| commit | 781480548c1754a1d01fab923756ad398b55ff3c (patch) | |
| tree | 635d2c2cd03c8f3021d6ce3b171522808e69ddf1 /lang/python | |
| parent | 8fab6153e46ea377f949af813ba4f90fbb65d8c3 (diff) | |
| download | pkgsrc-781480548c1754a1d01fab923756ad398b55ff3c.tar.gz | |
Remove Python 2.1 support.
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/pyversion.mk | 13 | ||||
| -rw-r--r-- | lang/python/srcdist.mk | 12 |
2 files changed, 2 insertions, 23 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index c2b7d9858dc..ea1ad0739c7 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.62 2009/01/23 18:02:32 joerg Exp $ +# $NetBSD: pyversion.mk,v 1.63 2009/02/09 21:09:21 joerg Exp $ # This file determines which Python version is used as a dependency for # a package. @@ -62,11 +62,6 @@ PYTHON_VERSION_DEFAULT?= 24 PYTHON_VERSIONS_ACCEPTED?= 25 24 23 PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default -.if ${OPSYS} == "Darwin" -PYTHON_VERSIONS_INCOMPATIBLE+= 21 -.endif - -BUILDLINK_API_DEPENDS.python21?= python21>=2.1 BUILDLINK_API_DEPENDS.python23?= python23>=2.3 BUILDLINK_API_DEPENDS.python24?= python24>=2.4 BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1 @@ -129,12 +124,6 @@ PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python23}:${PYPKGSRCDIR} PYPACKAGE= python23 PYVERSSUFFIX= 2.3 PYPKGPREFIX= py23 -.elif ${_PYTHON_VERSION} == "21" -PYPKGSRCDIR= ../../lang/python21 -PYPACKAGE= python21 -PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python21}:${PYPKGSRCDIR} -PYVERSSUFFIX= 2.1 -PYPKGPREFIX= py21 .else PKG_FAIL_REASON+= "No valid Python version" .endif diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk index 1570e284db0..e96ad4ac255 100644 --- a/lang/python/srcdist.mk +++ b/lang/python/srcdist.mk @@ -1,4 +1,4 @@ -# $NetBSD: srcdist.mk,v 1.24 2008/12/02 22:15:12 wiz Exp $ +# $NetBSD: srcdist.mk,v 1.25 2009/02/09 21:09:21 joerg Exp $ .include "../../lang/python/pyversion.mk" @@ -32,16 +32,6 @@ PYSUBDIR= Python-2.3.7 WRKSRC= ${WRKDIR}/${PYSUBDIR} MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.7/ -.elif ${_PYTHON_VERSION} == "21" - -DISTNAME= Python-2.1.3 -EXTRACT_SUFX= .tgz -DISTINFO_FILE= ${.CURDIR}/../../lang/python21/distinfo -PATCHDIR= ${.CURDIR}/../../lang/python21/patches -PYSUBDIR= Python-2.1.3 -WRKSRC= ${WRKDIR}/${PYSUBDIR} -MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/ - .endif .if defined(PYDISTUTILSPKG) |