diff options
| author | tnn <tnn@pkgsrc.org> | 2008-04-24 01:39:25 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2008-04-24 01:39:25 +0000 |
| commit | cfdf3df312751c7b18c01ac0a4d00495d17ac83f (patch) | |
| tree | 6bfaed92e59f67f3edd6d4ab3ab392ce534637db | |
| parent | 0c982bd5de0eb8d0ae10451b055fe5ce4f727a65 (diff) | |
| download | pkgsrc-cfdf3df312751c7b18c01ac0a4d00495d17ac83f.tar.gz | |
prepare for arrival of Python 2.5
| -rw-r--r-- | lang/python/extension.mk | 12 | ||||
| -rw-r--r-- | lang/python/srcdist.mk | 14 |
2 files changed, 21 insertions, 5 deletions
diff --git a/lang/python/extension.mk b/lang/python/extension.mk index 884295d80ea..45d6967ca09 100644 --- a/lang/python/extension.mk +++ b/lang/python/extension.mk @@ -1,4 +1,4 @@ -# $NetBSD: extension.mk,v 1.17 2007/10/31 00:59:52 joerg Exp $ +# $NetBSD: extension.mk,v 1.18 2008/04/24 01:39:25 tnn Exp $ # derive a python version from the package name if possible # optionally handled quoted package names @@ -28,13 +28,19 @@ _PYSETUPINSTALLARGS+= --root=${DESTDIR:Q} PY_PATCHPLIST?= yes PYSETUPSUBDIR?= #empty +PY_NO_EGG?= yes +.if !empty(PY_NO_EGG:M[yY][eE][sS]) +# see python25/patches/patch-av +INSTALL_ENV+= PKGSRC_PYTHON_NO_EGG=defined +.endif + do-build: (cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \ ${PYSETUP} build ${PYSETUPBUILDARGS}) do-install: - (cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \ - ${PYSETUP} "install" ${_PYSETUPINSTALLARGS}) + (cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \ + ${PYTHONBIN} ${PYSETUP} "install" ${_PYSETUPINSTALLARGS}) .endif .if defined(PY_PATCHPLIST) diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk index 0cc53999454..33ae6bbf9a7 100644 --- a/lang/python/srcdist.mk +++ b/lang/python/srcdist.mk @@ -1,8 +1,18 @@ -# $NetBSD: srcdist.mk,v 1.20 2008/04/11 10:44:48 drochner Exp $ +# $NetBSD: srcdist.mk,v 1.21 2008/04/24 01:39:25 tnn Exp $ .include "../../lang/python/pyversion.mk" -.if ${_PYTHON_VERSION} == "24" +.if ${_PYTHON_VERSION} == "25" + +DISTNAME= Python-2.5.2 +EXTRACT_SUFX= .tar.bz2 +DISTINFO_FILE= ${.CURDIR}/../../lang/python25/distinfo +PATCHDIR= ${.CURDIR}/../../lang/python25/patches +PYSUBDIR= Python-2.5.2 +WRKSRC= ${WRKDIR}/${PYSUBDIR} +MASTER_SITES= ftp://ftp.python.org/pub/python/2.5/ + +.elif ${_PYTHON_VERSION} == "24" DISTNAME= Python-2.4.5 EXTRACT_SUFX= .tar.bz2 |