Fix errno, don't add more #if cancer.

10 files changed, 192 insertions, 1 deletions

diff --git a/chat/tirc/distinfo b/chat/tirc/distinfo
index 9d97b3029e6..539dd0f894f 100644
--- a/chat/tirc/distinfo
+++ b/chat/tirc/distinfo
@@ -1,5 +1,14 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 15:59:13 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/15 23:02:33 joerg Exp $
 
 SHA1 (tirc-1.2.tar.gz) = eae51ae46282943a3c1a3aa134aaec9455e0f65b
 RMD160 (tirc-1.2.tar.gz) = 31ad3e1796e28a5cbadb1ff30c4753a72775968e
 Size (tirc-1.2.tar.gz) = 300089 bytes
+SHA1 (patch-aa) = e47e007f827c3453e9a3944ede6b2aba4ae6b9ed
+SHA1 (patch-ab) = 012837ad61d2790fb00f8c621da10e912029bb86
+SHA1 (patch-ac) = 048f33969cca99f80e9f63401dab95ca1ee247bf
+SHA1 (patch-ad) = 9cfae360117275d08df46468308d895f353cbf83
+SHA1 (patch-ae) = ab0a0da6a47ffc12ac81bce0aa45c20f05372a46
+SHA1 (patch-af) = 649f4b57ff56bc297f33a0511c6b11bb0016ef73
+SHA1 (patch-ag) = 34cfac73b5438ff108f96e57a4196994d50e0a23
+SHA1 (patch-ah) = dd9c67e8a51d63b7efa98d8addd6ccd320b7b87e
+SHA1 (patch-ai) = 117f8de13192e4123df68860d817a366d6395e76
diff --git a/chat/tirc/patches/patch-aa b/chat/tirc/patches/patch-aa
new file mode 100644
index 00000000000..59a76db0ec4
--- /dev/null
+++ b/chat/tirc/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- main.c.orig	2005-12-15 22:49:50.000000000 +0000
++++ main.c
+@@ -63,6 +63,7 @@ static char rcsid[] = "$Old: main.c,v 1.
+ #ifdef	HAVE_CTYPE_H
+ #include <ctype.h>
+ #endif
++#include <errno.h>
+ 
+ #include "compat.h"
+ #include "tty.h"
+@@ -80,7 +81,6 @@ void		sigtstp __P((int));
+ void		sigchld __P((int));
+ void		sigalrm __P((int));
+ 
+-extern int	errno;
+ extern int	on_irc;
+ extern int	restart_irc;
+ extern char	ppre[], version[];
diff --git a/chat/tirc/patches/patch-ab b/chat/tirc/patches/patch-ab
new file mode 100644
index 00000000000..60986786bc8
--- /dev/null
+++ b/chat/tirc/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- ircx.c.orig	2005-12-15 22:52:05.000000000 +0000
++++ ircx.c
+@@ -30,6 +30,7 @@ static char rcsid[] = "$Id: ircx.c,v 1.4
+ #ifdef	HAVE_CTYPE_H
+ #include <ctype.h>
+ #endif
++#include <errno.h>
+ 
+ #include "compat.h"
+ #include "tty.h"
+@@ -74,7 +75,6 @@ extern struct channel *cha;
+ extern char	ppre[], *our_address;
+ extern int	sock;
+ extern void	(*othercmd) __P((char *));
+-extern int	errno;
+ extern int	is_away;
+ 
+ struct i_entry	*i_first;
diff --git a/chat/tirc/patches/patch-ac b/chat/tirc/patches/patch-ac
new file mode 100644
index 00000000000..02360208ce7
--- /dev/null
+++ b/chat/tirc/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- cmd.c.orig	2005-12-15 22:52:43.000000000 +0000
++++ cmd.c
+@@ -14,6 +14,7 @@ static char rcsid[] = "$Id: cmd.c,v 1.65
+ 
+ #include "tirc.h"
+ 
++#include <errno.h>
+ #ifdef	HAVE_CTYPE_H
+ #include <ctype.h>
+ #endif
+@@ -118,7 +119,6 @@ extern char	ppre[], nick[];
+ extern int	sock, debugwin;
+ extern int	on_irc;
+ extern FILE	*lastlog;
+-extern int	errno;
+ 
+ struct cmdtbl {
+ 	const char	*c_name;
diff --git a/chat/tirc/patches/patch-ad b/chat/tirc/patches/patch-ad
new file mode 100644
index 00000000000..cfa3bd45e5a
--- /dev/null
+++ b/chat/tirc/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- screen.c.orig	2005-12-15 22:53:30.000000000 +0000
++++ screen.c
+@@ -36,6 +36,7 @@ static char rcsid[] = "$Id: screen.c,v 1
+ #elif defined(HAVE_LIBGEN_H)
+ #include <libgen.h>
+ #endif
++#include <errno.h>
+ 
+ #include "compat.h"
+ #include "tty.h"
+@@ -109,7 +110,6 @@ extern char	*myname, nick[], *srvnm;
+ extern void	(*othercmd) __P((char *));
+ extern int	on_irc;
+ extern int	umd;
+-extern int	errno;
+ extern int	is_away;
+ 
+ char		*prompt;
diff --git a/chat/tirc/patches/patch-ae b/chat/tirc/patches/patch-ae
new file mode 100644
index 00000000000..05188ed3eb4
--- /dev/null
+++ b/chat/tirc/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- tty.c.orig	2005-12-15 22:54:31.000000000 +0000
++++ tty.c
+@@ -35,6 +35,7 @@ static char rcsid[] = "$Id: tty.c,v 1.33
+ #ifdef	HAVE_CTYPE_H
+ #include <ctype.h>
+ #endif
++#include <errno.h>
+ 
+ #if defined(HAVE_TCGETATTR) && defined(HAVE_TCSETATTR) && \
+     (defined(HAVE_TERMIOS_H) || defined(HAVE_SYS_TERMIOS_H))
+@@ -54,8 +55,6 @@ static char rcsid[] = "$Id: tty.c,v 1.33
+ static void	regaddln __P((struct tty_region *, char *));
+ static int	tty_putch __P((int));
+ 
+-extern int	errno;
+-
+ static enum { STATE_RESET, STATE_RAW, STATE_CBREAK }
+ 		ttystate = STATE_RESET;
+ #ifdef	USE_TERMIOS
diff --git a/chat/tirc/patches/patch-af b/chat/tirc/patches/patch-af
new file mode 100644
index 00000000000..7a551bfe18d
--- /dev/null
+++ b/chat/tirc/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- system.c.orig	2005-12-15 22:54:59.000000000 +0000
++++ system.c
+@@ -22,6 +22,7 @@ static char rcsid[] = "$Id: system.c,v 1
+ #ifdef	HAVE_SIGNAL_H
+ #include <signal.h>
+ #endif
++#include <errno.h>
+ 
+ #include "compat.h"
+ #include "tty.h"
+@@ -33,7 +34,6 @@ struct pmsg_entry {
+ 	TAILQ_ENTRY(pmsg_entry) pme_entries;
+ };
+ 
+-extern int	errno;
+ extern char	ppre[];
+ 
+ int	syspipe;
diff --git a/chat/tirc/patches/patch-ag b/chat/tirc/patches/patch-ag
new file mode 100644
index 00000000000..79458720ccf
--- /dev/null
+++ b/chat/tirc/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- dcc.c.orig	2005-12-15 22:55:23.000000000 +0000
++++ dcc.c
+@@ -70,6 +70,7 @@ static char rcsid[] = "$Id: dcc.c,v 1.43
+ #ifdef	HAVE_CTYPE_H
+ #include <ctype.h>
+ #endif
++#include <errno.h>
+ 
+ #define	CHLD_WAIT4KILL	{ pause(); _exit(1); }
+ #define TIMESTAMP	(is_away || check_conf(CONF_STAMP)) ? timestamp() : ""
+@@ -128,7 +129,6 @@ static void	dcc_age __P((void));
+ static int	dcc_shmprobe __P((void));
+ 
+ extern char	ppre[], **argv0;
+-extern int	errno;
+ extern int	is_away;
+ extern FILE	*lastlog;
+ extern char	lastmsg[MSGNAMEHIST][NICKSZ+2];
diff --git a/chat/tirc/patches/patch-ah b/chat/tirc/patches/patch-ah
new file mode 100644
index 00000000000..d7f3fc166d8
--- /dev/null
+++ b/chat/tirc/patches/patch-ah
@@ -0,0 +1,21 @@
+$NetBSD: patch-ah,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- shm.c.orig	2005-12-15 22:55:48.000000000 +0000
++++ shm.c
+@@ -60,6 +60,8 @@ static char rcsid[] = "$Id: shm.c,v 1.18
+ #endif
+ #endif	/* HAVE_SVIPC_SHM */
+ 
++#include <errno.h>
++
+ #include "compat.h"
+ #include "colour.h"
+ 
+@@ -89,7 +91,6 @@ union overhead {
+ 
+ #define	MAGIC	0xef	/* magic # on accounting info */
+ 
+-extern int	errno;
+ extern char	*myname;	/* in main.c */
+ 
+ static void	morecore __P((int));
diff --git a/chat/tirc/patches/patch-ai b/chat/tirc/patches/patch-ai
new file mode 100644
index 00000000000..eceb72b0f8e
--- /dev/null
+++ b/chat/tirc/patches/patch-ai
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1 2005/12/15 23:02:33 joerg Exp $
+
+--- url.c.orig	2005-12-15 22:56:16.000000000 +0000
++++ url.c
+@@ -25,6 +25,7 @@ static char rcsid[] = "$Id: url.c,v 1.14
+ #ifdef	HAVE_CTYPE_H
+ #include <ctype.h>
+ #endif
++#include <errno.h>
+ 
+ #include "compat.h"
+ #include "tty.h"
+@@ -33,7 +34,6 @@ static char rcsid[] = "$Id: url.c,v 1.14
+ 
+ extern char     ppre[];
+ extern void     (*othercmd) __P((char *));
+-extern int      errno;
+ 
+ static void	done_urlfn __P((char *));
+