From 49914b64c3353640836caf1bf020077fd06da3a5 Mon Sep 17 00:00:00 2001 From: cube Date: Thu, 13 Apr 2006 19:14:44 +0000 Subject: Update gkrellm packages to version 2.2.9. pkgsrc changes: - introduce various patches to fix compilation problems (gkrellm is a complete mess). - activate sensors-common.c on NetBSD. 2.2.9 - Fri Mar 31, 2006 ------------------------ * Bugfixes o Segfault if select config Builtins->Battery with no batteries present. 2.2.8 - Thu Mar 30, 2006 ------------------------ * Add battery monitor option to use percent capacity remaining for alerts. * Filippo Giunchedi linux.c patch: make sensor code able to read apple/pmu's sysfs based sensors. * Jindrich Makovicka linux.c patch: subtract the memory allocated to slabs from the used memory and add it to the cached value instead. * Put multiple instances lock files in /var/lock. * Bugfixes: o Fix gkrellm_125_sequence() off by a bit here and there. o Invalidate chart text runs when chart height changed. o mbmon sensors decimal point char can be different from current locale. o Read linux cpu stats from /proc/stat as 64 bits. o Segfault on editing disk chart format string after disabling a disk. o gkrellmd -plog segfaulted if no plugins are installed. o Don't NULL serve_name prior to each gkrellmd plugin serve_data call. o Use a per client input_func in gkrellmd_client_read(). * Translation updates o bg.po new Bulgarian translation by Vasko Vasilev. o es.po from Cristian Othon Martinez Vera o ru.po from Vitaly Lipatov --- sysutils/gkrellm-server/Makefile | 6 +++--- sysutils/gkrellm-share/Makefile | 4 ++-- sysutils/gkrellm-share/PLIST | 3 ++- sysutils/gkrellm/Makefile | 6 +++--- sysutils/gkrellm/Makefile.common | 4 ++-- sysutils/gkrellm/distinfo | 16 ++++++++-------- sysutils/gkrellm/files/top.Makefile.inc | 2 +- sysutils/gkrellm/patches/patch-ae | 9 +++++++-- sysutils/gkrellm/patches/patch-ao | 30 +++++++++++++++++++++++++++--- sysutils/gkrellm/patches/patch-ax | 13 ------------- sysutils/gkrellm/patches/patch-ay | 31 ++++++++++++++++++++++++++++--- sysutils/gkrellm/patches/patch-az | 13 +++++++++++++ 12 files changed, 96 insertions(+), 41 deletions(-) delete mode 100644 sysutils/gkrellm/patches/patch-ax create mode 100644 sysutils/gkrellm/patches/patch-az (limited to 'sysutils') diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile index 8e38faedadb..082fc8ec67d 100644 --- a/sysutils/gkrellm-server/Makefile +++ b/sysutils/gkrellm-server/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.20 2006/03/30 21:21:37 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2006/04/13 19:14:45 cube Exp $ .include "../../sysutils/gkrellm/Makefile.common" -PKGREVISION= 2 +PKGREVISION= # GKRELLM_PKGBASE= gkrellm-server COMMENT= Monitoring daemon remotely accessible by a GKrellM client -DEPENDS+= gkrellm-share-${GKRELLM_VERSION}nb1:../../sysutils/gkrellm-share +DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share USE_TOOLS+= pkg-config PTHREAD_OPTS+= require diff --git a/sysutils/gkrellm-share/Makefile b/sysutils/gkrellm-share/Makefile index 4f593253194..562a9c6d34b 100644 --- a/sysutils/gkrellm-share/Makefile +++ b/sysutils/gkrellm-share/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2006/04/13 18:23:37 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2006/04/13 19:14:45 cube Exp $ .include "../../sysutils/gkrellm/Makefile.common" -PKGREVISION= 1 +PKGREVISION= # GKRELLM_PKGBASE= gkrellm-share COMMENT= GKrellM2 locale files diff --git a/sysutils/gkrellm-share/PLIST b/sysutils/gkrellm-share/PLIST index 84e1df632e5..f2f7a3e8c50 100644 --- a/sysutils/gkrellm-share/PLIST +++ b/sysutils/gkrellm-share/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 22:27:27 cube Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/04/13 19:14:45 cube Exp $ share/gkrellm2/COPYRIGHT share/gkrellm2/README +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gkrellm.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gkrellm.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gkrellm.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gkrellm.mo diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 38d9f7d60f2..e1478321750 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.50 2006/03/19 22:10:38 joerg Exp $ +# $NetBSD: Makefile,v 1.51 2006/04/13 19:14:44 cube Exp $ .include "Makefile.common" GKRELLM_PKGBASE= gkrellm -PKGREVISION= 2 +PKGREVISION= # WRKSRC= ${GKRELLM_SRCDIR} COMMENT= GTK2 based system monitor -DEPENDS+= gkrellm-share-${GKRELLM_VERSION}nb1:../../sysutils/gkrellm-share +DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share USE_TOOLS+= pkg-config diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common index 849d5fd336c..68f870d9fd0 100644 --- a/sysutils/gkrellm/Makefile.common +++ b/sysutils/gkrellm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2006/03/19 22:10:38 joerg Exp $ +# $NetBSD: Makefile.common,v 1.15 2006/04/13 19:14:44 cube Exp $ DISTNAME= ${GKRELLM_DISTBASE} PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION} @@ -21,7 +21,7 @@ MAKE_ENV+= GREP=${GREP:Q} MAKE_ENV+= DEBUG=yes .endif -GKRELLM_VERSION= 2.2.7 +GKRELLM_VERSION= 2.2.9 GKRELLM_DISTBASE= gkrellm-${GKRELLM_VERSION} GKRELLM_SRCDIR= ${WRKDIR}/${GKRELLM_DISTBASE} diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo index 626850385b9..70c019d0869 100644 --- a/sysutils/gkrellm/distinfo +++ b/sysutils/gkrellm/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.35 2006/03/19 22:10:38 joerg Exp $ +$NetBSD: distinfo,v 1.36 2006/04/13 19:14:44 cube Exp $ -SHA1 (gkrellm-2.2.7.tar.bz2) = a6910b6f843868b4d801f7f7873e1e85c4f2039c -RMD160 (gkrellm-2.2.7.tar.bz2) = 5388e3fba604a7c4b99a9c134ab6526296fe70d8 -Size (gkrellm-2.2.7.tar.bz2) = 673728 bytes +SHA1 (gkrellm-2.2.9.tar.bz2) = 114c09c78ae27bbb1b2f4c2edb346800831f2cef +RMD160 (gkrellm-2.2.9.tar.bz2) = e6de12774ec85c51dce18e3208340d1a080a6398 +Size (gkrellm-2.2.9.tar.bz2) = 691133 bytes SHA1 (patch-aa) = bc07107ed828a5a86012cae39316c1d35d2d7a4d SHA1 (patch-ab) = 015ed1c6b4d07d2da6aeefab2b746bff3fa1a88e SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75 SHA1 (patch-ad) = 18218e5e9e7a8cfaabb20ec03865670ae66a15bd -SHA1 (patch-ae) = d9670d5956daaf768276a7b27b1831cbfc5cf4cb +SHA1 (patch-ae) = e7c85ed5985bffd4cc2528b8c9fe258436257f75 SHA1 (patch-ag) = 6791436e17fccd7265cda8b4e3da229c4937c20f SHA1 (patch-ah) = 2018be5c2dd11c22c6d3f7c7fc8607e2c63123f3 SHA1 (patch-ai) = 234e3e1e458e5709157668cf7d18faabdd076071 @@ -16,7 +16,7 @@ SHA1 (patch-ak) = b96987c120ca4c37c83075da61e8eb04e41d2023 SHA1 (patch-al) = 4eab3c3757c198dcc3049a63fc3b8adceef7bc1c SHA1 (patch-am) = bf8b01f5e368a5387f8d224ca51ec18a74410b5c SHA1 (patch-an) = 1e63ce0e4fbe9bd22c46d00c6aeac6b3e7cda440 -SHA1 (patch-ao) = afc56bb647c6b3bb9eba90b0b18d918dcf31a100 +SHA1 (patch-ao) = c9e1a7324e0a9194c05554a09bafd4fe0460df38 SHA1 (patch-ap) = b2c33796fdfdc0166a869e528fcaab1f8f0ab615 SHA1 (patch-aq) = 0799e334333ae072a40cdcb6ccd04ed6a2f52765 SHA1 (patch-ar) = 86ee88c8506c1ceb1d35eb488d209b16306a715d @@ -24,5 +24,5 @@ SHA1 (patch-as) = 3df33e28754cf1fee88717b431726bf090c15f70 SHA1 (patch-au) = 27df64d854cb15202fa984170faeab4c128d5cad SHA1 (patch-av) = 09cbc2fbb8226f8fe56bff458a4772998cae3f32 SHA1 (patch-aw) = c32ae045dad9754edb88e375b8893cfe161567d0 -SHA1 (patch-ax) = 4377fa60acbc701c2cb78636574168820af2b936 -SHA1 (patch-ay) = bc512682f19631273a372581c6e091c7465e98d6 +SHA1 (patch-ay) = 54ce179dd051509d9fdf857730cf2ddf9b9fe0b3 +SHA1 (patch-az) = 3dbfe97e17a9aad5a6fc8e62b1116ac1fd2ec3a2 diff --git a/sysutils/gkrellm/files/top.Makefile.inc b/sysutils/gkrellm/files/top.Makefile.inc index da318303394..ebf276c78c3 100644 --- a/sysutils/gkrellm/files/top.Makefile.inc +++ b/sysutils/gkrellm/files/top.Makefile.inc @@ -1,4 +1,4 @@ -VERSION= 2.2.7 +VERSION= 2.2.9 # Path options PREFIX?= /usr/local diff --git a/sysutils/gkrellm/patches/patch-ae b/sysutils/gkrellm/patches/patch-ae index 1ee4dd399af..df146860bb1 100644 --- a/sysutils/gkrellm/patches/patch-ae +++ b/sysutils/gkrellm/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.2 2006/03/19 22:10:38 joerg Exp $ +$NetBSD: patch-ae,v 1.3 2006/04/13 19:14:45 cube Exp $ ---- server/gkrellmd-private.h.orig 2005-05-24 03:46:32.000000000 +0000 +--- server/gkrellmd-private.h.orig 2006-03-30 00:23:50.000000000 +0200 +++ server/gkrellmd-private.h @@ -28,6 +28,10 @@ #endif @@ -43,3 +43,8 @@ $NetBSD: patch-ae,v 1.2 2006/03/19 22:10:38 joerg Exp $ struct GkrellmdConfig { +@@ -142,3 +146,4 @@ void gkrellmd_serve_setup(GkrellmdClie + + GkrellmdMonitor *gkrellmd_init_mail_monitor(void); + ++gint gkrellm_connect_to(gchar *, gint); diff --git a/sysutils/gkrellm/patches/patch-ao b/sysutils/gkrellm/patches/patch-ao index f133c76191a..d944bbd6bba 100644 --- a/sysutils/gkrellm/patches/patch-ao +++ b/sysutils/gkrellm/patches/patch-ao @@ -1,8 +1,18 @@ -$NetBSD: patch-ao,v 1.2 2006/03/19 22:10:38 joerg Exp $ +$NetBSD: patch-ao,v 1.3 2006/04/13 19:14:45 cube Exp $ ---- server/sysdeps-unix.c.orig 2005-03-19 16:00:16.000000000 +0000 +--- server/sysdeps-unix.c.orig 2006-03-30 00:23:50.000000000 +0200 +++ server/sysdeps-unix.c -@@ -43,6 +43,12 @@ static gint gkrellm_connect_to(gchar *, +@@ -24,9 +24,6 @@ + + #include "../src/gkrellm-sysdeps.h" + +-static gboolean (*mbmon_check_func)(); +-static gint gkrellm_connect_to(gchar *, gint); +- + #if defined(__linux__) + #include "../src/sysdeps/linux.c" + #include "../src/sysdeps/sensors-common.c" +@@ -43,10 +40,17 @@ static gint gkrellm_connect_to(gchar *, #include "../src/sysdeps/sensors-common.c" #endif @@ -15,3 +25,17 @@ $NetBSD: patch-ao,v 1.2 2006/03/19 22:10:38 joerg Exp $ #if defined(__NetBSD__) #include "../src/sysdeps/netbsd.c" #include "../src/sysdeps/bsd-net-open.c" + #include "../src/sysdeps/bsd-common.c" ++#include "../src/sysdeps/sensors-common.c" + #endif + + #if defined(__OpenBSD__) +@@ -123,7 +127,7 @@ gkrellm_sensors_linux_name_fix(gchar *id + } + + #ifdef SENSORS_COMMON +-static gint ++gint + gkrellm_connect_to(gchar *server, gint server_port) + { + gint fd = -1; diff --git a/sysutils/gkrellm/patches/patch-ax b/sysutils/gkrellm/patches/patch-ax deleted file mode 100644 index 974b6c16526..00000000000 --- a/sysutils/gkrellm/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2006/03/19 22:10:38 joerg Exp $ - ---- src/plugins.c.orig 2006-03-17 00:55:53.000000000 +0000 -+++ src/plugins.c -@@ -761,7 +761,7 @@ gkrellm_place_plugin(GList **monitor_lis - if (list == *monitor_list) - *monitor_list = g_list_prepend(list, plugin); - else -- g_list_prepend(list, plugin); -+ list = g_list_prepend(list, plugin); - } - return; - } diff --git a/sysutils/gkrellm/patches/patch-ay b/sysutils/gkrellm/patches/patch-ay index 19d61995aae..2e4330351e5 100644 --- a/sysutils/gkrellm/patches/patch-ay +++ b/sysutils/gkrellm/patches/patch-ay @@ -1,8 +1,17 @@ -$NetBSD: patch-ay,v 1.1 2006/03/19 22:10:38 joerg Exp $ +$NetBSD: patch-ay,v 1.2 2006/04/13 19:14:45 cube Exp $ ---- src/sysdeps-unix.c.orig 2006-03-17 01:00:20.000000000 +0000 +--- src/sysdeps-unix.c.orig 2006-03-30 00:23:26.000000000 +0200 +++ src/sysdeps-unix.c -@@ -43,6 +43,12 @@ static gboolean (*mbmon_check_func)(); +@@ -24,8 +24,6 @@ + #include "gkrellm-sysdeps.h" + + +-static gboolean (*mbmon_check_func)(); +- + + #if defined(__linux__) + #include "sysdeps/linux.c" +@@ -43,10 +41,17 @@ static gboolean (*mbmon_check_func)(); #include "sysdeps/sensors-common.c" #endif @@ -15,3 +24,19 @@ $NetBSD: patch-ay,v 1.1 2006/03/19 22:10:38 joerg Exp $ #if defined(__NetBSD__) #include "sysdeps/netbsd.c" #include "sysdeps/bsd-net-open.c" + #include "sysdeps/bsd-common.c" ++#include "sysdeps/sensors-common.c" + #endif + + #if defined(__OpenBSD__) +@@ -65,6 +70,10 @@ static gboolean (*mbmon_check_func)(); + + #include + ++#ifndef SENSORS_COMMON ++static gboolean (*mbmon_check_func)(); ++#endif ++ + gchar * + gkrellm_sys_get_host_name(void) + { diff --git a/sysutils/gkrellm/patches/patch-az b/sysutils/gkrellm/patches/patch-az new file mode 100644 index 00000000000..aa5b3658ee5 --- /dev/null +++ b/sysutils/gkrellm/patches/patch-az @@ -0,0 +1,13 @@ +$NetBSD: patch-az,v 1.1 2006/04/13 19:14:45 cube Exp $ + +--- src/sysdeps/sensors-common.c.orig 2006-03-30 00:23:37.000000000 +0200 ++++ src/sysdeps/sensors-common.c +@@ -40,6 +40,8 @@ static gchar gkrellm_decimal_point, + mbmon_decimal_point; + static gboolean mbmon_need_decimal_point_fix; + ++static gboolean (*mbmon_check_func)(); ++ + static gboolean + mbmon_decimal_point_fix(gchar *buf) + { -- cgit v1.2.3