23 files changed, 10 insertions, 688 deletions

diff --git a/net/icb/Makefile b/net/icb/Makefile
index 4ac82816c650..36abdf8ec2d5 100644
--- a/net/icb/Makefile
+++ b/net/icb/Makefile
@@ -7,30 +7,25 @@
 #
 
 PORTNAME=	icb
-PORTVERSION=	5.0.9
+PORTVERSION=	5.1.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.swcp.com/pub/icb/clients/unix/  \
-		ftp://ftp.empire.net/pub/icb/clients/  \
-		ftp://ftp.cs.unm.edu/pub/armijo/icb.src/clients/ \
-		ftp://ftp.dorje.com/pub/archive/ \
-		ftp://ftp.tu-clausthal.de/pub/unix.new/net/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	http://ftp.obfuscation.org/ftp/pub/icb/  \
+		ftp://ftp.obfuscation.org/pub/icb/
+DISTNAME=	cicb-${PORTVERSION}
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SED} -e s,@PREFIX@,${PREFIX},g ${FILESDIR}/config >${WRKSRC}/config
+GNU_CONFIGURE=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icb/icb ${PREFIX}/bin
 	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${PREFIX}/share/icb
 	${INSTALL_DATA} ${WRKSRC}/icbserverdb ${PREFIX}/share/icb
-	${INSTALL_DATA} ${WRKSRC}/sample.icbrc \
+	${INSTALL_DATA} ${WRKSRC}/contrib/sample.icbrc \
 		${WRKSRC}/contrib/bartender \
 		${WRKSRC}/contrib/confuse \
-		${WRKSRC}/contrib/echofile \
+		${WRKSRC}/contrib/echofunctions \
 		${PREFIX}/share/icb
 
 .include <bsd.port.mk>
