update ircII package to 4.4M, plus a couple of additional fixes since then.

changes in 4.4M are:

	- .ircquick support (loaded when client starts)
	- new functions: hasvoice(), dcclist() and chatpeers()
	- new variable: MAKE_NOTICE_MSG
	- fixed long line sending in ICB mode: long lines are split
	  and send to the server separately
	- new scripts based on my start up: default (suggested for
	  a .ircrc), times (to add time to most chat) and otherstatus
	  (to allow non-inverse status lines to be constructed)
	- fix by in xecho
	- make SHOW_CHANNEL_NAMES work in ICB mode.
	- incorporate IPv6 support

additional fixes include:

	- ipv6 support in configure.in was a bit broken
	- /whois works in ICB mode
	- group name changes are now handled in ICB mode

9 files changed, 263 insertions, 137 deletions

diff --git a/net/ircII/Makefile b/net/ircII/Makefile
index 6e37289bab3..f3b5a9edef9 100644
--- a/net/ircII/Makefile
+++ b/net/ircII/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2000/01/10 00:57:15 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2000/01/31 23:00:45 mrg Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
 #
 
-DISTNAME=		ircii-4.4L
-PKGNAME=		ircII-4.4L
-WRKSRC=			${WRKDIR}/ircii-4.4L
+DISTNAME=		ircii-4.4M
+PKGNAME=		ircII-4.4M
+WRKSRC=			${WRKDIR}/ircii-4.4M
 CATEGORIES=		net
 MASTER_SITES=		ftp://ircftp.au.eterna.com.au/pub/ircII/
 
diff --git a/net/ircII/files/md5 b/net/ircII/files/md5
index 805bb35ec8d..3605f2b745d 100644
--- a/net/ircII/files/md5
+++ b/net/ircII/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 1999/08/23 12:27:12 mrg Exp $
+$NetBSD: md5,v 1.8 2000/01/31 23:00:47 mrg Exp $
 
-MD5 (ircii-4.4L.tar.gz) = 016637c1c8f399e97227404e84f11296
+MD5 (ircii-4.4M.tar.gz) = 34d6fb3e4d2635b04978741a3fad5c9d
diff --git a/net/ircII/files/patch-sum b/net/ircII/files/patch-sum
index 3e7df78d985..025b2dda0ce 100644
--- a/net/ircII/files/patch-sum
+++ b/net/ircII/files/patch-sum
@@ -1,5 +1,7 @@
-$NetBSD: patch-sum,v 1.9 1999/11/29 11:50:14 frueauf Exp $
+<<<<<<< patch-sum
 
-MD5 (patch-aa) = ad0513671ae928967f60c329958ad24e
-MD5 (patch-ab) = 9b17a8b43f833f694f44afa7ee8345d9
-MD5 (patch-ac) = b9ec004beff786ef4ef7467a2ef168dc
+MD5 (patch-aa) = 349090fc868403231edfd1a827a4f0fd
+MD5 (patch-ab) = fa2f44d39bc1669be9087ce8750103c1
+MD5 (patch-ac) = a1297cc8a4c19898983e2420c8307160
+MD5 (patch-ad) = 0d76b09f64886ca9dc2beb86ec07937f
+MD5 (patch-ae) = 21b33a3e38b7a07ad22939114677986a
diff --git a/net/ircII/patches/patch-aa b/net/ircII/patches/patch-aa
index 3d0c0b6da1f..67529386116 100644
--- a/net/ircII/patches/patch-aa
+++ b/net/ircII/patches/patch-aa
@@ -1,34 +1,18 @@
-$NetBSD: patch-aa,v 1.6 1999/11/29 11:45:14 frueauf Exp $
+$netBSD$
 
