diff options
| author | snj <snj@pkgsrc.org> | 2009-03-21 17:35:06 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2009-03-21 17:35:06 +0000 |
| commit | c07e5ba7331eed3c86da158130108d1fd2c6891a (patch) | |
| tree | c1f5b13597c3720da17276a3fd1d8affbcfc249f /sysutils/pscpug/patches | |
| parent | 8c149c0c2a436622b6eaf10980e287ee587b07db (diff) | |
| download | pkgsrc-c07e5ba7331eed3c86da158130108d1fd2c6891a.tar.gz | |
Update to 0.3.5.
No changelog, but changes seem to be the addition of DragonFly and
FreeBSD plus some minor code shuffling.
From Bartosz Kuzma in PR pkg/41053.
Diffstat (limited to 'sysutils/pscpug/patches')
| -rw-r--r-- | sysutils/pscpug/patches/patch-aa | 6 | ||||
| -rw-r--r-- | sysutils/pscpug/patches/patch-ab | 43 |
2 files changed, 3 insertions, 46 deletions
diff --git a/sysutils/pscpug/patches/patch-aa b/sysutils/pscpug/patches/patch-aa index c3943343c67..3cd8ad374ce 100644 --- a/sysutils/pscpug/patches/patch-aa +++ b/sysutils/pscpug/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2008/06/12 02:14:46 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2009/03/21 17:35:07 snj Exp $ ---- Makefile.in.orig 2006-06-08 22:24:47.000000000 -0700 +--- Makefile.in.orig 2009-03-11 19:28:57.000000000 +0100 +++ Makefile.in @@ -26,8 +26,8 @@ ${EXE} : ${OBJ} - @CC@ @LIBS@ -o $@ ${OBJ} + @CC@ -o $@ ${OBJ} @LIBS@ install : - @INSTALL_DATA@ ${EXE} @bindir@ diff --git a/sysutils/pscpug/patches/patch-ab b/sysutils/pscpug/patches/patch-ab deleted file mode 100644 index 7d061ad98c8..00000000000 --- a/sysutils/pscpug/patches/patch-ab +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2007/02/17 09:47:59 minskim Exp $ - ---- psinfo.c.orig 2006-06-23 04:28:38.000000000 +0200 -+++ psinfo.c -@@ -48,7 +48,11 @@ - - #if defined(USE_MACH) || defined(USE_KVM) - #include <sys/fcntl.h> -+#if defined(__DragonFly__) -+#include <sys/user.h> -+#else - #include <sys/proc.h> -+#endif - #include <sys/sysctl.h> - #endif - -@@ -238,7 +242,7 @@ float getProcessCPUPercentByProcessID(in - #elif defined(USE_KVM) - { - int found, fscale; -- struct kinfo_proc2 *givenproc; -+ struct kinfo_proc *givenproc; - struct nlist readnl[] = {{"_fscale"}, {NULL}}; - kvm_t *kd; - -@@ -260,7 +264,7 @@ float getProcessCPUPercentByProcessID(in - - - /* get proc */ -- givenproc = kvm_getproc2(kd, KERN_PROC_PID, pid, sizeof(struct kinfo_proc2), &found); -+ givenproc = kvm_getprocs(kd, KERN_PROC_PID, pid, &found); - - switch (found) { - case 0: -@@ -270,7 +274,7 @@ float getProcessCPUPercentByProcessID(in - /* these maths gleaned from NetBSD top and ps */ - #define fxtofl(fixpt) ((double)(fixpt) / fscale) - -- cpuval = (100 * fxtofl(givenproc->p_pctcpu)); -+ cpuval = (100 * fxtofl(givenproc->kp_proc.p_pctcpu)); - - Valid = true; - break; |