From 9f42d17af73695a34c89c538d5a286b5de3d182f Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 25 Oct 2010 18:11:26 +0000 Subject: [PATCH] switch kvm_getprocs to kvm_getproc2 --- sysutils/conky/Makefile | 4 ++-- sysutils/conky/patches/patch-src_openbsd_c | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 245f288b476..70ce574afab 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2010/10/24 21:36:04 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.18 2010/10/25 18:11:26 sthen Exp $ ONLY_FOR_ARCHS= ${APM_ARCHS} COMMENT= light-weight system monitor DISTNAME= conky-1.7.2 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= sysutils HOMEPAGE= http://conky.sourceforge.net/ diff --git a/sysutils/conky/patches/patch-src_openbsd_c b/sysutils/conky/patches/patch-src_openbsd_c index 150fbc24cae..bcb0713f873 100644 --- a/sysutils/conky/patches/patch-src_openbsd_c +++ b/sysutils/conky/patches/patch-src_openbsd_c @@ -1,6 +1,15 @@ -$OpenBSD: patch-src_openbsd_c,v 1.8 2010/04/27 20:56:11 sthen Exp $ ---- src/openbsd.c.orig Sat Aug 8 21:05:55 2009 -+++ src/openbsd.c Tue Apr 27 20:40:38 2010 +$OpenBSD: patch-src_openbsd_c,v 1.9 2010/10/25 18:11:26 sthen Exp $ +--- src/openbsd.c.orig Sat Aug 8 22:05:55 2009 ++++ src/openbsd.c Mon Oct 25 20:05:06 2010 +@@ -271,7 +271,7 @@ void update_total_processes() + int n_processes; + + kvm_init(); +- kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes); ++ kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(n_processes), &n_processes); + + info.procs = n_processes; + } @@ -454,14 +454,13 @@ void update_obsd_sensors() dev = obsd_sensors.device; // FIXME: read more than one device