[pkgsrc/trunk]: pkgsrc/sysutils/gkrellm Rename auxiliary getline function whi...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0990a935d34
branches:  trunk
changeset: 399932:e0990a935d34
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Oct 10 12:52:40 2009 +0000

description:
Rename auxiliary getline function which collides with the new prototype in
NetBSD current.  Found on NetBSD/macppc 5.99.19.

diffstat:

 sysutils/gkrellm/distinfo         |   4 ++--
 sysutils/gkrellm/patches/patch-ap |  31 +++++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 8969ece658d9 -r e0990a935d34 sysutils/gkrellm/distinfo
--- a/sysutils/gkrellm/distinfo Sat Oct 10 11:43:37 2009 +0000
+++ b/sysutils/gkrellm/distinfo Sat Oct 10 12:52:40 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2008/12/19 21:25:28 macallan Exp $
+$NetBSD: distinfo,v 1.40 2009/10/10 12:52:40 jmmv Exp $
 
 SHA1 (gkrellm-2.2.10.tar.bz2) = 329d0ba5600998f21b75491937c3c2924ab6ed40
 RMD160 (gkrellm-2.2.10.tar.bz2) = 6694838015716c09291887ae598daceb4f4b440f
@@ -17,7 +17,7 @@
 SHA1 (patch-am) = bf8b01f5e368a5387f8d224ca51ec18a74410b5c
 SHA1 (patch-an) = 1e63ce0e4fbe9bd22c46d00c6aeac6b3e7cda440
 SHA1 (patch-ao) = c9e1a7324e0a9194c05554a09bafd4fe0460df38
-SHA1 (patch-ap) = b2c33796fdfdc0166a869e528fcaab1f8f0ab615
+SHA1 (patch-ap) = 0781bec3da89724f7145beaffba4aa318493dbef
 SHA1 (patch-aq) = 0799e334333ae072a40cdcb6ccd04ed6a2f52765
 SHA1 (patch-ar) = 86ee88c8506c1ceb1d35eb488d209b16306a715d
 SHA1 (patch-as) = 3df33e28754cf1fee88717b431726bf090c15f70
diff -r 8969ece658d9 -r e0990a935d34 sysutils/gkrellm/patches/patch-ap
--- a/sysutils/gkrellm/patches/patch-ap Sat Oct 10 11:43:37 2009 +0000
+++ b/sysutils/gkrellm/patches/patch-ap Sat Oct 10 12:52:40 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2006/03/19 22:10:38 joerg Exp $
+$NetBSD: patch-ap,v 1.3 2009/10/10 12:52:40 jmmv Exp $
 
---- src/client.c.orig  2005-05-24 04:28:22.000000000 +0000
+--- src/client.c.orig  2006-09-27 22:29:18.000000000 +0100
 +++ src/client.c
 @@ -24,6 +24,8 @@
  #include "gkrellm-private.h"
@@ -58,3 +58,30 @@
                        &mem.swap_total, &mem.swap_used,
                        &mem.swap_in, &mem.swap_out);
        }
+@@ -1598,7 +1604,7 @@ KeyTable update_table[] =
+ 
+ 
+ static gint
+-getline(gint fd, gchar *buf, gint len)
++xgetline(gint fd, gchar *buf, gint len)
+       {
+       fd_set                  read_fds;
+       struct timeval  tv;
+@@ -1690,7 +1696,7 @@ read_server_setup(gint fd)
+ 
+       while (1)
+               {
+-              getline(fd, buf, sizeof(buf));
++              xgetline(fd, buf, sizeof(buf));
+               if (!strcmp(buf, "</gkrellmd_setup>"))
+                       break;
+               process_server_line(&setup_table[0], table_size, buf);
+@@ -1706,7 +1712,7 @@ read_server_setup(gint fd)
+       table_size = sizeof(update_table) / sizeof(KeyTable);
+       while (1)
+               {
+-              getline(fd, buf, sizeof(buf));
++              xgetline(fd, buf, sizeof(buf));
+               if (!strcmp(buf, "</initial_update>"))
+                       break;
+               process_server_line(&update_table[0], table_size, buf);