diff options
| -rw-r--r-- | lang/python/pyversion.mk | 11 | ||||
| -rw-r--r-- | lang/python/srcdist.mk | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 6ccdba074d5..d331956b85b 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.8 2002/02/02 13:26:01 drochner Exp $ +# $NetBSD: pyversion.mk,v 1.9 2002/08/20 20:00:14 drochner Exp $ .if !defined(PYTHON_PYVERSION_MK) PYTHON_PYVERSION_MK= defined @@ -11,6 +11,7 @@ PYTHON_VERSIONS_ACCEPTED?= 22 21 20 BUILDLINK_DEPENDS.python15?= python15>=1.5 BUILDLINK_DEPENDS.python20?= python20>=2.0 BUILDLINK_DEPENDS.python21?= python21>=2.1 +BUILDLINK_DEPENDS.python21pth?= python21-pth>=2.1 BUILDLINK_DEPENDS.python22?= python22>=2.2 # transform the list into individual variables @@ -25,6 +26,9 @@ _PYTHON_VERSION_22_INSTALLED= yes .if exists(${LOCALBASE}/bin/python2.1) _PYTHON_VERSION_21_INSTALLED= yes .endif +.if exists(${LOCALBASE}/bin/python2p1) +_PYTHON_VERSION_21pth_INSTALLED=yes +.endif .if exists(${LOCALBASE}/bin/python2.0) _PYTHON_VERSION_20_INSTALLED= yes .endif @@ -85,6 +89,11 @@ PYPKGPREFIX= py22 PYDEPENDENCY= ${BUILDLINK_DEPENDS.python21}:../../lang/python21 PYVERSSUFFIX= 2.1 PYPKGPREFIX= py21 +.elif ${_PYTHON_VERSION} == "21pth" +PYDEPENDENCY= ${BUILDLINK_DEPENDS.python21pth}:../../lang/python21-pth +PYVERSSUFFIX= 2p1 +PYPKGPREFIX= py21pth +.include "../../devel/pth/buildlink.mk" .elif ${_PYTHON_VERSION} == "20" PYDEPENDENCY= ${BUILDLINK_DEPENDS.python20}:../../lang/python20 PYVERSSUFFIX= 2.0 diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk index 7c1d77f95a5..ce59fea32aa 100644 --- a/lang/python/srcdist.mk +++ b/lang/python/srcdist.mk @@ -1,4 +1,4 @@ -# $NetBSD: srcdist.mk,v 1.3 2002/04/15 12:29:14 drochner Exp $ +# $NetBSD: srcdist.mk,v 1.4 2002/08/20 20:00:14 drochner Exp $ .include "../../lang/python/pyversion.mk" @@ -12,7 +12,7 @@ PYSUBDIR= Python-2.2.1 WRKSRC= ${WRKDIR}/${PYSUBDIR} MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.1/ -.elif ${_PYTHON_VERSION} == "21" +.elif ${_PYTHON_VERSION} == "21" || ${_PYTHON_VERSION} == "21pth" DISTNAME= Python-2.1.3 EXTRACT_SUFX= .tgz |