diff options
-rw-r--r-- | sysutils/xfce4-cpugraph-plugin/Makefile | 9 | ||||
-rw-r--r-- | sysutils/xfce4-cpugraph-plugin/distinfo | 5 | ||||
-rw-r--r-- | sysutils/xfce4-cpugraph-plugin/patches/patch-aa | 14 | ||||
-rw-r--r-- | sysutils/xfce4-cpugraph-plugin/patches/patch-ab | 10 |
4 files changed, 26 insertions, 12 deletions
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile index 7641ed51e40..c1ccd0d010b 100644 --- a/sysutils/xfce4-cpugraph-plugin/Makefile +++ b/sysutils/xfce4-cpugraph-plugin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/04/12 09:55:13 martti Exp $ +# $NetBSD: Makefile,v 1.10 2007/04/17 13:05:08 joerg Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -10,13 +10,12 @@ CATEGORIES= sysutils MASTER_SITES= http://goodies.xfce.org/releases/xfce4-cpugraph-plugin/ COMMENT= Xfce CPU load plugin -USE_TOOLS+= intltool +USE_TOOLS+= intltool autoconf .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "DragonFly" -MAKE_ENV+= OS_LIBS=-lkinfo -.endif +pre-configure: + cd ${WRKSRC} && autoconf .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-cpugraph-plugin/distinfo b/sysutils/xfce4-cpugraph-plugin/distinfo index 91167e93fa1..f97c49075cb 100644 --- a/sysutils/xfce4-cpugraph-plugin/distinfo +++ b/sysutils/xfce4-cpugraph-plugin/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.8 2007/04/12 09:55:13 martti Exp $ +$NetBSD: distinfo,v 1.9 2007/04/17 13:05:08 joerg Exp $ SHA1 (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = d869625350d6c0ae4bef3203f03bbc409773494f RMD160 (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = 99c309b3bf0ab622a9b95df9b568808a6c034055 Size (xfce4-cpugraph-plugin-0.3.0.tar.bz2) = 102638 bytes -SHA1 (patch-ab) = 049a27b8946d401ece639b5cfa999dada5ffd2eb +SHA1 (patch-aa) = fac9f1ac080540eb90291a73a718ea09040a7ff5 +SHA1 (patch-ab) = 0a566fd969a3359d709001728edcaa736f5d8776 SHA1 (patch-ad) = a989f0ed1b91d2e1fbc61fa623b989d371be80e0 diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-aa b/sysutils/xfce4-cpugraph-plugin/patches/patch-aa new file mode 100644 index 00000000000..cc081662e28 --- /dev/null +++ b/sysutils/xfce4-cpugraph-plugin/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.5 2007/04/17 13:05:08 joerg Exp $ + +--- configure.ac.orig 2007-04-17 12:26:04.000000000 +0000 ++++ configure.ac +@@ -29,6 +29,9 @@ AC_PROG_INTLTOOL + dnl Check for standard header files + AC_HEADER_STDC + ++dnl *** Check for kinfo, needed for DragonFly *** ++AC_CHECK_LIB([kinfo], [kinfo_get_sched_cputime]) ++ + dnl configure the panel plugin + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) + diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-ab b/sysutils/xfce4-cpugraph-plugin/patches/patch-ab index d02cd1bfd95..75454ac035e 100644 --- a/sysutils/xfce4-cpugraph-plugin/patches/patch-ab +++ b/sysutils/xfce4-cpugraph-plugin/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2007/04/12 09:55:13 martti Exp $ +$NetBSD: patch-ab,v 1.4 2007/04/17 13:05:08 joerg Exp $ --- panel-plugin/os.c.orig 2004-07-24 17:25:15.000000000 +0000 -+++ panel-plugin/os.c 2007-01-23 15:51:04.000000000 +0000 -@@ -67,6 +67,26 @@ ++++ panel-plugin/os.c +@@ -67,6 +67,26 @@ long GetCPUUsage (int *oldusage, int *ol return usage; } @@ -13,8 +13,8 @@ $NetBSD: patch-ab,v 1.3 2007/04/12 09:55:13 martti Exp $ + struct kinfo_cputime cp_time; + + if (kinfo_get_sched_cputime(&cp_time) < 0) { -+ g_warning("kinfo_get_sched_cputime failed"); -+ return 0; ++ printf ("kinfo_get_sched_cputime failed"); ++ return -1; + } + used = cp_time.cp_user + cp_time.cp_nice + cp_time.cp_sys; + total = used + cp_time.cp_idle; |