summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2006-02-01 12:36:25 +0000
committermarkd <markd@pkgsrc.org>2006-02-01 12:36:25 +0000
commit3b1781af6531268938833bf7fcc65a785e7ff6c9 (patch)
tree3853b2c179a471902828f241bd50e15097861e7c
parent7c40ff0d9291e1f172201e307e19ec80f6cfdfbf (diff)
downloadpkgsrc-3b1781af6531268938833bf7fcc65a785e7ff6c9.tar.gz
Fix display of NetBSD device info in the KInfoCenter. (Reads
/var/run/dmesg.boot and was stopping at first blank line rather that EOF) Bump PKGREVISION.
-rw-r--r--x11/kdebase3/Makefile3
-rw-r--r--x11/kdebase3/distinfo4
-rw-r--r--x11/kdebase3/patches/patch-af13
3 files changed, 15 insertions, 5 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 2db53424d3c..f980ee5c2f1 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2006/01/31 22:25:32 markd Exp $
+# $NetBSD: Makefile,v 1.105 2006/02/01 12:36:25 markd Exp $
DISTNAME= kdebase-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 08234cf61d4..abf2d9dd2a9 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2006/01/31 22:25:32 markd Exp $
+$NetBSD: distinfo,v 1.81 2006/02/01 12:36:25 markd Exp $
SHA1 (kdebase-3.5.1.tar.bz2) = 656fca622f1a663eab5f254dcceb8ded2d41ef48
RMD160 (kdebase-3.5.1.tar.bz2) = 5308bfe188f49815e68392b2f3a48e7def34dee0
@@ -16,7 +16,7 @@ SHA1 (patch-aa) = 28647cdec95367504e582ceb871e67dd3c321e29
SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
SHA1 (patch-ae) = e281920c63ab6cea8ed41c406275e63120d27490
-SHA1 (patch-af) = d149ff332c82b9ef2765de407fefe4daffdafe31
+SHA1 (patch-af) = 5438b3738420d154715bf0d0f75b23767aa944d6
SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
SHA1 (patch-ah) = 3d4f42af56a5c345d5784458d70b8f73a1841664
SHA1 (patch-aj) = bedd17a5a04bff32e4441ed1750ae8ab5a4fa323
diff --git a/x11/kdebase3/patches/patch-af b/x11/kdebase3/patches/patch-af
index bb0ab489017..79a7fae3534 100644
--- a/x11/kdebase3/patches/patch-af
+++ b/x11/kdebase3/patches/patch-af
@@ -1,7 +1,16 @@
-$NetBSD: patch-af,v 1.6 2005/03/23 21:44:37 markd Exp $
+$NetBSD: patch-af,v 1.7 2006/02/01 12:36:25 markd Exp $
---- kcontrol/info/info_netbsd.cpp.orig 2005-02-04 12:18:52.000000000 +1300
+--- kcontrol/info/info_netbsd.cpp.orig 2005-09-10 20:25:05.000000000 +1200
+++ kcontrol/info/info_netbsd.cpp
+@@ -123,7 +123,7 @@ static bool GetDmesgInfo(QListView *lBox
+ }
+
+ QListViewItem *olditem = NULL;
+- while(!(s = t->readLine().local8Bit()).isEmpty()) {
++ while(!(s = t->readLine().local8Bit()).isNull()) {
+ if (!seencpu) {
+ if (s.contains("cpu"))
+ seencpu = true;
@@ -265,9 +265,11 @@ bool GetInfo_SCSI (QListView *lbox)
bool GetInfo_Partitions (QListView *lbox)
{