Make this work with 64 bit hosts.

14 files changed, 359 insertions, 26 deletions

diff --git a/chat/icb/Makefile b/chat/icb/Makefile
index 8f4945a1b40..25da9838cff 100644
--- a/chat/icb/Makefile
+++ b/chat/icb/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2006/04/22 09:22:06 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/05/15 15:33:00 christos Exp $
 #
 
 # Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way
 #	older than this here. It's got no readline support, tcl, ... - HF
 DISTNAME=		icb-5.0.9
 PKGNAME=		icb-5.0.9pl1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/chat/icb/distinfo b/chat/icb/distinfo
index 9a0a5303388..a554cdbabee 100644
--- a/chat/icb/distinfo
+++ b/chat/icb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/05/15 15:33:00 christos Exp $
 
 SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8
 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf
@@ -9,14 +9,14 @@ SHA1 (patch-ac) = 87bc593c9678ca32d1d87d89ccd4c361bb1a8b53
 SHA1 (patch-ad) = 8724940ed0a768298948b183c5573f11b0b5be1f
 SHA1 (patch-ae) = 401d674f262576e5c1b40e3d612880cc264581d4
 SHA1 (patch-af) = faf546afead78974a338de4265dcb3d9eee5a3a9
-SHA1 (patch-ag) = 9e438a0a3911d08437feb6e4a08a7a8dd93bc461
-SHA1 (patch-ah) = c116aecd6f7337c7df89807a62857252847c4917
+SHA1 (patch-ag) = 59827ffff6cfc0c84747d4e90d372d9d27b1209e
+SHA1 (patch-ah) = 22736ecb95cde54ca690f3de476da7b6e1d87db9
 SHA1 (patch-ai) = 8a5ccf25d57ae8184aee9c35128f26a6a87535d5
 SHA1 (patch-aj) = cfbe4e58167d97d54410cf7e87e81d4c7d5cc487
 SHA1 (patch-ak) = 0bd3aa7b872ae1248586f8f2726b0c6a4bb0b462
 SHA1 (patch-al) = d61dcc6fda72137645a23ebeb2aef2e3bfa9a184
 SHA1 (patch-am) = dfe51f6c4116fafa087e068a1c1f7aee67b14fc7
-SHA1 (patch-an) = 4209e12166b3d6914a854faa4ce8fb9a51601bca
+SHA1 (patch-an) = 79952322d0cbc6b8ab829e11503a62045ceb1c66
 SHA1 (patch-ao) = 20e9511c9529cb1567feb639453d99293d8c0f6d
 SHA1 (patch-ap) = 26ad0ce069c32d80a1f81cbf1b9377c797bd9b75
 SHA1 (patch-aq) = f4f2029218f8c99f48b2df81ceb2d984498f9880
@@ -35,3 +35,12 @@ SHA1 (patch-bc) = f83b1cbbc32cfb1996aeed1cff355b6ffe86b629
 SHA1 (patch-bf) = e2d9d09928a0bfb54798355ea5b552ef095c133a
 SHA1 (patch-bg) = 47f6789704fe9efce584825f56cc18c1511f1dc0
 SHA1 (patch-bh) = 97764b5d7e48b56164bc92966cd557e9fe94189a
+SHA1 (patch-bi) = 319c4a7fdcb05a15eb310069fb7f940ea05147b4
+SHA1 (patch-bj) = b5c491ced075194d6bc828046875da1d98e7452a
+SHA1 (patch-bk) = c64208544c8de6be73cf1f60e3fcad1c27b21cd0
+SHA1 (patch-bl) = 0e91272ae71463aee4b462d33610a5ca4e2bdb6d
+SHA1 (patch-bm) = 450ec7695653d1b43eda76d848e7565e873e5d6a
+SHA1 (patch-bn) = 201e67181f4eb009f0717920396f6c7e71fe74a0
+SHA1 (patch-bo) = b15f98e783432098e9baa94cbbe80845ce3d767b
+SHA1 (patch-bp) = 756f78fd3cf9aafc37d676fef7b7f8baca4be4d3
+SHA1 (patch-bq) = fd2cdf919f7f62a53969d226e3465133d55e28cb
diff --git a/chat/icb/patches/patch-ag b/chat/icb/patches/patch-ag
index f601d78408f..461a46927a1 100644
--- a/chat/icb/patches/patch-ag
+++ b/chat/icb/patches/patch-ag
@@ -1,16 +1,17 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2006/05/15 15:33:00 christos Exp $
 
