Update gkrellm packages to 2.2.5.

pkgsrc changes:
 o convert gkrellm-server to options.mk

GKrellM changes:
2.2.5 - Sun Mar 20, 2005
------------------------
        * Sensor monitor can read data from "mbmon -r -P port" daemon.
          mbmon and hddtemp daemon sensor monitor code moved to
          sysdeps/sensors-common.c to be available to all operating systems.
        * Hajimu Umemoto patch: added FreeBSD mbmon support.  Added general socket
          connection gkrellm_connect_to() function and cleaned up mail.c,
          client.c and sensors-common.c to use it.
        * Add api for gkrellmd plugins to have gkrellmd.conf config items.
          Gkrellmd plugins can read data sent from their gkrellm client plugins.
        * Keep history of daily, weekly & monthly net receive/transmit statistics.
        * Tom Felker patch: add to Linux sensors nVidia video card temperature
          reading via the nvidia-settings command.
        * Hajimu Umemoto patch: make gkrellmd support standard CIDR notation
          for both IPv4 and IPv6 allow-hosts.
        * Jiri Denemark patch: while charging, battery display shows time to
          full charge instead of discharge time left.  Make launcher work for
          all battery panels in case batteries are removed.
        * Try to make sensor labels fit better by using <small> markup.
        * Added option for mail fetch/check program to run at local check interval.
        * Bugfixes:
          o Jason Greene: IMAP patch fixes handling of status responses which
            contain literals.
          o Accumulate partial gkrellmd server lines.
          o Put minor mod numbers in Linux disk table to get c0d1, cc0d1, etc.
          o Segfault when rebuilding gkrellm if temp displayed on a disk panel.
          o Kim Bruning patch: display "no bat" if buggy APM flags don't flag
            when to hide batttery panel.
        * Translation updates
          o cs.po from Pav Lucistnik
          o da.po from Chris Larsen

15 files changed, 168 insertions, 15 deletions

diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile
index ae566d1936b..ca4961c11eb 100644
--- a/sysutils/gkrellm-server/Makefile
+++ b/sysutils/gkrellm-server/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:50 reed Exp $
+# $NetBSD: Makefile,v 1.11 2005/03/22 14:57:12 cube Exp $
 .include "../../sysutils/gkrellm/Makefile.common"
 
 PKGREVISION=		# empty1
 
 GKRELLM_PKGBASE=	gkrellm-server
-PKGREVISION=		1
 COMMENT=		Monitoring daemon remotely accessible by a GKrellM client
 DEPENDS+=		gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
 
@@ -24,8 +23,11 @@ NOT_FOR_PLATFORM=	IRIX-*
 
 MAKE_ENV+=		MODULES=server
 
-# Define this to use glib-1.2 instead of glib-2
-BUILD_DEFS+=		GKRELLMSERVER_USE_GLIB12
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gkrellm-server
+PKG_SUPPORTED_OPTIONS=	glib1
+PKG_DEFAULTS_OPTIONS?=	# empty
+
+.include "../../mk/bsd.options.mk"
 
 SUBST_STAGE.gkprefix=	post-patch
 SUBST_FILES.gkprefix=	${WRKSRC}/server/gkrellmd.h
