summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2003-08-04 08:15:47 +0000
committerdrochner <drochner@pkgsrc.org>2003-08-04 08:15:47 +0000
commit88109ac95a1708ccc1391eff1cc7ade037a2272a (patch)
tree59cc274c5cb4e290027169a8aca1cde457dae194 /lang
parent78bfeffd554d83feceedfa2fa82a3e96daaca0fb (diff)
downloadpkgsrc-88109ac95a1708ccc1391eff1cc7ade037a2272a.tar.gz
prepare for Python-2.3
Diffstat (limited to 'lang')
-rw-r--r--lang/python/pyversion.mk33
-rw-r--r--lang/python/srcdist.mk14
2 files changed, 42 insertions, 5 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index db2a11d68d9..0e87258a512 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.20 2003/05/07 20:08:18 drochner Exp $
+# $NetBSD: pyversion.mk,v 1.21 2003/08/04 08:15:47 drochner Exp $
.if !defined(PYTHON_PYVERSION_MK)
PYTHON_PYVERSION_MK= defined
@@ -9,7 +9,7 @@ PYTHON_VERSION_DEFAULT?= 22
.if ${OPSYS} == "Darwin"
PYTHON_VERSIONS_ACCEPTED= 22 # the only one that builds
.else
-PYTHON_VERSIONS_ACCEPTED?= 22 22pth 21 21pth 20
+PYTHON_VERSIONS_ACCEPTED?= 22 22pth 23 23pth 21 21pth 20
.endif
BUILDLINK_DEPENDS.python15?= python15>=1.5
@@ -18,6 +18,8 @@ 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
+BUILDLINK_DEPENDS.python23?= python23>=2.3
+BUILDLINK_DEPENDS.python23-pth?= python23-pth>=2.3
# transform the list into individual variables
.for pv in ${PYTHON_VERSIONS_ACCEPTED}
@@ -25,6 +27,12 @@ _PYTHON_VERSION_${pv}_OK= yes
.endfor
# check what is installed
+.if exists(${LOCALBASE}/bin/python2.3)
+_PYTHON_VERSION_23_INSTALLED= yes
+.endif
+.if exists(${LOCALBASE}/bin/python2p3)
+_PYTHON_VERSION_23pth_INSTALLED=yes
+.endif
.if exists(${LOCALBASE}/bin/python2.2)
_PYTHON_VERSION_22_INSTALLED= yes
.endif
@@ -89,7 +97,26 @@ _PYTHON_VERSION= ${_PYTHON_VERSION_FIRSTACCEPTED}
# PYPKGPREFIX: prefix to use in PKGNAME for extensions which can install
# to multiple Python versions
#
-.if ${_PYTHON_VERSION} == "22"
+.if ${_PYTHON_VERSION} == "23"
+PYPKGSRCDIR= ../../lang/python23
+PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23}:${PYPKGSRCDIR}
+PYPACKAGE= python23
+PYVERSSUFFIX= 2.3
+PYPKGPREFIX= py23
+.elif ${_PYTHON_VERSION} == "23pth"
+PYPKGSRCDIR= ../../lang/python23-pth
+PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23-pth}:${PYPKGSRCDIR}
+PYPACKAGE= python23-pth
+PYVERSSUFFIX= 2p3
+PYPKGPREFIX= py23pth
+. if defined(USE_BUILDLINK2)
+PTHREAD_OPTS= require
+. include "../../mk/pthread.buildlink2.mk"
+. if ${PTHREAD_TYPE} == "pth"
+. include "../../devel/pth/buildlink2.mk"
+. endif
+. endif
+.elif ${_PYTHON_VERSION} == "22"
PYPKGSRCDIR= ../../lang/python22
PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22}:${PYPKGSRCDIR}
PYPACKAGE= python22
diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk
index cdb26575f88..79effe9c54e 100644
--- a/lang/python/srcdist.mk
+++ b/lang/python/srcdist.mk
@@ -1,8 +1,18 @@
-# $NetBSD: srcdist.mk,v 1.7 2003/06/06 17:31:17 drochner Exp $
+# $NetBSD: srcdist.mk,v 1.8 2003/08/04 08:15:47 drochner Exp $
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == "22" || ${_PYTHON_VERSION} == "22pth"
+.if ${_PYTHON_VERSION} == "23" || ${_PYTHON_VERSION} == "23pth"
+
+DISTNAME= Python-2.3
+EXTRACT_SUFX= .tgz
+DISTINFO_FILE= ${.CURDIR}/../../lang/python23/distinfo
+PATCHDIR= ${.CURDIR}/../../lang/python23/patches
+PYSUBDIR= Python-2.3
+WRKSRC= ${WRKDIR}/${PYSUBDIR}
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.3/
+
+.elif ${_PYTHON_VERSION} == "22" || ${_PYTHON_VERSION} == "22pth"
DISTNAME= Python-2.2.3
EXTRACT_SUFX= .tgz