pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/py-idle Clean up the test for the version of Pyt...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/81bf13998b05
branches:  trunk
changeset: 487155:81bf13998b05
user:      darcy <darcy%pkgsrc.org@localhost>
date:      Mon Jan 10 16:07:55 2005 +0000

description:
Clean up the test for the version of Python.
Use ${TRUE} instead of true.
Reorder a few lines.

diffstat:

 devel/py-idle/Makefile |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 795efd06aebe -r 81bf13998b05 devel/py-idle/Makefile
--- a/devel/py-idle/Makefile    Mon Jan 10 15:51:36 2005 +0000
+++ b/devel/py-idle/Makefile    Mon Jan 10 16:07:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/01/08 19:40:37 perry Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/10 16:07:55 darcy Exp $
 #
 
 PKGNAME=       ${PYPKGPREFIX}-idle-0
@@ -20,16 +20,15 @@
 do-patch:
        (cd ${WRKSRC}; \
        for f in ${PATCHDIR}/patch-*;do \
-       ${PATCH} --batch <$$f || true; \
+       ${PATCH} --batch <$$f || ${TRUE}; \
        done)
 
 #
 # With Python-2.3, the Idle code is part of the base library.
 # We just install a wrapper script. Also, threads are required now.
 #
-PYTHON_VERSIONS_ACCEPTED=      20 20pth 21 21pth 22 22pth 23pth 24pth
-.include "../../lang/python/extension.mk"
-.if (${PYPKGPREFIX} != "py23pth") && (${PYPKGPREFIX} != "py24pth")
+PYTHON_VERSIONS_ACCEPTED=      24pth 23pth 22pth 22 21pth 21 20pth 20
+.if !exists(${PREFIX}/${PYLIB}/idlelib/)
 
 EXTRACT_ELEMENTS=      ${PYSUBDIR}/Tools/idle/*
 PYTHON_PATCH_SCRIPTS=  Tools/idle/idle.py
@@ -59,8 +58,9 @@
                ${PREFIX}/bin/idle${PYVERSSUFFIX}
        ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
 
-.endif # py23pth
+.endif # py23pth and up
 
+.include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/py-Tk/buildlink3.mk"



Home | Main Index | Thread Index | Old Index