Quick fix for PR pkg/37605. ps->userTime is never used so just set to 0,

a proper fix will be committed after the freeze.

Also fix PR pkg/37423 - LP64 issue with nspluginviewer from Steve Woodford.
Bump PKGREVISION.

4 files changed, 27 insertions, 8 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 2d42c75fdb3..cca9ac7c3ac 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.138 2007/11/30 21:55:01 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2007/12/27 08:01:20 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 77be0ada2eb..998e146d03e 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.101 2007/11/01 10:35:56 markd Exp $
+$NetBSD: distinfo,v 1.102 2007/12/27 08:01:20 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -34,7 +34,7 @@ SHA1 (patch-cb) = d13c59029ef13c89d565431244128044735ddaef
 SHA1 (patch-cc) = ed95490558d4de4a04aa0f45634e44ed0b78fdd8
 SHA1 (patch-dd) = 4c98e62275ce9a632f79f99110e8fb4995e3f017
 SHA1 (patch-ep) = 745f03daf088afdef4d5eff486311a49291eb947
-SHA1 (patch-er) = ead52469004abbb4e04278e038fad8f850d79701
+SHA1 (patch-er) = 5e0ad3d9a039565719728390b1b9fef568e51981
 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
 SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
 SHA1 (patch-fa) = 1ea4390477d7f68283b68e695bcb2e4b7c18aecc
@@ -52,4 +52,5 @@ SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
 SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e
 SHA1 (patch-gc) = e02ddb93ae7aa249b3b3e68690f587b2c98255b8
 SHA1 (patch-gd) = 39469384668e4ee7fc489406e2813100fc90aa9b
+SHA1 (patch-ge) = 4d86708cae2bb52803a67804e02cec1331648783
 SHA1 (patch-kdesud) = acc40c2d1fb65e404a7aa0dbb6eae72fa7ac6a5e
diff --git a/x11/kdebase3/patches/patch-er b/x11/kdebase3/patches/patch-er
index c572908986d..ef8d344872c 100644
--- a/x11/kdebase3/patches/patch-er
+++ b/x11/kdebase3/patches/patch-er
@@ -1,7 +1,7 @@
-$NetBSD: patch-er,v 1.6 2006/05/16 13:21:06 tron Exp $
+$NetBSD: patch-er,v 1.7 2007/12/27 08:01:20 markd Exp $
 
---- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig	2005-10-10 16:04:31.000000000 +0100
-+++ ksysguard/ksysguardd/NetBSD/ProcessList.c	2006-05-16 14:17:57.000000000 +0100
+--- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig	2005-10-11 04:04:31.000000000 +1300
++++ ksysguard/ksysguardd/NetBSD/ProcessList.c
 @@ -24,6 +24,7 @@
  
  #include <ctype.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-er,v 1.6 2006/05/16 13:21:06 tron Exp $
  #include <pwd.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -191,7 +192,9 @@
+@@ -191,11 +192,13 @@ updateProcess(int pid)
          ps->ppid      = p.kp_eproc.e_ppid;
          ps->uid       = p.kp_eproc.e_ucred.cr_uid;
          ps->gid       = p.kp_eproc.e_pgid;
@@ -20,3 +20,8 @@ $NetBSD: patch-er,v 1.6 2006/05/16 13:21:06 tron Exp $
          ps->niceLevel = p.kp_proc.p_nice;
  
          /* this isn't usertime -- it's total time (??) */
+-	ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100;
++	ps->userTime = 0;
+         ps->sysTime  = 0;
+         ps->sysLoad  = 0;
+ 
diff --git a/x11/kdebase3/patches/patch-ge b/x11/kdebase3/patches/patch-ge
new file mode 100644
index 00000000000..3574455a151
--- /dev/null
+++ b/x11/kdebase3/patches/patch-ge
@@ -0,0 +1,13 @@
+$NetBSD: patch-ge,v 1.1 2007/12/27 08:01:21 markd Exp $
+
+--- nsplugins/viewer/qxteventloop.cpp.orig	2007-05-14 19:55:42.000000000 +1200
++++ nsplugins/viewer/qxteventloop.cpp
+@@ -72,7 +72,7 @@ public:
+ 
+     QIntDict<QSocketNotifier> socknotDict;
+     bool activate_timers;
+-    int timerid;
++    XtIntervalId timerid;
+ 
+     // arguments for Xt display initialization
+     const char* applicationClass;