diff --git a/net/icb/distinfo b/net/icb/distinfo
index 4998993fe5e4..35a8407eeb94 100644
--- a/net/icb/distinfo
+++ b/net/icb/distinfo
@@ -1 +1 @@
-MD5 (icb-5.0.9.tar.Z) = 19e802b1644d5a27284b70ecdcb07e0f
+MD5 (cicb-5.1.0.tar.gz) = 7ffe712d2606ee2295aee2b3f1f3aec7
diff --git a/net/icb/files/config b/net/icb/files/config
deleted file mode 100644
index 270602a841a0..000000000000
--- a/net/icb/files/config
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#	THIS IS AN AUTOMATICALLY GENERATED FILE
-#
-#	If you edit this file and later run "setup", your
-#	changes will be lost. This file gets fed to "make",
-#	so keep that in mind if you make changes.
-#
-
-# Installing user's home directory
-HOME		= /nonexistent
-
-# Directory where the client will be installed.
-BINDIR		= @PREFIX@/bin
-
-# Directory where the manual page will be installed.
-MANDIR		= @PREFIX@/man
-
-# Compiler to use.
-CC		= cc
-
-# Compile options.
-CFLAGS		= -O2  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
-TCLCFLAGS	= -O2  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
-
-# Lint flags
-LFLAGS		= -u  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
-
-# System dependent source file.
-SYSDEP		=sysdep.bsd
-
-# Other libraries to include.
-OTHERLIBS	=-lcurses -ltermcap
-
-# Resolver library
-RESOLVLIB	=
-
-# Parallel makes. Set to & for Sequents.
-PMAKE		=
-
-# Makefile dependency generator.
-MAKEDEPEND	= makedepend
-
-# Makefile dependency generator.
-DEPENDFLAGS	= -fMake  -DNO_LRAND48 -DSTRINGS_H -DTIME_H
-
-# Hostname and port of remote server.
-#DEFAULTHOST	= crater.unm.edu
-DEFAULTHOST	= cvs.openbsd.org
-DEFAULTPORT	= 7326
-
-# Directory for support files
-LIBDIR = @PREFIX@/share/icb
-
-# location of server database
-SERVERLIST = @PREFIX@/share/icb/icbserverdb
-
diff --git a/net/icb/files/patch-ab b/net/icb/files/patch-ab
deleted file mode 100644
index 93413db66b51..000000000000
--- a/net/icb/files/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
---- tcl/Make.orig	Fri Feb 24 13:19:48 1995
-+++ tcl/Make	Mon May 25 14:58:35 1998
-@@ -11,13 +11,6 @@
- 
- 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 +23,6 @@
- 
- OBJ = \
- 	panic.o \
--	strchr.o \
--	strerror.o \
--	strpbrk.o \
--	strspn.o \
--	strstr.o \
--	strtol.o \
--	strtoul.o \
- 	tclAssem.o \
- 	tclBasic.o \
- 	tclCmdAH.o \
diff --git a/net/icb/files/patch-ac b/net/icb/files/patch-ac
deleted file mode 100644
index e58c70c4903d..000000000000
--- a/net/icb/files/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
---- icb/c_log.c.orig	Fri Feb 24 13:20:18 1995
-+++ icb/c_log.c	Sat Aug 26 19:18:36 2000
-@@ -6,6 +6,7 @@
- #include "icb.h"
- #include "externs.h"
- #include <time.h>
-+#include <errno.h>
- 
- FILE *logfp = NULL;
- 
-@@ -45,8 +46,10 @@
- 	time_t time();
- 	struct tm *t, *localtime();
- 	time_t clock;
-+#if !(defined(BSD) && BSD >= 199306)
- 	extern int errno, sys_nerr;
- 	extern char *sys_errlist[];
-+#endif
- 
- 	/* determine pathname to use */
- 	if (path == NULL || *path == '\0')
-@@ -97,8 +100,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 +129,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/net/icb/files/patch-ad b/net/icb/files/patch-ad
deleted file mode 100644
index 036023b82631..000000000000
--- a/net/icb/files/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
---- icb/strings.c.orig	Sun Sep 19 18:14:24 1999
-+++ icb/strings.c	Sun Sep 19 18:20:05 1999
-@@ -3,7 +3,7 @@
- 
- #include "icb.h"
- #include "externs.h"
--#include <varargs.h>
-+#include <stdarg.h>
- 
- extern char *charmap;
- 
-@@ -334,19 +334,12 @@
- /* call with strscat(dest, src, src, ...) */
- 
- char *
--strscat(va_alist)
--va_dcl
-+strscat(char *dest, ...)
- {
--	char *dest, *src;
- 	va_list args;
-+	char *src;
- 
--	va_start(args);
--
--	/* get the dest pointer */
--	if ((dest = va_arg(args, char *)) == 0) {
--		puts("fatal error: strscat called without dest");
--		exit(-1);
--	}
-+	va_start(args, dest);
- 
- 	/* copy strings */
- 	while ((src = va_arg(args, char *)) != NULL) {
diff --git a/net/icb/files/patch-globals.c b/net/icb/files/patch-globals.c
deleted file mode 100644
index 134712089906..000000000000
--- a/net/icb/files/patch-globals.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1999/11/26 22:12:37 hubertf 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 */
diff --git a/net/icb/files/patch-helpdata.c b/net/icb/files/patch-helpdata.c
deleted file mode 100644
index b897555d26a4..000000000000
--- a/net/icb/files/patch-helpdata.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.4 1999/11/26 22:12:37 hubertf 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",
diff --git a/net/icb/files/patch-icb.h b/net/icb/files/patch-icb.h
deleted file mode 100644
index 4a0d1ef5c674..000000000000
--- a/net/icb/files/patch-icb.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1999/11/26 22:12:37 hubertf Exp $
-
-diff -x *.orig -urN ./icb/icb.h /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/icb.h
---- ./icb/icb.h	Fri Feb 24 22:20:23 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/icb.h	Fri Nov 26 22:56:30 1999
-@@ -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/net/icb/files/patch-n-ac b/net/icb/files/patch-n-ac
deleted file mode 100644
index bba6ba061903..000000000000
--- a/net/icb/files/patch-n-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- icb/protos.h.orig	Fri Feb 24 15:20:25 1995
-+++ icb/protos.h	Sun Sep 19 18:17:21 1999
-@@ -15,7 +15,7 @@
- char *idlestr(char *num);
- char *nextword(char *s);
- char *response(char *num);
--char *strscat(int va_alist,...);
-+char *strscat(char *dest, ...);
- char *tildexpand(char *s);
- int addusage(char *name, int type, char *args, char *usage);
- sighandler askquit();
-@@ -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);
diff --git a/net/icb/files/patch-o-aa b/net/icb/files/patch-o-aa
deleted file mode 100644
index 25500e293009..000000000000
--- a/net/icb/files/patch-o-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** murgil/clientserve.c.orig	Wed May  6 18:40:46 1998
---- murgil/clientserve.c	Wed May  6 18:43:34 1998
-***************
-*** 41,47 ****
-  	/* look at tty fd */
-  	FD_SET(0,&fdset); /**/
-  
-! 	signal(SIGALRM, gotalarm);
-  	timeisup = 0;
-  
-  	for (;;) {
---- 41,47 ----
-  	/* look at tty fd */
-  	FD_SET(0,&fdset); /**/
-  
-! 	signal(SIGALRM, (void *)gotalarm);
-  	timeisup = 0;
-  
-  	for (;;) {
diff --git a/net/icb/files/patch-o-ab b/net/icb/files/patch-o-ab
deleted file mode 100644
index a5af3884f240..000000000000
--- a/net/icb/files/patch-o-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** murgil/getrname.c.orig	Wed May  6 18:43:56 1998
---- murgil/getrname.c	Wed May  6 18:45:17 1998
-***************
-*** 14,20 ****
-  {
-  	static char rname[24];
-  	struct hostent *host;
-! #if defined(linux)
-  #define PEER_CAST (struct sockaddr *)
-  #define HOST_CAST (char *)
-  #else
---- 14,20 ----
-  {
-  	static char rname[24];
-  	struct hostent *host;
-! #if defined(linux) || defined(__OpenBSD__)
-  #define PEER_CAST (struct sockaddr *)
-  #define HOST_CAST (char *)
-  #else
diff --git a/net/icb/files/patch-o-ac b/net/icb/files/patch-o-ac
deleted file mode 100644
index 2e09c1dd645a..000000000000
--- a/net/icb/files/patch-o-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-*** murgil/serverserve.c.orig	Wed May  6 18:47:32 1998
---- murgil/serverserve.c	Wed May  6 18:47:48 1998
-***************
-*** 33,39 ****
-  	if (port_fd > highestfd)
-  		highestfd = port_fd;
-  
-! 	signal(SIGALRM, gotalarm);
-  	timeisup = 0;
-  
-  	for (;;) {
---- 33,39 ----
-  	if (port_fd > highestfd)
-  		highestfd = port_fd;
-  
-! 	signal(SIGALRM, (void *)gotalarm);
-  	timeisup = 0;
-  
-  	for (;;) {
diff --git a/net/icb/files/patch-o-ad b/net/icb/files/patch-o-ad
deleted file mode 100644
index f50110f139d6..000000000000
--- a/net/icb/files/patch-o-ad
+++ /dev/null
@@ -1,36 +0,0 @@
-*** tcl/tclCmdAH.c.orig	Sat Feb 25 03:19:53 1995
---- tcl/tclCmdAH.c	Wed May  6 18:54:07 1998
-***************
-*** 38,45 ****
---- 38,51 ----
-  #include <sys/wait.h>
-  #include "tclInt.h"
-  
-+ #if (defined(__unix__) || defined(unix)) && !defined(USG)
-+ #include <sys/param.h>
-+ #endif
-+ 
-  extern int errno;
-+ #if !(defined(BSD) && BSD >= 199306)
-  extern long lseek();
-+ #endif
-  extern char *mktemp();
-  
-  /*
-***************
-*** 627,633 ****
-  	while (1) {
-  	    int child;
-  
-! 	    child = wait(&status);
-  	    if (child == -1) {
-  		sprintf(interp->result,
-  			"child process disappeared mysteriously");
---- 633,639 ----
-  	while (1) {
-  	    int child;
-  
-! 	    child = wait((int *)&status);
-  	    if (child == -1) {
-  		sprintf(interp->result,
-  			"child process disappeared mysteriously");
diff --git a/net/icb/files/patch-o-ae b/net/icb/files/patch-o-ae
deleted file mode 100644
index afb9058781ee..000000000000
--- a/net/icb/files/patch-o-ae
+++ /dev/null
@@ -1,104 +0,0 @@
-*** readline/readline.c.orig	Wed May  6 18:49:08 1998
---- readline/readline.c	Wed May  6 18:51:35 1998
-***************
-*** 610,631 ****
-  
-  rl_set_signals ()
-  {
-!   old_int = (SigHandler *)signal (SIGINT, rl_signal_handler);
-    if (old_int == (SigHandler *)SIG_IGN)
-      signal (SIGINT, SIG_IGN);
-  
-!   old_alrm = (SigHandler *)signal (SIGALRM, rl_signal_handler);
-    if (old_alrm == (SigHandler *)SIG_IGN)
-      signal (SIGALRM, SIG_IGN);
-  
-  #if defined (SIGTSTP)
-!   old_tstp = (SigHandler *)signal (SIGTSTP, rl_signal_handler);
-    if (old_tstp == (SigHandler *)SIG_IGN)
-      signal (SIGTSTP, SIG_IGN);
-  #endif
-  #if defined (SIGTTOU)
-!   old_ttou = (SigHandler *)signal (SIGTTOU, rl_signal_handler);
-!   old_ttin = (SigHandler *)signal (SIGTTIN, rl_signal_handler);
-  
-    if (old_tstp == (SigHandler *)SIG_IGN)
-      {
---- 610,631 ----
-  
-  rl_set_signals ()
-  {
-!   old_int = (SigHandler *)signal (SIGINT, (void *)rl_signal_handler);
-    if (old_int == (SigHandler *)SIG_IGN)
-      signal (SIGINT, SIG_IGN);
-  
-!   old_alrm = (SigHandler *)signal (SIGALRM, (void *)rl_signal_handler);
-    if (old_alrm == (SigHandler *)SIG_IGN)
-      signal (SIGALRM, SIG_IGN);
-  
-  #if defined (SIGTSTP)
-!   old_tstp = (SigHandler *)signal (SIGTSTP, (void *)rl_signal_handler);
-    if (old_tstp == (SigHandler *)SIG_IGN)
-      signal (SIGTSTP, SIG_IGN);
-  #endif
-  #if defined (SIGTTOU)
-!   old_ttou = (SigHandler *)signal (SIGTTOU, (void *)rl_signal_handler);
-!   old_ttin = (SigHandler *)signal (SIGTTIN, (void *)rl_signal_handler);
-  
-    if (old_tstp == (SigHandler *)SIG_IGN)
-      {
-***************
-*** 635,660 ****
-  #endif
-  
-  #if defined (SIGWINCH)
-!   old_sigwinch = (SigHandler *)signal (SIGWINCH, rl_handle_sigwinch);
-  #endif
-  }
-  
-  rl_clear_signals ()
-  {
-!   signal (SIGINT, old_int);
-!   signal (SIGALRM, old_alrm);
-  
-  #if defined (SIGTSTP)
-!   signal (SIGTSTP, old_tstp);
-  #endif
-  
-  #if defined (SIGTTOU)
-!   signal (SIGTTOU, old_ttou);
-!   signal (SIGTTIN, old_ttin);
-  #endif
-  
-  #if defined (SIGWINCH)
-!       signal (SIGWINCH, old_sigwinch);
-  #endif
-  }
-  #endif  /* HANDLE_SIGNALS */
---- 635,660 ----
-  #endif
-  
-  #if defined (SIGWINCH)
-!   old_sigwinch = (SigHandler *)signal (SIGWINCH, (void *)rl_handle_sigwinch);
-  #endif
-  }
-  
-  rl_clear_signals ()
-  {
-!   signal (SIGINT, (void *)old_int);
-!   signal (SIGALRM, (void *)old_alrm);
-  
-  #if defined (SIGTSTP)
-!   signal (SIGTSTP, (void *)old_tstp);
-  #endif
-  
-  #if defined (SIGTTOU)
-!   signal (SIGTTOU, (void *)old_ttou);
-!   signal (SIGTTIN, (void *)old_ttin);
-  #endif
-  
-  #if defined (SIGWINCH)
-!       signal (SIGWINCH, (void *)old_sigwinch);
-  #endif
-  }
-  #endif  /* HANDLE_SIGNALS */
diff --git a/net/icb/files/patch-o-ah b/net/icb/files/patch-o-ah
deleted file mode 100644
index 858a51e24b3c..000000000000
--- a/net/icb/files/patch-o-ah
+++ /dev/null
@@ -1,31 +0,0 @@
-*** icb/c_shell.c.orig	Wed May  6 18:54:38 1998
---- icb/c_shell.c	Wed May  6 18:55:02 1998
-***************
-*** 60,72 ****
-  	signal(SIGQUIT, SIG_IGN);
-  
-  	/* wait for the child(ren) to die */
-! 	while ((w = wait(&status)) != pid && w != -1);
-  
-  	/* restore the terminal */
-  	icbterm();
-  
-  	/* restore signal processing */
-! 	signal(SIGINT, askquit);
-  	signal(SIGQUIT, SIG_DFL);
-  
-  	/* clean up a little */
---- 60,72 ----
-  	signal(SIGQUIT, SIG_IGN);
-  
-  	/* wait for the child(ren) to die */
-! 	while ((w = wait((int *)&status)) != pid && w != -1);
-  
-  	/* restore the terminal */
-  	icbterm();
-  
-  	/* restore signal processing */
-! 	signal(SIGINT, (void *)askquit);
-  	signal(SIGQUIT, SIG_DFL);
-  
-  	/* clean up a little */
diff --git a/net/icb/files/patch-o-ai b/net/icb/files/patch-o-ai
deleted file mode 100644
index 1ac66091909b..000000000000
--- a/net/icb/files/patch-o-ai
+++ /dev/null
@@ -1,67 +0,0 @@
-*** icb/signals.c.orig	Wed May  6 18:55:15 1998
---- icb/signals.c	Wed May  6 18:55:55 1998
-***************
-*** 22,35 ****
-  /*	sighandler askquit(), suspend(), icbexit(); */
-  
-  	/* exit on a hangup or terminate signal */
-! 	signal(SIGHUP, icbexit);
-! 	signal(SIGTERM, icbexit);
-  
-  	/* on an interrupt, verify the user wants to quit */
-! 	signal(SIGINT, askquit);
-  
-  	/* suspend on a stop signal */
-! 	signal(SIGTSTP, suspend);
-  }
-  
-  
---- 22,35 ----
-  /*	sighandler askquit(), suspend(), icbexit(); */
-  
-  	/* exit on a hangup or terminate signal */
-! 	signal(SIGHUP, (void *)icbexit);
-! 	signal(SIGTERM, (void *)icbexit);
-  
-  	/* on an interrupt, verify the user wants to quit */
-! 	signal(SIGINT, (void *)askquit);
-  
-  	/* suspend on a stop signal */
-! 	signal(SIGTSTP, (void *)suspend);
-  }
-  
-  
-***************
-*** 45,51 ****
-  	sigsetmask(sigblock(0) &~ mask(SIGTSTP));
-  	kill(0, SIGTSTP);
-  	sigblock(mask(SIGTSTP));
-! 	signal(SIGTSTP, suspend);
-  	icbterm();
-  	continued = 1;
-  }
---- 45,51 ----
-  	sigsetmask(sigblock(0) &~ mask(SIGTSTP));
-  	kill(0, SIGTSTP);
-  	sigblock(mask(SIGTSTP));
-! 	signal(SIGTSTP, (void *)suspend);
-  	icbterm();
-  	continued = 1;
-  }
-***************
-*** 73,79 ****
-  	if (c == 'Y' || c == 'y')
-  		icbexit();
-  	
-! 	signal(SIGINT, askquit);
-  	continued = 1;
-  
-  	if (oem)
---- 73,79 ----
-  	if (c == 'Y' || c == 'y')
-  		icbexit();
-  	
-! 	signal(SIGINT, (void *)askquit);
-  	continued = 1;
-  
-  	if (oem)
diff --git a/net/icb/files/patch-o-aj b/net/icb/files/patch-o-aj
deleted file mode 100644
index 760a3b4f0be4..000000000000
--- a/net/icb/files/patch-o-aj
+++ /dev/null
@@ -1,29 +0,0 @@
-*** tcl/tclProc.c.orig	Mon May 18 03:13:18 1998
---- tcl/tclProc.c	Mon May 18 03:14:36 1998
-***************
-*** 793,803 ****
-       */
-  
-      procDone:
-!     for (argPtr = frame.varPtr; argPtr != NULL; argPtr = argPtr->nextPtr) {
-  	if (argPtr->flags & VAR_DYNAMIC) {
-  	    free(argPtr->value);
-  	}
-! 	free((char *) argPtr);
-      }
-      iPtr->framePtr = frame.callerPtr;
-      iPtr->varFramePtr = frame.callerVarPtr;
---- 793,805 ----
-       */
-  
-      procDone:
-!     for (argPtr = frame.varPtr; argPtr != NULL;) {
-! 	void *tmp = argPtr;
-  	if (argPtr->flags & VAR_DYNAMIC) {
-  	    free(argPtr->value);
-  	}
-!         argPtr = argPtr->nextPtr;
-! 	free(tmp);
-      }
-      iPtr->framePtr = frame.callerPtr;
-      iPtr->varFramePtr = frame.callerVarPtr;
diff --git a/net/icb/files/patch-oset.c b/net/icb/files/patch-oset.c
deleted file mode 100644
index ceba9beaa9f9..000000000000
--- a/net/icb/files/patch-oset.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 1999/11/26 22:12:37 hubertf Exp $
-
-diff -x *.orig -urN ./icb/oset.c /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/oset.c
---- ./icb/oset.c	Fri Feb 24 22:20:24 1995
-+++ /usr/pkgsrc/net/icb/work.i386.unpatched/icb-5.0.9/icb/oset.c	Fri Nov 26 22:56:31 1999
-@@ -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 },
diff --git a/net/icb/files/patch-print.c b/net/icb/files/patch-print.c
deleted file mode 100644
index 9647ec63f682..000000000000
--- a/net/icb/files/patch-print.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ag,v 1.3 1999/11/26 23:18:47 hubertf 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 @@
- 
- #include "icb.h"
- #include "externs.h"
-+#include <time.h>
- 
- extern FILE *logfp;
- 
-@@ -17,12 +18,22 @@
- 	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)) {
-@@ -35,6 +46,8 @@
- 			*p++ = *t++;
- 		*p++ = '\r';
- 		*p++ = '\n';
-+		if (gv.printtime)
-+			write(1, timestamp, 8);
- 		write(1, printbuf, p - printbuf);
- 	}
- 
diff --git a/net/icb/files/patch-sample.icbrc b/net/icb/files/patch-sample.icbrc
deleted file mode 100644
index 418a1802b299..000000000000
--- a/net/icb/files/patch-sample.icbrc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.2 1999/11/29 05:19:26 soren 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
- 
- #==============================================================================#
- # procedures
diff --git a/net/icb/files/patch-serverlist.c b/net/icb/files/patch-serverlist.c
deleted file mode 100644
index 914c877d9993..000000000000
--- a/net/icb/files/patch-serverlist.c
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1999/11/26 22:12:37 hubertf 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 @@
- #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;
- 
- #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/net/icb/pkg-plist b/net/icb/pkg-plist
index a76a5fd4c1f0..c561276a4f11 100644
--- a/net/icb/pkg-plist
+++ b/net/icb/pkg-plist
@@ -4,5 +4,5 @@ share/icb/icbserverdb
 share/icb/sample.icbrc
 share/icb/bartender
 share/icb/confuse
-share/icb/echofile
+share/icb/echofunctions
 @dirrm share/icb