@@ -36,7 +38,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gkrellm-server
 	${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf ${PREFIX}/share/examples/gkrellm-server
 
-.if defined(GKRELLMSERVER_USE_GLIB12)
+.if !empty(PKG_OPTIONS:Mglib1)
 MAKE_ENV+=		USE_GLIB12=yes
 .include "../../devel/glib/buildlink3.mk"
 .else
diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common
index 35a915c12e4..7bd8c21cc95 100644
--- a/sysutils/gkrellm/Makefile.common
+++ b/sysutils/gkrellm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2004/10/25 15:29:48 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/03/22 14:57:12 cube Exp $
 
 DISTNAME=	${GKRELLM_DISTBASE}
 PKGNAME=	${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
@@ -20,7 +20,7 @@ MAKE_ENV+=		LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
 MAKE_ENV+=		DEBUG=yes
 .endif
 
-GKRELLM_VERSION=	2.2.4
+GKRELLM_VERSION=	2.2.5
 GKRELLM_DISTBASE=	gkrellm-${GKRELLM_VERSION}
 GKRELLM_SRCDIR=		${WRKDIR}/${GKRELLM_DISTBASE}
 
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 7acbc13ff6b..cd85ea2a490 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,10 +1,19 @@
-$NetBSD: distinfo,v 1.30 2005/02/24 13:40:53 agc Exp $
+$NetBSD: distinfo,v 1.31 2005/03/22 14:57:12 cube Exp $
 
-SHA1 (gkrellm-2.2.4.tar.bz2) = 20bf65e8b4d0026d5a727e6e5f6f4ded487bb935
-RMD160 (gkrellm-2.2.4.tar.bz2) = 06ba0d27a8ec1d8b0461fbe4297945f7c40121d2
-Size (gkrellm-2.2.4.tar.bz2) = 647916 bytes
+SHA1 (gkrellm-2.2.5.tar.bz2) = 4cbdf75828b3d8b216694c2e6978c29a4920595a
+RMD160 (gkrellm-2.2.5.tar.bz2) = 7755fa7bbf88dfd53185e76604981b2a5c81d74d
+Size (gkrellm-2.2.5.tar.bz2) = 668581 bytes
 SHA1 (patch-aa) = e7d7dc8f3189632a8a0855c3fc39479482407cc4
 SHA1 (patch-ab) = de2ef6e1d083a32c274d2ec42fa1b9e9d3d65663
 SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75
 SHA1 (patch-ad) = c33319783a40ad64f43015200047656efc1bcdb3
 SHA1 (patch-ae) = 5f7b1bdfa99bcec9cfdaee3a97b38b27581dd954
+SHA1 (patch-ag) = 6791436e17fccd7265cda8b4e3da229c4937c20f
+SHA1 (patch-ah) = 2018be5c2dd11c22c6d3f7c7fc8607e2c63123f3
+SHA1 (patch-ai) = 234e3e1e458e5709157668cf7d18faabdd076071
+SHA1 (patch-aj) = f61f36d1d82388e1d88eb78ec3107be4f8c9cf2b
+SHA1 (patch-ak) = b96987c120ca4c37c83075da61e8eb04e41d2023
+SHA1 (patch-al) = 4eab3c3757c198dcc3049a63fc3b8adceef7bc1c
+SHA1 (patch-am) = bf8b01f5e368a5387f8d224ca51ec18a74410b5c
+SHA1 (patch-an) = 1e63ce0e4fbe9bd22c46d00c6aeac6b3e7cda440
+SHA1 (patch-ao) = 63bf8657fa7707def41b13b3cc74c031098e070a
diff --git a/sysutils/gkrellm/files/server.Makefile b/sysutils/gkrellm/files/server.Makefile
index f938103404b..e46a228284d 100644
--- a/sysutils/gkrellm/files/server.Makefile
+++ b/sysutils/gkrellm/files/server.Makefile
@@ -50,7 +50,7 @@ ifeq ($(HAVE_GETADDRINFO),1)
 endif
 
 
-override CFLAGS += -Wall $(FLAGS)
+override CFLAGS += -Wall -Werror $(FLAGS)
 
 OBJS =	main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o
 
diff --git a/sysutils/gkrellm/files/src.Makefile b/sysutils/gkrellm/files/src.Makefile
index 2cf8a5822d1..ffae35e3ede 100644
--- a/sysutils/gkrellm/files/src.Makefile
+++ b/sysutils/gkrellm/files/src.Makefile
@@ -51,7 +51,7 @@ endif
 
 LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(MD5_LIBS) $(SSL_LIBS)
 
-override CFLAGS += -Wall $(FLAGS)
+override CFLAGS += -Wall -Werror $(FLAGS)
 
 OBJS =	main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \
 	hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \
@@ -140,7 +140,7 @@ IMAGES = \
 
 SYSDEPS_SRC = sysdeps/bsd-common.c sysdeps/bsd-net-open.c sysdeps/freebsd.c \
 	sysdeps/gtop.c sysdeps/linux.c sysdeps/netbsd.c sysdeps/openbsd.c \
-	sysdeps/solaris.c sysdeps/darwin.c
+	sysdeps/solaris.c sysdeps/darwin.c sysdeps/sensors-common.c
 
 GKRELLM_H = gkrellm.h gkrellm-private.h
 GKRELLM_H_SYS = gkrellm.h gkrellm-public-proto.h gkrellm-private.h \
diff --git a/sysutils/gkrellm/files/top.Makefile.inc b/sysutils/gkrellm/files/top.Makefile.inc
index e5c2aac733a..eae4d9fd723 100644
--- a/sysutils/gkrellm/files/top.Makefile.inc
+++ b/sysutils/gkrellm/files/top.Makefile.inc
@@ -1,4 +1,4 @@
-VERSION=	2.2.4
+VERSION=	2.2.5
 
 # Path options
 PREFIX?=	/usr/local
diff --git a/sysutils/gkrellm/patches/patch-ag b/sysutils/gkrellm/patches/patch-ag
new file mode 100644
index 00000000000..2e7b9f7426a
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- src/chart.c.orig	2004-08-31 16:34:23.000000000 +0200
++++ src/chart.c
+@@ -1086,9 +1086,9 @@ gkrellm_draw_chart_text(GkrellmChart *cp
+ 				ts = ts_alt;
+ 				shadow = ts_alt->effect ? 1 : 0;
+ 				}
+-			else if (c == 'x' && isdigit(*s))
++			else if (c == 'x' && isdigit((unsigned char)*s))
+ 				xx = *s++ - '0';
+-			else if (c == 'y' && isdigit(*s))
++			else if (c == 'y' && isdigit((unsigned char)*s))
+ 				y = *s++ - '0';
+ 			else if (c == 'D')
+ 				{
diff --git a/sysutils/gkrellm/patches/patch-ah b/sysutils/gkrellm/patches/patch-ah
new file mode 100644
index 00000000000..43db621b179
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- src/config.c.orig	2005-03-07 21:05:44.000000000 +0100
++++ src/config.c
+@@ -411,7 +411,7 @@ assign_style_entry(GkrellmStyle *style, 
+ 		{
+ 		if (strcmp(value, "center") == 0)
+ 			style->label_position = GKRELLM_LABEL_CENTER;
+-		else if (isdigit(*value))
++		else if (isdigit((unsigned char)*value))
+ 			style->label_position = atoi(value);
+ 		else
+ 			style->label_position = GKRELLM_LABEL_NONE;
+@@ -1725,7 +1725,7 @@ parse_config_line(gchar *line, struct _c
+ 			}
+ 		if (conf->value)
+ 			{
+-			if (isdigit(*s) || *s == '-')
++			if (isdigit((unsigned char)*s) || *s == '-')
+ 				val = atoi(s);
+ 			else if (!strcmp(s, "on") || !strcmp(s, "true"))
+ 				val = 1;
diff --git a/sysutils/gkrellm/patches/patch-ai b/sysutils/gkrellm/patches/patch-ai
new file mode 100644
index 00000000000..8cc10cf0aa3
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- src/disk.c.orig	2005-03-06 18:04:22.000000000 +0100
++++ src/disk.c
+@@ -487,7 +487,7 @@ gkrellm_disk_temperature_display(gpointe
+ 		{
+ 		disk = (DiskMon *) list->data;
+ 		if (   strncmp(disk->name, disk_name, len)
+-			|| (disk->name[len] != '\0' && !isdigit(disk->name[len]))
++			|| (disk->name[len] != '\0' && !isdigit((unsigned char)disk->name[len]))
+ 		   )
+ 			continue;
+ 		if (!disk->enabled || !disk->chart || !disk->chart->panel->decal_list)
+@@ -548,7 +548,7 @@ gkrellm_disk_temperature_remove(gchar *i
+ 		if (!disk->chart)
+ 			continue;
+ 		if (   strncmp(disk->name, disk_name, len)
+-			|| (disk->name[len] != '\0' && !isdigit(disk->name[len]))
++			|| (disk->name[len] != '\0' && !isdigit((unsigned char)disk->name[len]))
+ 		   )
+ 			continue;
+ 		p = disk->chart->panel;
diff --git a/sysutils/gkrellm/patches/patch-aj b/sysutils/gkrellm/patches/patch-aj
new file mode 100644
index 00000000000..a16a59c500c
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- src/mail.c.orig	2005-03-19 17:00:16.000000000 +0100
++++ src/mail.c
+@@ -1297,7 +1297,7 @@ check_mh_dir(Mailbox *mbox)
+ 	while ((name = (gchar *) g_dir_read_name(dir)) != NULL)
+ 		{
+ 		/* Files starting with a digit are messages. */
+-		if (isdigit(name[0]))
++		if (isdigit((unsigned char)name[0]))
+ 			mbox->mail_count++;
+ 		}
+ 	g_dir_close(dir);
diff --git a/sysutils/gkrellm/patches/patch-ak b/sysutils/gkrellm/patches/patch-ak
new file mode 100644
index 00000000000..56c9ed50209
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- src/net.c.orig	2005-03-20 18:11:02.000000000 +0100
++++ src/net.c
+@@ -158,7 +158,7 @@ strcmp_net_name(NetMon *net1, NetMon *ne
+ 	gint	n, n1, n2, len;
+ 
+ 	for (s = net1->name; *s; ++s)
+-		if (isdigit(*s))
++		if (isdigit((unsigned char)*s))
+ 			break;
+ 	if (!*s)
+ 		return strcmp(net1->name, net2->name);
diff --git a/sysutils/gkrellm/patches/patch-al b/sysutils/gkrellm/patches/patch-al
new file mode 100644
index 00000000000..2ffd334ec4d
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- src/sensors.c.orig	2005-03-20 18:29:30.000000000 +0100
++++ src/sensors.c
+@@ -2541,7 +2541,7 @@ sensors_apply(void)
+ 	if (mbmon_port_entry)
+ 		{
+ 		str = gkrellm_gtk_entry_get_text(&mbmon_port_entry);
+-		if (isdigit(*str))
++		if (isdigit((unsigned char)*str))
+ 			{
+ 			port = atoi(str);
+ 			if (_GK.mbmon_port != port)
diff --git a/sysutils/gkrellm/patches/patch-am b/sysutils/gkrellm/patches/patch-am
new file mode 100644
index 00000000000..92d641e5bd0
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- src/smbencrypt.c.orig	2004-05-14 21:45:14.000000000 +0200
++++ src/smbencrypt.c
+@@ -108,8 +108,8 @@ while (*s)
+       s += skip;
+     else
+       {
+-      if (islower(*s))
+-	*s = toupper(*s);
++      if (islower((unsigned char)*s))
++	*s = toupper((unsigned char)*s);
+       s++;
+       }
+     }
diff --git a/sysutils/gkrellm/patches/patch-an b/sysutils/gkrellm/patches/patch-an
new file mode 100644
index 00000000000..f1ff9ea1aee
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- server/mail.c.orig	2004-05-01 19:45:31.000000000 +0200
++++ server/mail.c
+@@ -231,7 +231,7 @@ check_mh_dir(Mailbox *mbox)
+ 	while ((name = (gchar *) g_dir_read_name(dir)) != NULL)
+ 		{
+ 		/* Files starting with a digit are messages. */
+-		if (isdigit(name[0]))
++		if (isdigit((unsigned char)name[0]))
+ 			mbox->mail_count++;
+ 		}
+ 	g_dir_close(dir);
diff --git a/sysutils/gkrellm/patches/patch-ao b/sysutils/gkrellm/patches/patch-ao
new file mode 100644
index 00000000000..aaf6830fed3
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2005/03/22 14:57:12 cube Exp $
+
+--- server/sysdeps-unix.c.orig	2005-03-19 17:00:16.000000000 +0100
++++ server/sysdeps-unix.c
+@@ -24,8 +24,10 @@
+ 
+ #include "../src/gkrellm-sysdeps.h"
+ 
++#if 0
+ static gboolean (*mbmon_check_func)();
+ static gint gkrellm_connect_to(gchar *, gint);
++#endif
+ 
+ #if defined(__linux__)
+ #include "../src/sysdeps/linux.c"