Fix build for systems with POSIX getline().

4 files changed, 41 insertions, 4 deletions

diff --git a/news/cg/distinfo b/news/cg/distinfo
index e94c50f1733..ad837ad6d86 100644
--- a/news/cg/distinfo
+++ b/news/cg/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/11/03 16:53:34 tv Exp $
+$NetBSD: distinfo,v 1.5 2009/08/24 08:06:41 wiz Exp $
 
 SHA1 (cg-0.4.tar.gz) = 8fdb3156e3ad11fd182d2adf1d87ff799beaac60
 RMD160 (cg-0.4.tar.gz) = 9a706b5b1dc5e4e2617dec7f9f6e37b19ed634aa
 Size (cg-0.4.tar.gz) = 203503 bytes
-SHA1 (patch-aa) = c30af62f04e07b347c5a048edad19b2cca70ae98
+SHA1 (patch-aa) = 112a34f172f71369dd09f5310d7e380ad01a07f0
+SHA1 (patch-ab) = 537cc5ab6d7f316f0a7802672e63104b2a476796
+SHA1 (patch-ac) = 3353ec656425732397926cdf1c09466b4640aed7
diff --git a/news/cg/patches/patch-aa b/news/cg/patches/patch-aa
index be265c48ab6..f842ce79fa1 100644
--- a/news/cg/patches/patch-aa
+++ b/news/cg/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2005/11/03 16:53:34 tv Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/24 08:06:41 wiz Exp $
 
---- snprintf.c.orig	2002-05-13 12:51:22.000000000 -0400
+--- snprintf.c.orig	2002-05-13 16:51:22.000000000 +0000
 +++ snprintf.c
 @@ -64,7 +64,7 @@
  
diff --git a/news/cg/patches/patch-ab b/news/cg/patches/patch-ab
new file mode 100644
index 00000000000..96c95566cd0
--- /dev/null
+++ b/news/cg/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2009/08/24 08:06:41 wiz Exp $
+
+--- util.c.orig	2002-05-13 16:27:29.000000000 +0000
++++ util.c
+@@ -180,7 +180,7 @@ rename_uniq(const char *from, char **to)
+ 
+ 
+ char *
+-getline(FILE *f)
++get_line(FILE *f)
+ {
+     static char *b;
+     static int bsize;
+@@ -234,7 +234,7 @@ getline(FILE *f)
+ void
+ skip_rest(FILE *f)
+ {
+-    while (getline(f) != NULL)
++    while (get_line(f) != NULL)
+ 	;
+ }
+ 
diff --git a/news/cg/patches/patch-ac b/news/cg/patches/patch-ac
new file mode 100644
index 00000000000..39f522a3d7f
--- /dev/null
+++ b/news/cg/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/08/24 08:06:41 wiz Exp $
+
+--- util.h.orig	2002-04-24 15:45:24.000000000 +0000
++++ util.h
+@@ -57,7 +57,7 @@ void copy_stream(stream *in, out_state *
+ void debug(out_state *out, char *fmt, ...);
+ char *expand(char *path);
+ FILE *fopen_uniq(char **s);
+-char *getline(FILE *f);
++char *get_line(FILE *f);
+ void output_header(out_state *out, symbol name, struct header *h);
+ void prdebug(int level, char *fmt, ...);
+ void prdebug_init(int do_file, int do_stdout);