update to ircII 20020321. from the NEWS file:

o  /save -all works properly now
o  new server server groups can be listed in $IRCSERVER by prefixing
   :group: to the server name, eg, IRC/:lamenet:irc.lamenet.org:666
o  fix /set status_voice
o  add /server -group, allowing proper multi-network configuration
o  fix tabkey for people who join channels
o  fix many $functions() to work properly in multi-server context, and
   no longer use the current window
o  enhance $ignored()
o  add missing docs for /set tab, decrypt_program, show_stars and
   iso2022_support
o  new /on window_list for /window list output hookery
o  /window create now takes -xterm and -screen flags to force either a
   xterm or screen window to be created, rather than forcing the choice
o  /on flood support for ICB

4 files changed, 12 insertions, 67 deletions

diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 5ef28dfcc76..0c2dd48a4da 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/03/10 10:37:27 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/21 15:29:50 mrg Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
@@ -12,7 +12,7 @@ COMMENT=		The 'Internet Relay Chat' and 'Internet Citizens Band' Client
 
 CONFLICTS=		blackened-[0-9]*
 
-VERS=			20020310
+VERS=			20020321
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -59,7 +59,5 @@ post-install:
 		${ECHO} Compressing help files; \
 		${FIND} ${PREFIX}/share/irc/help -type f -print | ${XARGS} ${GZIP_CMD}; \
 	fi
-	${RM} -f ${PREFIX}/man/man1/irc.1
-	${LN} -s ircII.1 ${PREFIX}/man/man1/irc.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/ircII/PLIST b/chat/ircII/PLIST
index 7df5bf33cbb..65494fa79a5 100644
--- a/chat/ircII/PLIST
+++ b/chat/ircII/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2002/03/10 10:37:27 mrg Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/03/21 15:29:51 mrg Exp $
 bin/irc
-bin/irc-20020310
+bin/irc-20020321
 bin/ircbug
 bin/ircflush
 bin/ircio
@@ -295,6 +295,7 @@ share/irc/help/on/wallop@.GZ@
 share/irc/help/on/who@.GZ@
 share/irc/help/on/window@.GZ@
 share/irc/help/on/window_kill@.GZ@
+share/irc/help/on/window_list@.GZ@
 share/irc/help/on/window_swap@.GZ@
 share/irc/help/on/icb_status@.GZ@
 share/irc/help/on/icb_error@.GZ@
@@ -337,6 +338,7 @@ share/irc/help/set/ctcp_reply_flood_size@.GZ@
 share/irc/help/set/ctcp_reply_ignore_seconds@.GZ@
 share/irc/help/set/dcc_block_size@.GZ@
 share/irc/help/set/debug@.GZ@
+share/irc/help/set/decrypt_program@.GZ@
 share/irc/help/set/display@.GZ@
 share/irc/help/set/eight_bit_characters@.GZ@
 share/irc/help/set/encrypt_program@.GZ@
@@ -364,6 +366,7 @@ share/irc/help/set/input_protection@.GZ@
 share/irc/help/set/insert_mode@.GZ@
 share/irc/help/set/inverse_video@.GZ@
 share/irc/help/set/irchost@.GZ@
+share/irc/help/set/iso2022_support@.GZ@
 share/irc/help/set/lastlog@.GZ@
 share/irc/help/set/lastlog_level@.GZ@
 share/irc/help/set/load_path@.GZ@
@@ -382,7 +385,6 @@ share/irc/help/set/notify_level@.GZ@
 share/irc/help/set/notify_on_termination@.GZ@
 share/irc/help/set/novice@.GZ@
 share/irc/help/set/old_encrypt_program@.GZ@
-share/irc/help/set/pause_after_motd@.GZ@
 share/irc/help/set/realname@.GZ@
 share/irc/help/set/same_window_only@.GZ@
 share/irc/help/set/scroll@.GZ@
@@ -396,6 +398,7 @@ share/irc/help/set/show_away_once@.GZ@
 share/irc/help/set/show_channel_names@.GZ@
 share/irc/help/set/show_end_of_msgs@.GZ@
 share/irc/help/set/show_numerics@.GZ@
+share/irc/help/set/show_stars@.GZ@
 share/irc/help/set/show_status_all@.GZ@
 share/irc/help/set/show_who_hopcount@.GZ@
 share/irc/help/set/star_prefix@.GZ@