---- configure.in.orig	Mon Aug 23 14:06:36 1999
-+++ configure.in	Mon Nov 29 01:26:53 1999
-@@ -734,7 +734,7 @@
-       CAST_SRC=cast.c
-       ;;
-   esac ],
--  if test -f source/cast.c; then
-+  if test -f ${srcdir}/source/cast.c; then
-     AC_MSG_RESULT(yes)
-     AC_DEFINE_UNQUOTED(USE_CAST, 1)
-     CAST_SRC=cast.c
-@@ -809,11 +809,15 @@
- 	      withval="-lsocks5"
- 	    else
- 	      if test -d "$withval"; then
--		if test -d "$withval/include"; then
--		  CFLAGS="$CFLAGS -I$withval/include"
--		else
--		  CFLAGS="$CFLAGS -I$withval"
--		fi
-+#
-+# On NetBSD avoid problems if the ncurses package is installed. $withval/include
-+# should be after the local includes in the include path.
-+#
-+#		if test -d "$withval/include"; then
-+#		  CFLAGS="$CFLAGS -I$withval/include"
-+#		else
-+#		  CFLAGS="$CFLAGS -I$withval"
-+#		fi
- 	        if test -d "$withval/lib"; then
- 		  withval="-L$withval/lib -lsocks5"
- 		else
+Index: configure.in
+===================================================================
+RCS file: /home/cvs/ircii/configure.in,v
+retrieving revision 1.121
+retrieving revision 1.122
+diff -p -u -r1.121 -r1.122
+--- configure.in	2000/01/28 19:55:28	1.121
++++ configure.in	2000/01/31 04:06:24	1.122
+@@ -916,7 +916,6 @@ AC_ARG_ENABLE(ipv6,
+ #include <sys/socket.h>
+ main()
+ {
+-  exit(0);
+  if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+    exit(1);
+  else
diff --git a/net/ircII/patches/patch-ab b/net/ircII/patches/patch-ab
index 122a83ddda8..69234a4f676 100644
--- a/net/ircII/patches/patch-ab
+++ b/net/ircII/patches/patch-ab
@@ -1,113 +1,148 @@
-$NetBSD: patch-ab,v 1.7 1999/11/29 11:50:15 frueauf Exp $
+$NetBSD: patch-ab,v 1.8 2000/01/31 23:00:47 mrg Exp $
 
---- configure.orig	Mon Aug 23 14:06:36 1999
-+++ configure	Mon Nov 29 01:30:00 1999
-@@ -4072,7 +4072,7 @@
-       ;;
-   esac 
- else
--  if test -f source/cast.c; then
-+  if test -f ${srcdir}/source/cast.c; then
-     echo "$ac_t""yes" 1>&6
-     cat >> confdefs.h <<EOF
- #define USE_CAST 1
-@@ -4261,11 +4261,15 @@
- 	      withval="-lsocks5"
- 	    else
- 	      if test -d "$withval"; then
--		if test -d "$withval/include"; then
--		  CFLAGS="$CFLAGS -I$withval/include"
--		else
--		  CFLAGS="$CFLAGS -I$withval"
--		fi
-+#
-+# On NetBSD avoid problems if the ncurses package is installed. $withval/include
-+# should be after the local includes in the include path.
-+#
-+#		if test -d "$withval/include"; then
-+#		  CFLAGS="$CFLAGS -I$withval/include"
-+#		else
-+#		  CFLAGS="$CFLAGS -I$withval"
-+#		fi
- 	        if test -d "$withval/lib"; then
- 		  withval="-L$withval/lib -lsocks5"
- 		else
-@@ -4280,14 +4284,14 @@
- 	    TMPLIBS="$LIBS"
- 	    LIBS="$LIBS $KERBEROS_LIBS"
- 	    cat > conftest.$ac_ext <<EOF
--#line 4284 "configure"
-+#line 4288 "configure"
- #include "confdefs.h"
+Index: configure
+===================================================================
+RCS file: /home/cvs/ircii/configure,v
+retrieving revision 2.83
+retrieving revision 2.84
+diff -p -u -r2.83 -r2.84
+--- configure	2000/01/28 19:57:35	2.83
++++ configure	2000/01/31 04:07:12	2.84
+@@ -4511,7 +4511,6 @@ else
+ #include <sys/socket.h>
+ main()
+ {
+-  exit(0);
+  if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+    exit(1);
+  else
+@@ -4519,7 +4518,7 @@ main()
+ }
  
- int main() {
-  SOCKSconnect(); 
- ; return 0; }
  EOF
--if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   :
- else
-   echo "configure: failed program was:" >&5
-@@ -4308,7 +4312,7 @@
+-if { (eval echo configure:4523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   echo "$ac_t""yes" 1>&6
+   cat >> confdefs.h <<\EOF
+@@ -4546,12 +4545,12 @@ ipv6trylibc=no
  
- if test "x$socks" = "x"; then
- 	echo $ac_n "checking whether to support SOCKS4""... $ac_c" 1>&6
--echo "configure:4312: checking whether to support SOCKS4" >&5
-+echo "configure:4316: checking whether to support SOCKS4" >&5
- 	# Check whether --with-socks4 or --without-socks4 was given.
- if test "${with_socks4+set}" = set; then
-   withval="$with_socks4"
-@@ -4328,14 +4332,14 @@
- 	    fi
- 	    LIBS="$withval $LIBS"
- 	    cat > conftest.$ac_ext <<EOF
--#line 4332 "configure"
-+#line 4336 "configure"
+ if test "x$ipv6" = "xyes"; then
+         echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6
+-echo "configure:4550: checking ipv6 stack type" >&5
++echo "configure:4549: checking ipv6 stack type" >&5
+         for i in inria kame linux-glibc linux-libinet6 toshiba v6d zeta; do
+                 case $i in
+                 inria)
+                                                 cat > conftest.$ac_ext <<EOF
+-#line 4555 "configure"
++#line 4554 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+@@ -4570,7 +4569,7 @@ rm -f conftest*
+                         ;;
+                 kame)
+                                                 cat > conftest.$ac_ext <<EOF
+-#line 4574 "configure"
++#line 4573 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+@@ -4592,7 +4591,7 @@ rm -f conftest*
+                         ;;
+                 linux-glibc)
+                                                 cat > conftest.$ac_ext <<EOF
+-#line 4596 "configure"
++#line 4595 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <features.h>
+@@ -4620,7 +4619,7 @@ rm -f conftest*
+                         ;;
+                 toshiba)
+                         cat > conftest.$ac_ext <<EOF
+-#line 4624 "configure"
++#line 4623 "configure"
  #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+@@ -4641,7 +4640,7 @@ rm -f conftest*
