From 27708e1f4b82203e949502b507accfff8eb1de4f Mon Sep 17 00:00:00 2001
From: snj <snj>
Date: Sat, 21 Mar 2009 17:35:06 +0000
Subject: 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.
---
 sysutils/pscpug/Makefile         |  9 ++++-----
 sysutils/pscpug/distinfo         | 11 +++++-----
 sysutils/pscpug/patches/patch-aa |  6 +++---
 sysutils/pscpug/patches/patch-ab | 43 ----------------------------------------
 4 files changed, 12 insertions(+), 57 deletions(-)
 delete mode 100644 sysutils/pscpug/patches/patch-ab

diff --git a/sysutils/pscpug/Makefile b/sysutils/pscpug/Makefile
index add13c60ac1..b215843156a 100644
--- a/sysutils/pscpug/Makefile
+++ b/sysutils/pscpug/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:46 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.4 2009/03/21 17:35:06 snj Exp $
 
-DISTNAME=		pscpug032
-PKGNAME=		pscpug-0.3.2
+DISTNAME=		pscpug035
+PKGNAME=		pscpug-0.3.5
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.diablonet.net/~mercadal/projects/pscpug/
 EXTRACT_SUFX=		.tgz
 
-MAINTAINER=		bartosz@atom.eu.org
+MAINTAINER=		bartosz.kuzma@gmail.com
 HOMEPAGE=		http://www.diablonet.net/~mercadal/projects/pscpug/
 COMMENT=		Graph a given process's CPU usage
 
diff --git a/sysutils/pscpug/distinfo b/sysutils/pscpug/distinfo
index f76f0a2461f..4bf23038fdc 100644
--- a/sysutils/pscpug/distinfo
+++ b/sysutils/pscpug/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/06/12 02:14:46 joerg Exp $
+$NetBSD: distinfo,v 1.4 2009/03/21 17:35:07 snj Exp $
 
-SHA1 (pscpug032.tgz) = 03da889738d791e3316a91da10b20be83662d977
-RMD160 (pscpug032.tgz) = fc3aa7289e0051f0f25b5695987d77a7f93d4fbb
-Size (pscpug032.tgz) = 40378 bytes
-SHA1 (patch-aa) = 1d354ff4f38170ed1eebefff10b2c98312465b47
-SHA1 (patch-ab) = c252d1f567ca510d3cb3542e5ad36eaece107f19
+SHA1 (pscpug035.tgz) = 5c19191001b35ddaa4399d63de79d8b1873619e2
+RMD160 (pscpug035.tgz) = 25931ad9d0a5f867a6bb5b1fa6e17ef8180a9880
+Size (pscpug035.tgz) = 41552 bytes
+SHA1 (patch-aa) = bf5953870246fa5c602ca526a160fca66711cbfd
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;
-- 
cgit v1.2.3