Include sys/resource.h and uvm/uvm_extern.h for NetBSD/current.

Requires _KMEMUSER as well on NetBSD.

4 files changed, 58 insertions, 22 deletions

diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index d134be00964..1ae0b94e722 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.116 2012/09/26 11:10:16 jperkin Exp $
+$NetBSD: distinfo,v 1.117 2013/01/15 15:35:25 joerg Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -39,7 +39,7 @@ SHA1 (patch-cb) = d13c59029ef13c89d565431244128044735ddaef
 SHA1 (patch-cc) = ed95490558d4de4a04aa0f45634e44ed0b78fdd8
 SHA1 (patch-dd) = 4c98e62275ce9a632f79f99110e8fb4995e3f017
 SHA1 (patch-ep) = 745f03daf088afdef4d5eff486311a49291eb947
-SHA1 (patch-er) = 1596529d6aea207f18d9d42bd5944a8cbdc7e32b
+SHA1 (patch-er) = 04f3746034225a1861e5bcb9d1efd9a6f428f4bc
 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
 SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
 SHA1 (patch-fa) = 1ea4390477d7f68283b68e695bcb2e4b7c18aecc
@@ -50,7 +50,7 @@ SHA1 (patch-fe) = 3da89e7228d5246e98a244d7f52d9052c3dbcfa2
 SHA1 (patch-ff) = f86edffa3c26caa4538f6cc2ff32ed30ddc7e248
 SHA1 (patch-fg) = bdd6fbbf1f82e174d5ceb70e67763813c13b14dd
 SHA1 (patch-fh) = 387857dcf275acdcebe2c9b900f95fcc1206b85f
-SHA1 (patch-fi) = ba72e46fa0f728cc060bbdba8ed033a71266680c
+SHA1 (patch-fi) = d2587d0e264284830338d34270fc70d33bc3e671
 SHA1 (patch-fj) = 25de89b959a365f57f68557a878cc7dff5f62df5
 SHA1 (patch-fk) = 05b3a6a6451185b3f0eee3a8b9d2001ead62211a
 SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
@@ -61,6 +61,7 @@ SHA1 (patch-ge) = 8470cf03d768d784714e926281757e9d68749360
 SHA1 (patch-gf) = 78de196a700fa9cd5e221ff57c295fdb3562f931
 SHA1 (patch-kcheckpass_checkpass_pam.c) = b5dd2e50c5f1047d3c195836c8b2d06e11edea3b
 SHA1 (patch-kcontrol_access_kcmaccess.cpp) = f7eaec78fa13f2cfb5b97ca84c10f3e403b64919
+SHA1 (patch-kcontrol_kfontinst_kfontinst_GetPid.c) = b56389ec10d4388ba10f01798b0119efbbb72c4c
 SHA1 (patch-kdesud) = acc40c2d1fb65e404a7aa0dbb6eae72fa7ac6a5e
 SHA1 (patch-kicker_applets_launcher_easyvector.h) = 7bcb64630a71cb3740ccf203b63dcdcbb7b30675
 SHA1 (patch-kxkb_kcmmisc.cpp) = 6e31f261c872dc942305a7c25e8c03c089bc272a
diff --git a/x11/kdebase3/patches/patch-er b/x11/kdebase3/patches/patch-er
index fcc3922247c..3fd26b1ee71 100644
--- a/x11/kdebase3/patches/patch-er
+++ b/x11/kdebase3/patches/patch-er
@@ -1,8 +1,8 @@
-$NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
+$NetBSD: patch-er,v 1.9 2013/01/15 15:35:25 joerg Exp $
 
---- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig	2005-10-11 04:04:31.000000000 +1300
+--- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig	2005-10-10 15:04:31.000000000 +0000
 +++ ksysguard/ksysguardd/NetBSD/ProcessList.c
-@@ -24,10 +24,12 @@
+@@ -24,15 +24,18 @@
  
  #include <ctype.h>
  #include <dirent.h>
@@ -15,7 +15,13 @@ $NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
  #include <sys/param.h>
  #include <sys/sysctl.h>
  #include <sys/time.h>
-@@ -46,6 +48,8 @@ CONTAINER ProcessList = 0;
+ #include <sys/types.h>
+ #include <sys/user.h>
++#include <sys/resource.h>
+ #include <unistd.h>
+ #include <signal.h>
+ 
+@@ -46,6 +49,8 @@ CONTAINER ProcessList = 0;
  
  #define BUFSIZE 1024
  
@@ -24,7 +30,7 @@ $NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
  typedef struct
  {
  	/* This flag is set for all found processes at the beginning of the
-@@ -157,15 +161,13 @@ findProcessInList(int pid)
+@@ -157,15 +162,13 @@ findProcessInList(int pid)
  }
  
  static int
@@ -43,7 +49,7 @@ $NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
  
  	if ((ps = findProcessInList(pid)) == 0)
  	{
-@@ -178,26 +180,18 @@ updateProcess(int pid)
+@@ -178,26 +181,18 @@ updateProcess(int pid)
  
  	ps->alive = 1;
  
@@ -81,7 +87,7 @@ $NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
  
          /* memory, process name, process uid */
  	/* find out user name with process uid */
-@@ -205,19 +199,26 @@ updateProcess(int pid)
+@@ -205,19 +200,26 @@ updateProcess(int pid)
  	strlcpy(ps->userName,pwent&&pwent->pw_name? pwent->pw_name:"????",sizeof(ps->userName));
  	ps->userName[sizeof(ps->userName)-1]='\0';
  
@@ -119,7 +125,7 @@ $NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
  
  	return (0);
  }