---- icb/print.c.orig	Fri Feb 24 22:20:25 1995
-+++ icb/print.c	Sat Nov 27 00:01:04 1999
-@@ -5,6 +5,7 @@
+--- icb/print.c.orig	1995-02-24 16:20:25.000000000 -0500
++++ icb/print.c	2006-05-15 10:51:05.000000000 -0400
+@@ -5,6 +5,8 @@
  
  #include "icb.h"
  #include "externs.h"
 +#include <time.h>
++#include <string.h>
  
  extern FILE *logfp;
  
-@@ -17,12 +18,22 @@
+@@ -17,16 +19,26 @@
  	char printbuf[1024];
  	char *p = printbuf;
  	char *t = s;
@@ -33,7 +34,12 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
  	if (flags & PL_SCR) {
  		/* if paging in effect, do paging */
  		if (gv.pagesize && (++linenumber >= gv.pagesize)) {
-@@ -35,6 +46,8 @@
+-			pauseprompt("[=More=]", 1, 0, 1, (int) " ");
++			pauseprompt("[=More=]", 1, 0, 1, " ");
+ 			linenumber = 0;
+ 		}
+ 
+@@ -35,6 +47,8 @@
  			*p++ = *t++;
  		*p++ = '\r';
  		*p++ = '\n';
@@ -42,3 +48,20 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
  		write(1, printbuf, p - printbuf);
  	}
  
+@@ -61,7 +75,7 @@
+ int Erase;
+ char c;
+ int unget;
+-int except;
++char *except;
+ {
+ 	char uc, *p;
+ 
+@@ -89,6 +103,6 @@
+ 
+ 	/* push character back onto stream if requested */
+ 	if (unget)
+-		if (!except || !index(except,uc))
++		if (!except || !strchr(except,uc))
+ 			pushback(uc);
+ }
diff --git a/chat/icb/patches/patch-ah b/chat/icb/patches/patch-ah
index d4389180b89..07ab040b197 100644
--- a/chat/icb/patches/patch-ah
+++ b/chat/icb/patches/patch-ah
@@ -1,8 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2006/05/15 15:33:00 christos Exp $
 
-diff -x *.orig -urN ./icb/protos.h /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/protos.h
---- ./icb/protos.h	Fri Feb 24 22:20:25 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/protos.h	Fri Nov 26 22:56:28 1999
+--- icb/protos.h.orig	1995-02-24 16:20:25.000000000 -0500
++++ icb/protos.h	2006-05-15 11:19:21.000000000 -0400
 @@ -64,7 +64,7 @@
  int inserttab(void);
  int ishushed(char *nick);
@@ -12,3 +11,35 @@ diff -x *.orig -urN ./icb/protos.h /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5
  int linebuffer(FILE *fp);
  #else
  int linebuffer(struct _iobuf *fp);
+@@ -78,7 +78,7 @@
+ int mprint(int per, char *from, char *s);
+ int numeric(char *txt);
+ int parse(char *s);
+-int pauseprompt(char *prompt, int erase, int c, int unget, int except);
++int pauseprompt(char *prompt, int erase, int c, int unget, char *except);
+ int printcutetime(void);
+ int printmilitarytime(void);
+ int printnormaltime(void);
+@@ -107,7 +107,7 @@
+ int split(char *s);
+ int startsessionlog(Tcl_Interp *interp, char *path);
+ int statusmsg(char *pkt);
+-int strcasecmp(char *s1, char *s2);
++int strcasecmp(const char *s1, const char *s2);
+ int strcicmp(char *s1, char *s2);
+ int strcincmp(char *s1, char *s2, int n);
+ int strlinkafter(STRLIST *s, STRLIST *i, STRLIST **head, STRLIST **tail);
+@@ -115,7 +115,7 @@
+ int strlinkbefore(STRLIST *s, STRLIST *i, STRLIST **head, STRLIST **tail);
+ int strlinkhead(STRLIST *s, STRLIST **head, STRLIST **tail);
+ int strlinktail(STRLIST *s, STRLIST **head, STRLIST **tail);
+-int strncasecmp(char *s1, char *s2, register int n);
++int strncasecmp(const char *s1, const char *s2, size_t n);
+ int strunlink(STRLIST *s, STRLIST **head, STRLIST **tail);
+ sighandler suspend();
+ int tclinit(void);
+@@ -140,3 +140,4 @@
+ struct server *getservbyname(char *name);
+ void listservers(void);
+ sighandler icbexit();
++char *basename(char *);
diff --git a/chat/icb/patches/patch-an b/chat/icb/patches/patch-an
index ef7b936e269..3f84aa85a2c 100644
--- a/chat/icb/patches/patch-an
+++ b/chat/icb/patches/patch-an
@@ -1,8 +1,15 @@
-$NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-an,v 1.3 2006/05/15 15:33:00 christos Exp $
 
