-back out HAVE_GETLINE, so that this builds on pre-5.99 NetBSD

-patch replacement getline() to be of type ssize_t, so that this builds
 on NetBSD >=5.99
Problem reported by Matthias Kretschmer and Luca Sironi; first part of
fix by Matthias, too.

3 files changed, 26 insertions, 14 deletions

diff --git a/net/vpnc/patches/patch-ba b/net/vpnc/patches/patch-ba
deleted file mode 100644
index 97f2b24b2aa..00000000000
--- a/net/vpnc/patches/patch-ba
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2011/03/05 17:54:17 cegger Exp $
-
---- sysdep.h.orig	2011-03-01 13:49:38.000000000 +0000
-+++ sysdep.h
-@@ -57,6 +57,7 @@ int tun_get_hwaddr(int fd, char *dev, ui
- #define HAVE_FGETLN    1
- #define HAVE_UNSETENV  1
- #define HAVE_SETENV    1
-+#define HAVE_GETLINE   1
- #endif
- 
- /***************************************************************************/
diff --git a/net/vpnc/patches/patch-bd b/net/vpnc/patches/patch-bd
index 21f04feb4b4..91a5af47874 100644
--- a/net/vpnc/patches/patch-bd
+++ b/net/vpnc/patches/patch-bd
@@ -1,5 +1,7 @@
---- sysdep.c.orig	2008-11-19 21:36:12.000000000 +0100
-+++ sysdep.c	2010-01-07 23:30:57.937261239 +0100
+$NetBSD: patch-bd,v 1.2 2011/05/18 12:28:50 is Exp $
+
+--- sysdep.c.orig	2008-11-19 20:36:12.000000000 +0000
++++ sysdep.c
 @@ -666,7 +666,7 @@ int tun_get_hwaddr(int fd, char *dev, ui
  	}
  	
@@ -30,3 +32,12 @@
  	
  	return 0;
  #else
+@@ -751,7 +760,7 @@ void error(int status, int errornum, con
+ #endif
+ 
+ #ifndef HAVE_GETLINE
+-int getline(char **line, size_t * length, FILE * stream)
++ssize_t getline(char **line, size_t * length, FILE * stream)
+ {
+ 	size_t len;
+ #ifdef HAVE_FGETLN
diff --git a/net/vpnc/patches/patch-be b/net/vpnc/patches/patch-be
new file mode 100644
index 00000000000..4e3d900b29f
--- /dev/null
+++ b/net/vpnc/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2011/05/18 12:28:50 is Exp $
+
+--- sysdep.h.orig	2008-11-19 20:36:12.000000000 +0000
++++ sysdep.h
+@@ -230,7 +230,7 @@ struct ether_arp {
+ extern void error(int fd, int errorno, const char *fmt, ...);
+ #endif
+ #ifndef HAVE_GETLINE
+-extern int getline(char **line, size_t * length, FILE * stream);
++extern ssize_t getline(char **line, size_t * length, FILE * stream);
+ #endif
+ #ifndef HAVE_VASPRINTF
+ #include <stdarg.h>