Always include sys/types.h, it is needed on !NetBSD as well.

Use dirent.h instead of sys/dir.h, the former is POSIX and the latter
gives a warning on DragonFly, which breaks -Werror.
Use NAME_MAX if available, fall back to MAXNAMLEN otherwise.

6 files changed, 88 insertions, 22 deletions

diff --git a/chat/i2cb/distinfo b/chat/i2cb/distinfo
index 83a0baa61d8..3340db62461 100644
--- a/chat/i2cb/distinfo
+++ b/chat/i2cb/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 15:59:11 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/12/13 21:30:11 joerg Exp $
 
 SHA1 (i2cb-6.0_ALPHA.tar.gz) = 6d2ddd234403fe33426ece3fd4de4104cf1a6257
 RMD160 (i2cb-6.0_ALPHA.tar.gz) = 2c0683c20939fe5709fa08b6e335cbee2574ecd8
 Size (i2cb-6.0_ALPHA.tar.gz) = 73607 bytes
 SHA1 (patch-aa) = ede7c2087324f0a79cfb4146926661fecc6af550
 SHA1 (patch-ab) = 358b366c16290d6d2326e72c281f977e49a8a98b
-SHA1 (patch-ac) = 4dc5be4a2c05f453369c4bb56cd1aeb81636904e
-SHA1 (patch-ad) = 609b2e5cf6118fbc36818a392866bc7fafc59abc
+SHA1 (patch-ac) = aa39fd72a66b1c5b3e0e19c4d6b279bc5a076816
+SHA1 (patch-ad) = 9dcb98fe3543d8e4a7b2af338606db8ffe271f56
 SHA1 (patch-ae) = 0f8765883c2b7e77394556405ee7fee7a054ad56
 SHA1 (patch-af) = 779ecab95384f8fa24000c90f6671317d6276c83
-SHA1 (patch-ag) = e2bf71557fa486371e0d26ff8d5716ae0924a498
+SHA1 (patch-ag) = 5f78d326406e98d912acd0388d0bb98d2d4bd459
 SHA1 (patch-ah) = 1785c0f09a7a0f83b7cb886e9e749959b1753972
 SHA1 (patch-ai) = f2b83d20f6357dd6cb3e468b573c46d6123cae39
 SHA1 (patch-aj) = 710c961ce5f88d7462154e42ed4aab3b4ba56b38
@@ -21,7 +21,8 @@ SHA1 (patch-ao) = 73d6915d68bd02fbfc0e481f42f4626bbce18882
 SHA1 (patch-ap) = f04fea14ab6a07095f6b2f95c693988563aa4f3a
 SHA1 (patch-aq) = f07edc14636f1321f8c0b5c98e4962f3bfb1eee5
 SHA1 (patch-ar) = 9fea79c9d7f701962e40f1b311c38b538029e633
-SHA1 (patch-as) = 67627f9beb5336fa5859aa150bb44fc7b3e5c6cf
+SHA1 (patch-as) = 36130a528b6b1c2fa98bc6402d2d65bb8d55e459
 SHA1 (patch-at) = a3b7923523347da20ac763c96b6dfbfeb13e296d
 SHA1 (patch-au) = 591bae1fcfe43ba86ec29c5ca53322bad5b572e7
 SHA1 (patch-av) = 3ebe9872953147e9694f36e76584482167d2f34a
+SHA1 (patch-aw) = 88d0cdbb02b1f43b16c001925573c547c016b743
diff --git a/chat/i2cb/patches/patch-ac b/chat/i2cb/patches/patch-ac
index aecca1dccb8..5d2de78c4ec 100644
--- a/chat/i2cb/patches/patch-ac
+++ b/chat/i2cb/patches/patch-ac
@@ -1,19 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2004/04/13 21:19:48 hubertf Exp $
+$NetBSD: patch-ac,v 1.3 2005/12/13 21:30:11 joerg Exp $
 
---- src/externs.h.orig	Wed Mar 15 23:28:13 2000
+--- src/externs.h.orig	2000-03-15 22:28:13.000000000 +0000
 +++ src/externs.h
-@@ -1,6 +1,10 @@
+@@ -1,6 +1,8 @@
  /* Copyright (c) 1989 by Carrick Sean Casey. All rights reserved. */
  /* For copying and distribution information, see the file "copyright.h." */
  
-+#ifdef __NetBSD__
 +#include <sys/types.h>		/* for time_t etc. */
-+#endif
 +
  /* external definitions for "icb" global variables */
  
  /* defined in port.c */
-@@ -25,6 +29,7 @@ extern char *mygroup;		/* requested grou
+@@ -25,6 +27,7 @@ extern char *mygroup;		/* requested grou
  extern char *myserver;		/* server name */
  extern char *myhost;		/* server host */
  extern int myport;		/* server port */
@@ -21,7 +19,7 @@ $NetBSD: patch-ac,v 1.2 2004/04/13 21:19:48 hubertf Exp $
  extern char *mbuf;		/* message buffer */
  extern char *mbuf2;		/* message buffer */
  extern int connected;		/* whether we are validated or not */
-@@ -69,7 +74,7 @@ void	clearargs (int argc, char **argv);
+@@ -69,7 +72,7 @@ void	clearargs (int argc, char **argv);
  int	clientserve (void);
  void	closesessionlog (void);
  void	cmdoutmsg (char *pkt);