-@@ -266,6 +267,8 @@ initProcessList(struct SensorModul* sm)
+@@ -266,6 +268,8 @@ initProcessList(struct SensorModul* sm)
  		registerCommand("setpriority", setPriority);
  	}
  
@@ -128,7 +134,7 @@ $NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
  	updateProcessList();
  }
  
-@@ -277,27 +280,22 @@ exitProcessList(void)
+@@ -277,27 +281,22 @@ exitProcessList(void)
  
  	if (ProcessList)
  		free (ProcessList);
@@ -167,7 +173,7 @@ $NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
  	cleanupProcessList();
  
  	return (0);
-@@ -306,8 +304,8 @@ updateProcessList(void)
+@@ -306,8 +305,8 @@ updateProcessList(void)
  void
  printProcessListInfo(const char* cmd)
  {
@@ -178,7 +184,7 @@ $NetBSD: patch-er,v 1.8 2008/01/04 21:05:57 markd Exp $
  }
  
  void
-@@ -318,10 +316,10 @@ printProcessList(const char* cmd)
+@@ -318,10 +317,10 @@ printProcessList(const char* cmd)
  	ps = first_ctnr(ProcessList); /* skip 'kernel' entry */
  	for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
  	{
diff --git a/x11/kdebase3/patches/patch-fi b/x11/kdebase3/patches/patch-fi
index 66aac6c5fa7..8a7be787c8c 100644
--- a/x11/kdebase3/patches/patch-fi
+++ b/x11/kdebase3/patches/patch-fi
@@ -1,8 +1,8 @@
-$NetBSD: patch-fi,v 1.4 2008/01/04 21:05:58 markd Exp $
+$NetBSD: patch-fi,v 1.5 2013/01/15 15:35:25 joerg Exp $
 
---- ksysguard/ksysguardd/NetBSD/Memory.c.orig	2005-10-11 04:04:31.000000000 +1300
+--- ksysguard/ksysguardd/NetBSD/Memory.c.orig	2005-10-10 15:04:31.000000000 +0000
 +++ ksysguard/ksysguardd/NetBSD/Memory.c
-@@ -21,7 +21,6 @@
+@@ -21,12 +21,12 @@
  */
  
  #include <fcntl.h>
@@ -10,7 +10,21 @@ $NetBSD: patch-fi,v 1.4 2008/01/04 21:05:58 markd Exp $
  #include <limits.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -45,29 +44,25 @@
+ #include <string.h>
+ #include <sys/param.h>
++#include <sys/resource.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+ #include <sys/vmmeter.h>
+@@ -34,6 +34,7 @@
+ /* Everything post 1.5.x uses uvm/uvm_* includes */
+ #if __NetBSD_Version__ >= 105010000
+ #include <uvm/uvm_param.h>
++#include <uvm/uvm_extern.h>
+ #else
+ #include <vm/vm_param.h>
+ #endif
+@@ -45,29 +46,25 @@
  static size_t Total = 0;
  static size_t MFree = 0;
  static size_t Used = 0;
@@ -50,7 +64,7 @@ $NetBSD: patch-fi,v 1.4 2008/01/04 21:05:58 markd Exp $
  	registerMonitor("mem/swap/free", "integer", printSwapFree, printSwapFreeInfo, sm);
  	registerMonitor("mem/swap/used", "integer", printSwapUsed, printSwapUsedInfo, sm);
  }
-@@ -75,7 +70,6 @@ initMemory(struct SensorModul* sm)
+@@ -75,7 +72,6 @@ initMemory(struct SensorModul* sm)
  void
  exitMemory(void)
  {
@@ -58,7 +72,7 @@ $NetBSD: patch-fi,v 1.4 2008/01/04 21:05:58 markd Exp $
  }
  
  int
-@@ -83,7 +77,6 @@ updateMemory(void)
+@@ -83,7 +79,6 @@ updateMemory(void)
  {
  
  #define ARRLEN(X) (sizeof(X)/sizeof(X[0]))
@@ -66,7 +80,7 @@ $NetBSD: patch-fi,v 1.4 2008/01/04 21:05:58 markd Exp $
    size_t len;
    
    {
-@@ -95,37 +88,26 @@ updateMemory(void)
+@@ -95,37 +90,26 @@ updateMemory(void)
    }
   
    {
@@ -116,7 +130,7 @@ $NetBSD: patch-fi,v 1.4 2008/01/04 21:05:58 markd Exp $
    return 0;
  }
  
-@@ -154,27 +136,63 @@ printUsedInfo(const char* cmd)
+@@ -154,27 +138,63 @@ printUsedInfo(const char* cmd)
  }
  
  void
diff --git a/x11/kdebase3/patches/patch-kcontrol_kfontinst_kfontinst_GetPid.c b/x11/kdebase3/patches/patch-kcontrol_kfontinst_kfontinst_GetPid.c
new file mode 100644
index 00000000000..0b2e3f7b530
--- /dev/null
+++ b/x11/kdebase3/patches/patch-kcontrol_kfontinst_kfontinst_GetPid.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-kcontrol_kfontinst_kfontinst_GetPid.c,v 1.1 2013/01/15 15:35:25 joerg Exp $
+
+--- kcontrol/kfontinst/kfontinst/GetPid.c.orig	2013-01-14 15:01:36.000000000 +0000
++++ kcontrol/kfontinst/kfontinst/GetPid.c
+@@ -28,6 +28,10 @@
+ ////////////////////////////////////////////////////////////////////////////////
+ */
+ 
++#ifdef __NetBSD__
++#define _KMEMUSER
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>