make this work on 64 bit platforms:

- fix warnings for missing prototypes
- use termios instead of sgtty (why doesn't this work on amd64?)

45 files changed, 1176 insertions, 1029 deletions

diff --git a/chat/icb/Makefile b/chat/icb/Makefile
index 08aff3c8c24..346b01d1f22 100644
--- a/chat/icb/Makefile
+++ b/chat/icb/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2008/03/02 07:06:20 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/12/17 02:19:59 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=		4
+PKGREVISION=		5
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/chat/icb/distinfo b/chat/icb/distinfo
index a554cdbabee..a4cdea92bb7 100644
--- a/chat/icb/distinfo
+++ b/chat/icb/distinfo
@@ -1,46 +1,47 @@
-$NetBSD: distinfo,v 1.10 2006/05/15 15:33:00 christos Exp $
+$NetBSD: distinfo,v 1.11 2008/12/17 02:19:59 christos Exp $
 
 SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8
 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf
 Size (icb-5.0.9.tar.gz) = 357565 bytes
-SHA1 (patch-aa) = 1790a2c85ec28fc6b741d56299dc287c29f6bf90
-SHA1 (patch-ab) = 6a5970e1443834e9370c29ace56811f0ba35fa4e
-SHA1 (patch-ac) = 87bc593c9678ca32d1d87d89ccd4c361bb1a8b53
-SHA1 (patch-ad) = 8724940ed0a768298948b183c5573f11b0b5be1f
-SHA1 (patch-ae) = 401d674f262576e5c1b40e3d612880cc264581d4
-SHA1 (patch-af) = faf546afead78974a338de4265dcb3d9eee5a3a9
-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) = 79952322d0cbc6b8ab829e11503a62045ceb1c66
-SHA1 (patch-ao) = 20e9511c9529cb1567feb639453d99293d8c0f6d
-SHA1 (patch-ap) = 26ad0ce069c32d80a1f81cbf1b9377c797bd9b75
-SHA1 (patch-aq) = f4f2029218f8c99f48b2df81ceb2d984498f9880
-SHA1 (patch-ar) = 013c19ac1746e0af1a11cbc9161a38640fc2c990
-SHA1 (patch-as) = 237e3df93eb0cd81eca818643fc58d568663258b
-SHA1 (patch-at) = d7b82512d54459d413ddc9144e7cf30db334a270
-SHA1 (patch-au) = 79c096d9ab536850179359bd31d32b6df36fff2b
-SHA1 (patch-av) = 00ebe9b96ab57e181adca3e3aa69a7b24037b03e
-SHA1 (patch-aw) = 34dd91b715209345f109133455f7192cd6259d16
-SHA1 (patch-ax) = b86f65e2faa2dab36e022120f97d33ae18144726
-SHA1 (patch-ay) = df4e003467106afcdafad53e4c8affa493af10ca
-SHA1 (patch-az) = 6a31269f11b08aa08c0650bce8e62a6364663b3a
-SHA1 (patch-ba) = 85744afd9a01d3d97395fe46a26d6f7a46fe46ec
-SHA1 (patch-bb) = 6067445ad48d3a6089f133ae9641fb59241f395f
-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
+SHA1 (patch-aa) = b82fb642c79a200aaa47b0db397c82f19fb7f9ff
+SHA1 (patch-ab) = a68cfdec69b17ca8200b8ab7245acb693265dc2b
+SHA1 (patch-ac) = f090233dccd3f42f9176a6c0d21469bea03bfcc9
+SHA1 (patch-ad) = b64e9ca73b5e56122cb82363ee9c765457bde5ca
+SHA1 (patch-ae) = c98d058cfe6177fb4807104695f96c774b11d177
+SHA1 (patch-af) = b16cdbbd6d4a5489b19bb3339b6cd8d95b5395d9
+SHA1 (patch-ag) = d9d1a36a381829b4a5593d666185f79722a33697
+SHA1 (patch-ah) = 464f3a3de74f049187d8e6702c6e060b4fe03146
+SHA1 (patch-ai) = 11322bc2753dd6921272b2e64554349bb7aa6c5c
+SHA1 (patch-aj) = 1ba8c916513b449bede0330026b9f844d03d9a2f
+SHA1 (patch-ak) = 8e363cc6c5647c064d56ec75b8b627d7d9a07a72
+SHA1 (patch-al) = c2bbd85884e8a9f4acd53a2441281e92baecac25
+SHA1 (patch-am) = 58ce219463d2cdb0306a664b383015096938e6d6
+SHA1 (patch-an) = d66e16511fbfe4f51ba2f7f77a4a67087470342a
+SHA1 (patch-ao) = a798b898e3527f7a4458c6e278e86ef69bb38a53
+SHA1 (patch-ap) = 794d608ac548bc1b5c83b7bf967ed43e5cee65be
+SHA1 (patch-aq) = 78b772a2f6ec27a782b1681a61a2329992dcc741
+SHA1 (patch-ar) = 7fa954914f8c0fdad4f610f37dd81129ec57bc14
+SHA1 (patch-as) = 5c42bfdc2e836fb86e814c396760040560864256
+SHA1 (patch-at) = 703abcc2415b92776241011fe893286de06da034
+SHA1 (patch-au) = 35db5c53aed27f3a73977098b89cf4273e801a22
+SHA1 (patch-av) = ee5d630cf578dcf8150486526b9b96214a06997e
+SHA1 (patch-aw) = 6dbc66a63f52244ac9b8b29346cb376b98442695
+SHA1 (patch-ax) = 9dbc788c08357e2207f08290a014267f306ead76
+SHA1 (patch-ay) = f8a787d5a6611890d65fa8b0411977fd5c0bc7e9
+SHA1 (patch-az) = 6d8a12c0309678e854253d1256b86851f9ed2b4e
+SHA1 (patch-ba) = b85f00aea832da4d9f730b5295f943264550a7ab
+SHA1 (patch-bb) = 64cebf4a262c31850bc1658e3a3c8841baadc37c
+SHA1 (patch-bc) = 88dd502d44f708c81a2f54953c17b5cca18d59c7
+SHA1 (patch-bd) = f4ed0e007c5971d8c01e1c1cfebfd32adb24a746
+SHA1 (patch-be) = 862df6c2de3a26c8a8b761b122ddea73fdf8d910
+SHA1 (patch-bf) = 4e65811b06f100659c83a3c6a95fa0ba5732f991
+SHA1 (patch-bg) = 51cc10151b658ec094e4cceb67e11993533cb7ca
+SHA1 (patch-bh) = 5e24c606b9ee9656b15d66a4611d732b563cc831
+SHA1 (patch-bi) = cc92516799335123f6ac0d37380a428e9a88063d
+SHA1 (patch-bj) = 082e74059e3c2f91f5a56b5d100e4cdedd00340f
+SHA1 (patch-bk) = caab3a28f9e05f7e3321d5b56ad3dd47ee3e3b40
+SHA1 (patch-bl) = cef6d92a02bb6080a9121f2ecbd36c4b15777a68
+SHA1 (patch-bm) = 1171ce0885693b198d8d7ad8960c55dec4604aa0
+SHA1 (patch-bn) = 57972d7c9712755833dc97559edded528e38aa97
+SHA1 (patch-bo) = c04e9b0103b03559896de098a4beea7c3f5c311d
+SHA1 (patch-bp) = f79cfc4a9bd18397611e3dd46b4b85675054da6c
diff --git a/chat/icb/patches/patch-aa b/chat/icb/patches/patch-aa
index dfcc5b80026..5c826b9a221 100644
--- a/chat/icb/patches/patch-aa
+++ b/chat/icb/patches/patch-aa
@@ -1,43 +1,51 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/15 00:36:37 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- icb/c_log.c.orig	Fri Feb 24 22:20:18 1995
-+++ icb/c_log.c	Fri Jul 21 02:08:35 2000
-@@ -6,6 +6,7 @@
- #include "icb.h"
- #include "externs.h"
- #include <time.h>
-+#include <errno.h>
+--- glob/tilde.c.orig	1995-02-24 16:20:46.000000000 -0500
++++ glob/tilde.c	2008-12-16 20:35:03.000000000 -0500
+@@ -28,12 +28,16 @@
+ #endif
  
- FILE *logfp = NULL;
+ #include <pwd.h>
++#include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
  
-@@ -45,8 +46,6 @@
- 	time_t time();
- 	struct tm *t, *localtime();
- 	time_t clock;
--	extern int errno, sys_nerr;
--	extern char *sys_errlist[];
+ #ifndef savestring
+ #define savestring(x) (char *)strcpy ((char *)xmalloc (1 + strlen (x)), (x))
+ #endif
  
- 	/* determine pathname to use */
- 	if (path == NULL || *path == '\0')
-@@ -97,8 +96,8 @@
- 		aptr++;
- 	
- 	/* timestamp it */
--	sprintf(mbuf, "Session log \"%s\" started at %d/%02d/%-2d %s.",
--	  path, t->tm_mon+1, t->tm_mday, t->tm_year, aptr);
-+	sprintf(mbuf, "Session log \"%s\" started at %d/%02d/%-4d %s.",
-+	  path, t->tm_mon+1, t->tm_mday, 1900+t->tm_year, aptr);
- 	putl(mbuf, PL_SCR | PL_LOG);
+ typedef int Function ();
++typedef char *CPFunction ();
+ #if !defined (NULL)
+ #  define NULL 0x0
+ #endif
+@@ -41,7 +45,7 @@
+ #if defined (TEST)
+ static char *xmalloc (), *xrealloc ();
+ #else
+-extern char *malloc (), *xrealloc ();
++extern char *xmalloc (), *xrealloc ();
+ #endif /* TEST */
  
- 	return(0);
-@@ -126,8 +125,8 @@
- 		aptr++;
- 	
- 	/* timestamp it */
--	sprintf(mbuf, "Session log closed at %d/%02d/%-2d %s.",
--	  t->tm_mon+1, t->tm_mday, t->tm_year, aptr);
-+	sprintf(mbuf, "Session log closed at %d/%02d/%-4d %s.",
-+	  t->tm_mon+1, t->tm_mday, 1900+t->tm_year, aptr);
- 	putl(mbuf, PL_SCR | PL_LOG);
+ /* The default value of tilde_additional_prefixes.  This is set to
+@@ -60,7 +64,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;
  
- 	/* close it */
+ /* 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 +211,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-ab b/chat/icb/patches/patch-ab
index b9c2492ed00..c6aa6086c54 100644
--- a/chat/icb/patches/patch-ab
+++ b/chat/icb/patches/patch-ab
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/15 00:36:37 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./icb/c_shell.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/c_shell.c
---- ./icb/c_shell.c	Fri Feb 24 22:20:19 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/c_shell.c	Fri Nov 26 22:56:29 1999
-@@ -14,7 +14,7 @@
- 	static char *usage = "usage: c_shell [command]";
- 	int w, pid;
- 	int shellout = 0;
--	union wait status;
-+	int status;
- 	char *shell, *getenv();
- 	
- 	/* disallow use if restricted mode set */
+--- tcl/tclGlob.c.orig	2008-12-16 20:18:00.000000000 -0500
++++ tcl/tclGlob.c	2008-12-16 20:18:01.000000000 -0500
+@@ -40,8 +40,6 @@
+  * grows dynamically to be as big as needed.
+  */
+ 
+-extern int errno;
+-
+ typedef struct {
+     char *result;		/* Pointer to result area. */
+     int totalSpace;		/* Total number of characters allocated
diff --git a/chat/icb/patches/patch-ac b/chat/icb/patches/patch-ac
index b3fe11d3780..a7e9b370664 100644
--- a/chat/icb/patches/patch-ac
+++ b/chat/icb/patches/patch-ac
@@ -1,13 +1,43 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./icb/globals.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/globals.c
---- ./icb/globals.c	Fri Feb 24 22:20:22 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/globals.c	Fri Nov 26 22:56:30 1999
-@@ -59,6 +59,7 @@
- 	1,		/* beeps */
- 	"vi",		/* editmode */
- 	0,		/* tabreply */
-+	0,		/* printtime */
- 	1, 		/* cute */
- 	0,		/* autodel */
- 	"",		/* personalto */
+--- icb/c_log.c.orig	1995-02-24 16:20:18.000000000 -0500
++++ icb/c_log.c	2008-12-16 20:17:59.000000000 -0500
+@@ -6,6 +6,7 @@
+ #include "icb.h"
+ #include "externs.h"
+ #include <time.h>
++#include <errno.h>
+ 
+ FILE *logfp = NULL;
+ 
+@@ -45,8 +46,6 @@
+ 	time_t time();
+ 	struct tm *t, *localtime();
+ 	time_t clock;
+-	extern int errno, sys_nerr;
+-	extern char *sys_errlist[];
+ 
+ 	/* determine pathname to use */
+ 	if (path == NULL || *path == '\0')
+@@ -97,8 +96,8 @@
+ 		aptr++;
+ 	
+ 	/* timestamp it */
+-	sprintf(mbuf, "Session log \"%s\" started at %d/%02d/%-2d %s.",
+-	  path, t->tm_mon+1, t->tm_mday, t->tm_year, aptr);
++	sprintf(mbuf, "Session log \"%s\" started at %d/%02d/%-4d %s.",
++	  path, t->tm_mon+1, t->tm_mday, 1900+t->tm_year, aptr);
+ 	putl(mbuf, PL_SCR | PL_LOG);
+ 
+ 	return(0);
+@@ -126,8 +125,8 @@
+ 		aptr++;
+ 	
+ 	/* timestamp it */
+-	sprintf(mbuf, "Session log closed at %d/%02d/%-2d %s.",
+-	  t->tm_mon+1, t->tm_mday, t->tm_year, aptr);
++	sprintf(mbuf, "Session log closed at %d/%02d/%-4d %s.",
++	  t->tm_mon+1, t->tm_mday, 1900+t->tm_year, aptr);
+ 	putl(mbuf, PL_SCR | PL_LOG);
+ 
+ 	/* close it */
diff --git a/chat/icb/patches/patch-ad b/chat/icb/patches/patch-ad
index e0cf1ac21a3..39fd5a20f4a 100644
--- a/chat/icb/patches/patch-ad
+++ b/chat/icb/patches/patch-ad
@@ -1,17 +1,21 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./icb/helpdata.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/helpdata.c
---- ./icb/helpdata.c	Fri Feb 24 22:20:23 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/helpdata.c	Fri Nov 26 22:56:30 1999
-@@ -600,6 +600,11 @@
- "    waiting for your screen, this gives you a chance to see the output",
- "    of your command.",
- "",
-+"printtime       (boolean)               default: false",
-+"",
-+"    Print the current time in front of every line sent to the display",
-+"    and log file.",
-+"",
- "restricted      (boolean)               default: false",
- "",
- "    Restricted shuts off the ability to run subshell commands or to",
+--- icb/c_shell.c.orig	1995-02-24 16:20:19.000000000 -0500
++++ icb/c_shell.c	2008-12-16 20:21:00.000000000 -0500
+@@ -5,6 +5,7 @@
+ 
+ #include "icb.h"
+ #include "externs.h"
++#include <unistd.h>
+ #include <sys/wait.h>
+ #include <signal.h>
+ 
+@@ -14,7 +15,7 @@
+ 	static char *usage = "usage: c_shell [command]";
+ 	int w, pid;
+ 	int shellout = 0;
+-	union wait status;
++	int status;
+ 	char *shell, *getenv();
+ 	
+ 	/* disallow use if restricted mode set */
diff --git a/chat/icb/patches/patch-ae b/chat/icb/patches/patch-ae
index 59df9a33c8c..36771ff24d1 100644
--- a/chat/icb/patches/patch-ae
+++ b/chat/icb/patches/patch-ae
@@ -1,27 +1,22 @@
-$NetBSD: patch-ae,v 1.3 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-ae,v 1.4 2008/12/17 02:19:59 christos Exp $
 
---- icb/icb.h.orig	1995-02-24 21:20:23.000000000 +0000
-+++ icb/icb.h
-@@ -4,13 +4,12 @@
- #include "../protocol.h"
- #include "../tcl/tcl.h"
+--- icb/getswitch.c.orig	1995-02-24 16:20:22.000000000 -0500
++++ icb/getswitch.c	2008-12-16 20:18:01.000000000 -0500
+@@ -1,6 +1,8 @@
  #include <stdio.h>
+ #include <strings.h>
+ #include <string.h>
 +#include <stdlib.h>
- #include <sys/param.h>
- #ifdef NEED_CTYPE
- #include <ctype.h>
- #endif
++#include <unistd.h>
  
--char *malloc();
--
- /* command usage information */
+ /* 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);
  
- typedef struct Usage {
-@@ -38,6 +37,7 @@ typedef struct {
- 	int beeps;		/* whether beeps are audible */
- 	char *editmode;		/* input editing mode */
- 	int tabreply;		/* should replies go into the tab history? */
-+	int printtime;		/* print timestamp in front of every msg? */
- 	int cute;		/* cute messages when a blank line is entered */
- 	int autodel;		/* automatically delete nicks from the tab
- 			        history that produce a "not logged on" error */
diff --git a/chat/icb/patches/patch-af b/chat/icb/patches/patch-af
index c8436c1c860..6e6bc094c67 100644
--- a/chat/icb/patches/patch-af
+++ b/chat/icb/patches/patch-af
@@ -1,21 +1,12 @@
-$NetBSD: patch-af,v 1.2 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-af,v 1.3 2008/12/17 02:19:59 christos Exp $
 
---- icb/oset.c.orig	1995-02-24 21:20:24.000000000 +0000
-+++ icb/oset.c
-@@ -39,6 +39,7 @@ VARIABLE vars[] = {
- 	{ "pagesize",	V_INT,		(char *)&gv.pagesize },
- 	{ "pauseonshell",	V_BOOLEAN,	(char *)&gv.pauseonshell },
- 	{ "personalto", V_STRING,	(char *)&gv.personalto },
-+	{ "printtime",	V_BOOLEAN,	(char *)&gv.printtime },
- 	{ "restricted",	V_BOOLEAN,	(char *)&gv.restricted },
- 	{ "tabreply",	V_BOOLEAN,	(char *)&gv.tabreply },
- 	{ "timedisplay",	V_STRING,	(char *)&gv.timedisplay },
-@@ -140,7 +141,7 @@ char *s;
- {
- 	int zero = 0, one = 1;
- 	int tmp;
--	char *p, *malloc();
-+	char *p;
- 
- 	switch(type) {
- 	case V_CHAR:
+--- icb/globals.c.orig	1995-02-24 16:20:22.000000000 -0500
++++ icb/globals.c	2008-12-16 20:17:59.000000000 -0500
+@@ -59,6 +59,7 @@
+ 	1,		/* beeps */
+ 	"vi",		/* editmode */
+ 	0,		/* tabreply */
++	0,		/* printtime */
+ 	1, 		/* cute */
+ 	0,		/* autodel */
+ 	"",		/* personalto */
diff --git a/chat/icb/patches/patch-ag b/chat/icb/patches/patch-ag
index 461a46927a1..b116cbbd2d9 100644
--- a/chat/icb/patches/patch-ag
+++ b/chat/icb/patches/patch-ag
@@ -1,67 +1,16 @@
-$NetBSD: patch-ag,v 1.2 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-ag,v 1.3 2008/12/17 02:19:59 christos Exp $
 
---- 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,16 +19,26 @@
- 	char printbuf[1024];
- 	char *p = printbuf;
- 	char *t = s;
-+	struct tm *tm, *localtime();
-+	char timestamp[9];
- 
- 	if (continued) {
- 		linenumber = 0;
- 		continued = 0;
- 	}
- 
-+	/* If requested, prepare timestamp */
-+	if (gv.printtime) {
-+		gettime();
-+		tm = localtime(&curtime);
-+		snprintf(timestamp, sizeof(timestamp), "[%02d:%02d] ",
-+		 	tm->tm_hour, tm->tm_min);
-+	}
-+
- 	if (flags & PL_SCR) {
- 		/* if paging in effect, do paging */
- 		if (gv.pagesize && (++linenumber >= gv.pagesize)) {
--			pauseprompt("[=More=]", 1, 0, 1, (int) " ");
-+			pauseprompt("[=More=]", 1, 0, 1, " ");
- 			linenumber = 0;
- 		}
- 
-@@ -35,6 +47,8 @@
- 			*p++ = *t++;
- 		*p++ = '\r';
- 		*p++ = '\n';
-+		if (gv.printtime)
-+			write(1, timestamp, 8);
- 		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);
- }
+--- icb/helpdata.c.orig	1995-02-24 16:20:23.000000000 -0500
++++ icb/helpdata.c	2008-12-16 20:17:59.000000000 -0500
+@@ -600,6 +600,11 @@
+ "    waiting for your screen, this gives you a chance to see the output",
+ "    of your command.",
+ "",
++"printtime       (boolean)               default: false",
++"",
++"    Print the current time in front of every line sent to the display",
++"    and log file.",
++"",
+ "restricted      (boolean)               default: false",
+ "",
+ "    Restricted shuts off the ability to run subshell commands or to",
diff --git a/chat/icb/patches/patch-ah b/chat/icb/patches/patch-ah
index 07ab040b197..19cf1a7c92e 100644
--- a/chat/icb/patches/patch-ah
+++ b/chat/icb/patches/patch-ah
@@ -1,45 +1,12 @@
-$NetBSD: patch-ah,v 1.2 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-ah,v 1.3 2008/12/17 02:19:59 christos Exp $
 
---- 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);
- int lcaseit(char *s);
--#ifdef linux
-+#if defined(linux) || (defined(BSD) && BSD >= 199306)
- 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 *);
+--- icb/history.c.orig	1995-02-24 16:20:23.000000000 -0500
++++ icb/history.c	2008-12-16 20:18:00.000000000 -0500
+@@ -19,7 +19,6 @@
+ histput(nick)
+ char *nick;
+ {
+-	char *malloc();
+ 	STRLIST *sp;
+ 
+ 	/* hunt for user within list */
diff --git a/chat/icb/patches/patch-ai b/chat/icb/patches/patch-ai
index 1a22ea1a202..e7ef001673e 100644
--- a/chat/icb/patches/patch-ai
+++ b/chat/icb/patches/patch-ai
@@ -1,54 +1,28 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./icb/serverlist.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/serverlist.c
---- ./icb/serverlist.c	Fri Feb 24 22:20:29 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/serverlist.c	Fri Nov 26 22:56:29 1999
-@@ -1,4 +1,6 @@
+--- icb/icb.h.orig	1995-02-24 16:20:23.000000000 -0500
++++ icb/icb.h	2008-12-16 20:20:23.000000000 -0500
+@@ -4,13 +4,13 @@
+ #include "../protocol.h"
+ #include "../tcl/tcl.h"
  #include <stdio.h>
++#include <string.h>
 +#include <stdlib.h>
-+#include <pwd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "icb.h"
-@@ -14,15 +16,14 @@
- FILE *openserverfile()
- {
- 	struct stat statbuf;
--	char *personalsl;
--	char command[256];
--	char pwd[256];
-+	char *personalsl, *home;
-+	char pwd[MAXPATHLEN+1];
- 	FILE *ret;
- 
- #ifdef sgi
- #undef SYSV
- #endif
--#ifndef SYSV
-+#if !defined(SYSV) && !(defined(BSD) && BSD >= 199306) && !defined(__linux__)
- 	getwd(pwd);
- #else /* SYSV */
- 	getcwd(pwd, MAXPATHLEN+1);
-@@ -30,11 +31,20 @@
- #ifdef sgi
- #define SYSV
+ #include <sys/param.h>
+ #ifdef NEED_CTYPE
+ #include <ctype.h>
  #endif
--	chdir(getenv("HOME"));
-+	if ((home = getenv("HOME")) == NULL) {
-+		struct passwd *pw;
-+		if ((pw = getpwuid(getuid())) == NULL)
-+			home = ".";
-+		home = pw->pw_dir;
-+	}
-+	chdir(home);
- 	if (!stat(PERSONALSL,&statbuf))
- 	{
--		sprintf(command,"/bin/cat %s %s\n", PERSONALSL, SERVERLIST);
-+		char *command = malloc(strlen("/bin/cat  \n") +
-+			strlen(PERSONALSL) + strlen(SERVERLIST) + 1);
-+		sprintf(command, "/bin/cat %s %s\n", PERSONALSL, SERVERLIST);
- 		ret= popen(command,"r");
-+		free(command);
- 	}
- 	else
- 		ret= fopen(SERVERLIST,"r");
+ 
+-char *malloc();
+-
+ /* command usage information */
+ 
+ typedef struct Usage {
+@@ -38,6 +38,7 @@
+ 	int beeps;		/* whether beeps are audible */
+ 	char *editmode;		/* input editing mode */
+ 	int tabreply;		/* should replies go into the tab history? */
++	int printtime;		/* print timestamp in front of every msg? */
+ 	int cute;		/* cute messages when a blank line is entered */
+ 	int autodel;		/* automatically delete nicks from the tab
+ 			        history that produce a "not logged on" error */
diff --git a/chat/icb/patches/patch-aj b/chat/icb/patches/patch-aj
index 7998f8ce13a..c7a72a2e261 100644
--- a/chat/icb/patches/patch-aj
+++ b/chat/icb/patches/patch-aj
@@ -1,28 +1,21 @@
-$NetBSD: patch-aj,v 1.2 2003/11/13 20:59:53 tron Exp $
+$NetBSD: patch-aj,v 1.3 2008/12/17 02:19:59 christos Exp $
 
---- icb/strings.c.orig	1995-02-24 22:20:30.000000000 +0100
-+++ icb/strings.c	2003-11-13 21:57:35.000000000 +0100
-@@ -3,7 +3,6 @@
+--- icb/oset.c.orig	1995-02-24 16:20:24.000000000 -0500
++++ icb/oset.c	2008-12-16 20:18:00.000000000 -0500
+@@ -39,6 +39,7 @@
+ 	{ "pagesize",	V_INT,		(char *)&gv.pagesize },
+ 	{ "pauseonshell",	V_BOOLEAN,	(char *)&gv.pauseonshell },
+ 	{ "personalto", V_STRING,	(char *)&gv.personalto },
++	{ "printtime",	V_BOOLEAN,	(char *)&gv.printtime },
+ 	{ "restricted",	V_BOOLEAN,	(char *)&gv.restricted },
+ 	{ "tabreply",	V_BOOLEAN,	(char *)&gv.tabreply },
+ 	{ "timedisplay",	V_STRING,	(char *)&gv.timedisplay },
+@@ -140,7 +141,7 @@
+ {
+ 	int zero = 0, one = 1;
+ 	int tmp;
+-	char *p, *malloc();
++	char *p;
  
- #include "icb.h"
- #include "externs.h"
--#include <varargs.h>
- 
- extern char *charmap;
- 
-@@ -333,6 +332,7 @@
- /* cat multiple strings into one */
- /* call with strscat(dest, src, src, ...) */
- 
-+#if 0
- char *
- strscat(va_alist)
- va_dcl
-@@ -357,6 +357,7 @@
- 	*dest = '\0';
- 	return(dest);
- }
-+#endif
- 
- char *basename(path)
- char *path;
+ 	switch(type) {
+ 	case V_CHAR:
diff --git a/chat/icb/patches/patch-ak b/chat/icb/patches/patch-ak
index 608731f0ae3..91ef89801dc 100644
--- a/chat/icb/patches/patch-ak
+++ b/chat/icb/patches/patch-ak
@@ -1,59 +1,67 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./icb/unix.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/unix.c
---- ./icb/unix.c	Fri Feb 24 22:20:31 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/unix.c	Fri Nov 26 22:56:29 1999
-@@ -4,6 +4,8 @@
- /* This file contains routines that are unix dependent. */
- /* Eventually, most unixisms should be moved here. */
- 
-+#include <sys/types.h>
-+#include <sys/param.h>
- #include <stdio.h>
+--- icb/print.c.orig	1995-02-24 16:20:25.000000000 -0500
++++ icb/print.c	2008-12-16 20:18:00.000000000 -0500
+@@ -5,6 +5,8 @@
+ 
  #include "icb.h"
  #include "externs.h"
-@@ -13,6 +15,14 @@
- #undef stty
- #undef gtty
- 
-+#if defined(__linux__)
-+#include <termios.h>
-+#include <sys/ioctl.h>
-+#define TTYSTRUCT termios
-+#define stty(fd,buf) tcgetattr((fd), (buf))
-+#define gtty(fd,buf) tcsetattr((fd), TCSANOW, (buf))
-+#define SYSV
-+#else 
- #ifndef SYSV
- 
- #ifdef linux
-@@ -30,6 +40,7 @@
- #define stty(fd,buf) ioctl((fd),TCSETA,(buf))
- #define gtty(fd,buf) ioctl((fd),TCGETA,(buf))
- #endif /* SYSV */
-+#endif /* __linux__ */
- 
- char *getlogin();
- 
-@@ -49,8 +60,10 @@
- 	if (((loginid = getlogin()) == NULL) || *loginid == '\0')
- 		if ((pw = getpwuid(getuid())) == NULL)
- 			loginid = NULL;
--		else
--			loginid = pw->pw_name;
-+		else {
-+			loginid = malloc(strlen(pw->pw_name) + 1);
-+			strcpy(loginid, pw->pw_name);
-+		}
- 	return(loginid);
- }
++#include <time.h>
++#include <string.h>
+ 
+ extern FILE *logfp;
+ 
+@@ -17,16 +19,26 @@
+ 	char printbuf[1024];
+ 	char *p = printbuf;
+ 	char *t = s;
++	struct tm *tm, *localtime();
++	char timestamp[9];
  
-@@ -181,7 +194,7 @@
+ 	if (continued) {
+ 		linenumber = 0;
+ 		continued = 0;
+ 	}
  
- getwinsize()
++	/* If requested, prepare timestamp */
++	if (gv.printtime) {
++		gettime();
++		tm = localtime(&curtime);
++		snprintf(timestamp, sizeof(timestamp), "[%02d:%02d] ",
++		 	tm->tm_hour, tm->tm_min);
++	}
++
+ 	if (flags & PL_SCR) {
+ 		/* if paging in effect, do paging */
+ 		if (gv.pagesize && (++linenumber >= gv.pagesize)) {
+-			pauseprompt("[=More=]", 1, 0, 1, (int) " ");
++			pauseprompt("[=More=]", 1, 0, 1, " ");
+ 			linenumber = 0;
+ 		}
+ 
+@@ -35,6 +47,8 @@
+ 			*p++ = *t++;
+ 		*p++ = '\r';
+ 		*p++ = '\n';
++		if (gv.printtime)
++			write(1, timestamp, 8);
+ 		write(1, printbuf, p - printbuf);
+ 	}
+ 
+@@ -61,7 +75,7 @@
+ int Erase;
+ char c;
+ int unget;
+-int except;
++char *except;
  {
--#ifndef NOWINSIZE
-+#ifdef TIOCGWINSZ
- 	struct winsize win;
+ 	char uc, *p;
  
- 	/* get tty settings */
+@@ -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-al b/chat/icb/patches/patch-al
index 4b49c7b3ad2..70a43ccae0c 100644
--- a/chat/icb/patches/patch-al
+++ b/chat/icb/patches/patch-al
@@ -1,14 +1,45 @@
-$NetBSD: patch-al,v 1.1.1.1 2000/12/15 00:36:38 wiz Exp $
+$NetBSD: patch-al,v 1.2 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./murgil/getrname.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/murgil/getrname.c
---- ./murgil/getrname.c	Fri Feb 24 22:19:41 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/murgil/getrname.c	Fri Nov 26 22:56:29 1999
-@@ -14,7 +14,7 @@
- {
- 	static char rname[24];
- 	struct hostent *host;
--#if defined(linux)
-+#if defined(linux) || defined(__NetBSD__)
- #define PEER_CAST (struct sockaddr *)
- #define HOST_CAST (char *)
+--- icb/protos.h.orig	1995-02-24 16:20:25.000000000 -0500
++++ icb/protos.h	2008-12-16 20:18:00.000000000 -0500
+@@ -64,7 +64,7 @@
+ int inserttab(void);
+ int ishushed(char *nick);
+ int lcaseit(char *s);
+-#ifdef linux
++#if defined(linux) || (defined(BSD) && BSD >= 199306)
+ 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-am b/chat/icb/patches/patch-am
index db3ffd7f021..4c4609ded79 100644
--- a/chat/icb/patches/patch-am
+++ b/chat/icb/patches/patch-am
@@ -1,31 +1,27 @@
-$NetBSD: patch-am,v 1.2 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-am,v 1.3 2008/12/17 02:19:59 christos Exp $
 
---- murgil/serverserve.c.orig	1995-02-24 21:19:44.000000000 +0000
-+++ murgil/serverserve.c
-@@ -15,11 +15,13 @@
- #include "ipcf.h"
+--- icb/readlineinit.c.orig	1995-02-24 16:20:25.000000000 -0500
++++ icb/readlineinit.c	2008-12-16 20:18:01.000000000 -0500
+@@ -1,4 +1,6 @@
+ #include <readline.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include "icb.h"
  #include "externs.h"
-  
--extern int errno;
- fd_set fdr;	
- int timeisup;
  
- sighandler gotalarm();
-+#ifndef __FDS_BITS
-+# define __FDS_BITS(set) ((set)->fds_bits)
-+#endif
+@@ -21,12 +23,12 @@
+ rl_vi_editing_mode(); /* default to vi, dammit. */
+ gv.editmode = "vi";
  
- serverserve()
- {
-@@ -81,9 +83,9 @@ sdoinput()
+-editor = (char *)getenv("EDITOR");
++editor = getenv("EDITOR");
+ if (!editor)
+-	editor = (char *)getenv("VISUAL");
++	editor = getenv("VISUAL");
  
- 	/* examine set of file descriptors */
- 	for (b = 0, y = 0; b <= (howmany(highestfd, 32) - 1); b++, y += 32) {
--	    if (!fdr.fds_bits[b])
-+	    if (!__FDS_BITS(&fdr)[b])
- 		continue;
--	    bits = fdr.fds_bits[b];
-+	    bits = __FDS_BITS(&fdr)[b];
- 	    for (x = y; bits; x++, bits >>= 01)
- 		if (bits & 01)
- 			if (x == port_fd) {
+ 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-an b/chat/icb/patches/patch-an
index 3f84aa85a2c..9bc53d0991d 100644
--- a/chat/icb/patches/patch-an
+++ b/chat/icb/patches/patch-an
@@ -1,4 +1,6 @@
-$NetBSD: patch-an,v 1.3 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-an,v 1.4 2008/12/17 02:19:59 christos Exp $
+
+$NetBSD: patch-an,v 1.4 2008/12/17 02:19:59 christos Exp $
 
 --- readline/readline.c.orig	1995-02-24 16:20:03.000000000 -0500
 +++ readline/readline.c	2006-05-15 10:41:51.000000000 -0400
diff --git a/chat/icb/patches/patch-ao b/chat/icb/patches/patch-ao
index 7a7da2211ab..b2943a534f8 100644
--- a/chat/icb/patches/patch-ao
+++ b/chat/icb/patches/patch-ao
@@ -1,17 +1,22 @@
-$NetBSD: patch-ao,v 1.3 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-ao,v 1.4 2008/12/17 02:19:59 christos Exp $
 
---- tcl/strerror.c.orig	1995-02-24 21:19:50.000000000 +0000
-+++ tcl/strerror.c
-@@ -20,6 +20,7 @@ static char rcsid[] = "$Header: /home/ag
- #include <stdio.h>
- #include <string.h>
+--- icb/register.c.orig	1995-02-24 16:20:26.000000000 -0500
++++ icb/register.c	2008-12-16 20:18:01.000000000 -0500
+@@ -5,6 +5,8 @@
  
-+#if !defined(BSD4_4) && !defined(__linux__) && !defined(__APPLE__) && !defined(__DragonFly__)
- /*
-  * List of known errors:
-  */
-@@ -138,3 +139,4 @@ strerror(error)
-     (void) sprintf(defaultMsg, "unknown error (%d)", error);
-     return defaultMsg;
- }
-+#endif
+ #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-ap b/chat/icb/patches/patch-ap
index b702540d0ad..a0682086709 100644
--- a/chat/icb/patches/patch-ap
+++ b/chat/icb/patches/patch-ap
@@ -1,59 +1,22 @@
-$NetBSD: patch-ap,v 1.2 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-ap,v 1.3 2008/12/17 02:19:59 christos Exp $
 
---- tcl/tclCmdAH.c.orig	1995-02-24 21:19:53.000000000 +0000
-+++ tcl/tclCmdAH.c
-@@ -38,9 +38,21 @@ static char rcsid[] = "$Header: /home/ag
- #include <sys/wait.h>
- #include "tclInt.h"
+--- icb/s_bump.c.orig	1995-02-24 16:20:27.000000000 -0500
++++ icb/s_bump.c	2008-12-16 20:18:01.000000000 -0500
+@@ -6,6 +6,8 @@
  
--extern int errno;
-+#ifdef __NetBSD__
-+#define unix
-+#endif
-+
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
+ #include "icb.h"
+ #include "externs.h"
++#include <stdlib.h>
 +#include <unistd.h>
-+#endif
-+
-+#if !(defined(BSD) && BSD >= 199306)
- extern long lseek();
-+#endif
-+#ifndef BSD4_4
- extern char *mktemp();
-+#endif
- 
- /*
-  *----------------------------------------------------------------------
-@@ -430,7 +442,7 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
-     int pid = -1;			/* -1 means child process doesn't
- 					 * exist (yet).  Non-zero gives its
- 					 * id (0 only in child). */
--    union wait status;
-+    int status;
-     char *cmdName, *execName;
  
-     /*
-@@ -501,8 +513,13 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
-     } else {
- 	char tmp[sizeof(TMP_FILE_NAME) + 1];
- 	strcpy(tmp, TMP_FILE_NAME);
-+#ifdef BSD4_4
-+	mkstemp(tmp);
-+	stdIn[0] = mkstemp(tmp);
-+#else
- 	mktemp(tmp);
- 	stdIn[0] = open(tmp, O_RDWR|O_CREAT, 0);
-+#endif
- 	if (stdIn[0] < 0) {
- 	    sprintf(interp->result,
- 		    "couldn't create input file for \"%.50s\" command: %.50s",
-@@ -642,7 +659,7 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
- 	    sprintf(interp->result, "command terminated abnormally");
- 	    result = TCL_ERROR;
- 	}
--	result = status.w_retcode;
-+	result = WEXITSTATUS(status);
-     }
-     if (stdIn[0] != -1) {
- 	close(stdIn[0]);
+ 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-aq b/chat/icb/patches/patch-aq
index d6c4801fe3f..7c36bc1d280 100644
--- a/chat/icb/patches/patch-aq
+++ b/chat/icb/patches/patch-aq
@@ -1,34 +1,22 @@
-$NetBSD: patch-aq,v 1.2 2005/05/23 09:04:00 rillig Exp $
+$NetBSD: patch-aq,v 1.3 2008/12/17 02:19:59 christos Exp $
 
-diff -x *.orig -urN ./tcl/tclGlob.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/tclGlob.c
---- ./tcl/tclGlob.c	Fri Feb 24 22:19:55 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/tcl/tclGlob.c	Fri Nov 26 22:56:30 1999
-@@ -28,6 +28,12 @@
- #include <sys/stat.h>
- #include <tcl.h>
+--- icb/s_chpw.c.orig	1995-02-24 16:20:27.000000000 -0500
++++ icb/s_chpw.c	2008-12-16 20:18:01.000000000 -0500
+@@ -6,6 +6,8 @@
  
-+#ifdef __linux__
-+#define DIRNAMLEN(d) strlen((d)->d_name)
-+#else
-+#define DIRNAMLEN(d) ((d)->d_namlen)
-+#endif
-+
- /*
-  * The structure below is used to keep track of a globbing result
-  * being built up (i.e. a partial list of file names).  The list
-@@ -298,12 +304,12 @@
- 	    if (Tcl_StringMatch(entryPtr->d_name, pattern)) {
- 		if (*p == 0) {
- 		    AppendResult(dir, entryPtr->d_name,
--			    (int) entryPtr->d_namlen, resPtr);
-+			    (int) DIRNAMLEN(entryPtr), resPtr);
- 		} else {
--		    if ((l1+entryPtr->d_namlen+2) <= STATIC_SIZE) {
-+		    if ((l1+DIRNAMLEN(entryPtr)+2) <= STATIC_SIZE) {
- 			newDir = static1;
- 		    } else {
--			newDir = malloc((unsigned) (l1+entryPtr->d_namlen+2));
-+			newDir = malloc((unsigned) (l1+DIRNAMLEN(entryPtr)+2));
- 		    }
- 		    sprintf(newDir, "%s%s/", dir, entryPtr->d_name);
- 		    result = DoGlob(interp, newDir, p+1, resPtr);
+ #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-ar b/chat/icb/patches/patch-ar
index c3654004433..ead46d4fc85 100644
--- a/chat/icb/patches/patch-ar
+++ b/chat/icb/patches/patch-ar
@@ -1,12 +1,53 @@
-$NetBSD: patch-ar,v 1.1.1.1 2000/12/15 00:36:39 wiz Exp $
+$NetBSD: patch-ar,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- sample.icbrc.orig	Fri Nov 26 23:44:37 1999
-+++ sample.icbrc	Fri Nov 26 23:45:00 1999
-@@ -15,6 +15,7 @@
- oset autodel false  # set to "true" to have nicks that generate an "error - 
- 					# so-and-so not signed on" removed from tab history 
- #echoback on		# uncomment to see your own public messages
-+#oset printtime true	# print time in front of each message
+--- icb/serverlist.c.orig	1995-02-24 16:20:29.000000000 -0500
++++ icb/serverlist.c	2008-12-16 20:18:00.000000000 -0500
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <pwd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include "icb.h"
+@@ -14,15 +16,14 @@
+ FILE *openserverfile()
+ {
+ 	struct stat statbuf;
+-	char *personalsl;
+-	char command[256];
+-	char pwd[256];
++	char *personalsl, *home;
++	char pwd[MAXPATHLEN+1];
+ 	FILE *ret;
  
- #==============================================================================#
- # procedures
+ #ifdef sgi
+ #undef SYSV
+ #endif
+-#ifndef SYSV
++#if !defined(SYSV) && !(defined(BSD) && BSD >= 199306) && !defined(__linux__)
+ 	getwd(pwd);
+ #else /* SYSV */
+ 	getcwd(pwd, MAXPATHLEN+1);
+@@ -30,11 +31,20 @@
+ #ifdef sgi
+ #define SYSV
+ #endif
+-	chdir(getenv("HOME"));
++	if ((home = getenv("HOME")) == NULL) {
++		struct passwd *pw;
++		if ((pw = getpwuid(getuid())) == NULL)
++			home = ".";
++		home = pw->pw_dir;
++	}
++	chdir(home);
+ 	if (!stat(PERSONALSL,&statbuf))
+ 	{
+-		sprintf(command,"/bin/cat %s %s\n", PERSONALSL, SERVERLIST);
++		char *command = malloc(strlen("/bin/cat  \n") +
++			strlen(PERSONALSL) + strlen(SERVERLIST) + 1);
++		sprintf(command, "/bin/cat %s %s\n", PERSONALSL, SERVERLIST);
+ 		ret= popen(command,"r");
++		free(command);
+ 	}
+ 	else
+ 		ret= fopen(SERVERLIST,"r");
diff --git a/chat/icb/patches/patch-as b/chat/icb/patches/patch-as
index b63e52c513e..c9d7b2fbc5a 100644
--- a/chat/icb/patches/patch-as
+++ b/chat/icb/patches/patch-as
@@ -1,21 +1,27 @@
-$NetBSD: patch-as,v 1.1.1.1 2000/12/15 00:36:39 wiz Exp $
+$NetBSD: patch-as,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- icb/unix.c.orig	Sun Nov 28 23:33:27 1999
-+++ icb/unix.c	Sun Nov 28 23:35:51 1999
-@@ -92,13 +92,13 @@
- pushback(c)
- char c;
+--- icb/strccmp.c.orig	1995-02-24 16:20:30.000000000 -0500
++++ icb/strccmp.c	2008-12-16 20:22:58.000000000 -0500
+@@ -61,8 +61,8 @@
+ 	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+ };
+ 
+-strcasecmp(s1, s2)
+-	char *s1, *s2;
++int
++strcasecmp(const char *s1, const char *s2)
  {
--#ifndef SYSV
-+#ifdef TIOCSTI
- 	if (ioctl(0, TIOCSTI, &c) < 0)
- 		perror("TIOCSTI ioctl failed");
--#else /* SYSV */
-+#else /* !TIOCSTI */
- 	if (ungetc(c,stdin) == EOF)
- 		perror("ungetc() failed");
--#endif /* SYSV */
-+#endif /* TIOCSTI */
+ 	register char	*cm = charmap,
+ 			*us1 = (char *)s1,
+@@ -74,9 +74,8 @@
+ 	return(cm[*us1] - cm[*--us2]);
  }
  
- 
+-strncasecmp(s1, s2, n)
+-	char *s1, *s2;
+-	register int n;
++int
++strncasecmp(const char *s1, const char *s2, size_t n)
+ {
+ 	register char	*cm = charmap,
+ 			*us1 = (char *)s1,
diff --git a/chat/icb/patches/patch-at b/chat/icb/patches/patch-at
index 8e2d0b608eb..e7e00106a3c 100644
--- a/chat/icb/patches/patch-at
+++ b/chat/icb/patches/patch-at
@@ -1,40 +1,28 @@
-$NetBSD: patch-at,v 1.1 2001/02/12 00:53:14 itojun Exp $
+$NetBSD: patch-at,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- tcl/tclProc.c-	Mon Feb 12 09:46:23 2001
-+++ tcl/tclProc.c	Mon Feb 12 09:49:35 2001
-@@ -690,7 +690,7 @@
-     char **argv;		/* Argument values. */
- {
-     char **args;
--    register Var *formalPtr, *argPtr;
-+    register Var *formalPtr, *argPtr, *nextPtr;
-     register Interp *iPtr = (Interp *) interp;
-     CallFrame frame;
-     char *value, *end;
-@@ -700,6 +700,7 @@
-      * Set up a call frame for the new procedure invocation.
-      */
+--- icb/strings.c.orig	1995-02-24 16:20:30.000000000 -0500
++++ icb/strings.c	2008-12-16 20:18:00.000000000 -0500
+@@ -3,7 +3,6 @@
  
-+    memset(&frame, 0, sizeof(frame));
-     iPtr = procPtr->iPtr;
-     frame.varPtr = NULL;
-     if (iPtr->varFramePtr != NULL) {
-@@ -793,7 +794,8 @@
-      */
+ #include "icb.h"
+ #include "externs.h"
+-#include <varargs.h>
  
-     procDone:
--    for (argPtr = frame.varPtr; argPtr != NULL; argPtr = argPtr->nextPtr) {
-+    for (argPtr = frame.varPtr; argPtr != NULL; argPtr = nextPtr) {
-+	nextPtr = argPtr->nextPtr;
- 	if (argPtr->flags & VAR_DYNAMIC) {
- 	    free(argPtr->value);
- 	}
-@@ -919,7 +921,7 @@
-     if (valueLength < 20) {
- 	valueLength = 20;
-     }
--    varPtr = (Var *) malloc(VAR_SIZE(nameLength, valueLength));
-+    varPtr = (Var *) calloc(1, VAR_SIZE(nameLength, valueLength));
-     strcpy(varPtr->name, name);
-     varPtr->value = varPtr->name + nameLength + 1;
-     strcpy(varPtr->value, value);
+ extern char *charmap;
+ 
+@@ -333,6 +332,7 @@
+ /* cat multiple strings into one */
+ /* call with strscat(dest, src, src, ...) */
+ 
++#if 0
+ char *
+ strscat(va_alist)
+ va_dcl
+@@ -357,6 +357,7 @@
+ 	*dest = '\0';
+ 	return(dest);
+ }
++#endif
+ 
+ char *basename(path)
+ char *path;
diff --git a/chat/icb/patches/patch-au b/chat/icb/patches/patch-au
index 71ea5f8df9e..ff2d17318b9 100644
--- a/chat/icb/patches/patch-au
+++ b/chat/icb/patches/patch-au
@@ -1,36 +1,36 @@
-$NetBSD: patch-au,v 1.3 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-au,v 1.4 2008/12/17 02:19:59 christos Exp $
 
---- tcl/panic.c.orig	1995-02-24 21:19:49.000000000 +0000
-+++ tcl/panic.c
-@@ -19,7 +19,7 @@ static char rcsid[] = "$Header: /home/ag
+--- icb/tcl.c.orig	1995-02-24 16:20:30.000000000 -0500
++++ icb/tcl.c	2008-12-16 20:18:01.000000000 -0500
+@@ -3,6 +3,7 @@
  
- #include <stdio.h>
- #include <stdlib.h>
--#include <varargs.h>
-+#include <stdarg.h>
- 
- /*
-  *----------------------------------------------------------------------
-@@ -39,18 +39,17 @@ static char rcsid[] = "$Header: /home/ag
+ /* TCL interface */
  
- #ifndef lint
- void
--panic(va_alist)
--    va_dcl			/* char *format, then any number of additional
-+panic(char *format, ...)
-+				/* char *format, then any number of additional
- 				 * values to be printed under the control of
- 				 * format.  This is all just the same as you'd
- 				 * pass to printf. */
++#include <limits.h>
+ #ifdef linux
+ #include <unistd.h>
+ #endif
+@@ -95,7 +96,11 @@
+ tclreadicbrc()
  {
--    char *format;
-     va_list args;
+ 	char *p, *path;
++#ifdef NAME_MAX
++	char cmd[NAME_MAX + 10];
++#else
+ 	char cmd[MAXNAMLEN+10];
++#endif
+ 	
+ 	if (!(path = getrcname())) return;
  
--    va_start(args);
--    format = va_arg(args, char *);
-+    va_start(args, format);
-     (void) vfprintf(stderr, format, args);
-+    va_end(args);
-     (void) fflush(stderr);
-     abort();
- }
+@@ -117,7 +122,11 @@
+ {
+ 	static char *names[] = { ".icbrc", ".fnrc", ".tclrc" , (char *)NULL };
+ 	char *rcfile, *homedir, *getenv(), **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/icb/patches/patch-av b/chat/icb/patches/patch-av
index 5f6ab9f520f..a69380e717d 100644
--- a/chat/icb/patches/patch-av
+++ b/chat/icb/patches/patch-av
@@ -1,12 +1,188 @@
-$NetBSD: patch-av,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- icb/history.c.orig	2005-12-13 16:25:41.000000000 +0000
-+++ icb/history.c
-@@ -19,7 +19,6 @@ static STRLIST *hp = (STRLIST *) 0;	/* u
- histput(nick)
- char *nick;
+--- icb/unix.c.orig	1995-02-24 16:20:31.000000000 -0500
++++ icb/unix.c	2008-12-16 21:16:10.000000000 -0500
+@@ -7,20 +7,26 @@
+ #include <stdio.h>
+ #include "icb.h"
+ #include "externs.h"
++#include <limits.h>
+ #include <pwd.h>
+ #include <sys/dir.h>
+ 
+ #undef stty
+ #undef gtty
+ 
+-#ifndef SYSV
+-
+ #ifdef linux
+ #include <bsd/sgtty.h>
+ #else
+ #include <sgtty.h>
+ #endif
+ 
++#if defined(__linux__) || defined(__NetBSD__)
++#include <termios.h>
++#define TTYSTRUCT termios
++#define stty(fd,buf) tcsetattr((fd),TCSANOW,(buf))
++#define gtty(fd,buf) tcgetattr((fd),(buf))
++#else
++#ifndef SYSV
+ #define TTYSTRUCT sgttyb
+ #define stty(fd,buf) ioctl((fd),TIOCSETN,(buf))
+ #define gtty(fd,buf) ioctl((fd),TIOCGETP,(buf))
+@@ -30,6 +36,7 @@
+ #define stty(fd,buf) ioctl((fd),TCSETA,(buf))
+ #define gtty(fd,buf) ioctl((fd),TCGETA,(buf))
+ #endif /* SYSV */
++#endif /* TIOCSETA */
+ 
+ char *getlogin();
+ 
+@@ -65,13 +72,16 @@
+ 
+ /* set line buffering for an open file pointer */
+ /* output will be flushed every newline */
++static char buf[1024];
+ 
+ linebuffer(fp)
+ FILE *fp;
+ {
+-#ifndef SYSV
++#ifndef _IOLBF
++	setvbuf(fp, buf, _IOLBF, sizeof(buf));
++#else
+ 	setlinebuf(fp);
+-#endif /* SYSV */
++#endif
+ }
+ 
+ 
+@@ -79,13 +89,13 @@
+ pushback(c)
+ char c;
+ {
+-#ifndef SYSV
++#ifdef TIOCSTI
+ 	if (ioctl(0, TIOCSTI, &c) < 0)
+ 		perror("TIOCSTI ioctl failed");
+-#else /* SYSV */
++#else
+ 	if (ungetc(c,stdin) == EOF)
+ 		perror("ungetc() failed");
+-#endif /* SYSV */
++#endif
+ }
+ 
+ 
+@@ -94,25 +104,25 @@
+ 
+ getterm()
  {
--	char *malloc();
- 	STRLIST *sp;
+-#ifndef SYSV
++#if !defined(TCSETA) && !defined(TCSANOW)
+ 	struct ltchars lt;
+-#endif /* SYSV */
++#endif
+ 	/* get tty settings */
+ 	if (gtty(0,&origtty) < 0) {
+ 		badttyinfo++;
+ 		ttyinfo.erase = '\b';	/* ^H */
+ 		ttyinfo.kill = '\025';	/* ^U */
+ 	} else {
+-#ifndef SYSV
+-		ttyinfo.erase = origtty.sg_erase;
+-		ttyinfo.kill = origtty.sg_kill;
+-#else /* SYSV */
++#if defined(TCSETA) || defined(TCSANOW)
+ 		ttyinfo.erase = origtty.c_cc[VERASE];
+ 		ttyinfo.kill = origtty.c_cc[VKILL];
+-#endif /* SYSV */
++#else
++		ttyinfo.erase = origtty.sg_erase;
++		ttyinfo.kill = origtty.sg_kill;
++#endif
+ 	}
+ 
+-#ifndef SYSV
++#if !defined(TCSETA) && !defined(TCSANOW)
+ 	/* get local special chars */
+  	if (ioctl(0, TIOCGLTC, &lt) < 0) {
+ 		ttyinfo.redraw = '\022'; /* ^R */
+@@ -121,10 +131,10 @@
+ 		ttyinfo.redraw = lt.t_rprntc;
+ 		ttyinfo.werase = lt.t_werasc;
+ 	}
+-#else /* SYSV */
++#else
+ 	ttyinfo.redraw = '\022'; /* ^R */
+ 	ttyinfo.werase = '\027'; /* ^W */
+-#endif /* SYSV */
++#endif
+ 
+ 	/* get the current window size */
+ 	getwinsize();
+@@ -145,14 +155,14 @@
+ 	bcopy((char *)&origtty, (char *)&tty, (unsigned)sizeof(struct TTYSTRUCT));
+ 
+ 	/* turn on cbreak - turn off echo */
+-#ifndef SYSV
+-	tty.sg_flags |= CBREAK;
+-	tty.sg_flags &= ~ECHO;
+-#else /* SYSV */
++#if defined(TCSETA) || defined(TCSANOW)
+ 	tty.c_lflag  &= ~ICANON;
+ 	tty.c_cc[VEOF] = 1;
+ 	tty.c_lflag &= ~ECHO;
+-#endif /* SYSV */
++#else 
++	tty.sg_flags |= CBREAK;
++	tty.sg_flags &= ~ECHO;
++#endif
+ 
+ 	echomode = 0;
+ 	/* set the new flags */
+@@ -206,7 +216,11 @@
+ 	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++ != '~')
+@@ -258,11 +272,11 @@
+ 	}
+ 
+ 	/* turn on echo */
+-#ifndef SYSV
+-	tty.sg_flags |= ECHO;
+-#else /* SYSV */
++#if defined(TCSETA) || defined(TCSANOW)
+ 	tty.c_lflag  |= ECHO;
+-#endif /* SYSV */
++#else
++	tty.sg_flags |= ECHO;
++#endif
+ 
+ 	echomode = 1;
+ 
+@@ -287,11 +301,11 @@
+ 	}
+ 
+ 	/* turn off echo */
+-#ifndef SYSV
+-	tty.sg_flags &= ~ECHO;
+-#else /* SYSV */
++#if defined(TCSETA) || defined(TCSANOW)
+ 	tty.c_lflag  &= ~ECHO;
+-#endif /* SYSV */
++#else
++	tty.sg_flags &= ~ECHO;
++#endif
+ 
+ 	echomode = 0;
  
- 	/* hunt for user within list */
diff --git a/chat/icb/patches/patch-aw b/chat/icb/patches/patch-aw
index 64cc520c4a9..1f8b54cb791 100644
--- a/chat/icb/patches/patch-aw
+++ b/chat/icb/patches/patch-aw
@@ -1,12 +1,13 @@
-$NetBSD: patch-aw,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-aw,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- murgil/clientserve.c.orig	2005-12-13 16:27:16.000000000 +0000
-+++ murgil/clientserve.c
-@@ -11,7 +11,6 @@
- #include "ipcf.h"
- #include "externs.h"
+--- malloc/xmalloc.c.orig	1995-02-24 16:20:43.000000000 -0500
++++ malloc/xmalloc.c	2008-12-16 20:18:01.000000000 -0500
+@@ -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 ();
  
--extern int errno;
- int sock;
- fd_set fdr;	
- struct Cbuf buf;
diff --git a/chat/icb/patches/patch-ax b/chat/icb/patches/patch-ax
index acbbce43da8..fdf69347609 100644
--- a/chat/icb/patches/patch-ax
+++ b/chat/icb/patches/patch-ax
@@ -1,13 +1,13 @@
-$NetBSD: patch-ax,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-ax,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- murgil/newconnect.c.orig	2005-12-13 16:27:44.000000000 +0000
-+++ murgil/newconnect.c
-@@ -20,8 +20,6 @@
- #include "ipcf.h"
- #include "externs.h"
-  
+--- tcl/tclCmdIZ.c.orig	1995-02-24 16:19:54.000000000 -0500
++++ tcl/tclCmdIZ.c	2008-12-16 20:18:01.000000000 -0500
+@@ -30,8 +30,6 @@
+ #include <sys/time.h>
+ #include "tclInt.h"
+ 
 -extern int errno;
 -
- _newconnect(s)
- int s;
- {
+ 
+ /*
+  *----------------------------------------------------------------------
diff --git a/chat/icb/patches/patch-ay b/chat/icb/patches/patch-ay
index c57a4577149..a9121266559 100644
--- a/chat/icb/patches/patch-ay
+++ b/chat/icb/patches/patch-ay
@@ -1,13 +1,12 @@
-$NetBSD: patch-ay,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-ay,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- murgil/readpacket.c.orig	2005-12-13 16:28:13.000000000 +0000
-+++ murgil/readpacket.c
-@@ -14,8 +14,6 @@
+--- murgil/clientserve.c.orig	1995-02-24 16:19:39.000000000 -0500
++++ murgil/clientserve.c	2008-12-16 20:18:00.000000000 -0500
+@@ -11,7 +11,6 @@
  #include "ipcf.h"
  #include "externs.h"
  
 -extern int errno;
--
- _readpacket(user, p)
- int user;
- struct Cbuf *p;
+ int sock;
+ fd_set fdr;	
+ struct Cbuf buf;
diff --git a/chat/icb/patches/patch-az b/chat/icb/patches/patch-az
index 79988256d21..1c795be7344 100644
--- a/chat/icb/patches/patch-az
+++ b/chat/icb/patches/patch-az
@@ -1,13 +1,15 @@
-$NetBSD: patch-az,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-az,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- murgil/sendpacket.c.orig	2005-12-13 16:28:40.000000000 +0000
-+++ murgil/sendpacket.c
-@@ -5,8 +5,6 @@
- #include <stdio.h>
- #include <errno.h>
+--- murgil/externs.h.orig	1995-02-24 16:19:40.000000000 -0500
++++ murgil/externs.h	2008-12-16 20:28:33.000000000 -0500
+@@ -1,6 +1,10 @@
+ /* Copyright (c) 1988 Carrick Sean Casey. All rights reserved. */
+ /* For copying and distribution information, see the file "copyright.h." */
  
--extern int errno;
--
- _sendpacket(s, pkt)
- int s;
- char *pkt;
++#include <unistd.h>
++#include <string.h>
++#include <stdlib.h>
++
+ extern fd_set fdset;		/* player fd set for select() */
+ extern fd_set ignorefds;		/* fds that are not to be polled */
+ extern char *fail;		/* failcode used by logerr */
diff --git a/chat/icb/patches/patch-ba b/chat/icb/patches/patch-ba
index 7db643579b1..625aa21cdfb 100644
--- a/chat/icb/patches/patch-ba
+++ b/chat/icb/patches/patch-ba
@@ -1,36 +1,12 @@
-$NetBSD: patch-ba,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-ba,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- icb/tcl.c.orig	1995-02-24 21:20:30.000000000 +0000
-+++ icb/tcl.c
-@@ -3,6 +3,7 @@
- 
- /* TCL interface */
- 
-+#include <limits.h>
- #ifdef linux
- #include <unistd.h>
- #endif
-@@ -95,7 +96,11 @@ tclinit()
- tclreadicbrc()
- {
- 	char *p, *path;
-+#ifdef NAME_MAX
-+	char cmd[NAME_MAX + 10];
-+#else
- 	char cmd[MAXNAMLEN+10];
-+#endif
- 	
- 	if (!(path = getrcname())) return;
- 
-@@ -117,7 +122,11 @@ getrcname()
- {
- 	static char *names[] = { ".icbrc", ".fnrc", ".tclrc" , (char *)NULL };
- 	char *rcfile, *homedir, *getenv(), **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)
+--- murgil/getaddr.c.orig	1995-02-24 16:19:40.000000000 -0500
++++ murgil/getaddr.c	2008-12-16 20:29:02.000000000 -0500
+@@ -14,6 +14,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
diff --git a/chat/icb/patches/patch-bb b/chat/icb/patches/patch-bb
index 0472133837b..61a468cd65f 100644
--- a/chat/icb/patches/patch-bb
+++ b/chat/icb/patches/patch-bb
@@ -1,24 +1,13 @@
-$NetBSD: patch-bb,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-bb,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- icb/unix.c.orig	2005-12-13 16:41:59.000000000 +0000
-+++ icb/unix.c
-@@ -6,6 +6,7 @@
- 
- #include <sys/types.h>
- #include <sys/param.h>
-+#include <limits.h>
- #include <stdio.h>
- #include "icb.h"
- #include "externs.h"
-@@ -219,7 +220,11 @@ 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++ != '~')
+--- murgil/getrname.c.orig	1995-02-24 16:19:41.000000000 -0500
++++ murgil/getrname.c	2008-12-16 20:18:00.000000000 -0500
+@@ -14,7 +14,7 @@
+ {
+ 	static char rname[24];
+ 	struct hostent *host;
+-#if defined(linux)
++#if defined(linux) || defined(__NetBSD__)
+ #define PEER_CAST (struct sockaddr *)
+ #define HOST_CAST (char *)
+ #else
diff --git a/chat/icb/patches/patch-bc b/chat/icb/patches/patch-bc
index 83398391b41..ed5cbc801a7 100644
--- a/chat/icb/patches/patch-bc
+++ b/chat/icb/patches/patch-bc
@@ -1,61 +1,13 @@
-$NetBSD: patch-bc,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-bc,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- tcl/Make.orig	1995-02-24 21:19:48.000000000 +0000
-+++ tcl/Make
-@@ -11,13 +11,7 @@ CFLAGS = $(TCLCFLAGS) -I. -DTCL_VERSION=
- 
- SRC = \
- 	panic.c \
--	strchr.c \
- 	strerror.c \
--	strpbrk.c \
--	strspn.c \
--	strstr.c \
--	strtol.c \
--	strtoul.c \
- 	tclAssem.c \
- 	tclBasic.c \
- 	tclCmdAH.c \
-@@ -30,13 +24,7 @@ SRC = \
- 
- OBJ = \
- 	panic.o \
--	strchr.o \
- 	strerror.o \
--	strpbrk.o \
--	strspn.o \
--	strstr.o \
--	strtol.o \
--	strtoul.o \
- 	tclAssem.o \
- 	tclBasic.o \
- 	tclCmdAH.o \
-@@ -80,28 +68,3 @@ depend:
- 	$(MAKEDEPEND) $(DEPENDFLAGS) *.c
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
+--- murgil/newconnect.c.orig	1995-02-24 16:19:42.000000000 -0500
++++ murgil/newconnect.c	2008-12-16 20:18:01.000000000 -0500
+@@ -20,8 +20,6 @@
+ #include "ipcf.h"
+ #include "externs.h"
+  
+-extern int errno;
 -
--panic.o: stdlib.h 
--strchr.o: string.h
--strerror.o: string.h
--strpbrk.o: string.h
--strspn.o: string.h
--strtol.o: stdlib.h 
--strtoul.o: sprite.h stdlib.h 
--tclAssem.o: tclInt.h tcl.h stdlib.h
--tclAssem.o: string.h
--tclBasic.o: stdlib.h string.h
--tclBasic.o: tclInt.h tcl.h
--tclCmdAH.o: stdlib.h string.h 
--tclCmdAH.o: tclInt.h tcl.h
--tclCmdIZ.o: stdlib.h string.h
--tclCmdIZ.o: tclInt.h tcl.h
--tclExpr.o: tcl.h tclInt.h
--tclGlob.o: stdlib.h string.h 
--tclGlob.o: tcl.h
--tclHistory.o: tclInt.h tcl.h 
--tclHistory.o: stdlib.h string.h
--tclProc.o: stdlib.h string.h 
--tclProc.o: tclInt.h tcl.h
--tclUtil.o: stdlib.h string.h tcl.h
--tclUtil.o: tclInt.h
+ _newconnect(s)
+ int s;
+ {
diff --git a/chat/icb/patches/patch-bd b/chat/icb/patches/patch-bd
new file mode 100644
index 00000000000..b6a7edd9be1
--- /dev/null
+++ b/chat/icb/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2008/12/17 02:19:59 christos Exp $
+
+--- murgil/readpacket.c.orig	1995-02-24 16:19:42.000000000 -0500
++++ murgil/readpacket.c	2008-12-16 20:18:01.000000000 -0500
+@@ -14,8 +14,6 @@
+ #include "ipcf.h"
+ #include "externs.h"
+ 
+-extern int errno;
+-
+ _readpacket(user, p)
+ int user;
+ struct Cbuf *p;
diff --git a/chat/icb/patches/patch-be b/chat/icb/patches/patch-be
new file mode 100644
index 00000000000..ef0df42bfe9
--- /dev/null
+++ b/chat/icb/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2008/12/17 02:19:59 christos Exp $
+
+--- murgil/sendpacket.c.orig	1995-02-24 16:19:43.000000000 -0500
++++ murgil/sendpacket.c	2008-12-16 20:18:01.000000000 -0500
+@@ -5,8 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ 
+-extern int errno;
+-
+ _sendpacket(s, pkt)
+ int s;
+ char *pkt;
diff --git a/chat/icb/patches/patch-bf b/chat/icb/patches/patch-bf
index 5b37f7af72d..d530619db9e 100644
--- a/chat/icb/patches/patch-bf
+++ b/chat/icb/patches/patch-bf
@@ -1,13 +1,31 @@
-$NetBSD: patch-bf,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-bf,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- tcl/tclCmdIZ.c.orig	2005-12-13 16:50:37.000000000 +0000
-+++ tcl/tclCmdIZ.c
-@@ -30,8 +30,6 @@ static char rcsid[] = "$Header: /home/ag
- #include <sys/time.h>
- #include "tclInt.h"
- 
+--- murgil/serverserve.c.orig	1995-02-24 16:19:44.000000000 -0500
++++ murgil/serverserve.c	2008-12-16 20:18:00.000000000 -0500
+@@ -15,11 +15,13 @@
+ #include "ipcf.h"
+ #include "externs.h"
+  
 -extern int errno;
--
- 
- /*
-  *----------------------------------------------------------------------
+ fd_set fdr;	
+ int timeisup;
+ 
+ sighandler gotalarm();
++#ifndef __FDS_BITS
++# define __FDS_BITS(set) ((set)->fds_bits)
++#endif
+ 
+ serverserve()
+ {
+@@ -81,9 +83,9 @@
+ 
+ 	/* examine set of file descriptors */
+ 	for (b = 0, y = 0; b <= (howmany(highestfd, 32) - 1); b++, y += 32) {
+-	    if (!fdr.fds_bits[b])
++	    if (!__FDS_BITS(&fdr)[b])
+ 		continue;
+-	    bits = fdr.fds_bits[b];
++	    bits = __FDS_BITS(&fdr)[b];
+ 	    for (x = y; bits; x++, bits >>= 01)
+ 		if (bits & 01)
+ 			if (x == port_fd) {
diff --git a/chat/icb/patches/patch-bg b/chat/icb/patches/patch-bg
index e2cf1e4bf9c..ed6035fec96 100644
--- a/chat/icb/patches/patch-bg
+++ b/chat/icb/patches/patch-bg
@@ -1,13 +1,59 @@
-$NetBSD: patch-bg,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-bg,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- tcl/tclGlob.c.orig	2005-12-13 16:51:11.000000000 +0000
-+++ tcl/tclGlob.c
-@@ -40,8 +40,6 @@ static char rcsid[] = "$Header: /home/ag
-  * grows dynamically to be as big as needed.
-  */
+--- tcl/tclCmdAH.c.orig	1995-02-24 16:19:53.000000000 -0500
++++ tcl/tclCmdAH.c	2008-12-16 20:18:00.000000000 -0500
+@@ -38,9 +38,21 @@
+ #include <sys/wait.h>
+ #include "tclInt.h"
  
 -extern int errno;
--
- typedef struct {
-     char *result;		/* Pointer to result area. */
-     int totalSpace;		/* Total number of characters allocated
++#ifdef __NetBSD__
++#define unix
++#endif
++
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#include <unistd.h>
++#endif
++
++#if !(defined(BSD) && BSD >= 199306)
+ extern long lseek();
++#endif
++#ifndef BSD4_4
+ extern char *mktemp();
++#endif
+ 
+ /*
+  *----------------------------------------------------------------------
+@@ -430,7 +442,7 @@
+     int pid = -1;			/* -1 means child process doesn't
+ 					 * exist (yet).  Non-zero gives its
+ 					 * id (0 only in child). */
+-    union wait status;
++    int status;
+     char *cmdName, *execName;
+ 
+     /*
+@@ -501,8 +513,13 @@
+     } else {
+ 	char tmp[sizeof(TMP_FILE_NAME) + 1];
+ 	strcpy(tmp, TMP_FILE_NAME);
++#ifdef BSD4_4
++	mkstemp(tmp);
++	stdIn[0] = mkstemp(tmp);
++#else
+ 	mktemp(tmp);
+ 	stdIn[0] = open(tmp, O_RDWR|O_CREAT, 0);
++#endif
+ 	if (stdIn[0] < 0) {
+ 	    sprintf(interp->result,
+ 		    "couldn't create input file for \"%.50s\" command: %.50s",
+@@ -642,7 +659,7 @@
+ 	    sprintf(interp->result, "command terminated abnormally");
+ 	    result = TCL_ERROR;
+ 	}
+-	result = status.w_retcode;
++	result = WEXITSTATUS(status);
+     }
+     if (stdIn[0] != -1) {
+ 	close(stdIn[0]);
diff --git a/chat/icb/patches/patch-bh b/chat/icb/patches/patch-bh
index 86a5a720c15..29799232434 100644
--- a/chat/icb/patches/patch-bh
+++ b/chat/icb/patches/patch-bh
@@ -1,8 +1,12 @@
-$NetBSD: patch-bh,v 1.1 2005/12/14 13:53:24 joerg Exp $
+$NetBSD: patch-bh,v 1.2 2008/12/17 02:19:59 christos Exp $
 
---- readline/history.c.orig	1995-02-24 21:20:00.000000000 +0000
-+++ readline/history.c
-@@ -45,6 +45,7 @@ extern char *alloca ();
+--- readline/history.c.orig	1995-02-24 16:20:00.000000000 -0500
++++ readline/history.c	2008-12-16 20:37:14.000000000 -0500
+@@ -42,9 +42,11 @@
+ #endif /* !__GNU_C__ */
+ 
+ #include <stdio.h>
++#include <string.h>
  #include <sys/types.h>
  #include <sys/file.h>
  #include <sys/stat.h>
@@ -10,7 +14,7 @@ $NetBSD: patch-bh,v 1.1 2005/12/14 13:53:24 joerg Exp $
  #include <fcntl.h>
  #include "history.h"
  
-@@ -466,7 +467,6 @@ read_history_range (filename, from, to)
+@@ -466,7 +468,6 @@
    char *input, *buffer = (char *)NULL;
    int file, current_line;
    struct stat finfo;
@@ -18,7 +22,7 @@ $NetBSD: patch-bh,v 1.1 2005/12/14 13:53:24 joerg Exp $
  
    input = history_filename (filename);
    file = open (input, O_RDONLY, 0666);
-@@ -601,7 +601,6 @@ history_do_write (filename, nelements, o
+@@ -601,7 +602,6 @@
       char *filename;
       int nelements, overwrite;
  {
diff --git a/chat/icb/patches/patch-bi b/chat/icb/patches/patch-bi
index a2341bd5147..fef1871db41 100644
--- a/chat/icb/patches/patch-bi
+++ b/chat/icb/patches/patch-bi
@@ -1,50 +1,40 @@
-$NetBSD: patch-bi,v 1.1 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-bi,v 1.2 2008/12/17 02:19:59 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
+--- tcl/tclProc.c.orig	1995-02-24 16:19:56.000000000 -0500
++++ tcl/tclProc.c	2008-12-16 20:18:00.000000000 -0500
+@@ -690,7 +690,7 @@
+     char **argv;		/* Argument values. */
+ {
+     char **args;
+-    register Var *formalPtr, *argPtr;
++    register Var *formalPtr, *argPtr, *nextPtr;
+     register Interp *iPtr = (Interp *) interp;
+     CallFrame frame;
+     char *value, *end;
+@@ -700,6 +700,7 @@
+      * Set up a call frame for the new procedure invocation.
+      */
  
- #include <pwd.h>
-+#include <stdlib.h>
-+#include <unistd.h>
++    memset(&frame, 0, sizeof(frame));
+     iPtr = procPtr->iPtr;
+     frame.varPtr = NULL;
+     if (iPtr->varFramePtr != NULL) {
+@@ -793,7 +794,8 @@
+      */
  
- #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)
+     procDone:
+-    for (argPtr = frame.varPtr; argPtr != NULL; argPtr = argPtr->nextPtr) {
++    for (argPtr = frame.varPtr; argPtr != NULL; argPtr = nextPtr) {
++	nextPtr = argPtr->nextPtr;
+ 	if (argPtr->flags & VAR_DYNAMIC) {
+ 	    free(argPtr->value);
+ 	}
+@@ -919,7 +921,7 @@
+     if (valueLength < 20) {
+ 	valueLength = 20;
+     }
+-    varPtr = (Var *) malloc(VAR_SIZE(nameLength, valueLength));
++    varPtr = (Var *) calloc(1, VAR_SIZE(nameLength, valueLength));
+     strcpy(varPtr->name, name);
+     varPtr->value = varPtr->name + nameLength + 1;
+     strcpy(varPtr->value, value);
diff --git a/chat/icb/patches/patch-bj b/chat/icb/patches/patch-bj
index 53b6947fe2a..b53f651ecc9 100644
--- a/chat/icb/patches/patch-bj
+++ b/chat/icb/patches/patch-bj
@@ -1,22 +1,28 @@
-$NetBSD: patch-bj,v 1.1 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-bj,v 1.2 2008/12/17 02:19:59 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 @@
+--- readline/readline.h.orig	1995-02-24 16:20:03.000000000 -0500
++++ readline/readline.h	2008-12-16 20:31:36.000000000 -0500
+@@ -5,11 +5,13 @@
+ 
+ #include <readline/keymaps.h>
  #include <stdio.h>
- #include <strings.h>
- #include <string.h>
-+#include <stdlib.h>
-+#include <unistd.h>
++#include <string.h>
  
- /* getswitch - parse multicharacter option arguments.
-  */
-@@ -43,7 +45,7 @@
- 	if (thisswitch != retswitch)
- 		free(thisswitch);
+ #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);
  
--	thisswitch = (char *)malloc(strlen(*switchv)+1);
-+	thisswitch = malloc(strlen(*switchv)+1);
- 	strcpy(thisswitch, *switchv);
- 	length = strlen(arg);
+ /* The functions for manipulating the text of the line within readline.
+ Most of these functions are bound to keys by default. */
+@@ -141,7 +143,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-bk b/chat/icb/patches/patch-bk
index 49fd87170f2..02c9ece3dea 100644
--- a/chat/icb/patches/patch-bk
+++ b/chat/icb/patches/patch-bk
@@ -1,27 +1,61 @@
-$NetBSD: patch-bk,v 1.1 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-bk,v 1.2 2008/12/17 02:19:59 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"
+--- tcl/Make.orig	1995-02-24 16:19:48.000000000 -0500
++++ tcl/Make	2008-12-16 20:18:01.000000000 -0500
+@@ -11,13 +11,7 @@
  
-@@ -21,12 +23,12 @@
- rl_vi_editing_mode(); /* default to vi, dammit. */
- gv.editmode = "vi";
+ SRC = \
+ 	panic.c \
+-	strchr.c \
+ 	strerror.c \
+-	strpbrk.c \
+-	strspn.c \
+-	strstr.c \
+-	strtol.c \
+-	strtoul.c \
+ 	tclAssem.c \
+ 	tclBasic.c \
+ 	tclCmdAH.c \
+@@ -30,13 +24,7 @@
  
--editor = (char *)getenv("EDITOR");
-+editor = getenv("EDITOR");
- if (!editor)
--	editor = (char *)getenv("VISUAL");
-+	editor = getenv("VISUAL");
+ OBJ = \
+ 	panic.o \
+-	strchr.o \
+ 	strerror.o \
+-	strpbrk.o \
+-	strspn.o \
+-	strstr.o \
+-	strtol.o \
+-	strtoul.o \
+ 	tclAssem.o \
+ 	tclBasic.o \
+ 	tclCmdAH.o \
+@@ -80,28 +68,3 @@
+ 	$(MAKEDEPEND) $(DEPENDFLAGS) *.c
  
- if (editor != NULL)
--   if (strcmp((char *)basename(editor),"emacs")==0)
-+   if (strcmp(basename(editor),"emacs")==0)
-    {
- 	rl_emacs_editing_mode();
- 	gv.editmode = "emacs";
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+-
+-panic.o: stdlib.h 
+-strchr.o: string.h
+-strerror.o: string.h
+-strpbrk.o: string.h
+-strspn.o: string.h
+-strtol.o: stdlib.h 
+-strtoul.o: sprite.h stdlib.h 
+-tclAssem.o: tclInt.h tcl.h stdlib.h
+-tclAssem.o: string.h
+-tclBasic.o: stdlib.h string.h
+-tclBasic.o: tclInt.h tcl.h
+-tclCmdAH.o: stdlib.h string.h 
+-tclCmdAH.o: tclInt.h tcl.h
+-tclCmdIZ.o: stdlib.h string.h
+-tclCmdIZ.o: tclInt.h tcl.h
+-tclExpr.o: tcl.h tclInt.h
+-tclGlob.o: stdlib.h string.h 
+-tclGlob.o: tcl.h
+-tclHistory.o: tclInt.h tcl.h 
+-tclHistory.o: stdlib.h string.h
+-tclProc.o: stdlib.h string.h 
+-tclProc.o: tclInt.h tcl.h
+-tclUtil.o: stdlib.h string.h tcl.h
+-tclUtil.o: tclInt.h
diff --git a/chat/icb/patches/patch-bl b/chat/icb/patches/patch-bl
index e8851019e58..12e6db52ebd 100644
--- a/chat/icb/patches/patch-bl
+++ b/chat/icb/patches/patch-bl
@@ -1,22 +1,36 @@
-$NetBSD: patch-bl,v 1.1 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-bl,v 1.2 2008/12/17 02:19:59 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 @@
+--- tcl/panic.c.orig	1995-02-24 16:19:49.000000000 -0500
++++ tcl/panic.c	2008-12-16 20:18:00.000000000 -0500
+@@ -19,7 +19,7 @@
  
- #include "icb.h"
- #include "externs.h"
-+#include <stdlib.h>
-+#include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+ /*
+  *----------------------------------------------------------------------
+@@ -39,18 +39,17 @@
  
+ #ifndef lint
  void
- regnick(password)
-@@ -13,7 +15,7 @@
- 	char message[256];
+-panic(va_alist)
+-    va_dcl			/* char *format, then any number of additional
++panic(char *format, ...)
++				/* char *format, then any number of additional
+ 				 * values to be printed under the control of
+ 				 * format.  This is all just the same as you'd
+ 				 * pass to printf. */
+ {
+-    char *format;
+     va_list args;
  
- 	if (!password)
--		password = (char *)getpass("Password:");
-+		password = getpass("Password:");
- 	
- 	sprintf(message,"p %s", password);
- 	sendpersonal("server",message,-1);
+-    va_start(args);
+-    format = va_arg(args, char *);
++    va_start(args, format);
+     (void) vfprintf(stderr, format, args);
++    va_end(args);
+     (void) fflush(stderr);
+     abort();
+ }
diff --git a/chat/icb/patches/patch-bm b/chat/icb/patches/patch-bm
index 4ef9167a10e..b28fbe410ce 100644
--- a/chat/icb/patches/patch-bm
+++ b/chat/icb/patches/patch-bm
@@ -1,22 +1,28 @@
-$NetBSD: patch-bm,v 1.2 2006/05/21 10:52:08 rillig Exp $
+$NetBSD: patch-bm,v 1.3 2008/12/17 02:19:59 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 @@
+--- tcl/stdlib.h.orig	1995-02-24 16:19:50.000000000 -0500
++++ tcl/stdlib.h	2008-12-16 20:30:23.000000000 -0500
+@@ -41,10 +41,10 @@
+  *------------------
+  */
  
- #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);
+-extern char *	alloca();
+-extern char *	calloc();
+-extern char *	malloc();
+-extern char *	realloc();
++extern void *	alloca();
++extern void *	calloc();
++extern void *	malloc();
++extern void *	realloc();
+ extern void	Mem_Bin();
+ extern char *	Mem_CallerPC();
+ extern void	Mem_DumpTrace();
+@@ -142,7 +142,7 @@
+ extern void	abort();
+ extern int	atexit();
+ extern char *   bsearch();
+-extern 		exit();
++extern void 	exit();
+ extern char *	getenv();
+ extern void	qsort();
+ extern int	rand();
diff --git a/chat/icb/patches/patch-bn b/chat/icb/patches/patch-bn
index 018847f2b83..a16e66d7ae4 100644
--- a/chat/icb/patches/patch-bn
+++ b/chat/icb/patches/patch-bn
@@ -1,22 +1,12 @@
-$NetBSD: patch-bn,v 1.1 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-bn,v 1.2 2008/12/17 02:19:59 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 @@
+--- sample.icbrc.orig	1995-02-24 16:19:29.000000000 -0500
++++ sample.icbrc	2008-12-16 20:18:00.000000000 -0500
+@@ -15,6 +15,7 @@
+ oset autodel false  # set to "true" to have nicks that generate an "error - 
+ 					# so-and-so not signed on" removed from tab history 
+ #echoback on		# uncomment to see your own public messages
++#oset printtime true	# print time in front of each message
  
- #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]);
+ #==============================================================================#
+ # procedures
diff --git a/chat/icb/patches/patch-bo b/chat/icb/patches/patch-bo
index 9e65d9beb3c..dfac19857cc 100644
--- a/chat/icb/patches/patch-bo
+++ b/chat/icb/patches/patch-bo
@@ -1,13 +1,17 @@
-$NetBSD: patch-bo,v 1.1 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-bo,v 1.2 2008/12/17 02:19:59 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. */
- 
+--- tcl/strerror.c.orig	1995-02-24 16:19:50.000000000 -0500
++++ tcl/strerror.c	2008-12-16 20:18:00.000000000 -0500
+@@ -20,6 +20,7 @@
  #include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
- 
- static void memory_error_and_abort ();
+ #include <string.h>
  
++#if !defined(BSD4_4) && !defined(__linux__) && !defined(__APPLE__) && !defined(__DragonFly__)
+ /*
+  * List of known errors:
+  */
+@@ -138,3 +139,4 @@
+     (void) sprintf(defaultMsg, "unknown error (%d)", error);
+     return defaultMsg;
+ }
++#endif
diff --git a/chat/icb/patches/patch-bp b/chat/icb/patches/patch-bp
index 88044b3cb87..1389ccb1bc6 100644
--- a/chat/icb/patches/patch-bp
+++ b/chat/icb/patches/patch-bp
@@ -1,25 +1,22 @@
-$NetBSD: patch-bp,v 1.1 2006/05/15 15:33:00 christos Exp $
+$NetBSD: patch-bp,v 1.2 2008/12/17 02:19:59 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>
+--- tcl/tclBasic.c.orig	1995-02-24 16:19:53.000000000 -0500
++++ tcl/tclBasic.c	2008-12-16 20:18:01.000000000 -0500
+@@ -656,7 +656,7 @@
+ 			length = strlen(iPtr->result);
+ 			if ((limit - dst) < length) {
+ 			    char *newCopy;
+-			    int delta;
++			    long delta;
  
- #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. */
+ 			    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);
diff --git a/chat/icb/patches/patch-bq b/chat/icb/patches/patch-bq
deleted file mode 100644
index ad888507db6..00000000000
--- a/chat/icb/patches/patch-bq
+++ /dev/null
@@ -1,22 +0,0 @@
-$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);