From 63d2465a26caae6c1c807e8fa72f4a016d4466fb Mon Sep 17 00:00:00 2001
From: is <is@pkgsrc.org>
Date: Wed, 18 May 2011 12:28:50 +0000
Subject: -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.

---
 net/vpnc/distinfo         |  6 +++---
 net/vpnc/patches/patch-ba | 12 ------------
 net/vpnc/patches/patch-bd | 15 +++++++++++++--
 net/vpnc/patches/patch-be | 13 +++++++++++++
 4 files changed, 29 insertions(+), 17 deletions(-)
 delete mode 100644 net/vpnc/patches/patch-ba
 create mode 100644 net/vpnc/patches/patch-be

diff --git a/net/vpnc/distinfo b/net/vpnc/distinfo
index feb43047d90..3ffad879732 100644
--- a/net/vpnc/distinfo
+++ b/net/vpnc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2011/04/14 21:42:42 hans Exp $
+$NetBSD: distinfo,v 1.17 2011/05/18 12:28:50 is Exp $
 
 SHA1 (vpnc-0.5.3.tar.gz) = 321527194e937371c83b5e7c38e46fca4f109304
 RMD160 (vpnc-0.5.3.tar.gz) = 6f3926901e75dc98762f6ef45782930f2fb76a2f
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = ae3e4be379965911dec27b6bb407ae1af017d88e
 SHA1 (patch-af) = d41aaab81061db058c4b38013f07815e1e8cf506
 SHA1 (patch-ag) = 2c1a2b2e93e5f8e0a13d7b92c15088ab66e4aaa3
 SHA1 (patch-ah) = 8180c569137f5d6de89b1a495dcba91dc374e2c2
-SHA1 (patch-ba) = 7cd58afdf4888ed9868644b071052ae9abcc5bfb
 SHA1 (patch-bb) = 015e3a6c3d0ec68a75694a03334d8116b381c46a
 SHA1 (patch-bc) = dd4817bfd05838cb863c8810e6b2c0194de3a3bf
-SHA1 (patch-bd) = 67f415224fadeddb1e3bb597eaa38696a15fe400
+SHA1 (patch-bd) = 3e7390667f06174f4434e10dfb840a6ab6c95ffb
+SHA1 (patch-be) = c09ebc1bbe4848e510a4f6aac24bbe4939d3f726
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>
-- 
cgit v1.2.3