Force traditional mode for cpp, at least GCC 3.4+ will not generate

tabs otherwise. Fix errno usage, initialise global FILE * variables
at run time.

6 files changed, 110 insertions, 10 deletions

diff --git a/net/icsi-finger/distinfo b/net/icsi-finger/distinfo
index a823d10df75..8edeceb50df 100644
--- a/net/icsi-finger/distinfo
+++ b/net/icsi-finger/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.5 2005/11/08 13:47:40 tv Exp $
+$NetBSD: distinfo,v 1.6 2006/06/08 14:29:26 joerg Exp $
 
 SHA1 (icsi-finger-1.0.27.tar.Z) = 41f03c42269a402169000a6b08ba8c6330256861
 RMD160 (icsi-finger-1.0.27.tar.Z) = 92839362b6d4b1893958ca0909654f070e734aa4
 Size (icsi-finger-1.0.27.tar.Z) = 729351 bytes
-SHA1 (patch-aa) = dc800d0011090a273ad348bb8c8daa38b2acc5a6
+SHA1 (patch-aa) = 2025b8722f863fa7fcda6f4c3640560fd213f866
 SHA1 (patch-ab) = d8a719d78288aad8ab3a7159f332afdd59231ebb
-SHA1 (patch-ac) = dd1603bef5c0c6764549a0fdcddfd819d4301809
+SHA1 (patch-ac) = e3759d714eafae1cc6a8e974d8a79f065f7efe24
+SHA1 (patch-ad) = de1489cf9860bd412a43a875a43eae69dd559606
+SHA1 (patch-ae) = 7613ee307bb047d5e5c794b829dcd1cb1c8edb81
+SHA1 (patch-af) = 96d691992eecbf08118a924218570325a52603b1
diff --git a/net/icsi-finger/patches/patch-aa b/net/icsi-finger/patches/patch-aa
index 0a66df3047e..a5027a46b63 100644
--- a/net/icsi-finger/patches/patch-aa
+++ b/net/icsi-finger/patches/patch-aa
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2005/11/08 13:47:40 tv Exp $
+$NetBSD: patch-aa,v 1.4 2006/06/08 14:29:26 joerg Exp $
 
---- lib/error.c.orig	1998-04-04 17:38:04.000000000 -0500
+--- lib/error.c.orig	1998-04-04 22:38:04.000000000 +0000
 +++ lib/error.c
