Remove redundant errno and use stdlib.h instead of defining the

prototypes manually and possibly mismatching. Update FreeBSD
config to match both DragonFly and FreeBSD 4+ reality.

4 files changed, 78 insertions, 10 deletions

diff --git a/comms/fidogate/distinfo b/comms/fidogate/distinfo
index 815f81342b7..4061fa73abe 100644
--- a/comms/fidogate/distinfo
+++ b/comms/fidogate/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.10 2005/08/17 11:43:27 tv Exp $
+$NetBSD: distinfo,v 1.11 2005/12/19 15:10:18 joerg Exp $
 
 SHA1 (fidogate-4.4.10.tar.gz) = 531305ac82963d5bd6398d2e8e350676bbc9c5eb
 RMD160 (fidogate-4.4.10.tar.gz) = 09b8dfa7304089ff27c7c39c1b6004aef00edadf
 Size (fidogate-4.4.10.tar.gz) = 1191524 bytes
 SHA1 (patch-aa) = a12ffe978a32b342a48927b2887b4c5340816c5c
 SHA1 (patch-ab) = 27457fff799208f3daf72eabb6a7b0b056faf945
-SHA1 (patch-ac) = 89e81b49da503eaaf6b641231d30cf75e58b376b
+SHA1 (patch-ac) = 220f4d95a4ef28fba3ac603957a2f084df5a95e4
 SHA1 (patch-ad) = bc08f722e53b23181d797e1f504023cf4b1ae5fa
 SHA1 (patch-ae) = e2cf8add74b051111626230257c01793c1c20ca9
 SHA1 (patch-af) = 7fbc604c555f210aa49de2ecc1ec13d9835287f0
@@ -22,4 +22,6 @@ SHA1 (patch-ap) = 9f8aae03b2b2e758785c9196583221c92d398371
 SHA1 (patch-aq) = cdf5aa7edc6cf6c5b33d95a6b7e9266608f38bca
 SHA1 (patch-ar) = 0883b75e210d635f7e9f49c9b2b5d3978645953b
 SHA1 (patch-as) = daf5a80d044933c17f8ab556bebc0765af1439e3
+SHA1 (patch-at) = 5fa13046a1557b84f2b75b55001435ba8fe09ede
 SHA1 (patch-av) = dec5e163dcba702d929f4242083ac942abbf2160
+SHA1 (patch-aw) = ca20e868bade0466a1a3c5e590993f6cbe6d6143
diff --git a/comms/fidogate/patches/patch-ac b/comms/fidogate/patches/patch-ac
index 548d6ae3af0..d3babdd0bac 100644
--- a/comms/fidogate/patches/patch-ac
+++ b/comms/fidogate/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2004/08/23 15:18:02 tv Exp $
+$NetBSD: patch-ac,v 1.5 2005/12/19 15:10:18 joerg Exp $
 
---- config.h.orig	2002-07-15 16:21:55.000000000 -0400
+--- config.h.orig	2004-08-22 20:19:09.000000000 +0000
 +++ config.h
 @@ -108,7 +108,7 @@
  /***** rfc2ftn configuration ************************************************/
@@ -11,10 +11,33 @@ $NetBSD: patch-ac,v 1.4 2004/08/23 15:18:02 tv Exp $
  /** Passthru operation for EchoMail: FIDO->Internet->FIDO **/
  /*
   * Implemented, but requires ftntoss run after rfc2ftn to sort SEEN-BY
-@@ -302,6 +302,25 @@
- # undef  HAS_POSIX_REGEX	/* ? */
+@@ -283,23 +283,42 @@
+ # define HAS_POSIX_REGEX
  #endif
  
+-#ifdef __FreeBSD__		/* FreeBSD 2.1.6., GNU gcc */
++#if defined(__FreeBSD__) || defined(__DragonFly__)		/* FreeBSD 2.1.6., GNU gcc */
+ # define HAS_FCNTL_LOCK
+ # define HAS_GETTIMEOFDAY
+ # define HAS_TM_GMTOFF
+ # define HAS_SYSEXITS_H
+ # define HAS_TM_ZONE
+ # define HAS_STRFTIME
+-# undef  HAS_TZNAME
++# define HAS_TZNAME
+ # define HAS_STRCASECMP
+ # undef  HAS_STRICMP
+-# undef  HAS_STRERROR		/* ? */
++# define HAS_STRERROR		/* ? */
+ # undef  DO_BINARY
+ # undef  DO_DOSIFY
+ # define HAS_SYSLOG
+ # define HAS_SNPRINTF		/* ? */
+ # define HAS_HARDLINKS
+-# undef  HAS_POSIX_REGEX	/* ? */
++# define HAS_POSIX_REGEX	/* ? */
++#endif
++
 +#ifdef __NetBSD__
 +# define HAS_FCNTL_LOCK
 +# define HAS_GETTIMEOFDAY
@@ -32,8 +55,6 @@ $NetBSD: patch-ac,v 1.4 2004/08/23 15:18:02 tv Exp $
 +# define HAS_SNPRINTF
 +# define HAS_HARDLINKS
 +# define HAS_POSIX_REGEX
-+#endif
-+
+ #endif
+ 
  #ifdef ISC			/* ISC 3.x, GNU gcc, -DISC necessary */
- # define HAS_FCNTL_LOCK
- # define HAS_GETTIMEOFDAY
diff --git a/comms/fidogate/patches/patch-at b/comms/fidogate/patches/patch-at
new file mode 100644
index 00000000000..cfff8d062c9
--- /dev/null
+++ b/comms/fidogate/patches/patch-at
@@ -0,0 +1,18 @@
+$NetBSD: patch-at,v 1.5 2005/12/19 15:10:18 joerg Exp $
+
+--- src/include/declare.h.orig	2005-12-19 14:46:39.000000000 +0000
++++ src/include/declare.h
+@@ -31,13 +31,6 @@
+  *****************************************************************************/
+ 
+ 
+-/*
+- * errno might not be declared extern in errno.h
+- */
+-extern int errno;
+-
+-
+-
+ #ifdef __sun__ /**************************************************************/
+ # ifndef __svr4__
+ /*
diff --git a/comms/fidogate/patches/patch-aw b/comms/fidogate/patches/patch-aw
new file mode 100644
index 00000000000..d933678a537
--- /dev/null
+++ b/comms/fidogate/patches/patch-aw
@@ -0,0 +1,27 @@
+$NetBSD: patch-aw,v 1.1 2005/12/19 15:10:18 joerg Exp $
+
+--- src/toss/dbz.c.orig	2005-12-19 15:00:58.000000000 +0000
++++ src/toss/dbz.c
+@@ -46,6 +46,8 @@ if the incore facility is used.
+  * NOBUFFER	do not buffer hash-table i/o, B News locking is defective
+  */
+ 
++#include <stdlib.h>
++
+ #ifdef FUNNYSEEKS
+ #include <unistd.h>
+ #else
+@@ -299,13 +301,6 @@ static int debug;			/* controlled by dbz
+ #define	DEBUG(args)	;
+ #endif
+ 
+-/* externals used */
+-extern char *malloc();
+-extern char *calloc();
+-extern void free();		/* ANSI C; some old implementations say int */
+-extern int atoi();
+-extern long atol();
+-
+ /* misc. forwards */
+ static long hash();
+ static void crcinit();