More getline() fallout

5 files changed, 54 insertions, 3 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 982128e957a..d4ad9ae2556 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2009/04/04 20:44:58 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2009/08/09 00:53:09 smb Exp $
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		net x11
 MASTER_SITES=		ftp://ftp.uk.research.att.com/pub/vnc/dist/
 DISTFILES=		vnc-3.3.3r2_unixsrc.tgz \
diff --git a/net/vnc/distinfo b/net/vnc/distinfo
index cbdbc9108ae..6416ce751f7 100644
--- a/net/vnc/distinfo
+++ b/net/vnc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/04/04 20:44:58 joerg Exp $
+$NetBSD: distinfo,v 1.12 2009/08/09 00:53:09 smb Exp $
 
 SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
 RMD160 (vnc-3.3.3r2_unixsrc.tgz) = 3c70c386065d8b0254b1a0627455fb7bc03846ae
@@ -19,3 +19,6 @@ SHA1 (patch-ag) = 917a14ec15a0903f3d80c9d442b0281d23523fb8
 SHA1 (patch-ah) = 0f9f3f3c9b167a2743e8dab2df430b0526346867
 SHA1 (patch-ai) = 0e8e49a44fbe2cf8f371a1224e0064b7cb28597c
 SHA1 (patch-aj) = 46f177a1dd199e72a0a8f02801941ab99e6f55d1
+SHA1 (patch-ba) = d179bade6870ff5abbe2322d918e9384fed519d3
+SHA1 (patch-bb) = 5601ee04f2287b67dbf94d27ec8706f484ea6ca9
+SHA1 (patch-bc) = 134930ca6c3034490ca99f4efb5a22c6afb5631c
diff --git a/net/vnc/patches/patch-ba b/net/vnc/patches/patch-ba
new file mode 100644
index 00000000000..e6459645f38
--- /dev/null
+++ b/net/vnc/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2009/08/09 00:53:09 smb Exp $
+
+--- Xvnc/config/makedepend/def.h.orig	2009-08-08 20:34:29.000000000 -0400
++++ Xvnc/config/makedepend/def.h	2009-08-08 20:35:13.000000000 -0400
+@@ -137,7 +137,7 @@
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*get_line();
+ struct symtab		**slookup();
+ struct symtab		**isdefined();
+ struct symtab		**fdefined();
diff --git a/net/vnc/patches/patch-bb b/net/vnc/patches/patch-bb
new file mode 100644
index 00000000000..db07151dcff
--- /dev/null
+++ b/net/vnc/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2009/08/09 00:53:09 smb Exp $
+
+--- Xvnc/config/makedepend/main.c.orig	2009-08-08 20:34:06.000000000 -0400
++++ Xvnc/config/makedepend/main.c	2009-08-08 20:35:08.000000000 -0400
+@@ -548,7 +548,7 @@
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *get_line(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
diff --git a/net/vnc/patches/patch-bc b/net/vnc/patches/patch-bc
new file mode 100644
index 00000000000..56e4f668f22
--- /dev/null
+++ b/net/vnc/patches/patch-bc
@@ -0,0 +1,22 @@
+$NetBSD: patch-bc,v 1.1 2009/08/09 00:53:09 smb Exp $
+
+--- Xvnc/config/makedepend/parse.c.orig	2009-08-08 20:34:37.000000000 -0400
++++ Xvnc/config/makedepend/parse.c	2009-08-08 20:35:18.000000000 -0400
+@@ -40,7 +40,7 @@
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while (line = getline(filep)) {
++	while (line = get_line(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE)) {
+ 		case IF:
+ 		case IFFALSE:
+@@ -529,7 +529,7 @@
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while (line = getline(filep)) {
++	while (line = get_line(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE)) {
+ 		case IF:
+ 		doif: