update to ircII 4.4I. features include ICB support and many bug fixes as usual.

7 files changed, 232 insertions, 251 deletions

diff --git a/net/ircII/Makefile b/net/ircII/Makefile
index 862037e9f69..1db4d3405be 100644
--- a/net/ircII/Makefile
+++ b/net/ircII/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.15 1998/08/09 21:42:01 kim Exp $
+# $NetBSD: Makefile,v 1.16 1999/05/21 16:09:45 mrg Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
 #
 
-DISTNAME=		ircii-4.4
-PKGNAME=		ircII-4.4
-WRKSRC=			${WRKDIR}/ircii-4.4
+DISTNAME=		ircii-4.4I
+PKGNAME=		ircII-4.4I
+WRKSRC=			${WRKDIR}/ircii-4.4I
 CATEGORIES=		net
-MASTER_SITES=		ftp://ircii.warped.com/pub/ircII/
+MASTER_SITES=		ftp://ftp.au.netbsd.com/pub/ircII/
 
-MAINTAINER=		mrg@eterna.com.au
+MAINTAINER=		packages@netbsd.org
 
 GNU_CONFIGURE=		yes
 #CONFIGURE_ARGS+=	--with-default-server=SERVER[:PORT]
+CONFIGURE_ARGS+=	${IRCII_CONFIGURE_ARGS}
+CONFIGURE_ENV+=		${IRCII_CONFIGURE_ENV}
 
 PLIST_SRC=		${WRKDIR}/PLIST.tmp
 
diff --git a/net/ircII/files/md5 b/net/ircII/files/md5
index 534c7d30625..fe0b6e0822d 100644
--- a/net/ircII/files/md5
+++ b/net/ircII/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/08/07 13:25:10 agc Exp $
+$NetBSD: md5,v 1.5 1999/05/21 16:09:46 mrg Exp $
 
