[pkgsrc/trunk]: pkgsrc/misc/kdeutils3 If multiple python's are installed make...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/029333ebb23b
branches:  trunk
changeset: 505830:029333ebb23b
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Jan 08 12:07:51 2006 +0000

description:
If multiple python's are installed make sure configure chooses the same
one that buildlink has.

diffstat:

 misc/kdeutils3/Makefile         |   3 ++-
 misc/kdeutils3/distinfo         |   4 ++--
 misc/kdeutils3/patches/patch-ao |  13 +++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 762c9567319a -r 029333ebb23b misc/kdeutils3/Makefile
--- a/misc/kdeutils3/Makefile   Sun Jan 08 11:47:10 2006 +0000
+++ b/misc/kdeutils3/Makefile   Sun Jan 08 12:07:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/01/06 15:10:06 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2006/01/08 12:07:51 markd Exp $
 
 DISTNAME=      kdeutils-${_KDE_VERSION}
 PKGREVISION=   1
@@ -31,6 +31,7 @@
 .endif
 
 CONFIGURE_ARGS+=       --with-pythondir=${LOCALBASE}
+CONFIGURE_ENV+=                PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff -r 762c9567319a -r 029333ebb23b misc/kdeutils3/distinfo
--- a/misc/kdeutils3/distinfo   Sun Jan 08 11:47:10 2006 +0000
+++ b/misc/kdeutils3/distinfo   Sun Jan 08 12:07:51 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2006/01/05 20:25:16 joerg Exp $
+$NetBSD: distinfo,v 1.37 2006/01/08 12:07:52 markd Exp $
 
 SHA1 (kdeutils-3.5.0.tar.bz2) = 194d20c78d61b41dda6c3a6f55f0e10b4718d0a8
 RMD160 (kdeutils-3.5.0.tar.bz2) = 0638cc14a1db465a05eaf915da62d1993a44f461
@@ -9,6 +9,6 @@
 SHA1 (patch-ad) = 3504496bf4b0957e74ae999f16bc03ed3499371d
 SHA1 (patch-ae) = b4067b7e23253d51ed5d0bf545ee7044943a1721
 SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb
-SHA1 (patch-ao) = 06b87e5e2ad5c20f14a993949bc57c3a64225e56
+SHA1 (patch-ao) = 0ffece64199b090608feb5457fbdfce576691999
 SHA1 (patch-ap) = 7f8a89156f6d419ca708bf5e55a57d30e5f94756
 SHA1 (patch-aq) = a76ff5042c3dec821026f512f6e83f5a3eaa3d91
diff -r 762c9567319a -r 029333ebb23b misc/kdeutils3/patches/patch-ao
--- a/misc/kdeutils3/patches/patch-ao   Sun Jan 08 11:47:10 2006 +0000
+++ b/misc/kdeutils3/patches/patch-ao   Sun Jan 08 12:07:51 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.12 2006/01/05 20:25:16 joerg Exp $
+$NetBSD: patch-ao,v 1.13 2006/01/08 12:07:52 markd Exp $
 
---- configure.orig     2005-11-26 07:19:12.000000000 +0000
+--- configure.orig     2005-11-26 20:19:12.000000000 +1300
 +++ configure
 @@ -34076,6 +34076,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -35,3 +35,12 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -38008,6 +38008,8 @@ else
+   version=""2.4""
+ fi
+ 
++version="$PYVERSSUFFIX"
++
+ echo "$as_me:$LINENO: checking for Python$version" >&5
+ echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
+