diff options
| author | recht <recht@pkgsrc.org> | 2004-12-05 23:39:03 +0000 |
|---|---|---|
| committer | recht <recht@pkgsrc.org> | 2004-12-05 23:39:03 +0000 |
| commit | 9c29fe1aeb1a59289ca6d43475fc9c51e623ef27 (patch) | |
| tree | 0c51a1ee9ecbc6c504ea88b2a09b946cddff647d /lang/python | |
| parent | c12617def5ce83faf5f2935cd76d4ebecd5ae910 (diff) | |
| download | pkgsrc-9c29fe1aeb1a59289ca6d43475fc9c51e623ef27.tar.gz | |
add Python 2.4
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/pyversion.mk | 33 | ||||
| -rw-r--r-- | lang/python/srcdist.mk | 14 |
2 files changed, 42 insertions, 5 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 0b815449422..c0b50eb9cbd 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.29 2004/07/23 15:35:50 recht Exp $ +# $NetBSD: pyversion.mk,v 1.30 2004/12/05 23:39:03 recht Exp $ .if !defined(PYTHON_PYVERSION_MK) PYTHON_PYVERSION_MK= defined @@ -11,7 +11,7 @@ PYTHON_VERSIONS_INCOMPATIBLE+= 23 22 21 21pth 20 15 BUILDLINK_DEPENDS.python22-pth?= python22-pth>=2.2.3nb2 BUILDLINK_DEPENDS.python23-pth?= python23-pth>=2.3.3nb3 .endif -PYTHON_VERSIONS_ACCEPTED?= 23 23pth 22 22pth 21 21pth 20 +PYTHON_VERSIONS_ACCEPTED?= 24 24pth 23 23pth 22 22pth 21 21pth 20 PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default BUILDLINK_DEPENDS.python15?= python15>=1.5 @@ -22,6 +22,8 @@ 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 +BUILDLINK_DEPENDS.python24?= python24>=2.4 +BUILDLINK_DEPENDS.python24-pth?= python24-pth>=2.4 # transform the list into individual variables .for pv in ${PYTHON_VERSIONS_ACCEPTED} @@ -31,6 +33,12 @@ _PYTHON_VERSION_${pv}_OK= yes .endfor # check what is installed +.if exists(${LOCALBASE}/bin/python2.4) +_PYTHON_VERSION_24_INSTALLED= yes +.endif +.if exists(${LOCALBASE}/bin/python2p4) +_PYTHON_VERSION_24pth_INSTALLED=yes +.endif .if exists(${LOCALBASE}/bin/python2.3) _PYTHON_VERSION_23_INSTALLED= yes .endif @@ -103,7 +111,26 @@ _PYTHON_VERSION= ${_PYTHON_VERSION_FIRSTACCEPTED} # PYPKGPREFIX: prefix to use in PKGNAME for extensions which can install # to multiple Python versions # -.if ${_PYTHON_VERSION} == "23" +.if ${_PYTHON_VERSION} == "24" +PYPKGSRCDIR= ../../lang/python24 +PYDEPENDENCY= ${BUILDLINK_DEPENDS.python24}:${PYPKGSRCDIR} +PYPACKAGE= python24 +PYVERSSUFFIX= 2.4 +PYPKGPREFIX= py24 +.elif ${_PYTHON_VERSION} == "24pth" +PYPKGSRCDIR= ../../lang/python24-pth +PYDEPENDENCY= ${BUILDLINK_DEPENDS.python24-pth}:${PYPKGSRCDIR} +PYPACKAGE= python24-pth +PYVERSSUFFIX= 2p4 +PYPKGPREFIX= py24pth +. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]) +PTHREAD_OPTS= require +. include "../../mk/pthread.buildlink3.mk" +. if ${PTHREAD_TYPE} == "pth" +. include "../../devel/pth/buildlink3.mk" +. endif +. endif +.elif ${_PYTHON_VERSION} == "23" PYPKGSRCDIR= ../../lang/python23 PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23}:${PYPKGSRCDIR} PYPACKAGE= python23 diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk index 9a08a4bd097..2947ea3272a 100644 --- a/lang/python/srcdist.mk +++ b/lang/python/srcdist.mk @@ -1,8 +1,18 @@ -# $NetBSD: srcdist.mk,v 1.11 2004/06/02 12:30:55 recht Exp $ +# $NetBSD: srcdist.mk,v 1.12 2004/12/05 23:39:03 recht Exp $ .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == "23" || ${_PYTHON_VERSION} == "23pth" +.if ${_PYTHON_VERSION} == "24" || ${_PYTHON_VERSION} == "24pth" + +DISTNAME= Python-2.4 +EXTRACT_SUFX= .tar.bz2 +DISTINFO_FILE= ${.CURDIR}/../../lang/python24/distinfo +PATCHDIR= ${.CURDIR}/../../lang/python24/patches +PYSUBDIR= Python-2.4 +WRKSRC= ${WRKDIR}/${PYSUBDIR} +MASTER_SITES= ftp://ftp.python.org/pub/python/2.4/ + +.elif ${_PYTHON_VERSION} == "23" || ${_PYTHON_VERSION} == "23pth" DISTNAME= Python-2.3.4 EXTRACT_SUFX= .tgz |