---- readline/readline.c.orig	1995-02-24 21:20:03.000000000 +0000
-+++ readline/readline.c
-@@ -48,7 +48,11 @@ static char *xmalloc (), *xrealloc ();
+--- readline/readline.c.orig	1995-02-24 16:20:03.000000000 -0500
++++ readline/readline.c	2006-05-15 10:41:51.000000000 -0400
+@@ -43,12 +43,18 @@
+ #include <fcntl.h>
+ #include <sys/file.h>
+ #include <signal.h>
++#include <stdlib.h>
++#include <readline/readline.h>
+ 
+ #if defined (HAVE_UNISTD_H)
  #  include <unistd.h>
  #endif
  
@@ -14,7 +21,7 @@ $NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $
  #define HAVE_BSD_SIGNALS
  /* #define USE_XON_XOFF */
  
-@@ -80,6 +84,10 @@ static char *xmalloc (), *xrealloc ();
+@@ -80,6 +86,10 @@
  #  if !defined (O_NDELAY)
  #    define O_NDELAY O_NONBLOCK	/* Posix-style non-blocking i/o */
  #  endif /* O_NDELAY */
@@ -25,7 +32,7 @@ $NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $
  #endif /* _POSIX_VERSION */
  
  /* Other (BSD) machines use sgtty. */
-@@ -104,7 +112,6 @@ static char *xmalloc (), *xrealloc ();
+@@ -104,7 +114,6 @@
  #endif /* !NEW_TTY_DRIVER && !_POSIX_VDISABLE */
  
  #include <errno.h>
@@ -33,7 +40,7 @@ $NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $
  
  #include <setjmp.h>
  #if defined (SHELL)
-@@ -133,7 +140,7 @@ struct passwd *getpwuid (), *getpwent ()
+@@ -133,7 +142,7 @@
  #  endif /* USGr3 */
  #endif /* USG && hpux */
  
@@ -42,7 +49,7 @@ $NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $
  #  include <dirent.h>
  #  define direct dirent
  #  if defined (_POSIX_VERSION)
-@@ -280,7 +287,7 @@ static jmp_buf readline_top_level;
+@@ -280,7 +289,7 @@
  static FILE *in_stream, *out_stream;
  
  /* The names of the streams that we do input and output to. */
@@ -51,7 +58,7 @@ $NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $
  
  /* Non-zero means echo characters as they are read. */
  int readline_echoing_p = 1;