+                         ;;
+                 v6d)
+                         cat > conftest.$ac_ext <<EOF
+-#line 4645 "configure"
++#line 4644 "configure"
+ #include "confdefs.h"
+ dnl
+ #include </usr/local/v6/include/sys/v6config.h>
+@@ -4662,7 +4661,7 @@ rm -f conftest*
+                         ;;
+                 zeta)
+                         cat > conftest.$ac_ext <<EOF
+-#line 4666 "configure"
++#line 4665 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+@@ -4703,13 +4702,13 @@ ipv6 kit and compile beforehand." 1>&2; 
+         fi
+ fi
+ echo $ac_n "checking getaddrinfo bug""... $ac_c" 1>&6
+-echo "configure:4707: checking getaddrinfo bug" >&5
++echo "configure:4706: checking getaddrinfo bug" >&5
+ if test "$cross_compiling" = yes; then
+   echo "$ac_t""buggy" 1>&6
+ buggygetaddrinfo=yes
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4713 "configure"
++#line 4712 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -4796,7 +4795,7 @@ main()
+ }
  
- int main() {
-  Rconnect(); 
- ; return 0; }
  EOF
--if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   :
- else
-   echo "configure: failed program was:" >&5
-@@ -4493,7 +4497,7 @@
+-if { (eval echo configure:4800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   echo "$ac_t""good" 1>&6
+ buggygetaddrinfo=no
+@@ -4832,7 +4831,7 @@ do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:4497: checking for $ac_word" >&5
-+echo "configure:4501: checking for $ac_word" >&5
+-echo "configure:4836: checking for $ac_word" >&5
++echo "configure:4835: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_COPY_DIRECTORY'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4528,7 +4532,7 @@
+@@ -4867,7 +4866,7 @@ do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:4532: checking for $ac_word" >&5
-+echo "configure:4536: checking for $ac_word" >&5
+-echo "configure:4871: checking for $ac_word" >&5
++echo "configure:4870: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_COPY_DIRECTORY'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4581,7 +4585,7 @@
+@@ -4920,7 +4919,7 @@ do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:4585: checking for $ac_word" >&5
-+echo "configure:4589: checking for $ac_word" >&5
+-echo "configure:4924: checking for $ac_word" >&5
++echo "configure:4923: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_ZCAT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4656,7 +4660,7 @@
+@@ -4995,7 +4994,7 @@ if test -z "$SENDMAIL"; then
    # Extract the first word of `sendmail', so it can be a program name with args.
    set dummy sendmail; word=$2
    echo $ac_n "checking for $word""... $ac_c" 1>&6
--echo "configure:4660: checking for $word" >&5
-+echo "configure:4664: checking for $word" >&5
+-echo "configure:4999: checking for $word" >&5
++echo "configure:4998: checking for $word" >&5
    IFS="${IFS= 	}"; saveifs="$IFS"; IFS="${IFS}:"
    for dir in $_PATH; do
      test -z "$dir" && dir=.
diff --git a/net/ircII/patches/patch-ac b/net/ircII/patches/patch-ac
index c5dfa80d2df..0d5497ec8ab 100644
--- a/net/ircII/patches/patch-ac
+++ b/net/ircII/patches/patch-ac
@@ -1,5 +1,6 @@
-$NetBSD: patch-ac,v 1.8 1999/11/29 11:45:14 frueauf Exp $
+$NetBSD: patch-ac,v 1.9 2000/01/31 23:00:48 mrg Exp $
 
+Index: Makefile.in
 --- Makefile.in.orig	Mon Aug 23 13:46:48 1999
 +++ Makefile.in	Mon Nov 29 01:33:06 1999
 @@ -176,8 +176,8 @@
@@ -27,12 +28,3 @@ $NetBSD: patch-ac,v 1.8 1999/11/29 11:45:14 frueauf Exp $
  
  installscript: installdirs
  	(								\
-@@ -318,7 +316,7 @@
- 
- CAST_SRC = @CAST_SRC@
- 
--INCLUDES = -I. -I$(incdir)
-+INCLUDES = -I. -I$(incdir) -I${prefix}/include
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -c $<
diff --git a/net/ircII/patches/patch-ad b/net/ircII/patches/patch-ad
new file mode 100644
index 00000000000..91771ce22df
--- /dev/null
+++ b/net/ircII/patches/patch-ad
@@ -0,0 +1,81 @@
+$NetBSD: patch-ad,v 1.3 2000/01/31 23:00:48 mrg Exp $
+
+Index: source/icb.c
+===================================================================
+RCS file: /home/cvs/ircii/source/icb.c,v
+retrieving revision 2.24
+retrieving revision 2.26
+diff -p -u -r2.24 -r2.26
+--- source/icb.c	2000/01/06 01:00:55	2.24
++++ source/icb.c	2000/01/31 22:29:07	2.26
+@@ -216,7 +216,7 @@ icb_got_status(line)
+ 			group = ap[1] + 21;
+ 			KILL_SPACE(group);
+ 			clear_channel_list(parsing_server_index);
+-			add_channel(group, parsing_server_index, 1, 0);
++			add_channel(group, parsing_server_index, CHAN_JOINED, 0);
+ 			set_server_icbgroup(parsing_server_index, group);
+ 			icb_set_fromuserhost(empty_string);
+ 			message_from(group, LOG_CRAP);
+@@ -268,14 +268,32 @@ icb_got_status(line)
+ 			do_say = 0;
+ 		RESTORE_SPACE;
+ 	}
++	else
++	if (my_stricmp(ap[0], "change") == 0)
++	{
++		/* look for "Group is now named XXX" */
++
++		if (my_strnicmp(ap[1], "Group is now named ", 19) == 0)
++		{
++			int	len;
++
++			group = ap[1] + 19;
++			len = strlen(group);
++			if (group[len - 1] == '.')
++				group[len - 1] = 0;	/* kill the period */
++
++			clear_channel_list(parsing_server_index);
++			add_channel(group, parsing_server_index, CHAN_JOINED, 0);
++			set_server_icbgroup(parsing_server_index, group);
++			icb_set_fromuserhost(empty_string);
++		}
++		/* leave do_say set for both cases */
++	}
+ 
+-	/* run this hook even if do_say is no?  for now, no. */
+-	/* HOOK: new? status? icb_status? */
+-	/* the hook is needed.  or support here for it.  there are a lot more status messages
+-	 * we need to deal with that come via here... */
+ #if 0
+-*** info Change: Group is now named somaz
++/* messages not yet understood */
+ #endif
++
+ 	if (do_say && do_hook(ICB_STATUS_LIST, "%s %s", ap[0], ap[1]))
+ 		say("info %s: %s", ap[0], ap[1]);
+ out:	
+@@ -623,13 +641,16 @@ icb_put_msg2(to, line)
+ 	size_t	len, remain;
+ 
+ 	/* HOOK: send_msg */
+-	save_message_from();
+-	level = set_lastlog_msg_level(LOG_MSG);
+-	message_from(to, LOG_MSG);
+-	if (do_hook(SEND_MSG_LIST, "%s %s", to, line))
+-		put_it("-> *%s* %s", to, line);
+-	set_lastlog_msg_level(level);
+-	restore_message_from();
++	if (window_display)
++	{
++		save_message_from();
++		level = set_lastlog_msg_level(LOG_MSG);
++		message_from(to, LOG_MSG);
++		if (do_hook(SEND_MSG_LIST, "%s %s", to, line))
++			put_it("-> *%s* %s", to, line);
++		set_lastlog_msg_level(level);
++		restore_message_from();
++	}
+ 
+ 	/* deal with ICB 255 length limits */
+ 	/* command + 'm' + sep + to + space + (line +) nul */
diff --git a/net/ircII/patches/patch-ae b/net/ircII/patches/patch-ae
new file mode 100644
index 00000000000..291a8bd02c7
--- /dev/null
+++ b/net/ircII/patches/patch-ae
@@ -0,0 +1,32 @@
+$NetBSD: patch-ae,v 1.1 2000/01/31 23:00:49 mrg Exp $
+
+Index: source/edit.c
+===================================================================
+RCS file: /home/cvs/ircii/source/edit.c,v
+retrieving revision 1.119
+retrieving revision 1.120
+diff -p -u -r1.119 -r1.120
+--- edit.c	1999/12/18 13:12:00	1.119
++++ edit.c	2000/01/30 21:07:47	1.120
+@@ -1285,6 +1285,21 @@ whois(command, args, subargs)
+ 		*args,
+ 		*subargs;
+ {
++	if (get_server_version(from_server) == ServerICB)
++	{
++		int	display;
++		char	*buf;
++
++		display = window_display;
++		window_display = 0;
++		buf = new_malloc(5 + 1 + strlen(args) + 1);
++		sprintf(buf, "whereis %s", args);
++		icb_put_msg2("server", buf);
++		new_free(&buf);
++		window_display = display;
++		return;
++	}
++
+ 	if (args && *args)
+ 		send_to_server("%s %s", command, args);
+ 	else /* Default to yourself  -lynx */
diff --git a/net/ircII/pkg/PLIST b/net/ircII/pkg/PLIST
index 2cac3fe4074..1fd863206d6 100644
--- a/net/ircII/pkg/PLIST
+++ b/net/ircII/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.18 1999/08/24 07:27:21 tron Exp $
-bin/irc-4.4L
+@comment $NetBSD: PLIST,v 1.19 2000/01/31 23:00:50 mrg Exp $
+bin/irc-4.4M
 bin/ircbug
 bin/irc
 bin/ircio