Fix LP64 issues with gkrellm and gkrellm-server.

4 files changed, 92 insertions, 1 deletions

diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index cd85ea2a490..76e2f4095a2 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2005/03/22 14:57:12 cube Exp $
+$NetBSD: distinfo,v 1.32 2005/03/30 15:26:43 cube Exp $
 
 SHA1 (gkrellm-2.2.5.tar.bz2) = 4cbdf75828b3d8b216694c2e6978c29a4920595a
 RMD160 (gkrellm-2.2.5.tar.bz2) = 7755fa7bbf88dfd53185e76604981b2a5c81d74d
@@ -17,3 +17,6 @@ SHA1 (patch-al) = 4eab3c3757c198dcc3049a63fc3b8adceef7bc1c
 SHA1 (patch-am) = bf8b01f5e368a5387f8d224ca51ec18a74410b5c
 SHA1 (patch-an) = 1e63ce0e4fbe9bd22c46d00c6aeac6b3e7cda440
 SHA1 (patch-ao) = 63bf8657fa7707def41b13b3cc74c031098e070a
+SHA1 (patch-ap) = b3c89911085e73b8651e35f71b9561046b3cd073
+SHA1 (patch-aq) = 4cdf043e8cdabd8482705c80b9c06b416454b658
+SHA1 (patch-ar) = 8d672b33875186791dee2bfeea4d6cf10c3ee33c
diff --git a/sysutils/gkrellm/patches/patch-ap b/sysutils/gkrellm/patches/patch-ap
new file mode 100644
index 00000000000..94bc0787767
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-ap
@@ -0,0 +1,40 @@
+$NetBSD: patch-ap,v 1.1 2005/03/30 15:26:43 cube Exp $
+
+--- src/client.c.orig	2005-03-19 17:00:16.000000000 +0100
++++ src/client.c
+@@ -127,7 +127,7 @@ client_cpu_line_from_server(gchar *line)
+ 	gint	n;
+ 	guint64	user, nice, sys, idle;
+ 
+-	sscanf(line, "%d %llu %llu %llu %llu", &n, &user, &nice, &sys, &idle);
++	sscanf(line, "%d %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, &n, &user, &nice, &sys, &idle);
+ 	for (list = cpu_list; list; list = list->next)
+ 		{
+ 		cpu = (Cpu *) list->data;
+@@ -371,7 +371,7 @@ client_net_line_from_server(gchar *line)
+ 	gchar		name[32];
+ 	guint64		rx, tx;
+ 
+-	sscanf(line, "%31s %llu %llu", name, &rx, &tx);
++	sscanf(line, "%31s %" PRIu64 " %" PRIu64, name, &rx, &tx);
+ 	for (list = net_list; list; list = list->next)
+ 		{
+ 		net = (NetData *) list->data;
+@@ -615,7 +615,7 @@ struct
+ static void
+ client_mem_line_from_server(gchar *line)
+ 	{
+-	sscanf(line, "%llu %llu %llu %llu %llu %llu",
++	sscanf(line, "%" PRIu64 "%" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64,
+ 			&mem.total, &mem.used, &mem.free,
+ 			&mem.shared, &mem.buffers, &mem.cached);
+ 	}
+@@ -623,7 +623,7 @@ client_mem_line_from_server(gchar *line)
+ static void
+ client_swap_line_from_server(gchar *line)
+ 	{
+-	sscanf(line, "%llu %llu %lu %lu",
++	sscanf(line, "%" PRIu64 " %" PRIu64 " %lu %lu",
+ 			&mem.swap_total, &mem.swap_used,
+ 			&mem.swap_in, &mem.swap_out);
+ 	}
diff --git a/sysutils/gkrellm/patches/patch-aq b/sysutils/gkrellm/patches/patch-aq
new file mode 100644
index 00000000000..e32b5415eb6
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2005/03/30 15:26:43 cube Exp $
+
+--- server/main.c.orig	2005-03-11 16:03:54.000000000 +0100
++++ server/main.c
+@@ -1051,7 +1051,7 @@ main(gint argc, gchar **argv)
+ 				{
+ 				client_fd = accept(server_fd,
+ 						(struct sockaddr *) &client_addr,
+-						(socklen_t *) &addr_len);
++						(socklen_t *) (void *)&addr_len);
+ 				if (client_fd == -1)
+ 					{
+ 					fprintf(stderr, "gkrellmd accept() failed: %s\n",
diff --git a/sysutils/gkrellm/patches/patch-ar b/sysutils/gkrellm/patches/patch-ar
new file mode 100644
index 00000000000..6ed46ed8975
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-ar
@@ -0,0 +1,35 @@
+$NetBSD: patch-ar,v 1.1 2005/03/30 15:26:43 cube Exp $
+
+--- server/monitor.c.orig	2005-03-09 17:25:01.000000000 +0100
++++ server/monitor.c
+@@ -550,10 +550,10 @@ serve_disk_data(GkrellmdMonitor *mon, gb
+ 		if (!disk->changed && !first_serve)
+ 			continue;
+ 		if (!disk->subdisk_parent)
+-			snprintf(buf, sizeof(buf), "%s %llu %llu\n",
++			snprintf(buf, sizeof(buf), "%s %" PRIu64 " %" PRIu64 "\n",
+ 						disk->name, disk->rb, disk->wb);
+ 		else if (mon->privat->client->feature_subdisk)
+-			snprintf(buf, sizeof(buf), "%s %s %llu %llu\n",
++			snprintf(buf, sizeof(buf), "%s %s %" PRIu64 " %" PRIu64 "\n",
+ 						disk->name, disk->subdisk_parent, disk->rb, disk->wb);
+ 		else
+ 			continue;
+@@ -1134,7 +1134,7 @@ serve_mem_data(GkrellmdMonitor *mon, gbo
+ 	if (mem.mem_changed || first_serve)
+ 		{
+ 		gkrellmd_set_serve_name(mon, "mem");
+-		snprintf(buf, sizeof(buf), "%llu %llu %llu %llu %llu %llu\n",
++		snprintf(buf, sizeof(buf), "%" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 "\n",
+ 				mem.total, mem.used, mem.free,
+ 				mem.shared, mem.buffers, mem.cached);
+ 		gkrellmd_serve_data(mon, buf);
+@@ -1143,7 +1143,7 @@ serve_mem_data(GkrellmdMonitor *mon, gbo
+ 	if (mem.swap_changed || first_serve)
+ 		{
+ 		gkrellmd_set_serve_name(mon, "swap");
+-		snprintf(buf, sizeof(buf), "%llu %llu %lu %lu\n",
++		snprintf(buf, sizeof(buf), "%" PRIu64 " %" PRIu64 " %lu %lu\n",
+ 				mem.swap_total, mem.swap_used,
+ 				mem.swap_in, mem.swap_out);
+ 		gkrellmd_serve_data(mon, buf);