diff --git a/chat/i2cb/patches/patch-ad b/chat/i2cb/patches/patch-ad
index 6d0a15c4ec7..b171cda31c3 100644
--- a/chat/i2cb/patches/patch-ad
+++ b/chat/i2cb/patches/patch-ad
@@ -1,14 +1,12 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/11/14 00:55:44 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2005/12/13 21:30:11 joerg Exp $
 
---- src/ipcf.h.orig	Wed Mar 15 23:13:28 2000
+--- src/ipcf.h.orig	2000-03-15 22:13:28.000000000 +0000
 +++ src/ipcf.h
-@@ -1,6 +1,10 @@
+@@ -1,6 +1,8 @@
  /* Copyright (c) 1988 Carrick Sean Casey. All rights reserved. */
  /* For copying and distribution information, see the file "copyright.h." */
  
-+#ifdef __NetBSD__
 +#include <sys/types.h>		/* fd_set etc. */
-+#endif
 +
  #define USER_BUF_SIZE	1024
  
diff --git a/chat/i2cb/patches/patch-ag b/chat/i2cb/patches/patch-ag
index d843af4c51a..88c39ea384a 100644
--- a/chat/i2cb/patches/patch-ag
+++ b/chat/i2cb/patches/patch-ag
@@ -1,13 +1,44 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/11/14 00:55:44 hubertf Exp $
+$NetBSD: patch-ag,v 1.2 2005/12/13 21:30:11 joerg Exp $
 
---- src/tcl.c.orig	Wed Mar 15 23:28:26 2000
+--- src/tcl.c.orig	2000-03-15 22:28:26.000000000 +0000
 +++ src/tcl.c
-@@ -92,7 +92,7 @@
+@@ -5,9 +5,11 @@
+ 
+ #include "icb.h"
+ #include "externs.h"
+-#include <sys/dir.h>
++#include <sys/types.h>
++#include <dirent.h>
+ #include <sys/file.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <unistd.h>
+ 
+ void	tclinit (void);
+@@ -72,7 +74,11 @@ void
+ tclreadicbrc (void)
+ {
+ 	char *path;
++#ifdef NAME_MAX
++	char cmd[NAME_MAX + 10];
++#else
+ 	char cmd[MAXNAMLEN+10];
++#endif
+ 	
+ 	if (!(path = getrcname())) return;
+ 
+@@ -92,9 +98,13 @@ tclreadicbrc (void)
  static char *
  getrcname (void)
  {
 -	static char *names[] = { ".icbrc", ".fnrc", ".tclrc" , (char *)NULL };
 +	static char *names[] = { ".i2cbrc", ".icbrc", ".fnrc", ".tclrc" , (char *)NULL };
  	char *rcfile, *homedir, **p;
++#ifdef NAME_MAX
++	static char rcpath[NAME_MAX + 1];
++#else
  	static char rcpath[MAXNAMLEN+1];	/* path of startup file */
++#endif
  
+ 	/* get name of file to use */
+ 	if (((rcfile = getenv("ICBRC")) != NULL)
diff --git a/chat/i2cb/patches/patch-as b/chat/i2cb/patches/patch-as
index cef57c0d68f..ba0aa20aa65 100644
--- a/chat/i2cb/patches/patch-as
+++ b/chat/i2cb/patches/patch-as
@@ -1,7 +1,19 @@
-$NetBSD: patch-as,v 1.1 2004/04/13 21:19:48 hubertf Exp $
+$NetBSD: patch-as,v 1.2 2005/12/13 21:30:11 joerg Exp $
 
---- src/main.c.orig	Wed Mar 15 23:13:28 2000
+--- src/main.c.orig	2000-03-15 22:13:28.000000000 +0000
 +++ src/main.c
+@@ -2,9 +2,9 @@
+ /* Portions copyright (c) 1990-1993, 1994 Mark J. Reed */
+ /* For copying and distribution information, see the file COPYING. */
+ 
+-
++#include <sys/types.h>
+ #include <sys/wait.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include <string.h>
 @@ -19,6 +19,7 @@ static void	usage (char *name, int ret);
  
  char *optv[] = { "clear", "list", "who", "restricted", "nickname:", "group:",
diff --git a/chat/i2cb/patches/patch-aw b/chat/i2cb/patches/patch-aw
new file mode 100644
index 00000000000..1c619d064be
--- /dev/null
+++ b/chat/i2cb/patches/patch-aw
@@ -0,0 +1,26 @@
+$NetBSD: patch-aw,v 1.1 2005/12/13 21:30:11 joerg Exp $
+
+--- src/unix.c.orig	2005-12-13 17:46:52.000000000 +0000
++++ src/unix.c
+@@ -10,7 +10,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <pwd.h>
+-#include <sys/dir.h>
++#include <dirent.h>
++#include <limits.h>
+ #include <time.h>
+ #include <unistd.h>
+ #include "icb.h"
+@@ -235,7 +236,11 @@ tildexpand (char *s)
+ 	struct passwd *pw;
+ 	char login[17];
+ 	char *p = login;
++#ifdef NAME_MAX
++	static char path[NAME_MAX + 1];
++#else
+ 	static char path[MAXNAMLEN+1];
++#endif
+ 
+ 	/* has to start with a tilde */
+ 	if (*s++ != '~')