Make this package build on Linux.

  - Do not declare getopt() because the correct declaration is in
    getopt.h.

2 files changed, 15 insertions, 13 deletions

diff --git a/devel/cdecl/distinfo b/devel/cdecl/distinfo
index 99342acb82a..513a34a2f72 100644
--- a/devel/cdecl/distinfo
+++ b/devel/cdecl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/05/22 05:48:14 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/09/13 06:07:03 minskim Exp $
 
 SHA1 (cdecl-2.5.tar.gz) = b955a0b95b635090360b19de888cb29d5c005296
 Size (cdecl-2.5.tar.gz) = 21435 bytes
-SHA1 (patch-aa) = 48cd50b6c1aee3286c9dabe2e21fbeccc1a03e3b
+SHA1 (patch-aa) = d9a5c55d98632acd0fb72b0de43a3421798ed9c0
 SHA1 (patch-ab) = e8c9f70894ed5613234ed17b8c1c95c9b12afd7b
diff --git a/devel/cdecl/patches/patch-aa b/devel/cdecl/patches/patch-aa
index b4d318fa82f..b3651cd639f 100644
--- a/devel/cdecl/patches/patch-aa
+++ b/devel/cdecl/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2001/05/22 05:48:15 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2004/09/13 06:07:03 minskim Exp $
 
---- cdecl.c.orig	Mon Jan 15 22:54:46 1996
-+++ cdecl.c	Tue May 22 01:41:35 2001
+--- cdecl.c.orig	1996-01-15 21:54:46.000000000 -0600
++++ cdecl.c
 @@ -59,7 +59,9 @@
   */
  
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.3 2001/05/22 05:48:15 jlam Exp $
  #include <stdio.h>
  #include <ctype.h>
  #if __STDC__ || defined(DOS)
-@@ -71,11 +73,12 @@
+@@ -71,11 +73,12 @@ char cdeclsccsid[] = "@(#)cdecl.c	2.5 1/
  # ifndef NOVARARGS
  #  include <varargs.h>
  # endif /* ndef NOVARARGS */
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.3 2001/05/22 05:48:15 jlam Exp $
  #  define strrchr rindex
  #  define NOTMPFILE
  # else
-@@ -87,6 +90,10 @@
+@@ -87,6 +90,10 @@ void free(), exit(), perror();
  # endif /* NOVOID */
  #endif /* __STDC__ || DOS */
  
@@ -38,17 +38,19 @@ $NetBSD: patch-aa,v 1.3 2001/05/22 05:48:15 jlam Exp $
  #ifdef USE_READLINE
  # include <readline/readline.h>
    /* prototypes for functions related to readline() */
-@@ -124,7 +131,9 @@
+@@ -124,7 +131,11 @@ char real_prompt[MAX_NAME+3];
  
  #if __STDC__
    char *ds(char *), *cat(char *, ...), *visible(int);
-+#if !(defined(BSD) && BSD >= 199306) && !(defined(__sun__) && defined(__svr4__))
++#if !(defined(BSD) && BSD >= 199306) && \
++	!(defined(__sun__) && defined(__svr4__)) && \
++	!(defined(__linux__))
    int getopt(int,char **,char *);
 +#endif
    int main(int, char **);
    int yywrap(void);
    int dostdin(void);
-@@ -138,7 +147,7 @@
+@@ -138,7 +149,7 @@ char real_prompt[MAX_NAME+3];
    void docast(char*, char*, char*, char*);
    void dodexplain(char*, char*, char*, char*);
    void docexplain(char*, char*, char*, char*);
@@ -57,7 +59,7 @@ $NetBSD: patch-aa,v 1.3 2001/05/22 05:48:15 jlam Exp $
    int dotmpfile(int, char**), dofileargs(int, char**);
  #else
    char *ds(), *cat(), *visible();
-@@ -148,7 +157,7 @@
+@@ -148,7 +159,7 @@ char real_prompt[MAX_NAME+3];
    void unsupp(), notsupported();
    void yyerror();
    void doset(), dodeclare(), docast(), dodexplain(), docexplain();
@@ -66,7 +68,7 @@ $NetBSD: patch-aa,v 1.3 2001/05/22 05:48:15 jlam Exp $
    int dotmpfile(), dofileargs();
  #endif /* __STDC__ */
    FILE *tmpfile();
-@@ -803,7 +812,7 @@
+@@ -803,7 +814,7 @@ void prompt()
  }
  
  /* Save away the name of the program from argv[0] */
@@ -75,7 +77,7 @@ $NetBSD: patch-aa,v 1.3 2001/05/22 05:48:15 jlam Exp $
  char *argv0;
  {
  #ifdef DOS
-@@ -1255,7 +1264,7 @@
+@@ -1255,7 +1266,7 @@ char **argv;
      rl_completion_entry_function = (Function *)keyword_completion;
  #endif