3 files changed, 35 insertions, 4 deletions
diff --git a/chat/bitchx/patches/patch-ao b/chat/bitchx/patches/patch-ao
index 8da6258268c..a57b96a5ed8 100644
--- a/chat/bitchx/patches/patch-ao
+++ b/chat/bitchx/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.2 2005/11/08 16:16:55 joerg Exp $
+$NetBSD: patch-ao,v 1.3 2007/03/17 13:25:46 rillig Exp $
 
---- source/term.c.orig	2005-11-06 17:14:05.000000000 +0000
-+++ source/term.c
+--- source/term.c.orig	2007-03-17 14:16:38.000000000 +0100
++++ source/term.c	2007-03-17 14:18:28.000000000 +0100
 @@ -92,7 +92,10 @@ extern	int		tgetflag();
  #endif
  
  extern  char    *getenv();
 +
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
++#if !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__NetBSD__)
  extern	char	*tparm();
 +#endif
  
diff --git a/chat/bitchx/patches/patch-ap b/chat/bitchx/patches/patch-ap
new file mode 100644
index 00000000000..3060bb72a93
--- /dev/null
+++ b/chat/bitchx/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1 2007/03/17 13:25:46 rillig Exp $
+
+gcc4 complains:
+error: static declaration of 'ctcp_type' follows non-static declaration
+
+--- source/ctcp.c.orig	2003-05-27 09:00:22.000000000 +0200
++++ source/ctcp.c	2007-03-17 14:12:31.000000000 +0100
+@@ -176,7 +176,7 @@ CtcpEntryDll *dll_ctcp = NULL;
+ 
+ /* CDE do ops and unban logging */
+ 
+-static char	*ctcp_type[] =
++char	*ctcp_type[] =
+ {
+ 	"PRIVMSG",
+ 	"NOTICE"
diff --git a/chat/bitchx/patches/patch-aq b/chat/bitchx/patches/patch-aq
new file mode 100644
index 00000000000..4b0f0971930
--- /dev/null
+++ b/chat/bitchx/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.1 2007/03/17 13:25:46 rillig Exp $
+
+PendingTimers is only used in timer.c, so there is no need for an
+"extern" declaration.
+
+--- include/struct.h.orig	2003-04-11 03:09:07.000000000 +0200
++++ include/struct.h	2007-03-17 14:20:26.000000000 +0100
+@@ -1064,7 +1064,6 @@ struct	timeval	time;
+ 	int	delete;
+ }	TimerList;
+ 
+-extern TimerList *PendingTimers;
+ typedef struct nicktab_stru
+ {
+ 	struct nicktab_stru *next;