upgrade to ircii 20011210. this includes:

    o  new /on raw_send
    o  new /exec -filter option
    o  fixed mIRC colour code handling
    o  enhanced redirection to multiple targets
    o  bug fix for $mid()
    o  bug fix for when resizing to a smaller window
    o  other bug fixes

4 files changed, 12 insertions, 106 deletions

diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index baca646a822..bb88249a8b8 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.10 2001/09/27 23:17:48 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/12/10 13:38:29 mrg Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
 #
 
-DISTNAME=		ircii-20010612
-PKGNAME=		ircII-20010612
-WRKSRC=			${WRKDIR}/ircii-20010612
+DISTNAME=		ircii-20011210
+PKGNAME=		ircII-20011210
+WRKSRC=			${WRKDIR}/ircii-20011210
 CATEGORIES=		chat
-MASTER_SITES=		ftp://ircftp.au.eterna.com.au/pub/ircII/
+MASTER_SITES=		ftp://ircii.warped.com/pub/ircII/ \
+			ftp://ircftp.au.eterna.com.au/pub/ircII/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
diff --git a/chat/ircII/PLIST b/chat/ircII/PLIST
index 58edea63d63..6a1ed769173 100644
--- a/chat/ircII/PLIST
+++ b/chat/ircII/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:06:30 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/10 13:38:29 mrg Exp $
 bin/irc
-bin/irc-20010612
+bin/irc-20011210
 bin/ircbug
 bin/ircflush
 bin/ircio
@@ -277,6 +277,7 @@ share/irc/help/on/public_msg@.GZ@
 share/irc/help/on/public_notice@.GZ@
 share/irc/help/on/public_other@.GZ@
 share/irc/help/on/raw_irc@.GZ@
+share/irc/help/on/raw_send@.GZ@
 share/irc/help/on/send_action@.GZ@
 share/irc/help/on/send_dcc_chat@.GZ@
 share/irc/help/on/send_msg@.GZ@
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index 7b2212d8454..681eaa3ee25 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2001/10/02 14:13:38 mrg Exp $
+$NetBSD: distinfo,v 1.7 2001/12/10 13:38:29 mrg Exp $
 
-SHA1 (ircii-20010612.tar.bz2) = 04189908de744956a66530d77d97c452927bb876
-Size (ircii-20010612.tar.bz2) = 522912 bytes
+SHA1 (ircii-20011210.tar.bz2) = 66e649380e472626acfbe63a8f41045b668948a3
+Size (ircii-20011210.tar.bz2) = 527842 bytes
 SHA1 (patch-aa) = 80aa471bcb6f864bed32117ed437d9d1ca9aa1ee
-SHA1 (patch-ab) = a9d84f59c73560c1d738cb3d9eb35486c75574a9
 SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151
diff --git a/chat/ircII/patches/patch-ab b/chat/ircII/patches/patch-ab
deleted file mode 100644
index 90c38c2a6b4..00000000000
--- a/chat/ircII/patches/patch-ab
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/10/02 14:13:38 mrg Exp $
-
-Index: source/screen.c
-===================================================================
-RCS file: /home/cvs/ircii/source/screen.c,v
-retrieving revision 1.119
-retrieving revision 1.121
-diff -p -c -r1.119 -r1.121
-*** source/screen.c	2001/05/19 20:57:36	1.119
---- source/screen.c	2001/07/20 00:42:39	1.121
-*************** output_line(str, result, startpos)
-*** 688,695 ****
-  				/* parse all consequent colour settings */
-  				int fg, bg;
-  
-! 				fg = *++ptr - 1;
-! 				bg = *++ptr - 1;
-  				if (fg < 16)
-  					fgcolour = fg;
-  				if (bg < 16)
---- 688,705 ----
-  				/* parse all consequent colour settings */
-  				int fg, bg;
-  
-! 				if (!*++ptr)
-! 				{
-! 					str = ptr;
-! 					break;
-! 				}
-! 				fg = *ptr - 1;
-! 				if (!*++ptr)
-! 				{
-! 					str = ptr;
-! 					break;
-! 				}
-! 				bg = *ptr - 1;
-  				if (fg < 16)
-  					fgcolour = fg;
-  				if (bg < 16)
-*************** output_line(str, result, startpos)
-*** 712,719 ****
-  			}
-  			if (written > CO)
-  				len = len - (written - CO);
-! 			if (!startpos)
-! 				fwrite(str, len, 1, current_screen->fpout);
-  			
-  			if (!underline)
-  			{
---- 722,729 ----
-  			}
-  			if (written > CO)
-  				len = len - (written - CO);
-! 			if (!startpos && len > 0)
-! 				fwrite(str, (size_t)len, 1, current_screen->fpout);
-  			
-  			if (!underline)
-  			{
-*************** output_line(str, result, startpos)
-*** 747,758 ****
-  			}
-  			if (written > CO)
-  				len = len - (written - CO);
-! 			if (!startpos)
-! 				fwrite(str, len, 1, current_screen->fpout);
-  			do
-  			{
-! 				charset_type = *++ptr;
-! 				charset = *++ptr;
-  			} while (ptr[1] == CHARSET_TAG && ptr++);
-  			display_charset(charset_type, charset);
-  			str = ++ptr;
---- 757,778 ----
-  			}
-  			if (written > CO)
-  				len = len - (written - CO);
-! 			if (!startpos && len > 0)
-! 				fwrite(str, (size_t)len, 1, current_screen->fpout);
-  			do
-  			{
-! 				if (!*++ptr)
-! 				{
-! 					str = ptr;
-! 					break;
-! 				}
-! 				charset_type = *ptr;
-! 				if (!*++ptr)
-! 				{
-! 					str = ptr;
-! 					break;
-! 				}
-! 				charset = *ptr;
-  			} while (ptr[1] == CHARSET_TAG && ptr++);
-  			display_charset(charset_type, charset);
-  			str = ++ptr;