update to ircii 20030314. changes since ircII 20021103:

  o  server's added by /server are no longer removed if they fail to connect.
  o  SEVERAL REMOTE HOLES FIXED in ctcp, status & other code
  o  fix ICB /msg to names starting with a /.  you can now /msg \/oink to send
     a message to "/oink".  if you previously were able to /msg \oink you now
     have to /msg \\oink.
  o  arithmetic "|" now works properly
  o  fix ICB /msg with a user the same name as the channel
  o  fix ICB group's and user's with comma's in them
  o  /notify and /timer always go to level crap now
  o  fix nickname response lossage
  o  fix $connect() hich was broken recently
  o  fix "irc -h" which was broken recently
  o  fix "dcc close raw" which was broken recently

4 files changed, 7 insertions, 71 deletions

diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 442b7ba37f0..76f3722a539 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/02/18 02:29:14 lukem Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/14 12:59:03 mrg Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
-PKGREVISION=		1
 CATEGORIES=		chat
 MASTER_SITES=		ftp://ircii.warped.com/pub/ircII/ \
 			ftp://ircftp.au.eterna.com.au/pub/ircII/
@@ -13,7 +12,7 @@ COMMENT=		The 'Internet Relay Chat' and 'Internet Citizens Band' Client
 
 CONFLICTS=		blackened-[0-9]*
 
-VERS=			20021103
+VERS=			20030314
 PLIST_SUBST+= 		VERS=${VERS}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/chat/ircII/PLIST b/chat/ircII/PLIST
index 23398fb7efc..0bc603e910f 100644
--- a/chat/ircII/PLIST
+++ b/chat/ircII/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2002/12/09 16:01:15 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/03/14 12:59:03 mrg Exp $
 bin/irc
 bin/irc-${VERS}
 bin/ircbug
@@ -8,6 +8,7 @@ bin/wserv
 man/man1/irc.1
 man/man1/ircII.1
 man/man1/ircbug.1
+share/irc/help/@@.GZ@
 share/irc/help/!@.GZ@
 share/irc/help/.date@.GZ@
 share/irc/help/:@.GZ@
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index 2f558917842..10ed20fa350 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.17 2003/02/18 02:29:15 lukem Exp $
+$NetBSD: distinfo,v 1.18 2003/03/14 12:59:03 mrg Exp $
 
-SHA1 (ircii-20021103.tar.bz2) = 222d0ba4fcdb48e86739c2ec639115d86975d85e
-Size (ircii-20021103.tar.bz2) = 554379 bytes
+SHA1 (ircii-20030314.tar.bz2) = fdf038ff775da9042ab27d514d58816fedf88aac
+Size (ircii-20030314.tar.bz2) = 551874 bytes
 SHA1 (patch-aa) = aff3a8c5ff05797b8617be2b4b57920913ae9ca2
 SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151
-SHA1 (patch-ad) = 57d918857e2be0687af335d7231a07d2b1d76e35
diff --git a/chat/ircII/patches/patch-ad b/chat/ircII/patches/patch-ad
deleted file mode 100644
index ea8016ffbf2..00000000000
--- a/chat/ircII/patches/patch-ad
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/02/18 02:29:15 lukem Exp $
-
---- source/server.c.orig	2002-09-07 02:04:38.000000000 +1000
-+++ source/server.c
-@@ -58,7 +58,9 @@ int	connect_to_unix _((int, u_char *));
- #include "icb.h"
- #include "server.h"
- 
-+#if 0
- static	void	server_list_garbage_collect _((void));
-+#endif
- static	void	add_to_server_buffer _((int, u_char *));
- static	void	login_to_server _((int));
- static	int	connect_to_server_direct _((u_char *, int, u_char *, int));
-@@ -95,6 +97,7 @@ extern	int	dgets_errno;
- 
- #define DEFAULT_SERVER_VERSION Server2_8
- 
-+#if 0
- /*
-  * clean out the SERVER_FAKE entries
-  */
-@@ -109,6 +112,7 @@ server_list_garbage_collect()
- 		else
- 			i++;
- }
-+#endif
- 
- /*
-  * close_server: Given an index into the server list, this closes the
-@@ -684,7 +688,7 @@ remove_from_server_list(i)
- 	if (i < from_server)
- 		--from_server;
- 	while ((tmp = traverse_all_windows(&flag)) != NULL)
--		if (tmp->server > i)
-+		if (tmp->server > i && tmp->server > 0)
- 			tmp->server--;
- 
- 	bcopy((char *) &server_list[i + 1], (char *) &server_list[i], (number_of_servers - i - 1) * sizeof(Server));
-@@ -1171,7 +1175,9 @@ connect_to_server(server_name, port, nic
- 			server_index = connect_to_server_process(server_name, port, nick, server_index);
- 		else
- 			server_index = connect_to_server_direct(server_name, port, nick, server_index);
-+#if 0
- 		server_list_garbage_collect();
-+#endif
- 		if (server_index)
- 		{
- 			server_list[server_index].attempting_to_connect = 0;
-@@ -1423,9 +1429,11 @@ display_server_list()
- 		say("Server list:");
- 		for (i = 0; i < number_of_servers; i++)
- 		{
--			u_char	*icb_msg = server_list[i].version == ServerICB ? (u_char *) " (ICB connection)" : empty_string;
--			u_char	*group_msg, lbuf[BIG_BUFFER_SIZE];
-+			u_char	*icb_msg, *group_msg, lbuf[BIG_BUFFER_SIZE];
- 
-+			if (server_list[i].flags & SERVER_FAKE)
-+				continue;
-+			icb_msg = server_list[i].version == ServerICB ? (u_char *) " (ICB connection)" : empty_string;
- 			if (server_list[i].server_group)
- 			{
- 				snprintf(CP(lbuf), sizeof lbuf, " [group: %s]",