Fix paths to ProcessTable.sgrd in ksysguard. This lets "ksysguard

--showprocesses" work properly (as invoked by ctrl+esc).
Bump PKGREVISION to 1.

5 files changed, 63 insertions, 2 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index d97a144c9c0..8a932216df2 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2004/01/15 12:22:10 markd Exp $
+# $NetBSD: Makefile,v 1.37 2004/01/22 18:55:26 jmmv Exp $
 
 DISTNAME=	kdebase-3.1.5
+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 3de4a21db2b..b0c5beddfa1 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2004/01/15 10:15:14 markd Exp $
+$NetBSD: distinfo,v 1.40 2004/01/22 18:55:26 jmmv Exp $
 
 SHA1 (kdebase-3.1.5.tar.bz2) = 489f802e2558db2025ca59ca888286a026bf2552
 Size (kdebase-3.1.5.tar.bz2) = 15163007 bytes
@@ -121,3 +121,6 @@ SHA1 (patch-fa) = fc8d6f0e22548e86ad4d9f328a657c86ea9f51c4
 SHA1 (patch-fb) = 5f6895322c186813c43a3426dfe4d57a17090346
 SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31
 SHA1 (patch-fd) = 0005eaf7eaecb6377da5342c27effd798f425c95
+SHA1 (patch-fe) = eb98edce602c3f56e02b7fc1ae907582723787df
+SHA1 (patch-ff) = 4d324c4d346183020915815aa47c9bfb2b55a9ca
+SHA1 (patch-fg) = c8553eae605ec0ed3d6c7a6cdd84696ab37b8adc
diff --git a/x11/kdebase3/patches/patch-fe b/x11/kdebase3/patches/patch-fe
new file mode 100644
index 00000000000..1b44b4b0d30
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fe
@@ -0,0 +1,22 @@
+$NetBSD: patch-fe,v 1.1 2004/01/22 18:55:26 jmmv Exp $
+
+--- ksysguard/gui/KSysGuardApplet.cc.orig	2003-07-13 21:24:24.000000000 +0200
++++ ksysguard/gui/KSysGuardApplet.cc
+@@ -359,7 +359,7 @@ bool
+ KSysGuardApplet::load()
+ {
+ 	KStandardDirs* kstd = KGlobal::dirs();
+-	kstd->addResourceType("data", "share/apps/ksysguard");
++	kstd->addResourceType("data", "share/kde/apps/ksysguard");
+ 	QString fileName = kstd->findResource("data", "KSysGuardApplet.xml");
+ 
+ 	QFile file(fileName);
+@@ -516,7 +516,7 @@ KSysGuardApplet::save()
+ 		}
+ 
+ 	KStandardDirs* kstd = KGlobal::dirs();
+-	kstd->addResourceType("data", "share/apps/ksysguard");
++	kstd->addResourceType("data", "share/kde/apps/ksysguard");
+ 	QString fileName = kstd->saveLocation("data", "ksysguard");
+ 	fileName += "/KSysGuardApplet.xml";
+ 
diff --git a/x11/kdebase3/patches/patch-ff b/x11/kdebase3/patches/patch-ff
new file mode 100644
index 00000000000..0aeae2200ea
--- /dev/null
+++ b/x11/kdebase3/patches/patch-ff
@@ -0,0 +1,22 @@
+$NetBSD: patch-ff,v 1.1 2004/01/22 18:55:26 jmmv Exp $
+
+--- ksysguard/gui/Workspace.cc.orig	2003-07-13 21:24:24.000000000 +0200
++++ ksysguard/gui/Workspace.cc
+@@ -91,7 +91,7 @@ Workspace::readProperties(KConfig* cfg)
+ 		 * probably the first time the user has started KSysGuard. We
+ 		 * then "restore" a special default configuration. */
+ 		KStandardDirs* kstd = KGlobal::dirs();
+-		kstd->addResourceType("data", "share/apps/ksysguard");
++		kstd->addResourceType("data", "share/kde/apps/ksysguard");
+ 
+ 		workDir = kstd->saveLocation("data", "ksysguard");
+ 
+@@ -470,7 +470,7 @@ void
+ Workspace::showProcesses()
+ {
+ 	KStandardDirs* kstd = KGlobal::dirs();
+-	kstd->addResourceType("data", "share/apps/ksysguard");
++	kstd->addResourceType("data", "share/kde/apps/ksysguard");
+ 
+ 	QString f = kstd->findResource("data", "ProcessTable.sgrd");
+ 	if (!f.isEmpty())
diff --git a/x11/kdebase3/patches/patch-fg b/x11/kdebase3/patches/patch-fg
new file mode 100644
index 00000000000..6142f606e74
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fg
@@ -0,0 +1,13 @@
+$NetBSD: patch-fg,v 1.1 2004/01/22 18:55:26 jmmv Exp $
+
+--- ksysguard/gui/ksysguard.cc.orig	2003-05-07 13:44:16.000000000 +0200
++++ ksysguard/gui/ksysguard.cc
+@@ -156,7 +156,7 @@ void TopLevel::resetWorkSheets()
+ 	ws->removeAllWorkSheets();
+ 
+ 	KStandardDirs* kstd = KGlobal::dirs();
+-	kstd->addResourceType("data", "share/apps/ksysguard");
++	kstd->addResourceType("data", "share/kde/apps/ksysguard");
+ 
+ 	QString workDir = kstd->saveLocation("data", "ksysguard");
+