Added some patches that are needed to compile on NetBSD-1.6.2/i386.

5 files changed, 78 insertions, 1 deletions

diff --git a/chat/ircu/distinfo b/chat/ircu/distinfo
index 41ca0aed7db..0bac1e40dc5 100644
--- a/chat/ircu/distinfo
+++ b/chat/ircu/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 15:59:12 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/05/12 08:32:51 rillig Exp $
 
 SHA1 (ircu2.10.11.07.tar.gz) = 1e1518cbbdf096aaaabf5f56a1ec266769d847ad
 RMD160 (ircu2.10.11.07.tar.gz) = 359f92bb7a4464baf9af571865ee4bf9fbe56426
 Size (ircu2.10.11.07.tar.gz) = 844971 bytes
 SHA1 (patch-af) = da533f03542c268c9e3502278f51777c3b85824d
 SHA1 (patch-ag) = f34df6342c8e26b4cdf59e56c893b4845f7d3974
+SHA1 (patch-ah) = 4a90f7c547d87fe757e4e36dcc23d923a466158c
+SHA1 (patch-ai) = 83119426e72a4833460bced3cd11bf47829e8992
+SHA1 (patch-aj) = ac16fd3e8a4c6d7da7e6f5383c746a9cfc2674ea
+SHA1 (patch-ak) = dec69de5c6b678cb5736173cccc34907d16b1ab8
diff --git a/chat/ircu/patches/patch-ah b/chat/ircu/patches/patch-ah
new file mode 100644
index 00000000000..f4cf84a82f5
--- /dev/null
+++ b/chat/ircu/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2005/05/12 08:32:51 rillig Exp $
+
+Strip debugging CFLAGS correctly. Has been reported upstream.
+
+--- configure.orig	Sat Sep 18 04:17:45 2004
++++ configure	Thu May 12 09:56:30 2005
+@@ -2370,7 +2370,7 @@ if test x"$CFLAGS" != x; then
+ fi
+ if test x"$CFLAGS" != x; then
+     unet_old_cflags=$CFLAGS
+-    CFLAGS=`echo "$CFLAGS" | sed -e 's/-g//g'`
++    CFLAGS=`echo "$CFLAGS" | sed -e 's/-g.*//g'`
+ fi
+ if test x"$CFLAGS" != x"$unet_old_cflags"; then
+     # If -g was already there, force symbols to be enabled
diff --git a/chat/ircu/patches/patch-ai b/chat/ircu/patches/patch-ai
new file mode 100644
index 00000000000..8cc1425938e
--- /dev/null
+++ b/chat/ircu/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 2005/05/12 08:32:51 rillig Exp $
+
+These macros hide the crypt(3) function on NetBSD.
+
+--- ircd/ircd_xopen.c.orig	Sat Apr 21 23:49:12 2001
++++ ircd/ircd_xopen.c	Thu May 12 10:17:41 2005
+@@ -20,8 +20,10 @@
+  */
+ #include "config.h"
+ 
++#ifndef __NetBSD__
+ #define _XOPEN_SOURCE
+ #define _XOPEN_VERSION 4
++#endif
+ #include "ircd_xopen.h"
+ 
+ #include <assert.h>
diff --git a/chat/ircu/patches/patch-aj b/chat/ircu/patches/patch-aj
new file mode 100644
index 00000000000..3ab208203d3
--- /dev/null
+++ b/chat/ircu/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2005/05/12 08:32:51 rillig Exp $
+
+These macros hide the crypt(3) function.
+
+--- tools/mkpasswd.c.orig	Fri Apr  7 16:53:35 2000
++++ tools/mkpasswd.c	Sat Apr  9 00:53:30 2005
+@@ -2,9 +2,15 @@
+  * copyright 1991, all rights reserved.
+  * You can use this code as long as my name stays with it.
+  */
++#ifndef __NetBSD__
+ #define _XOPEN_SOURCE
+ #define _XOPEN_VERSION 4
+ #define _XOPEN_SOURCE_EXTENDED
++#endif
++
++#ifdef __NetBSD__
++#include <pwd.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/chat/ircu/patches/patch-ak b/chat/ircu/patches/patch-ak
new file mode 100644
index 00000000000..7d9766749b7
--- /dev/null
+++ b/chat/ircu/patches/patch-ak
@@ -0,0 +1,19 @@
+$NetBSD: patch-ak,v 1.1 2005/05/12 08:32:51 rillig Exp $
+
+A va_list may be an array type which cannot be copied using plain ISO
+C90.
+
+--- ircd/ircd_log.c.orig	Sat Aug 24 18:08:48 2002
++++ ircd/ircd_log.c	Sat Apr  9 01:00:57 2005
+@@ -395,7 +395,11 @@ log_vwrite(enum LogSys subsys, enum LogL
+ 
+   /* Build the basic log string */
+   vd.vd_format = fmt;
++#ifdef va_copy
++  va_copy(vd.vd_args, vl);
++#else
+   vd.vd_args = vl;
++#endif
+ 
+   /* save the length for writev */
+   /* Log format: "SYSTEM [SEVERITY]: log message" */