-MD5 (ircii-4.4.tar.gz) = acc9f39e21d31dfad36e403f76e890ed
+MD5 (ircii-4.4I.tar.gz) = 71a50c7aac58d279f3cf99b4cd948a93
diff --git a/net/ircII/patches/patch-ab b/net/ircII/patches/patch-ab
deleted file mode 100644
index 7971f05f5e8..00000000000
--- a/net/ircII/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:10:43 agc Exp $
-
-*** source/wserv.c.old	Mon Jan  1 19:10:40 1996
---- source/wserv.c	Mon Jan  1 19:10:18 1996
-***************
-*** 79,85 ****
-  	strcpy(addr->sun_path, argv[1]);
-  	s = socket(AF_UNIX, SOCK_STREAM, 0);
-  	if (0 > connect(s, (struct sockaddr *) addr, sizeof(addr->sun_family) +
-! 						strlen(addr->sun_path)))
-  		exit(0);
-  
-  	/*
---- 79,85 ----
-  	strcpy(addr->sun_path, argv[1]);
-  	s = socket(AF_UNIX, SOCK_STREAM, 0);
-  	if (0 > connect(s, (struct sockaddr *) addr, sizeof(addr->sun_family) +
-! 						2 + strlen(addr->sun_path)))
-  		exit(0);
-  
-  	/*
diff --git a/net/ircII/patches/patch-ac b/net/ircII/patches/patch-ac
index 72a446a8870..12ec7b0161b 100644
--- a/net/ircII/patches/patch-ac
+++ b/net/ircII/patches/patch-ac
@@ -1,16 +1,7 @@
-$NetBSD: patch-ac,v 1.5 1998/08/09 21:23:29 kim Exp $
+$NetBSD: patch-ac,v 1.6 1999/05/21 16:09:46 mrg Exp $
 
 --- Makefile.in.orig	Tue Mar 25 22:47:43 1997
 +++ Makefile.in	Sun Aug  9 17:05:07 1998
-@@ -36,7 +36,7 @@
- # Where the ircII library will be.  Generally this is the place that
- # you put the scripts, help pages and translation tables.  It is
- # very important that you set this correctly.
--IRCLIB = @IRCLIB@
-+IRCLIB = @datadir@/irc
- 
- # Set this to the lex you want to use, and if they lex uses a library.
- 
 @@ -132,8 +132,8 @@
  LN = @LN@
  CP = cp
diff --git a/net/ircII/pkg/COMMENT b/net/ircII/pkg/COMMENT
index 60813ab329e..fdfbadf26bf 100644
--- a/net/ircII/pkg/COMMENT
+++ b/net/ircII/pkg/COMMENT
@@ -1 +1 @@
-The 'Internet Relay Chat' Client.
+The 'Internet Relay Chat' and 'Internet Citizens Band' Client.
diff --git a/net/ircII/pkg/DESCR b/net/ircII/pkg/DESCR
index e1b50fc483d..85e83deab51 100644
--- a/net/ircII/pkg/DESCR
+++ b/net/ircII/pkg/DESCR
@@ -1,3 +1,3 @@
 The ircII program is a full screen, termcap based interface to Internet Relay
 Chat. It gives full access to all of the normal IRC functions, plus a variety
-of additional options.
+of additional options.  It also has support for ICB -- Internet Citizens Band.
diff --git a/net/ircII/pkg/PLIST b/net/ircII/pkg/PLIST
index 377ec9cdf3c..83fa57d791b 100644
--- a/net/ircII/pkg/PLIST
+++ b/net/ircII/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.10 1998/08/09 21:42:01 kim Exp $
-bin/irc
-bin/irc-4.4
+@comment $NetBSD: PLIST,v 1.11 1999/05/21 16:09:46 mrg Exp $
+bin/irc-4.4I
 bin/ircbug
+bin/irc
 bin/ircio
 bin/ircflush
 bin/wserv
-man/man1/irc.1
 man/man1/ircII.1
 man/man1/ircbug.1
 share/irc/translation/ASCII
@@ -69,7 +68,7 @@ share/irc/script/fnet
 share/irc/script/functions
 share/irc/script/global
 share/irc/script/help
-share/irc/script/log
+share/irc/script/icb
 share/irc/script/history
 share/irc/script/history-match
 share/irc/script/imap
@@ -80,6 +79,7 @@ share/irc/script/kickmenu
 share/irc/script/killpath
 share/irc/script/kpstat
 share/irc/script/list
+share/irc/script/log
 share/irc/script/lynx_ircrc
 share/irc/script/meta1
 share/irc/script/meta2
@@ -90,6 +90,7 @@ share/irc/script/netsplit
 share/irc/script/newaway
 share/irc/script/newformat
 share/irc/script/nicks
+share/irc/script/nocolour
 share/irc/script/oldping
 share/irc/script/oper
 share/irc/script/ping
@@ -114,99 +115,14 @@ share/irc/script/whowas
 share/irc/script/window
 share/irc/help/alias/alias@.GZ@
 share/irc/help/alias/quote@.GZ@
-share/irc/help/alias/functions@.GZ@
 share/irc/help/alias/special@.GZ@
 share/irc/help/alias/width@.GZ@
-share/irc/help/away@.GZ@
-share/irc/help/basics@.GZ@
-share/irc/help/beep@.GZ@
-share/irc/help/bye@.GZ@
-share/irc/help/cd@.GZ@
-share/irc/help/clear@.GZ@
-share/irc/help/comment@.GZ@
-share/irc/help/connect@.GZ@
-share/irc/help/date@.GZ@
-share/irc/help/deop@.GZ@
-share/irc/help/describe@.GZ@
-share/irc/help/die@.GZ@
-share/irc/help/dmsg@.GZ@
-share/irc/help/dquery@.GZ@
-share/irc/help/echo@.GZ@
-share/irc/help/encrypt@.GZ@
-share/irc/help/eval@.GZ@
-share/irc/help/exec@.GZ@
-share/irc/help/if@.GZ@
-share/irc/help/exit@.GZ@
-share/irc/help/expressions@.GZ@
-share/irc/help/flush@.GZ@
-share/irc/help/foreach@.GZ@
-share/irc/help/help@.GZ@
-share/irc/help/hook@.GZ@
-share/irc/help/ignore@.GZ@
-share/irc/help/info@.GZ@
-share/irc/help/intro@.GZ@
-share/irc/help/invite@.GZ@
-share/irc/help/ison@.GZ@
-share/irc/help/join@.GZ@
-share/irc/help/kick@.GZ@
-share/irc/help/kill@.GZ@
-share/irc/help/lastlog@.GZ@
-share/irc/help/leave@.GZ@
-share/irc/help/list@.GZ@
-share/irc/help/lusers@.GZ@
-share/irc/help/me@.GZ@
-share/irc/help/mload@.GZ@
-share/irc/help/mode@.GZ@
-share/irc/help/motd@.GZ@
-share/irc/help/msg@.GZ@
-share/irc/help/news@.GZ@
-share/irc/help/newuser@.GZ@
-share/irc/help/nick@.GZ@
-share/irc/help/notice@.GZ@
-share/irc/help/oper@.GZ@
-share/irc/help/parsekey@.GZ@
-share/irc/help/part@.GZ@
-share/irc/help/ping@.GZ@
-share/irc/help/query@.GZ@
-share/irc/help/quit@.GZ@
-share/irc/help/quote@.GZ@
-share/irc/help/redirect@.GZ@
-share/irc/help/save@.GZ@
-share/irc/help/rehash@.GZ@
-share/irc/help/rules@.GZ@
-share/irc/help/say@.GZ@
-share/irc/help/send@.GZ@
-share/irc/help/sendline@.GZ@
-share/irc/help/server@.GZ@
-share/irc/help/servlist@.GZ@
-share/irc/help/signoff@.GZ@
-share/irc/help/sleep@.GZ@
-share/irc/help/squit@.GZ@
-share/irc/help/stats@.GZ@
-share/irc/help/summon@.GZ@
-share/irc/help/time@.GZ@
-share/irc/help/topic@.GZ@
-share/irc/help/trace@.GZ@
-share/irc/help/type@.GZ@
-share/irc/help/userhost@.GZ@
-share/irc/help/users@.GZ@
-share/irc/help/version@.GZ@
-share/irc/help/wait@.GZ@
-share/irc/help/who@.GZ@
-share/irc/help/whowas@.GZ@
-share/irc/help/xecho@.GZ@
-share/irc/help/xtype@.GZ@
-share/irc/help/!@.GZ@
-share/irc/help/which@.GZ@
-share/irc/help/while@.GZ@
-share/irc/help/channel@.GZ@
-share/irc/help/digraph@.GZ@
-share/irc/help/history@.GZ@
-share/irc/help/notify@.GZ@
-share/irc/help/squery@.GZ@
-share/irc/help/:@.GZ@
-share/irc/help/wallops@.GZ@
-share/irc/help/whois@.GZ@
+share/irc/help/alias/functions@.GZ@
+share/irc/help/bind/backspace@.GZ@
+share/irc/help/bind/backward_character@.GZ@
+share/irc/help/bind/backward_history@.GZ@
+share/irc/help/bind/backward_word@.GZ@
+share/irc/help/bind/beginning_of_line@.GZ@
 share/irc/help/bind/bind@.GZ@
 share/irc/help/bind/clear_screen@.GZ@
 share/irc/help/bind/command_completion@.GZ@
@@ -220,15 +136,19 @@ share/irc/help/bind/erase_line@.GZ@
 share/irc/help/bind/erase_to_beg_of_line@.GZ@
 share/irc/help/bind/erase_to_end_of_line@.GZ@
 share/irc/help/bind/examples@.GZ@
+share/irc/help/bind/keys@.GZ@
 share/irc/help/bind/forward_character@.GZ@
 share/irc/help/bind/forward_history@.GZ@
 share/irc/help/bind/forward_word@.GZ@
-share/irc/help/bind/keys@.GZ@
-share/irc/help/bind/next_window@.GZ@
-share/irc/help/bind/nothing@.GZ@
+share/irc/help/bind/help_character@.GZ@
+share/irc/help/bind/meta1_character@.GZ@
+share/irc/help/bind/meta2_character@.GZ@
 share/irc/help/bind/meta3_character@.GZ@
 share/irc/help/bind/meta4_character@.GZ@
+share/irc/help/bind/next_window@.GZ@
+share/irc/help/bind/nothing@.GZ@
 share/irc/help/bind/parse_command@.GZ@
+share/irc/help/bind/previous_window@.GZ@
 share/irc/help/bind/quit_irc@.GZ@
 share/irc/help/bind/quote_character@.GZ@
 share/irc/help/bind/refresh_inputline@.GZ@
@@ -240,107 +160,104 @@ share/irc/help/bind/scroll_start@.GZ@
 share/irc/help/bind/self_insert@.GZ@
 share/irc/help/bind/send_line@.GZ@
 share/irc/help/bind/stop_irc@.GZ@
+share/irc/help/bind/switch_channels@.GZ@
 share/irc/help/bind/toggle_insert_mode@.GZ@
 share/irc/help/bind/toggle_stop_screen@.GZ@
 share/irc/help/bind/transpose_characters@.GZ@
-share/irc/help/bind/backspace@.GZ@
-share/irc/help/bind/help_character@.GZ@
-share/irc/help/bind/backward_character@.GZ@
-share/irc/help/bind/previous_window@.GZ@
-share/irc/help/bind/switch_channels@.GZ@
-share/irc/help/bind/backward_history@.GZ@
-share/irc/help/bind/backward_word@.GZ@
-share/irc/help/bind/beginning_of_line@.GZ@
-share/irc/help/bind/meta1_character@.GZ@
-share/irc/help/bind/meta2_character@.GZ@
 share/irc/help/bind/type_text@.GZ@
 share/irc/help/bind/unstop_all_windows@.GZ@
 share/irc/help/bind/yank_from_cutbuffer@.GZ@
+share/irc/help/ctcp/action@.GZ@
+share/irc/help/ctcp/clientinfo@.GZ@
+share/irc/help/ctcp/ctcp@.GZ@
+share/irc/help/ctcp/echo@.GZ@
+share/irc/help/ctcp/finger@.GZ@
 share/irc/help/ctcp/ping@.GZ@
 share/irc/help/ctcp/time@.GZ@
 share/irc/help/ctcp/userinfo@.GZ@
 share/irc/help/ctcp/utc@.GZ@
 share/irc/help/ctcp/version@.GZ@
-share/irc/help/ctcp/action@.GZ@
-share/irc/help/ctcp/ctcp@.GZ@
-share/irc/help/ctcp/clientinfo@.GZ@
-share/irc/help/ctcp/echo@.GZ@
-share/irc/help/ctcp/finger@.GZ@
+share/irc/help/dcc/chat@.GZ@
+share/irc/help/dcc/close@.GZ@
+share/irc/help/dcc/dcc@.GZ@
+share/irc/help/dcc/get@.GZ@
+share/irc/help/dcc/list@.GZ@
 share/irc/help/dcc/raw@.GZ@
 share/irc/help/dcc/rename@.GZ@
 share/irc/help/dcc/send@.GZ@
 share/irc/help/dcc/talk@.GZ@
 share/irc/help/dcc/tmsg@.GZ@
-share/irc/help/dcc/chat@.GZ@
-share/irc/help/dcc/get@.GZ@
-share/irc/help/dcc/dcc@.GZ@
-share/irc/help/dcc/list@.GZ@
-share/irc/help/dcc/close@.GZ@
+share/irc/help/load/action@.GZ@
+share/irc/help/load/alias@.GZ@
+share/irc/help/load/autoop@.GZ@
+share/irc/help/load/basical@.GZ@
 share/irc/help/load/bigcheese@.GZ@
 share/irc/help/load/brc@.GZ@
 share/irc/help/load/channel@.GZ@
 share/irc/help/load/columns@.GZ@
-share/irc/help/load/dccchan@.GZ@
+share/irc/help/load/commander@.GZ@
+share/irc/help/load/cursor@.GZ@
 share/irc/help/load/deutsch@.GZ@
 share/irc/help/load/disc@.GZ@
 share/irc/help/load/edit@.GZ@
 share/irc/help/load/english@.GZ@
 share/irc/help/load/events@.GZ@
+share/irc/help/load/extensions@.GZ@
+share/irc/help/load/finger@.GZ@
 share/irc/help/load/finger.who@.GZ@
 share/irc/help/load/flood@.GZ@
 share/irc/help/load/fnet@.GZ@
 share/irc/help/load/functions@.GZ@
-share/irc/help/load/help@.GZ@
 share/irc/help/load/history@.GZ@
-share/irc/help/load/msg@.GZ@
+share/irc/help/load/irciihelp@.GZ@
 share/irc/help/load/ircprimer@.GZ@
+share/irc/help/load/kickmenu@.GZ@
+share/irc/help/load/killpath@.GZ@
 share/irc/help/load/kpstat@.GZ@
 share/irc/help/load/list@.GZ@
-share/irc/help/load/killpath@.GZ@
 share/irc/help/load/load@.GZ@
 share/irc/help/load/local@.GZ@
+share/irc/help/load/lynx_ircrc@.GZ@
 share/irc/help/load/meta1@.GZ@
 share/irc/help/load/meta2@.GZ@
+share/irc/help/load/msg@.GZ@
 share/irc/help/load/mudlike@.GZ@
 share/irc/help/load/nemesis@.GZ@
 share/irc/help/load/netsplit@.GZ@
 share/irc/help/load/newaway@.GZ@
 share/irc/help/load/nicks@.GZ@
+share/irc/help/load/oldping@.GZ@
 share/irc/help/load/oper@.GZ@
+share/irc/help/load/prefix@.GZ@
 share/irc/help/load/recursion@.GZ@
 share/irc/help/load/repeat@.GZ@
 share/irc/help/load/screen@.GZ@
 share/irc/help/load/service@.GZ@
+share/irc/help/load/shell@.GZ@
 share/irc/help/load/silent@.GZ@
+share/irc/help/load/smileys@.GZ@
 share/irc/help/load/suggestions@.GZ@
 share/irc/help/load/tabkey@.GZ@
 share/irc/help/load/time@.GZ@
 share/irc/help/load/traces@.GZ@
 share/irc/help/load/troy@.GZ@
+share/irc/help/load/uhnotify@.GZ@
 share/irc/help/load/version@.GZ@
+share/irc/help/load/wallopstat@.GZ@
+share/irc/help/load/icb@.GZ@
 share/irc/help/load/whowas@.GZ@
 share/irc/help/load/window@.GZ@
 share/irc/help/load/2.9script@.GZ@
-share/irc/help/load/autoop@.GZ@
-share/irc/help/load/extensions@.GZ@
-share/irc/help/load/kickmenu@.GZ@
-share/irc/help/load/prefix@.GZ@
-share/irc/help/load/smileys@.GZ@
-share/irc/help/load/action@.GZ@
-share/irc/help/load/alias@.GZ@
-share/irc/help/load/basical@.GZ@
-share/irc/help/load/cursor@.GZ@
-share/irc/help/load/finger@.GZ@
-share/irc/help/load/irciihelp@.GZ@
-share/irc/help/load/lynx_ircrc@.GZ@
-share/irc/help/load/oldping@.GZ@
-share/irc/help/load/shell@.GZ@
-share/irc/help/load/uhnotify@.GZ@
-share/irc/help/load/commander@.GZ@
-share/irc/help/load/wallopstat@.GZ@
+share/irc/help/load/dccchan@.GZ@
+share/irc/help/load/help@.GZ@
+share/irc/help/note/antiwall@.GZ@
+share/irc/help/note/count@.GZ@
+share/irc/help/note/deny@.GZ@
 share/irc/help/note/find@.GZ@
 share/irc/help/note/flag@.GZ@
 share/irc/help/note/key@.GZ@
+share/irc/help/note/log@.GZ@
+share/irc/help/note/ls@.GZ@
 share/irc/help/note/news@.GZ@
 share/irc/help/note/note@.GZ@
 share/irc/help/note/rm@.GZ@
@@ -349,27 +266,29 @@ share/irc/help/note/send@.GZ@
 share/irc/help/note/sent@.GZ@
 share/irc/help/note/service@.GZ@
 share/irc/help/note/spy@.GZ@
+share/irc/help/note/stats@.GZ@
+share/irc/help/note/user@.GZ@
 share/irc/help/note/waitfor@.GZ@
 share/irc/help/note/wall@.GZ@
 share/irc/help/note/wallops@.GZ@
-share/irc/help/note/antiwall@.GZ@
-share/irc/help/note/ls@.GZ@
-share/irc/help/note/count@.GZ@
-share/irc/help/note/stats@.GZ@
-share/irc/help/note/deny@.GZ@
-share/irc/help/note/log@.GZ@
-share/irc/help/note/user@.GZ@
+share/irc/help/on/action@.GZ@
+share/irc/help/on/channel_nick@.GZ@
+share/irc/help/on/channel_signoff@.GZ@
+share/irc/help/on/connect@.GZ@
 share/irc/help/on/ctcp@.GZ@
+share/irc/help/on/ctcp_reply@.GZ@
 share/irc/help/on/dcc_chat@.GZ@
 share/irc/help/on/dcc_raw@.GZ@
 share/irc/help/on/disconnect@.GZ@
 share/irc/help/on/exec@.GZ@
+share/irc/help/on/exec_errors@.GZ@
 share/irc/help/on/exec_exit@.GZ@
 share/irc/help/on/exec_prompt@.GZ@
 share/irc/help/on/flood@.GZ@
 share/irc/help/on/help@.GZ@
 share/irc/help/on/hook@.GZ@
 share/irc/help/on/idle@.GZ@
+share/irc/help/on/input@.GZ@
 share/irc/help/on/invite@.GZ@
 share/irc/help/on/join@.GZ@
 share/irc/help/on/leave@.GZ@
@@ -377,46 +296,44 @@ share/irc/help/on/list@.GZ@
 share/irc/help/on/mail@.GZ@
 share/irc/help/on/mode@.GZ@
 share/irc/help/on/msg@.GZ@
+share/irc/help/on/msg_group@.GZ@
 share/irc/help/on/names@.GZ@
-share/irc/help/on/note@.GZ@
 share/irc/help/on/nickname@.GZ@
+share/irc/help/on/note@.GZ@
 share/irc/help/on/notice@.GZ@
+share/irc/help/on/notify_signoff@.GZ@
 share/irc/help/on/notify_signon@.GZ@
 share/irc/help/on/numeric@.GZ@
 share/irc/help/on/on@.GZ@
-share/irc/help/on/talk@.GZ@
+share/irc/help/on/public@.GZ@
 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/send_action@.GZ@
 share/irc/help/on/send_dcc_chat@.GZ@
 share/irc/help/on/send_msg@.GZ@
 share/irc/help/on/send_notice@.GZ@
 share/irc/help/on/send_public@.GZ@
 share/irc/help/on/send_talk@.GZ@
 share/irc/help/on/serial_numbers@.GZ@
+share/irc/help/on/server_notice@.GZ@
 share/irc/help/on/signoff@.GZ@
+share/irc/help/on/talk@.GZ@
 share/irc/help/on/timer@.GZ@
 share/irc/help/on/topic@.GZ@
 share/irc/help/on/wall@.GZ@
-share/irc/help/on/who@.GZ@
 share/irc/help/on/wallop@.GZ@
-share/irc/help/on/window_kill@.GZ@
-share/irc/help/on/action@.GZ@
-share/irc/help/on/channel_nick@.GZ@
-share/irc/help/on/exec_errors@.GZ@
-share/irc/help/on/notify_signoff@.GZ@
-share/irc/help/on/send_action@.GZ@
+share/irc/help/on/who@.GZ@
 share/irc/help/on/window@.GZ@
-share/irc/help/on/connect@.GZ@
-share/irc/help/on/ctcp_reply@.GZ@
-share/irc/help/on/input@.GZ@
-share/irc/help/on/msg_group@.GZ@
-share/irc/help/on/public@.GZ@
-share/irc/help/on/public_notice@.GZ@
-share/irc/help/on/server_notice@.GZ@
-share/irc/help/on/channel_signoff@.GZ@
+share/irc/help/on/window_kill@.GZ@
+share/irc/help/set/always_split_biggest@.GZ@
+share/irc/help/set/auto_unmark_away@.GZ@
+share/irc/help/set/auto_whowas@.GZ@
 share/irc/help/set/beep@.GZ@
 share/irc/help/set/beep_max@.GZ@
+share/irc/help/set/beep_on_msg@.GZ@
+share/irc/help/set/beep_when_away@.GZ@
 share/irc/help/set/bold_video@.GZ@
 share/irc/help/set/channel_name_width@.GZ@
 share/irc/help/set/client_information@.GZ@
@@ -424,22 +341,24 @@ share/irc/help/set/clock@.GZ@
 share/irc/help/set/clock_24hour@.GZ@
 share/irc/help/set/clock_alarm@.GZ@
 share/irc/help/set/cmdchars@.GZ@
+share/irc/help/set/command_mode@.GZ@
 share/irc/help/set/continued_line@.GZ@
-share/irc/help/set/ctcp_reply_flood_size@.GZ@
-share/irc/help/set/debug@.GZ@
 share/irc/help/set/dcc_block_size@.GZ@
+share/irc/help/set/debug@.GZ@
 share/irc/help/set/display@.GZ@
-share/irc/help/set/help_path@.GZ@
+share/irc/help/set/eight_bit_characters@.GZ@
+share/irc/help/set/flood_after@.GZ@
 share/irc/help/set/encrypt_program@.GZ@
 share/irc/help/set/exec_protection@.GZ@
-share/irc/help/set/flood_after@.GZ@
-share/irc/help/set/ctcp_reply_ignore_seconds@.GZ@
 share/irc/help/set/flood_rate@.GZ@
 share/irc/help/set/flood_users@.GZ@
+share/irc/help/set/flood_warning@.GZ@
 share/irc/help/set/full_status_line@.GZ@
-share/irc/help/set/help_pager@.GZ@
+share/irc/help/set/help_path@.GZ@
 share/irc/help/set/help_prompt@.GZ@
+share/irc/help/set/no_ctcp_flood@.GZ@
 share/irc/help/set/help_window@.GZ@
+share/irc/help/set/hide_private_channels@.GZ@
 share/irc/help/set/highlight_char@.GZ@
 share/irc/help/set/history@.GZ@
 share/irc/help/set/history_file@.GZ@
@@ -447,35 +366,40 @@ share/irc/help/set/hold_mode@.GZ@
 share/irc/help/set/hold_mode_max@.GZ@
 share/irc/help/set/indent@.GZ@
 share/irc/help/set/input_aliases@.GZ@
-share/irc/help/set/insert_mode@.GZ@
 share/irc/help/set/input_prompt@.GZ@
-share/irc/help/set/inverse_video@.GZ@
+share/irc/help/set/input_protection@.GZ@
+share/irc/help/set/insert_mode@.GZ@
 share/irc/help/set/lastlog@.GZ@
 share/irc/help/set/load_path@.GZ@
+share/irc/help/set/inverse_video@.GZ@
+share/irc/help/set/lastlog_level@.GZ@
 share/irc/help/set/log@.GZ@
 share/irc/help/set/logfile@.GZ@
 share/irc/help/set/mail@.GZ@
+share/irc/help/set/max_recursions@.GZ@
 share/irc/help/set/menu@.GZ@
 share/irc/help/set/minimum_servers@.GZ@
 share/irc/help/set/minimum_users@.GZ@
-share/irc/help/set/no_ctcp_flood@.GZ@
+share/irc/help/set/translation@.GZ@
 share/irc/help/set/notify_handler@.GZ@
 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/pause_after_motd@.GZ@
 share/irc/help/set/realname@.GZ@
-share/irc/help/set/same_window_only@.GZ@
 share/irc/help/set/scroll@.GZ@
 share/irc/help/set/scroll_lines@.GZ@
 share/irc/help/set/send_ignore_msg@.GZ@
 share/irc/help/set/set@.GZ@
 share/irc/help/set/shell@.GZ@
+share/irc/help/set/shell_flags@.GZ@
 share/irc/help/set/shell_limit@.GZ@
 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_status_all@.GZ@
+share/irc/help/set/show_who_hopcount@.GZ@
 share/irc/help/set/status_away@.GZ@
 share/irc/help/set/status_channel@.GZ@
 share/irc/help/set/status_chanop@.GZ@
@@ -483,8 +407,10 @@ 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@
 share/irc/help/set/status_insert@.GZ@
 share/irc/help/set/status_mail@.GZ@
+share/irc/help/set/status_mode@.GZ@
 share/irc/help/set/status_notify@.GZ@
 share/irc/help/set/status_oper@.GZ@
 share/irc/help/set/status_overwrite@.GZ@
@@ -492,41 +418,35 @@ share/irc/help/set/status_query@.GZ@
 share/irc/help/set/status_server@.GZ@
 share/irc/help/set/status_umode@.GZ@
 share/irc/help/set/status_user@.GZ@
+share/irc/help/set/status_window@.GZ@
 share/irc/help/set/suppress_server_motd@.GZ@
 share/irc/help/set/tab_max@.GZ@
-share/irc/help/set/translation@.GZ@
+share/irc/help/set/underline_video@.GZ@
 share/irc/help/set/use_old_msg@.GZ@
+share/irc/help/set/user_information@.GZ@
 share/irc/help/set/user_wallops@.GZ@
 share/irc/help/set/verbose_ctcp@.GZ@
 share/irc/help/set/warn_of_ignores@.GZ@
 share/irc/help/set/xterm_options@.GZ@
-share/irc/help/set/always_split_biggest@.GZ@
-share/irc/help/set/beep_when_away@.GZ@
-share/irc/help/set/flood_warning@.GZ@
-share/irc/help/set/input_protection@.GZ@
-share/irc/help/set/notify_on_termination@.GZ@
-share/irc/help/set/status_hold_lines@.GZ@
-share/irc/help/set/auto_unmark_away@.GZ@
-share/irc/help/set/user_information@.GZ@
-share/irc/help/set/auto_whowas@.GZ@
-share/irc/help/set/beep_on_msg@.GZ@
-share/irc/help/set/command_mode@.GZ@
-share/irc/help/set/eight_bit_characters@.GZ@
-share/irc/help/set/hide_private_channels@.GZ@
-share/irc/help/set/lastlog_level@.GZ@
-share/irc/help/set/max_recursions@.GZ@
-share/irc/help/set/shell_flags@.GZ@
-share/irc/help/set/show_who_hopcount@.GZ@
-share/irc/help/set/status_mode@.GZ@
-share/irc/help/set/status_window@.GZ@
-share/irc/help/set/underline_video@.GZ@
+share/irc/help/set/same_window_only@.GZ@
+share/irc/help/set/help_pager@.GZ@
 share/irc/help/set/ctcp_reply_backlog_seconds@.GZ@
+share/irc/help/set/ctcp_reply_flood_size@.GZ@
+share/irc/help/set/ctcp_reply_ignore_seconds@.GZ@
+share/irc/help/set/old_encrypt_program@.GZ@
+share/irc/help/window/add@.GZ@
+share/irc/help/window/addgroup@.GZ@
+share/irc/help/window/back@.GZ@
+share/irc/help/window/balance@.GZ@
+share/irc/help/window/channel@.GZ@
 share/irc/help/window/create@.GZ@
 share/irc/help/window/delete@.GZ@
+share/irc/help/window/delgroup@.GZ@
 share/irc/help/window/double@.GZ@
 share/irc/help/window/goto@.GZ@
 share/irc/help/window/grow@.GZ@
 share/irc/help/window/hide@.GZ@
+share/irc/help/window/hide_others@.GZ@
 share/irc/help/window/hold_mode@.GZ@
 share/irc/help/window/kill@.GZ@
 share/irc/help/window/kill_others@.GZ@
@@ -538,44 +458,132 @@ share/irc/help/window/logfile@.GZ@
 share/irc/help/window/move@.GZ@
 share/irc/help/window/name@.GZ@
 share/irc/help/window/new@.GZ@
+share/irc/help/window/next@.GZ@
+share/irc/help/window/notify@.GZ@
+share/irc/help/window/notify_level@.GZ@
 share/irc/help/window/number@.GZ@
 share/irc/help/window/pop@.GZ@
 share/irc/help/window/previous@.GZ@
 share/irc/help/window/prompt@.GZ@
 share/irc/help/window/push@.GZ@
+share/irc/help/window/refnum@.GZ@
 share/irc/help/window/remove@.GZ@
 share/irc/help/window/scroll@.GZ@
-share/irc/help/window/add@.GZ@
 share/irc/help/window/server@.GZ@
 share/irc/help/window/show@.GZ@
+share/irc/help/window/shrink@.GZ@
 share/irc/help/window/stack@.GZ@
 share/irc/help/window/swap@.GZ@
 share/irc/help/window/window@.GZ@
-share/irc/help/window/addgroup@.GZ@
-share/irc/help/window/delgroup@.GZ@
-share/irc/help/window/next@.GZ@
-share/irc/help/window/notify_level@.GZ@
-share/irc/help/window/back@.GZ@
 share/irc/help/window/sticky@.GZ@
-share/irc/help/window/balance@.GZ@
-share/irc/help/window/channel@.GZ@
-share/irc/help/window/hide_others@.GZ@
-share/irc/help/window/notify@.GZ@
-share/irc/help/window/refnum@.GZ@
-share/irc/help/window/shrink@.GZ@
+share/irc/help/window/bind@.GZ@
+share/irc/help/window/unbind@.GZ@
+share/irc/help/window/query@.GZ@
+share/irc/help/.date@.GZ@
+share/irc/help/!@.GZ@
+share/irc/help/:@.GZ@
+share/irc/help/abort@.GZ@
 share/irc/help/admin@.GZ@
 share/irc/help/assign@.GZ@
+share/irc/help/away@.GZ@
+share/irc/help/basics@.GZ@
+share/irc/help/beep@.GZ@
+share/irc/help/bye@.GZ@
+share/irc/help/cd@.GZ@
+share/irc/help/channel@.GZ@
+share/irc/help/clear@.GZ@
 share/irc/help/commands@.GZ@
+share/irc/help/comment@.GZ@
+share/irc/help/connect@.GZ@
+share/irc/help/date@.GZ@
+share/irc/help/deop@.GZ@
+share/irc/help/describe@.GZ@
+share/irc/help/die@.GZ@
+share/irc/help/digraph@.GZ@
+share/irc/help/dmsg@.GZ@
+share/irc/help/dquery@.GZ@
+share/irc/help/echo@.GZ@
+share/irc/help/encrypt@.GZ@
 share/irc/help/etiquette@.GZ@
+share/irc/help/eval@.GZ@
+share/irc/help/exec@.GZ@
+share/irc/help/exit@.GZ@
+share/irc/help/expressions@.GZ@
+share/irc/help/flush@.GZ@
+share/irc/help/foreach@.GZ@
+share/irc/help/help@.GZ@
+share/irc/help/history@.GZ@
+share/irc/help/hook@.GZ@
+share/irc/help/if@.GZ@
+share/irc/help/ignore@.GZ@
+share/irc/help/info@.GZ@
 share/irc/help/input@.GZ@
+share/irc/help/intro@.GZ@
+share/irc/help/invite@.GZ@
+share/irc/help/join@.GZ@
+share/irc/help/kick@.GZ@
+share/irc/help/kill@.GZ@
+share/irc/help/lastlog@.GZ@
+share/irc/help/leave@.GZ@
 share/irc/help/links@.GZ@
+share/irc/help/list@.GZ@
+share/irc/help/lusers@.GZ@
+share/irc/help/me@.GZ@
+share/irc/help/menus@.GZ@
+share/irc/help/mload@.GZ@
+share/irc/help/mode@.GZ@
+share/irc/help/motd@.GZ@
+share/irc/help/msg@.GZ@
 share/irc/help/names@.GZ@
+share/irc/help/news@.GZ@
+share/irc/help/newuser@.GZ@
+share/irc/help/nick@.GZ@
+share/irc/help/notice@.GZ@
+share/irc/help/notify@.GZ@
+share/irc/help/oper@.GZ@
+share/irc/help/parsekey@.GZ@
+share/irc/help/part@.GZ@
+share/irc/help/ping@.GZ@
+share/irc/help/query@.GZ@
+share/irc/help/quit@.GZ@
+share/irc/help/quote@.GZ@
 share/irc/help/rbind@.GZ@
+share/irc/help/redirect@.GZ@
+share/irc/help/rehash@.GZ@
 share/irc/help/restart@.GZ@
+share/irc/help/rules@.GZ@
+share/irc/help/save@.GZ@
+share/irc/help/say@.GZ@
+share/irc/help/send@.GZ@
+share/irc/help/sendline@.GZ@
+share/irc/help/server@.GZ@
+share/irc/help/signoff@.GZ@
+share/irc/help/sleep@.GZ@
+share/irc/help/squit@.GZ@
+share/irc/help/stats@.GZ@
+share/irc/help/summon@.GZ@
+share/irc/help/time@.GZ@
 share/irc/help/timer@.GZ@
-share/irc/help/.date@.GZ@
-share/irc/help/menus@.GZ@
-share/irc/help/abort@.GZ@
+share/irc/help/who@.GZ@
+share/irc/help/topic@.GZ@
+share/irc/help/trace@.GZ@
+share/irc/help/type@.GZ@
+share/irc/help/userhost@.GZ@
+share/irc/help/users@.GZ@
+share/irc/help/version@.GZ@
+share/irc/help/wait@.GZ@
+share/irc/help/wallops@.GZ@
+share/irc/help/which@.GZ@
+share/irc/help/while@.GZ@
+share/irc/help/whois@.GZ@
+share/irc/help/whowas@.GZ@
+share/irc/help/xecho@.GZ@
+share/irc/help/xtype@.GZ@
+share/irc/help/ircii/copyright@.GZ@
+share/irc/help/ison@.GZ@
+share/irc/help/servlist@.GZ@
+share/irc/help/squery@.GZ@
+share/irc/help/icb@.GZ@
 @unexec rm -f %D/share/irc/ircII.servers %D/share/irc/ircII.motd
 @dirrm share/irc/help/alias
 @dirrm share/irc/help/bind
@@ -586,6 +594,7 @@ share/irc/help/abort@.GZ@
 @dirrm share/irc/help/on
 @dirrm share/irc/help/set
 @dirrm share/irc/help/window
+@dirrm share/irc/help/ircii
 @dirrm share/irc/help
 @dirrm share/irc/script
 @dirrm share/irc/translation