Import of pkgsrc-2015Q2
This commit is contained in:
@@ -1,21 +1,15 @@
|
||||
# $NetBSD: Makefile,v 1.34 2014/05/05 00:48:22 ryoon Exp $
|
||||
# $NetBSD: Makefile,v 1.36 2015/04/25 14:24:55 tnn Exp $
|
||||
|
||||
PKGREVISION= 1
|
||||
.include "../../meta-pkgs/xfce4/Makefile.common"
|
||||
|
||||
XFCE4_VERSION= 0.3.0
|
||||
|
||||
DISTNAME= xfce4-cpugraph-plugin-${XFCE4_VERSION}
|
||||
PKGREVISION= 21
|
||||
DISTNAME= xfce4-cpugraph-plugin-1.0.5
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-cpugraph-plugin/
|
||||
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/
|
||||
|
||||
HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
|
||||
COMMENT= Xfce CPU load plugin
|
||||
|
||||
USE_TOOLS+= autoconf
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
pre-configure:
|
||||
cd ${WRKSRC} && autoconf
|
||||
|
||||
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
|
||||
.include "../../x11/xfce4-panel/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
||||
@@ -1,3 +1,48 @@
|
||||
@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:13 martti Exp $
|
||||
libexec/xfce4/panel-plugins/xfce4-cpugraph-plugin
|
||||
share/xfce4/panel-plugins/cpugraph.desktop
|
||||
@comment $NetBSD: PLIST,v 1.4 2015/04/21 08:56:40 jperkin Exp $
|
||||
lib/xfce4/panel/plugins/libcpugraph.la
|
||||
share/icons/hicolor/16x16/apps/xfce4-cpugraph-plugin.png
|
||||
share/icons/hicolor/22x22/apps/xfce4-cpugraph-plugin.png
|
||||
share/icons/hicolor/48x48/apps/xfce4-cpugraph-plugin.png
|
||||
share/locale/ar/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ast/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/be/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ca/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/cs/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/da/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/de/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/el/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/en_GB/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/es/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/eu/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/fi/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/fr/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/gl/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/hr/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/hu/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/id/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/it/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ja/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/kk/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ko/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ku/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/lt/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/lv/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/nb/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/nl/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/pa/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/pl/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/pt/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ro/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ru/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/sk/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/sq/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/sv/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/tr/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ug/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/uk/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ur/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/ur_PK/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/xfce4-cpugraph-plugin.mo
|
||||
share/xfce4/panel/plugins/cpugraph.desktop
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
# $NetBSD: buildlink3.mk,v 1.37 2014/05/05 00:48:22 ryoon Exp $
|
||||
|
||||
BUILDLINK_TREE+= xfce4-cpugraph-plugin
|
||||
|
||||
.if !defined(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK)
|
||||
XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.3.0
|
||||
BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.3.0nb21
|
||||
BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?= ../../sysutils/xfce4-cpugraph-plugin
|
||||
|
||||
.include "../../x11/xfce4-panel/buildlink3.mk"
|
||||
.include "../../devel/glib2/buildlink3.mk"
|
||||
.endif # XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_TREE+= -xfce4-cpugraph-plugin
|
||||
@@ -1,8 +1,6 @@
|
||||
$NetBSD: distinfo,v 1.9 2007/04/17 13:05:08 joerg Exp $
|
||||
$NetBSD: distinfo,v 1.10 2015/04/21 08:56:40 jperkin 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-aa) = fac9f1ac080540eb90291a73a718ea09040a7ff5
|
||||
SHA1 (patch-ab) = 0a566fd969a3359d709001728edcaa736f5d8776
|
||||
SHA1 (patch-ad) = a989f0ed1b91d2e1fbc61fa623b989d371be80e0
|
||||
SHA1 (xfce4-cpugraph-plugin-1.0.5.tar.bz2) = 6286bcb91eb88a77e7d8965e80c0999a03afc2ae
|
||||
RMD160 (xfce4-cpugraph-plugin-1.0.5.tar.bz2) = 73494015fa2be1f6596dcafbd8c3fc2865196faa
|
||||
Size (xfce4-cpugraph-plugin-1.0.5.tar.bz2) = 328972 bytes
|
||||
SHA1 (patch-panel-plugin_os.c) = 53e9d414cf4be213ebb907672af0d5f6e977ee76
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
$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])
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
$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
|
||||
@@ -67,6 +67,26 @@ long GetCPUUsage (int *oldusage, int *ol
|
||||
|
||||
return usage;
|
||||
}
|
||||
+#elif defined(__DragonFly__)
|
||||
+long GetCPUUsage (int *oldusage, int *oldtotal)
|
||||
+{
|
||||
+ long used, total, usage;
|
||||
+ struct kinfo_cputime cp_time;
|
||||
+
|
||||
+ if (kinfo_get_sched_cputime(&cp_time) < 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;
|
||||
+ if (total != *oldtotal)
|
||||
+ usage = 100 * (used - *oldusage + used / 2 - *oldusage / 2) / (total - *oldtotal);
|
||||
+ else
|
||||
+ usage = 0;
|
||||
+ *oldusage = used;
|
||||
+ *oldtotal = total;
|
||||
+ return usage;
|
||||
+}
|
||||
#elif defined (__NetBSD__)
|
||||
long GetCPUUsage (int *oldusage, int *oldtotal)
|
||||
{
|
||||
@@ -1,15 +0,0 @@
|
||||
$NetBSD: patch-ad,v 1.2 2007/04/12 09:55:13 martti Exp $
|
||||
|
||||
--- panel-plugin/os.h.orig 2007-01-20 12:05:51.000000000 +0000
|
||||
+++ panel-plugin/os.h
|
||||
@@ -17,6 +17,10 @@
|
||||
#include <nlist.h>
|
||||
#endif
|
||||
|
||||
+#if defined(__DragonFly__)
|
||||
+#include <kinfo.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined (__NetBSD__)
|
||||
#include <sys/param.h>
|
||||
#include <sys/sched.h>
|
||||
@@ -0,0 +1,14 @@
|
||||
$NetBSD: patch-panel-plugin_os.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $
|
||||
|
||||
Fix NetBSD support.
|
||||
--- panel-plugin/os.c.orig 2012-04-18 21:27:33.000000000 +0000
|
||||
+++ panel-plugin/os.c
|
||||
@@ -211,7 +211,7 @@ gboolean read_cpu_data( CpuData *data, g
|
||||
data[0].load = 0;
|
||||
for( i = 1 ; i <= nb_cpu ; i++ )
|
||||
{
|
||||
- cp_time1 = cp_time + CPUSTATE * (i - 1);
|
||||
+ cp_time1 = cp_time + CPUSTATES * (i - 1);
|
||||
used = cp_time1[CP_USER] + cp_time1[CP_NICE] + cp_time1[CP_SYS] + cp_time1[CP_INTR];
|
||||
total = used + cp_time1[CP_IDLE];
|
||||
|
||||
Reference in New Issue
Block a user