pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/xfce4-cpugraph-plugin Catch up with change in...
details: https://anonhg.NetBSD.org/pkgsrc/rev/460c49c8c83e
branches: trunk
changeset: 527965:460c49c8c83e
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Apr 17 13:05:08 2007 +0000
description:
Catch up with change in the plugin. Adjust configure.ac for the kinfo
check and regen it for now using autoconf. Can't figure out how to
produce a minimal diff.
diffstat:
sysutils/xfce4-cpugraph-plugin/Makefile | 9 ++++-----
sysutils/xfce4-cpugraph-plugin/distinfo | 5 +++--
sysutils/xfce4-cpugraph-plugin/patches/patch-aa | 14 ++++++++++++++
sysutils/xfce4-cpugraph-plugin/patches/patch-ab | 10 +++++-----
4 files changed, 26 insertions(+), 12 deletions(-)
diffs (84 lines):
diff -r 3d4d0edb758b -r 460c49c8c83e sysutils/xfce4-cpugraph-plugin/Makefile
--- a/sysutils/xfce4-cpugraph-plugin/Makefile Tue Apr 17 11:29:42 2007 +0000
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile Tue Apr 17 13:05:08 2007 +0000
@@ -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 @@
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 -r 3d4d0edb758b -r 460c49c8c83e sysutils/xfce4-cpugraph-plugin/distinfo
--- a/sysutils/xfce4-cpugraph-plugin/distinfo Tue Apr 17 11:29:42 2007 +0000
+++ b/sysutils/xfce4-cpugraph-plugin/distinfo Tue Apr 17 13:05:08 2007 +0000
@@ -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 -r 3d4d0edb758b -r 460c49c8c83e sysutils/xfce4-cpugraph-plugin/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xfce4-cpugraph-plugin/patches/patch-aa Tue Apr 17 13:05:08 2007 +0000
@@ -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 -r 3d4d0edb758b -r 460c49c8c83e sysutils/xfce4-cpugraph-plugin/patches/patch-ab
--- a/sysutils/xfce4-cpugraph-plugin/patches/patch-ab Tue Apr 17 11:29:42 2007 +0000
+++ b/sysutils/xfce4-cpugraph-plugin/patches/patch-ab Tue Apr 17 13:05:08 2007 +0000
@@ -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 @@
+ 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;
Home |
Main Index |
Thread Index |
Old Index