Fix build problem on system which has getline(3).

5 files changed, 85 insertions, 1 deletions

diff --git a/net/wol/distinfo b/net/wol/distinfo
index b47268d8d9b..3714267b205 100644
--- a/net/wol/distinfo
+++ b/net/wol/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/03/04 15:43:55 uebayasi Exp $
+$NetBSD: distinfo,v 1.6 2011/05/10 14:07:48 taca Exp $
 
 SHA1 (wol-0.7.1.tar.gz) = 7edd1a8c2d4baffc3b6baf8fcd12e786f9fc1fbd
 RMD160 (wol-0.7.1.tar.gz) = 856fefe482db4326df47f10f07ec97396f23870d
 Size (wol-0.7.1.tar.gz) = 445648 bytes
+SHA1 (patch-config.h.in) = 8120dd852646cd1ca34e29ebcd339cc173a52b5b
+SHA1 (patch-configure) = c2a5d44c46c1c4850c6ecc58ba14abd1c047f1f6
+SHA1 (patch-lib_getline.c) = 20c17d840257f6533ec604d237e42dee1cfa8c07
+SHA1 (patch-lib_getline.h) = d04aae481729ebd91b09837c4eddaeb73e72adeb
diff --git a/net/wol/patches/patch-config.h.in b/net/wol/patches/patch-config.h.in
new file mode 100644
index 00000000000..95a4701b92f
--- /dev/null
+++ b/net/wol/patches/patch-config.h.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-config.h.in,v 1.1 2011/05/10 14:07:48 taca Exp $
+
+Allow to use getline(3) in base system.
+
+--- config.h.in.orig	2004-04-29 03:00:29.000000000 +0000
++++ config.h.in
+@@ -108,6 +108,9 @@
+ /* Define to 1 if you have the `getcwd' function. */
+ #undef HAVE_GETCWD
+ 
++/* Define to 1 if you have the `getline' function. */
++#undef HAVE_GETLINE
++
+ /* Define to 1 if you have the `getdelim' function. */
+ #undef HAVE_GETDELIM
+ 
diff --git a/net/wol/patches/patch-configure b/net/wol/patches/patch-configure
new file mode 100644
index 00000000000..b9fbddd0108
--- /dev/null
+++ b/net/wol/patches/patch-configure
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure,v 1.1 2011/05/10 14:07:48 taca Exp $
+
+Allow to use getline(3) in base system.
+
+--- configure.orig	2004-04-29 03:00:27.000000000 +0000
++++ configure
+@@ -14759,6 +14759,12 @@ echo "${ECHO_T}$am_cv_func_working_getli
+   *) LIBOBJS="$LIBOBJS getline.$ac_objext" ;;
+ esac
+ 
++  else
++
++    cat >>confdefs.h <<\_ACEOF
++#define HAVE_GETLINE 1
++_ACEOF
++
+   fi
+ 
+ for ac_func in usleep
diff --git a/net/wol/patches/patch-lib_getline.c b/net/wol/patches/patch-lib_getline.c
new file mode 100644
index 00000000000..bc8c6bed157
--- /dev/null
+++ b/net/wol/patches/patch-lib_getline.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_getline.c,v 1.1 2011/05/10 14:07:48 taca Exp $
+
+Allow to use getline(3) in base system.
+
+--- lib/getline.c.orig	2003-08-23 15:59:52.000000000 +0000
++++ lib/getline.c
+@@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include <sys/types.h>
+ 
+ #if defined __GNU_LIBRARY__ && HAVE_GETDELIM
++#ifndef HAVE_GETLINE
+ 
+ ssize_t
+ getline (char **lineptr, size_t *n, FILE *stream)
+@@ -41,6 +42,7 @@ getline (char **lineptr, size_t *n, FILE
+   return getdelim (lineptr, n, '\n', stream);
+ }
+ 
++#endif
+ #else /* ! have getdelim */
+ 
+ # include "getstr.h"
diff --git a/net/wol/patches/patch-lib_getline.h b/net/wol/patches/patch-lib_getline.h
new file mode 100644
index 00000000000..3b7a7efd251
--- /dev/null
+++ b/net/wol/patches/patch-lib_getline.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-lib_getline.h,v 1.1 2011/05/10 14:07:48 taca Exp $
+
+Allow to use getline(3) in base system.
+
+--- lib/getline.h.orig	2002-03-11 17:55:36.000000000 +0000
++++ lib/getline.h
+@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suit
+ # define GETLINE_H_ 1
+ 
+ # include <stdio.h>
++# include "config.h"
++
++# ifndef HAVE_GETLINE
+ 
+ # ifndef PARAMS
+ #  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+@@ -35,4 +38,6 @@ int
+ getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+ # endif
+ 
++# endif
++
+ #endif /* not GETLINE_H_ */