summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2006-01-08 12:07:51 +0000
committermarkd <markd@pkgsrc.org>2006-01-08 12:07:51 +0000
commitc4be92a335395f082af320dfdb7b8186643b0782 (patch)
tree9b0df44f39230bfb799b09cd81be1aa7432592b9 /misc
parente6df5f508098a86f8cb62827f5947231dbef31f9 (diff)
downloadpkgsrc-c4be92a335395f082af320dfdb7b8186643b0782.tar.gz
If multiple python's are installed make sure configure chooses the same
one that buildlink has.
Diffstat (limited to 'misc')
-rw-r--r--misc/kdeutils3/Makefile3
-rw-r--r--misc/kdeutils3/distinfo4
-rw-r--r--misc/kdeutils3/patches/patch-ao13
3 files changed, 15 insertions, 5 deletions
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index eceb033c3cb..a78e5bbe387 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -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 @@ CPPFLAGS+= -D__NetBSD_APM__
.endif
CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE}
+CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../devel/gmp/buildlink3.mk"
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 1c43567026c..72b78d1d79b 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -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-ac) = 9b31039b0e3cc05dc4fb288ee8f66ebf3e440f6e
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 --git a/misc/kdeutils3/patches/patch-ao b/misc/kdeutils3/patches/patch-ao
index 08a07b74067..d79b0fc1877 100644
--- a/misc/kdeutils3/patches/patch-ao
+++ b/misc/kdeutils3/patches/patch-ao
@@ -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 @@ $NetBSD: patch-ao,v 1.12 2006/01/05 20:25:16 joerg Exp $
}
_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
+