diff options
| author | snj <snj> | 2008-11-29 18:52:22 +0000 |
|---|---|---|
| committer | snj <snj> | 2008-11-29 18:52:22 +0000 |
| commit | 4932cae3226a71bcd1ea8050892e8c948fd5b4d2 (patch) | |
| tree | 546678bf6b5c6bc1d16313dec5601e6069319dda /lang | |
| parent | e32c5f92811d300b6a478bea441d31b3c8d97fdd (diff) | |
| download | pkgsrc-4932cae3226a71bcd1ea8050892e8c948fd5b4d2.tar.gz | |
Oops, forgot to commit these. Remove python15 support.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python/pyversion.mk | 20 | ||||
| -rw-r--r-- | lang/python/srcdist.mk | 12 |
2 files changed, 6 insertions, 26 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index e7249166a4c..a475f4e3fb3 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.59 2008/04/25 16:27:45 tnn Exp $ +# $NetBSD: pyversion.mk,v 1.60 2008/11/29 18:52:22 snj 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 21 23 24 25 +# Possible values: 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 21 15 +# Possible values: 25 24 23 21 # Default: 25 24 23 # # PYTHON_VERSIONS_INCOMPATIBLE # The Python versions that are NOT acceptable for the package. # -# Possible values: 15 21 23 24 25 +# Possible values: 21 23 24 25 # Default: (depends on the platform) # # PYTHON_FOR_BUILD_ONLY @@ -66,10 +66,9 @@ PYTHON_VERSIONS_ACCEPTED?= 25 24 23 PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default .if ${OPSYS} == "Darwin" -PYTHON_VERSIONS_INCOMPATIBLE+= 21 15 +PYTHON_VERSIONS_INCOMPATIBLE+= 21 .endif -BUILDLINK_API_DEPENDS.python15?= python15>=1.5 BUILDLINK_API_DEPENDS.python21?= python21>=2.1 BUILDLINK_API_DEPENDS.python23?= python23>=2.3 BUILDLINK_API_DEPENDS.python24?= python24>=2.4 @@ -139,15 +138,6 @@ PYPACKAGE= python21 PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python21}:${PYPKGSRCDIR} PYVERSSUFFIX= 2.1 PYPKGPREFIX= py21 -.elif ${_PYTHON_VERSION} == "15" -PYPKGSRCDIR= ../../lang/python15 -PYPACKAGE= python15 -PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python15}:${PYPKGSRCDIR} -PYVERSSUFFIX= 1.5 -PYPKGPREFIX= py15 -.if !defined(PYTHON_DISTUTILS_BOOTSTRAP) -BUILD_DEPENDS+= py15-distutils-[0-9]*:../../devel/py-distutils -.endif .else PKG_FAIL_REASON+= "No valid Python version" .endif diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk index 5ca3c729830..3b624625682 100644 --- a/lang/python/srcdist.mk +++ b/lang/python/srcdist.mk @@ -1,4 +1,4 @@ -# $NetBSD: srcdist.mk,v 1.22 2008/04/25 16:11:11 tnn Exp $ +# $NetBSD: srcdist.mk,v 1.23 2008/11/29 18:52:22 snj Exp $ .include "../../lang/python/pyversion.mk" @@ -42,16 +42,6 @@ PYSUBDIR= Python-2.1.3 WRKSRC= ${WRKDIR}/${PYSUBDIR} MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/ -.elif ${_PYTHON_VERSION} == "15" - -DISTNAME= py152 -EXTRACT_SUFX= .tgz -DISTINFO_FILE= ${.CURDIR}/../../lang/python15/distinfo -PATCHDIR= ${.CURDIR}/../../lang/python15/patches -PYSUBDIR= Python-1.5.2 -WRKSRC= ${WRKDIR}/${PYSUBDIR} -MASTER_SITES= http://www.python.org/ftp/python/src/ - .endif .if defined(PYDISTUTILSPKG) |