[pkgsrc/trunk]: pkgsrc/lang/python prepare for arrival of Python 2.5

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c3fd76e1ab1
branches:  trunk
changeset: 541649:8c3fd76e1ab1
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Apr 24 01:39:25 2008 +0000

description:
prepare for arrival of Python 2.5

diffstat:

 lang/python/extension.mk |  12 +++++++++---
 lang/python/srcdist.mk   |  14 ++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r b5160c49929e -r 8c3fd76e1ab1 lang/python/extension.mk
--- a/lang/python/extension.mk  Thu Apr 24 01:11:15 2008 +0000
+++ b/lang/python/extension.mk  Thu Apr 24 01:39:25 2008 +0000
@@ -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 @@
 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 -r b5160c49929e -r 8c3fd76e1ab1 lang/python/srcdist.mk
--- a/lang/python/srcdist.mk    Thu Apr 24 01:11:15 2008 +0000
+++ b/lang/python/srcdist.mk    Thu Apr 24 01:39:25 2008 +0000
@@ -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