Add missing prototypes. Don't conflict with unistd.h on getopt.

3 files changed, 46 insertions, 1 deletions

diff --git a/devel/fastdep/distinfo b/devel/fastdep/distinfo
index 660ebb2480c..8b11a5e1a22 100644
--- a/devel/fastdep/distinfo
+++ b/devel/fastdep/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/12/20 11:05:54 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/10/20 22:08:32 joerg Exp $
 
 SHA1 (fastdep-0.16.tar.gz) = e249ac93129f81e0aff791a442ef2dfd05edad9f
 RMD160 (fastdep-0.16.tar.gz) = b805d3db264e46de9e68cbf3104c874d9fa73ddc
 Size (fastdep-0.16.tar.gz) = 70374 bytes
 SHA1 (patch-aa) = 6704d991487d570da3cf475d03f1620febabc3aa
 SHA1 (patch-ab) = 60a89863baaee60c25842dd17fb1ba5cbb15652e
+SHA1 (patch-external_getopt.c) = e9d006a7bbd8e8d426ab0570a2aebb129918fbc1
+SHA1 (patch-external_getopt.h) = c626d845c6684901bcc9db80ae7d72e3c38fc493
diff --git a/devel/fastdep/patches/patch-external_getopt.c b/devel/fastdep/patches/patch-external_getopt.c
new file mode 100644
index 00000000000..8867ce8c20e
--- /dev/null
+++ b/devel/fastdep/patches/patch-external_getopt.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-external_getopt.c,v 1.1 2012/10/20 22:08:32 joerg Exp $
+
+--- external/getopt.c.orig	2003-01-21 21:19:37.000000000 +0000
++++ external/getopt.c
+@@ -72,11 +72,9 @@
+ # include <unistd.h>
+ #endif	/* GNU C library.  */
+ 
++#include <string.h>
+ #ifdef VMS
+ # include <unixlib.h>
+-# if HAVE_STRING_H - 0
+-#  include <string.h>
+-# endif
+ #endif
+ 
+ #ifndef _
diff --git a/devel/fastdep/patches/patch-external_getopt.h b/devel/fastdep/patches/patch-external_getopt.h
new file mode 100644
index 00000000000..8fbcaf6a166
--- /dev/null
+++ b/devel/fastdep/patches/patch-external_getopt.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-external_getopt.h,v 1.1 2012/10/20 22:08:32 joerg Exp $
+
+--- external/getopt.h.orig	2003-01-21 21:19:38.000000000 +0000
++++ external/getopt.h
+@@ -100,21 +100,6 @@ struct option
+ #define optional_argument	2
+ 
+ #if defined (__STDC__) && __STDC__
+-/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1.  If it is
+-   undefined, we haven't run the autoconf check so provide the
+-   declaration without arguments.  If it is 0, we checked and failed
+-   to find the declaration so provide a fully prototyped one.  If it
+-   is 1, we found it so don't provide any declaration at all.  */
+-#if defined (__GNU_LIBRARY__) || (defined (HAVE_DECL_GETOPT) && !HAVE_DECL_GETOPT)
+-/* Many other libraries have conflicting prototypes for getopt, with
+-   differences in the consts, in stdlib.h.  To avoid compilation
+-   errors, only prototype getopt for the GNU C library.  */
+-extern int getopt (int argc, char *const *argv, const char *shortopts);
+-#else /* not __GNU_LIBRARY__ */
+-# if !defined (HAVE_DECL_GETOPT)
+-extern int getopt ();
+-# endif
+-#endif /* __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ 		        const struct option *longopts, int *longind);
+ extern int getopt_long_only (int argc, char *const *argv,