Fixed the build on NetBSD with gcc4.

5 files changed, 41 insertions, 8 deletions

diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index 2f2d8ab705b..ddd84875ab3 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/01/05 19:56:38 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2007/03/17 13:25:46 rillig Exp $
 
 DISTNAME=	ircii-pana-1.1-final
 PKGNAME=	bitchx-1.1
@@ -26,9 +26,9 @@ CFLAGS+=	-DBIND_8_COMPAT
 .endif
 
 SUBST_CLASSES+=		manpage
+SUBST_STAGE.manpage=	post-patch
 SUBST_FILES.manpage+=	doc/BitchX.1
 SUBST_SED.manpage+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.manpage+=	post-patch
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/chat/bitchx/distinfo b/chat/bitchx/distinfo
index 2013c2135b1..72c30856553 100644
--- a/chat/bitchx/distinfo
+++ b/chat/bitchx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/11/08 16:16:55 joerg Exp $
+$NetBSD: distinfo,v 1.15 2007/03/17 13:25:46 rillig Exp $
 
 SHA1 (ircii-pana-1.1-final.tar.gz) = b25635b62c7ff905b6492a4aaa88c43b5aa164f8
 RMD160 (ircii-pana-1.1-final.tar.gz) = 4105de2587964146e2391a26a8a16e3d0059a93f
@@ -10,4 +10,6 @@ SHA1 (patch-ad) = ba00fb80b1b980a32b70d84e4ca4db91e9fd5538
 SHA1 (patch-ae) = 90c7e0a19c81e710392c675be650c57e64ee65b3
 SHA1 (patch-af) = c79fcbcc57b8234d5918b1414219965b75e3c0d1
 SHA1 (patch-an) = 59a6dc31a90b88bbffac5bb4629feaa2488afeff
-SHA1 (patch-ao) = a3ee3362835c8f04467a41d3beeb05023347df5a
+SHA1 (patch-ao) = ce6d8d68f39c54e5f174d294b0a72432b95fe89b
+SHA1 (patch-ap) = 7cc6162de323bf07e52cbad7d4b4b54ac01d105e
+SHA1 (patch-aq) = 97387bc2f7059f1a864f47ecd611ce62e13cb969
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;