Import of pkgsrc-2015Q2
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
# $NetBSD: Makefile,v 1.38 2014/05/05 00:48:23 ryoon Exp $
|
||||
# $NetBSD: Makefile,v 1.40 2015/04/25 14:24:56 tnn Exp $
|
||||
|
||||
PKGREVISION= 1
|
||||
.include "../../meta-pkgs/xfce4/Makefile.common"
|
||||
|
||||
XFCE4_VERSION= 0.4.2
|
||||
|
||||
DISTNAME= xfce4-systemload-plugin-${XFCE4_VERSION}
|
||||
PKGREVISION= 21
|
||||
DISTNAME= xfce4-systemload-plugin-1.1.2
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-systemload-plugin/
|
||||
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.1/
|
||||
|
||||
HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
|
||||
COMMENT= Xfce system load plugin
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
@@ -1,19 +1,49 @@
|
||||
@comment $NetBSD: PLIST,v 1.5 2007/04/12 09:55:17 martti Exp $
|
||||
libexec/xfce4/panel-plugins/xfce4-systemload-plugin
|
||||
@comment $NetBSD: PLIST,v 1.6 2015/04/21 08:56:41 jperkin Exp $
|
||||
lib/xfce4/panel/plugins/libsystemload.la
|
||||
share/locale/ar/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ast/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/bg/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ca/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/cs/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/da/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/de/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/el/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/en_AU/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/en_GB/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/es/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/eu/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/fi/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/fr/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/gl/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/hr/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/hu/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/id/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/is/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/it/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ja/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ko/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/lt/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/lv/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ms/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/nb/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/nl/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/oc/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/pl/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/pt/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ru/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/sk/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/sl/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/sq/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/sr/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/sv/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/th/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/tr/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ug/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/uk/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ur/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/ur_PK/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/vi/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/xfce4-systemload-plugin.mo
|
||||
share/xfce4/panel-plugins/systemload.desktop
|
||||
share/xfce4/panel/plugins/systemload.desktop
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
# $NetBSD: buildlink3.mk,v 1.39 2014/05/05 00:48:23 ryoon Exp $
|
||||
|
||||
BUILDLINK_TREE+= xfce4-systemload-plugin
|
||||
|
||||
.if !defined(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK)
|
||||
XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.4.2
|
||||
BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.4.2nb21
|
||||
BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?= ../../sysutils/xfce4-systemload-plugin
|
||||
|
||||
.include "../../x11/xfce4-panel/buildlink3.mk"
|
||||
.include "../../devel/glib2/buildlink3.mk"
|
||||
.endif # XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_TREE+= -xfce4-systemload-plugin
|
||||
@@ -1,10 +1,5 @@
|
||||
$NetBSD: distinfo,v 1.10 2007/04/16 18:20:17 joerg Exp $
|
||||
$NetBSD: distinfo,v 1.11 2015/04/21 08:56:41 jperkin Exp $
|
||||
|
||||
SHA1 (xfce4-systemload-plugin-0.4.2.tar.bz2) = 517cc051633cc6f28147d5adeaf5db56219dddfb
|
||||
RMD160 (xfce4-systemload-plugin-0.4.2.tar.bz2) = 228ad33b12a6a1151be6d079bd4c5a18fd50ba76
|
||||
Size (xfce4-systemload-plugin-0.4.2.tar.bz2) = 184575 bytes
|
||||
SHA1 (patch-aa) = 5526126b144359686781e6ddc1ef43fcd0afc03a
|
||||
SHA1 (patch-ab) = 9b7c4c4fd0db26a3ac239d1ffe5f3be7c32902f8
|
||||
SHA1 (patch-ac) = 961993f0273ba5ffcf0fa03e7e89aef2d55ab2ca
|
||||
SHA1 (patch-ad) = 4b428566ae952a4adeea6a6365a762eb92237593
|
||||
SHA1 (patch-ae) = 2054a2351a2338c721480bd19d9bf3f03dc80632
|
||||
SHA1 (xfce4-systemload-plugin-1.1.2.tar.bz2) = 05de6cebb2c2c4934f808932ce7711059850a7a5
|
||||
RMD160 (xfce4-systemload-plugin-1.1.2.tar.bz2) = 36d86ef3d9ff8fcb0cf7d04d65d8035201c8d228
|
||||
Size (xfce4-systemload-plugin-1.1.2.tar.bz2) = 305948 bytes
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:17 martti Exp $
|
||||
|
||||
--- panel-plugin/memswap.c.orig 2007-01-17 18:01:09.000000000 +0000
|
||||
+++ panel-plugin/memswap.c 2007-01-23 21:42:59.000000000 +0000
|
||||
@@ -113,7 +113,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-#elif defined(__FreeBSD__)
|
||||
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
/*
|
||||
* This is inspired by /usr/src/usr.bin/top/machine.c
|
||||
*
|
||||
@@ -1,36 +0,0 @@
|
||||
$NetBSD: patch-ab,v 1.2 2007/04/12 09:55:17 martti Exp $
|
||||
|
||||
--- panel-plugin/cpu.c.orig 2007-01-17 18:01:09.000000000 +0000
|
||||
+++ panel-plugin/cpu.c 2007-01-23 21:46:41.000000000 +0000
|
||||
@@ -78,6 +78,31 @@
|
||||
return cpu_used;
|
||||
}
|
||||
|
||||
+#elif defined(__DragonFly__)
|
||||
+#include <kinfo.h>
|
||||
+
|
||||
+static struct kinfo_cputime old_cp_time;
|
||||
+
|
||||
+gulong read_cpuload()
|
||||
+{
|
||||
+ gulong used, total;
|
||||
+ struct kinfo_cputime cp_time;
|
||||
+
|
||||
+ if (kinfo_get_sched_cputime(&cp_time) < 0) {
|
||||
+ g_warning("kinfo_get_sched_cputime failed");
|
||||
+ return 0;
|
||||
+ }
|
||||
+ used = cp_time.cp_user + cp_time.cp_nice + cp_time.cp_sys;
|
||||
+ used -= old_cp_time.cp_user + old_cp_time.cp_nice + old_cp_time.cp_sys;
|
||||
+ total = used + cp_time.cp_idle - old_cp_time.cp_idle;
|
||||
+ old_cp_time = cp_time;
|
||||
+
|
||||
+ if (total)
|
||||
+ return 100 * (used + used / 2) / total;
|
||||
+ else
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
#elif defined(__FreeBSD__)
|
||||
|
||||
#include <osreldate.h>
|
||||
@@ -1,81 +0,0 @@
|
||||
$NetBSD: patch-ac,v 1.4 2007/04/16 18:20:17 joerg Exp $
|
||||
|
||||
--- configure.orig 2007-01-17 18:01:14.000000000 +0000
|
||||
+++ configure
|
||||
@@ -4516,6 +4516,76 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
+{ echo "$as_me:$LINENO: checking for kinfo_get_sched_cputime in -lkinfo" >&5
|
||||
+echo $ECHO_N "checking for kinfo_get_sched_cputime in -lkinfo... $ECHO_C" >&6; }
|
||||
+if test "${ac_cv_lib_kinfo_kinfo_get_sched_cputime+set}" = set; then
|
||||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
+else
|
||||
+ ac_check_lib_save_LIBS=$LIBS
|
||||
+LIBS="-lkinfo $LIBS"
|
||||
+cat >conftest.$ac_ext <<_ACEOF
|
||||
+/* confdefs.h. */
|
||||
+_ACEOF
|
||||
+cat confdefs.h >>conftest.$ac_ext
|
||||
+cat >>conftest.$ac_ext <<_ACEOF
|
||||
+/* end confdefs.h. */
|
||||
+
|
||||
+/* Override any GCC internal prototype to avoid an error.
|
||||
+ Use char because int might match the return type of a GCC
|
||||
+ builtin and then its argument prototype would still apply. */
|
||||
+#ifdef __cplusplus
|
||||
+extern "C"
|
||||
+#endif
|
||||
+char kinfo_get_sched_cputime ();
|
||||
+int
|
||||
+main ()
|
||||
+{
|
||||
+return kinfo_get_sched_cputime ();
|
||||
+ ;
|
||||
+ return 0;
|
||||
+}
|
||||
+_ACEOF
|
||||
+rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
+if { (ac_try="$ac_link"
|
||||
+case "(($ac_try" in
|
||||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
+ *) ac_try_echo=$ac_try;;
|
||||
+esac
|
||||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
+ (eval "$ac_link") 2>conftest.er1
|
||||
+ ac_status=$?
|
||||
+ grep -v '^ *+' conftest.er1 >conftest.err
|
||||
+ rm -f conftest.er1
|
||||
+ cat conftest.err >&5
|
||||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
+ (exit $ac_status); } && {
|
||||
+ test -z "$ac_c_werror_flag" ||
|
||||
+ test ! -s conftest.err
|
||||
+ } && test -s conftest$ac_exeext &&
|
||||
+ $as_test_x conftest$ac_exeext; then
|
||||
+ ac_cv_lib_kinfo_kinfo_get_sched_cputime=yes
|
||||
+else
|
||||
+ echo "$as_me: failed program was:" >&5
|
||||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||||
+
|
||||
+ ac_cv_lib_kinfo_kinfo_get_sched_cputime=no
|
||||
+fi
|
||||
+
|
||||
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
+ conftest$ac_exeext conftest.$ac_ext
|
||||
+LIBS=$ac_check_lib_save_LIBS
|
||||
+fi
|
||||
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_kinfo_kinfo_get_sched_cputime" >&5
|
||||
+echo "${ECHO_T}$ac_cv_lib_kinfo_kinfo_get_sched_cputime" >&6; }
|
||||
+if test $ac_cv_lib_kinfo_kinfo_get_sched_cputime = yes; then
|
||||
+ cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_LIBkinfo 1
|
||||
+_ACEOF
|
||||
+
|
||||
+ LIBS="-lkinfo $LIBS"
|
||||
+
|
||||
+fi
|
||||
+
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
@@ -1,14 +0,0 @@
|
||||
$NetBSD: patch-ad,v 1.1 2007/04/16 18:20:18 joerg Exp $
|
||||
|
||||
--- configure.in.orig 2007-04-16 16:44:55.000000000 +0000
|
||||
+++ configure.in
|
||||
@@ -44,6 +44,9 @@ dnl *** Check for kvm, needed for BSD **
|
||||
dnl *************************************
|
||||
AC_CHECK_LIB([kvm], [kvm_open])
|
||||
|
||||
+dnl *** Check for kinfo, needed for DragonFly ***
|
||||
+AC_CHECK_LIB([kinfo], [kinfo_get_sched_cputime])
|
||||
+
|
||||
dnl **********************************
|
||||
dnl *** Check for standard headers ***
|
||||
dnl **********************************
|
||||
@@ -1,13 +0,0 @@
|
||||
$NetBSD: patch-ae,v 1.1 2007/04/16 18:20:18 joerg Exp $
|
||||
|
||||
--- panel-plugin/uptime.c.orig 2007-04-16 17:42:39.000000000 +0000
|
||||
+++ panel-plugin/uptime.c
|
||||
@@ -58,7 +58,7 @@ gulong read_uptime()
|
||||
return uptime;
|
||||
}
|
||||
|
||||
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
|
||||
|
||||
#ifdef __NetBSD__
|
||||
/*
|
||||
Reference in New Issue
Block a user