@@ -403,7 +406,6 @@ share/irc/help/set/status_away@.GZ@
 share/irc/help/set/status_channel@.GZ@
 share/irc/help/set/status_chanop@.GZ@
 share/irc/help/set/status_clock@.GZ@
-share/irc/help/set/status_dquery@.GZ@
 share/irc/help/set/status_format@.GZ@
 share/irc/help/set/status_hold@.GZ@
 share/irc/help/set/status_hold_lines@.GZ@
@@ -420,6 +422,7 @@ share/irc/help/set/status_user@.GZ@
 share/irc/help/set/status_voice@.GZ@
 share/irc/help/set/status_window@.GZ@
 share/irc/help/set/suppress_server_motd@.GZ@
+share/irc/help/set/tab@.GZ@
 share/irc/help/set/tab_max@.GZ@
 share/irc/help/set/translation@.GZ@
 share/irc/help/set/underline_video@.GZ@
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index 5c023814360..e3b9b00e8b4 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2002/03/10 14:06:43 mrg Exp $
+$NetBSD: distinfo,v 1.10 2002/03/21 15:29:51 mrg Exp $
 
-SHA1 (ircii-20020310.tar.bz2) = a8e0ff58e383adc10e5fbc87a1a8f8a2412a1cf3
-Size (ircii-20020310.tar.bz2) = 531259 bytes
+SHA1 (ircii-20020321.tar.bz2) = 76d1ae2680eca4cc861f7eb6a52e13d6e4f2e313
+Size (ircii-20020321.tar.bz2) = 534159 bytes
 SHA1 (patch-aa) = 80aa471bcb6f864bed32117ed437d9d1ca9aa1ee
 SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151
-SHA1 (patch-ad) = 90a2a9558d2b32c53c55214bdc2f3c1f6136ddff
diff --git a/chat/ircII/patches/patch-ad b/chat/ircII/patches/patch-ad
deleted file mode 100644
index ad3d16fbe7c..00000000000
--- a/chat/ircII/patches/patch-ad
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/03/10 14:06:43 mrg Exp $
-
-Index: source/icb.c
-===================================================================
-RCS file: /home/cvs/ircii/source/icb.c,v
-retrieving revision 2.47
-diff -p -r2.47 icb.c
-*** source/icb.c	2002/02/05 18:14:45	2.47
---- source/icb.c	2002/03/10 14:00:50
-*************** IRCII_RCSID("@(#)$eterna: icb.c,v 2.47 2
-*** 62,67 ****
---- 62,68 ----
-  #include "icb.h"
-  #include "hook.h"
-  #include "ignore.h"
-+ #include "flood.h"
-  
-  /* sender functions */
-  static	void	icb_put_login _((u_char *, u_char *, u_char *, u_char *, u_char *));
-*************** icb_got_public(line)
-*** 154,160 ****
-  		break;
-  	}
-  
-! 	if (do_hook(PUBLIC_LIST, "%s %s %s", ap[0], get_server_icbgroup(parsing_server_index), ap[1]))
-  		put_it("%s<%s>%s %s", high, ap[0], high, ap[1]);
-  out:
-  	set_lastlog_msg_level(level);
---- 155,162 ----
-  		break;
-  	}
-  
-! 	if (check_flooding(ap[0], PUBLIC_FLOOD, ap[1]) &&
-! 	    do_hook(PUBLIC_LIST, "%s %s %s", ap[0], get_server_icbgroup(parsing_server_index), ap[1]))
-  		put_it("%s<%s>%s %s", high, ap[0], high, ap[1]);
-  out:
-  	set_lastlog_msg_level(level);
-*************** icb_got_msg(line)
-*** 192,198 ****
-  		break;
-  	}
-  
-! 	if (do_hook(MSG_LIST, "%s %s", ap[0], ap[1]))
-  	{
-  		if (away_set)
-  		{
---- 194,201 ----
-  		break;
-  	}
-  
-! 	if (check_flooding(ap[0], MSG_FLOOD, ap[1]) &&
-! 	    do_hook(MSG_LIST, "%s %s", ap[0], ap[1]))
-  	{
-  		if (away_set)
-  		{