-@@ -143,13 +143,16 @@ file_error (severity, filename)
+@@ -44,7 +44,7 @@ char *progname = NULL;
+ 
+ jmp_buf top_level;
+ 
+-static FILE *errlog = stderr;
++static FILE *errlog = NULL;
+ 
+ /* **************************************************************** */
+ /*								    */
+@@ -93,6 +93,8 @@ handle_error (severity, format, arg1, ar
+      int severity;
+      char *format, *arg1, *arg2, *arg3;
+ {
++  if (errlog == NULL)
++    errlog = stderr;
+ #ifdef USE_SYSLOG
+   if (errlog == LOG_SYS)
+     {
+@@ -143,13 +145,16 @@ file_error (severity, filename)
       int severity;
       char *filename;
  {
@@ -21,7 +39,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/08 13:47:40 tv Exp $
    if (errno) {
      if (errno < sys_nerr)
        error_text = sys_errlist[errno];
-@@ -158,6 +161,7 @@ file_error (severity, filename)
+@@ -158,6 +163,7 @@ file_error (severity, filename)
    } else {
      error_text = "(Hmm, no error?)";
    }
diff --git a/net/icsi-finger/patches/patch-ac b/net/icsi-finger/patches/patch-ac
index 98cad37038c..baedae67579 100644
--- a/net/icsi-finger/patches/patch-ac
+++ b/net/icsi-finger/patches/patch-ac
@@ -1,8 +1,41 @@
-$NetBSD: patch-ac,v 1.1 2004/09/10 19:47:43 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/08 14:29:26 joerg Exp $
 
---- Makefile.orig	1998-04-04 21:27:42.000000000 +0200
+--- Makefile.orig	1998-04-04 19:27:42.000000000 +0000
 +++ Makefile
-@@ -98,7 +98,7 @@ dirs:	FRC
+@@ -44,22 +44,8 @@ DEFINES = -DSVR4
+ DEFINES = 
+ #endif
+ 
+-#ifdef NeXT
+-CC = cc -bsd
+-CPP = $(CC) -traditional -E 
+-#elifdef sun
+-CC = gcc -g $(DEFINES)
+-CPP = $(CC) -traditional -E
+-#elifdef sgi
+-CC = cc -g3 $(DEFINES)
+-CPP = $(CC) -E -cckr
+-#elifdef bsdi
+ CC = cc
+-CPP = $(CC) -traditional -E 
+-#else
+-CC = cc $(DEFINES)
+-CPP = $(CC) -E
+-#endif
++CPP = cpp -traditional
+ 
+ DIRNAME = /tmp/dirname
+ EXCLUDE = /tmp/exclude
+@@ -82,7 +68,7 @@ CPP_DEFINES = -DHAVE_GCC -DHAVE_FIXED_IN
+ #MAKE = make
+ 
+ CPPFLAGS = $(SYSTEM) $(CPP_DEFINES)
+-CPP_ARGS = -DCPP_CC="$(CC)" -DIncludes=$(INCLUDES)
++CPP_ARGS = -DCPP_CC=${CC:Q} -DIncludes=$(INCLUDES)
+ 
+ all:	$(SRC)$(MKFILE)
+ #	(cd $(SRC); $(MAKE) -f $(MKFILE) depend)
+@@ -98,7 +84,7 @@ dirs:	FRC
  $(SRC)$(MKFILE): support/cpp-Makefile Makefile config.h
  	cp $(SUPPORT)cpp-Makefile $(SRC)tmp-Makefile.c
  	(cd $(SRC); $(CPP) $(CPP_ARGS) tmp-Makefile.c \
diff --git a/net/icsi-finger/patches/patch-ad b/net/icsi-finger/patches/patch-ad
new file mode 100644
index 00000000000..59bbb12e704
--- /dev/null
+++ b/net/icsi-finger/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/06/08 14:29:26 joerg Exp $
+
+--- include/error.h.orig	2006-06-08 14:18:34.000000000 +0000
++++ include/error.h
+@@ -41,8 +41,6 @@
+ #define WARNING 3		/* Makes noise, and informs. */
+ #define DEBUG 4			/* Makes noise only if debuggging. */
+ 
+-extern int errno;		/* sometime missing from <errno.h> */
+-
+ extern char *progname;
+ extern jmp_buf top_level;
+ 
diff --git a/net/icsi-finger/patches/patch-ae b/net/icsi-finger/patches/patch-ae
new file mode 100644
index 00000000000..0e0e0ad404b
--- /dev/null
+++ b/net/icsi-finger/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2006/06/08 14:29:26 joerg Exp $
+
+--- lib/authuser.c.orig	2006-06-08 14:22:54.000000000 +0000
++++ lib/authuser.c
+@@ -18,7 +18,6 @@
+ #include <netinet/in.h>
+ #include <ctype.h>
+ #include <errno.h>
+-extern int errno;
+ #include "authuser.h"
+ 
+ #ifndef FNDELAY
diff --git a/net/icsi-finger/patches/patch-af b/net/icsi-finger/patches/patch-af
new file mode 100644
index 00000000000..1a836515302
--- /dev/null
+++ b/net/icsi-finger/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2006/06/08 14:29:26 joerg Exp $
+
+--- src/fingerd.c.orig	2006-06-08 14:23:22.000000000 +0000
++++ src/fingerd.c
+@@ -116,7 +116,7 @@ int debugging = 0;
+ int poll_debugging = 0;
+ 
+ /* The output stream for debugging. */
+-FILE *debug_output = stderr;
++FILE *debug_output;
+ 
+ /* The hostdata file descriptor */
+ int host_file = -1;
+@@ -158,6 +158,7 @@ main (argc, argv)
+   allow_time_outs = 1;
+   connect_timeout = DEFAULT_CONNECT_TIMEOUT;
+   read_timeout = DEFAULT_POLL_TIMEOUT;
++  debug_output = stderr;
+ 
+   /* Parse arguments. */
+   for (arg_index = 1; arg_index != argc; arg_index++)