summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2002-10-25 10:52:24 +0000
committerdrochner <drochner@pkgsrc.org>2002-10-25 10:52:24 +0000
commit92b5ac655f30970d414071db5c94600312bd7426 (patch)
tree3b7aaf7d51b0e80d46c3452baa022a674248862c /lang
parent8fffe3a86125ae67deaf7a7f5668077433f7fa03 (diff)
downloadpkgsrc-92b5ac655f30970d414071db5c94600312bd7426.tar.gz
another Python version
Diffstat (limited to 'lang')
-rw-r--r--lang/python/pyversion.mk17
-rw-r--r--lang/python/srcdist.mk4
2 files changed, 18 insertions, 3 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index 51598c08c26..a0107b13826 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.14 2002/10/09 11:11:51 jlam Exp $
+# $NetBSD: pyversion.mk,v 1.15 2002/10/25 10:52:24 drochner Exp $
.if !defined(PYTHON_PYVERSION_MK)
PYTHON_PYVERSION_MK= defined
@@ -13,6 +13,7 @@ BUILDLINK_DEPENDS.python20?= python20>=2.0
BUILDLINK_DEPENDS.python21?= python21>=2.1
BUILDLINK_DEPENDS.python21-pth?= python21-pth>=2.1
BUILDLINK_DEPENDS.python22?= python22>=2.2
+BUILDLINK_DEPENDS.python22-pth?= python22-pth>=2.2
# transform the list into individual variables
.for pv in ${PYTHON_VERSIONS_ACCEPTED}
@@ -23,6 +24,9 @@ _PYTHON_VERSION_${pv}_OK= yes
.if exists(${LOCALBASE}/bin/python2.2)
_PYTHON_VERSION_22_INSTALLED= yes
.endif
+.if exists(${LOCALBASE}/bin/python2p2)
+_PYTHON_VERSION_22pth_INSTALLED=yes
+.endif
.if exists(${LOCALBASE}/bin/python2.1)
_PYTHON_VERSION_21_INSTALLED= yes
.endif
@@ -87,6 +91,17 @@ PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22}:${PYPKGSRCDIR}
PYPACKAGE= python22
PYVERSSUFFIX= 2.2
PYPKGPREFIX= py22
+.elif ${_PYTHON_VERSION} == "22pth"
+PYPKGSRCDIR= ../../lang/python22-pth
+PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22-pth}:${PYPKGSRCDIR}
+PYPACKAGE= python22-pth
+PYVERSSUFFIX= 2p2
+PYPKGPREFIX= py22pth
+. if defined(USE_BUILDLINK2)
+. include "../../devel/pth/buildlink2.mk"
+. else
+. include "../../devel/pth/buildlink.mk"
+. endif
.elif ${_PYTHON_VERSION} == "21"
PYPKGSRCDIR= ../../lang/python21
PYPACKAGE= python21
diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk
index 781d934cb84..d49127a047d 100644
--- a/lang/python/srcdist.mk
+++ b/lang/python/srcdist.mk
@@ -1,8 +1,8 @@
-# $NetBSD: srcdist.mk,v 1.5 2002/10/15 16:16:34 tsarna Exp $
+# $NetBSD: srcdist.mk,v 1.6 2002/10/25 10:52:25 drochner Exp $
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == "22"
+.if ${_PYTHON_VERSION} == "22" || ${_PYTHON_VERSION} == "22pth"
DISTNAME= Python-2.2.2
EXTRACT_SUFX= .tgz