- Update to 0.3.7.

PR:		ports/124815
Submitted by:	chinsan
Approved by:	maintainer

1 files changed, 94 insertions, 0 deletions

diff --git a/x11/lxpanel/files/patch-src-plugins-cpu-cpu.c b/x11/lxpanel/files/patch-src-plugins-cpu-cpu.c
new file mode 100644
index 000000000000..6107f92a71d9
--- /dev/null
+++ b/x11/lxpanel/files/patch-src-plugins-cpu-cpu.c
@@ -0,0 +1,94 @@
+--- src/plugins/cpu/cpu.c.orig	2008-06-21 13:06:29.000000000 +0800
++++ src/plugins/cpu/cpu.c	2008-06-21 13:14:46.000000000 +0800
+@@ -18,14 +18,24 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  *
+  */
+-/*A little bug fixed by Mykola <mykola@2ka.mipt.ru>:) */
++/*
++ * A little bug fixed by Mykola <mykola@2ka.mipt.ru> :)
++ * FreeBSD support added by Andreas Wiese <aw@instandbesetzt.net>
++ */
+ 
+ 
+ #include <string.h>
+ #include <sys/time.h>
+ #include <time.h>
+-#include <sys/sysinfo.h>
++#ifdef __FreeBSD__
++# include <sys/types.h>
++# include <sys/resource.h>
++# include <sys/sysctl.h>
++#else
++# include <sys/sysinfo.h>
++#endif
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <glib/gi18n.h>
+ 
+ #include "plugin.h"
+@@ -59,6 +69,38 @@
+     struct cpu_stat cpu_anterior;
+ } cpu_t;
+ 
++#ifdef __FreeBSD__
++static void
++get_procstat(unsigned long *u, unsigned long *n, unsigned long *s,
++    unsigned long *i)
++{
++    static int mib[2] = { -1, -1 }, init = 0, j, realhz;
++    long ct[CPUSTATES];
++
++
++    if(init == 0) {
++	struct clockinfo ci;
++	j = sizeof(ci);
++	sysctlbyname("kern.clockrate", &ci, &j, NULL, 0);
++	realhz = ci.stathz ? ci.stathz : ci.hz;
++
++	j = 2;
++	sysctlnametomib("kern.cp_time", mib, &j);
++
++	init = 1;
++	j = sizeof(ct);
++    }
++
++    sysctl(mib, 2, ct, &j, NULL, 0);
++    *u = ct[CP_USER] / realhz;
++    *n = ct[CP_NICE] / realhz;
++    *s = ct[CP_SYS]  / realhz;
++    *i = ct[CP_IDLE] / realhz;
++
++    return;
++}
++#endif
++
+ 
+ static int
+ cpu_update(cpu_t *c)
+@@ -66,18 +108,24 @@
+     int cpu_u=0, cpu_s=0, cpu_n=0, cpu_i=100;
+     unsigned int i;
+     struct cpu_stat cpu, cpu_r;
++#ifndef __FreeBSD__
+     FILE *stat;
++    #endif
+     float total;
+ 
+     ENTER;
+     if(!c->pixmap)
+         RET(TRUE);
+-
++        
++#ifdef __FreeBSD__
++    get_procstat(&cpu.u, &cpu.n, &cpu.s, &cpu.i);
++#else
+     stat = fopen("/proc/stat", "r");
+     if(!stat)
+         RET(TRUE);
+     fscanf(stat, "cpu %lu %lu %lu %lu", &cpu.u, &cpu.n, &cpu.s, &cpu.i);
+     fclose(stat);
++#endif
+ 
+     cpu_r.u = cpu.u - c->cpu_anterior.u;
+     cpu_r.n = cpu.n - c->cpu_anterior.n;