-@@ -1152,6 +1159,8 @@ readline_initialize_everything ()
+@@ -1152,6 +1161,8 @@
  {
    /* Find out if we are running in Emacs. */
    running_in_emacs = getenv ("EMACS");
@@ -60,7 +67,7 @@ $NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $
  
    /* Allocate data structures. */
    if (!rl_line_buffer)
-@@ -2505,7 +2514,11 @@ rl_prep_terminal ()
+@@ -2505,7 +2516,11 @@
  
    tio.c_lflag &= ~(ICANON | ECHO);
  
@@ -73,3 +80,41 @@ $NetBSD: patch-an,v 1.2 2005/12/14 13:53:24 joerg Exp $
      eof_char = otio.c_cc[VEOF];
  
  #if defined (USE_XON_XOFF)
+@@ -2637,7 +2652,7 @@
+     return (1);
+ 
+   if (allow_pathname_alphabetic_chars)
+-    return ((int)rindex (pathname_alphabetic_chars, c));
++    return (rindex (pathname_alphabetic_chars, c) != NULL);
+   else
+     return (0);
+ }
+@@ -3570,7 +3585,7 @@
+    If this function exists and returns NULL then call the value of
+    rl_completion_entry_function to try to match, otherwise use the
+    array of strings returned. */
+-Function *rl_attempted_completion_function = (Function *)NULL;
++CPPFunction *rl_attempted_completion_function = (CPPFunction *)NULL;
+ 
+ /* Local variable states what happened during the last completion attempt. */
+ static int completion_changed_buffer = 0;
+@@ -3706,8 +3721,7 @@
+      variable rl_attempted_completion_function. */
+   if (rl_attempted_completion_function)
+     {
+-      matches =
+-	(char **)(*rl_attempted_completion_function) (text, start, end);
++      matches = (*rl_attempted_completion_function) (text, start, end);
+ 
+       if (matches)
+ 	{
+@@ -3760,8 +3774,7 @@
+ 	  /* We have marked all the dead slots with (char *)-1.
+ 	     Copy all the non-dead entries into a new array. */
+ 	  {
+-	    char **temp_array =
+-	      (char **)malloc ((3 + newlen) * sizeof (char *));
++	    char **temp_array = malloc ((3 + newlen) * sizeof (char *));
+ 
+ 	    for (i = 1, j = 1; matches[i]; i++)
+ 	      {
diff --git a/chat/icb/patches/patch-bi b/chat/icb/patches/patch-bi
new file mode 100644
index 00000000000..a2341bd5147
--- /dev/null
+++ b/chat/icb/patches/patch-bi
@@ -0,0 +1,50 @@
+$NetBSD: patch-bi,v 1.1 2006/05/15 15:33:00 christos Exp $
+
+--- glob/tilde.c.orig	1995-02-24 16:20:46.000000000 -0500
++++ glob/tilde.c	2006-05-15 10:56:09.000000000 -0400
+@@ -28,12 +28,15 @@
+ #endif
+ 
+ #include <pwd.h>
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ #ifndef savestring
+ #define savestring(x) (char *)strcpy ((char *)xmalloc (1 + strlen (x)), (x))
+ #endif
+ 
+ typedef int Function ();
++typedef char *CPFunction ();
+ #if !defined (NULL)
+ #  define NULL 0x0
+ #endif
+@@ -41,7 +44,7 @@
+ #if defined (TEST)
+ static char *xmalloc (), *xrealloc ();
+ #else
+-extern char *malloc (), *xrealloc ();
++extern char *xmalloc (), *xrealloc ();
+ #endif /* TEST */
+ 
+ /* The default value of tilde_additional_prefixes.  This is set to
+@@ -60,7 +63,7 @@
+    standard meaning for expanding a tilde fails.  The function is called
+    with the text (sans tilde, as in "foo"), and returns a malloc()'ed string
+    which is the expansion, or a NULL pointer if there is no expansion. */
+-Function *tilde_expansion_failure_hook = (Function *)NULL;
++CPFunction *tilde_expansion_failure_hook = (CPFunction *)NULL;
+ 
+ /* When non-null, this is a NULL terminated array of strings which
+    are duplicates for a tilde prefix.  Bash uses this to expand
+@@ -207,9 +210,9 @@
+       if (!dirname[1] || dirname[1] == '/')
+ 	{
+ 	  /* Prepend $HOME to the rest of the string. */
+-	  char *temp_home = (char *)getenv ("HOME");
++	  char *temp_home = getenv ("HOME");
+ 
+-	  temp_name = (char *)alloca (1 + strlen (&dirname[1])
++	  temp_name = alloca (1 + strlen (&dirname[1])
+ 				      + (temp_home? strlen (temp_home) : 0));
+ 	  temp_name[0] = '\0';
+ 	  if (temp_home)
diff --git a/chat/icb/patches/patch-bj b/chat/icb/patches/patch-bj
new file mode 100644
index 00000000000..53b6947fe2a
--- /dev/null
+++ b/chat/icb/patches/patch-bj
@@ -0,0 +1,22 @@
+$NetBSD: patch-bj,v 1.1 2006/05/15 15:33:00 christos Exp $
+
+--- icb/getswitch.c.orig	1995-02-24 16:20:22.000000000 -0500
++++ icb/getswitch.c	2006-05-15 10:58:13.000000000 -0400
+@@ -1,6 +1,8 @@
+ #include <stdio.h>
+ #include <strings.h>
+ #include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ /* getswitch - parse multicharacter option arguments.
+  */
+@@ -43,7 +45,7 @@
+ 	if (thisswitch != retswitch)
+ 		free(thisswitch);
+ 
+-	thisswitch = (char *)malloc(strlen(*switchv)+1);
++	thisswitch = malloc(strlen(*switchv)+1);
+ 	strcpy(thisswitch, *switchv);
+ 	length = strlen(arg);
+ 
diff --git a/chat/icb/patches/patch-bk b/chat/icb/patches/patch-bk
new file mode 100644
index 00000000000..49fd87170f2
--- /dev/null
+++ b/chat/icb/patches/patch-bk
@@ -0,0 +1,27 @@
+$NetBSD: patch-bk,v 1.1 2006/05/15 15:33:00 christos Exp $
+
+--- icb/readlineinit.c.orig	1995-02-24 16:20:25.000000000 -0500
++++ icb/readlineinit.c	2006-05-15 10:47:05.000000000 -0400
+@@ -1,4 +1,6 @@
+ #include <readline.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include "icb.h"
+ #include "externs.h"
+ 
+@@ -21,12 +23,12 @@
+ rl_vi_editing_mode(); /* default to vi, dammit. */
+ gv.editmode = "vi";
+ 
+-editor = (char *)getenv("EDITOR");
++editor = getenv("EDITOR");
+ if (!editor)
+-	editor = (char *)getenv("VISUAL");
++	editor = getenv("VISUAL");
+ 
+ if (editor != NULL)
+-   if (strcmp((char *)basename(editor),"emacs")==0)
++   if (strcmp(basename(editor),"emacs")==0)
+    {
+ 	rl_emacs_editing_mode();
+ 	gv.editmode = "emacs";
diff --git a/chat/icb/patches/patch-bl b/chat/icb/patches/patch-bl
new file mode 100644
index 00000000000..e8851019e58
--- /dev/null
+++ b/chat/icb/patches/patch-bl
@@ -0,0 +1,22 @@
+$NetBSD: patch-bl,v 1.1 2006/05/15 15:33:00 christos Exp $
+
+--- icb/register.c.orig	1995-02-24 16:20:26.000000000 -0500
++++ icb/register.c	2006-05-15 10:58:41.000000000 -0400
+@@ -5,6 +5,8 @@
+ 
+ #include "icb.h"
+ #include "externs.h"
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ void
+ regnick(password)
+@@ -13,7 +15,7 @@
+ 	char message[256];
+ 
+ 	if (!password)
+-		password = (char *)getpass("Password:");
++		password = getpass("Password:");
+ 	
+ 	sprintf(message,"p %s", password);
+ 	sendpersonal("server",message,-1);
diff --git a/chat/icb/patches/patch-bm b/chat/icb/patches/patch-bm
new file mode 100644
index 00000000000..6352381f64a
--- /dev/null
+++ b/chat/icb/patches/patch-bm
@@ -0,0 +1,22 @@
+$NetBSD: patch-bm,v 1.1 2006/05/15 15:33:00 christos Exp $ 
+
+--- icb/s_bump.c.orig	1995-02-24 16:20:27.000000000 -0500
++++ icb/s_bump.c	2006-05-15 10:59:10.000000000 -0400
+@@ -6,6 +6,8 @@
+ 
+ #include "icb.h"
+ #include "externs.h"
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ s_bump(TARGLIST)
+ TARGDEFS
+@@ -22,7 +24,7 @@
+ 	if (argc > 2)
+ 		password = argv[2];
+ 	else
+-		password = (char *) getpass ("Enter password:");
++		password = getpass ("Enter password:");
+ 
+ 	sprintf(message,"bump %s %s", nick, password);
+ 	sendpersonal("server",message,-1);
diff --git a/chat/icb/patches/patch-bn b/chat/icb/patches/patch-bn
new file mode 100644
index 00000000000..018847f2b83
--- /dev/null
+++ b/chat/icb/patches/patch-bn
@@ -0,0 +1,22 @@
+$NetBSD: patch-bn,v 1.1 2006/05/15 15:33:00 christos Exp $
+
+--- icb/s_chpw.c.orig	1995-02-24 16:20:27.000000000 -0500
++++ icb/s_chpw.c	2006-05-15 11:00:08.000000000 -0400
+@@ -6,6 +6,8 @@
+ 
+ #include "icb.h"
+ #include "externs.h"
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ s_chpw(TARGLIST)
+ TARGDEFS
+@@ -21,7 +23,7 @@
+ 	if (argc > 1 && argv[1][0])
+ 		strcpy(old, argv[1]);
+ 	else
+-		strcpy(old, (char *) getpass ("Enter old password:"));
++		strcpy(old, getpass ("Enter old password:"));
+ 
+ 	if (argc > 2)
+ 		strcpy(new1, argv[2]);
diff --git a/chat/icb/patches/patch-bo b/chat/icb/patches/patch-bo
new file mode 100644
index 00000000000..9e65d9beb3c
--- /dev/null
+++ b/chat/icb/patches/patch-bo
@@ -0,0 +1,13 @@
+$NetBSD: patch-bo,v 1.1 2006/05/15 15:33:00 christos Exp $
+
+--- malloc/xmalloc.c.orig	1995-02-24 16:20:43.000000000 -0500
++++ malloc/xmalloc.c	2006-05-15 10:52:52.000000000 -0400
+@@ -20,6 +20,8 @@
+    Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ static void memory_error_and_abort ();
+ 
diff --git a/chat/icb/patches/patch-bp b/chat/icb/patches/patch-bp
new file mode 100644
index 00000000000..88044b3cb87
--- /dev/null
+++ b/chat/icb/patches/patch-bp
@@ -0,0 +1,25 @@
+$NetBSD: patch-bp,v 1.1 2006/05/15 15:33:00 christos Exp $
+
+--- readline/readline.h.orig	1995-02-24 16:20:03.000000000 -0500
++++ readline/readline.h	2006-05-15 10:46:09.000000000 -0400
+@@ -7,9 +7,10 @@
+ #include <stdio.h>
+ 
+ #if !defined (__FUNCTION_DEF)
+-typedef int Function ();
++typedef int Function (const char *);
+ #define __FUNCTION_DEF
+ #endif /* __FUNCTION_DEF */
++typedef char **CPPFunction(const char *, int, int);
+ 
+ /* The functions for manipulating the text of the line within readline.
+ Most of these functions are bound to keys by default. */
+@@ -141,7 +142,7 @@
+    If this function exists and returns NULL then call the value of
+    rl_completion_entry_function to try to match, otherwise use the
+    array of strings returned. */
+-extern Function *rl_attempted_completion_function;
++extern CPPFunction *rl_attempted_completion_function;
+ 
+ /* If non-zero, then this is the address of a function to call just
+    before readline_internal () prints the first prompt. */
diff --git a/chat/icb/patches/patch-bq b/chat/icb/patches/patch-bq
new file mode 100644
index 00000000000..ad888507db6
--- /dev/null
+++ b/chat/icb/patches/patch-bq
@@ -0,0 +1,22 @@
+$NetBSD: patch-bq,v 1.1 2006/05/15 15:33:00 christos Exp $
+
+--- tcl/tclBasic.c.orig	1995-02-24 16:19:53.000000000 -0500
++++ tcl/tclBasic.c	2006-05-15 11:12:41.000000000 -0400
+@@ -656,7 +656,7 @@
+ 			length = strlen(iPtr->result);
+ 			if ((limit - dst) < length) {
+ 			    char *newCopy;
+-			    int delta;
++			    long delta;
+ 
+ 			    copySize = length + 10 + dst - copy;
+ 			    newCopy = (char *) malloc((unsigned) copySize);
+@@ -869,7 +869,7 @@
+     
+ 	    if (dst >= limit) {
+ 		char *newCopy;
+-		int delta;
++		long delta;
+     
+ 		copySize *= 2;
+ 		newCopy = (char *) malloc((unsigned) copySize);