Update to version 1.0c16.

PR:		16436
Submitted by:	maintainer

4 files changed, 230 insertions, 141 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 730e4711b544..ee3b03964597 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	BitchX ircII client
-# Version required:	1.0c15
+# Version required:	1.0c16
 # Date created:		26 Jan 1998
 # Whom:			griffin
 #
 # $FreeBSD$
 #
 
-DISTNAME=	BitchX-1.0c15
+DISTNAME=	BitchX-1.0c16
 CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.bitchx.com/pub/BitchX/source/ \
 		ftp://bitchx.dimension6.com/pub/BitchX/source/
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 WRKSRC=		${WRKDIR}/BitchX
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 .if defined(USE_GNOME)
 CONFIGURE_ARGS+=	--with-plugins --with-gtk --enable-sound
@@ -44,25 +44,20 @@ pre-extract:
 	@${ECHO} "You can add hooks for GNOME by defining USE_GNOME"
 .endif
 
-# Horrible hack to remove bogus CR's at the end of this file
-post-patch:
-	@${PERL} -pi -e 's,\r$$,,' ${WRKSRC}/script/menu.bx
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/bx/help
 	${MKDIR} ${PREFIX}/share/doc/bitchx
-	${TAR} --directory ${WRKSRC}/bitchx-docs -cf - . --exclude CVS | \
-		${TAR} --directory ${PREFIX}/share/bx/help -xf -
+	${CP} -r ${WRKSRC}/bitchx-docs/* ${PREFIX}/share/bx/help
 	${INSTALL_DATA} ${WRKSRC}/doc/bxfaq.html ${PREFIX}/share/doc/bitchx
 .endif
 .if defined(USE_GNOME)
 	@${ECHO} bin/gtkBitchX >> ${TMPPLIST}
-	@${ECHO} bin/gtkBitchX-1.0c15 >> ${TMPPLIST}
+	@${ECHO} bin/gtkBitchX-1.0c16 >> ${TMPPLIST}
 	@${ECHO} share/bx/plugins/nicklist.so >> ${TMPPLIST}
 .else
 	@${ECHO} bin/BitchX >> ${TMPPLIST}
-	@${ECHO} bin/BitchX-1.0c15 >> ${TMPPLIST}
+	@${ECHO} bin/BitchX-1.0c16 >> ${TMPPLIST}
 	@${ECHO} bin/scr-bx >> ${TMPPLIST}
 	@${ECHO} share/bx/wserv >> ${TMPPLIST}
 .endif
diff --git a/irc/bitchx/distinfo b/irc/bitchx/distinfo
index 34892a41ea0c..841833185039 100644
--- a/irc/bitchx/distinfo
+++ b/irc/bitchx/distinfo
@@ -1 +1 @@
-MD5 (BitchX-1.0c15.tar.gz) = 5048fd8d6b64302df5b52511e0acc19a
+MD5 (BitchX-1.0c16.tar.gz) = 4a3749c0b2da2b157eaa13b5b8856511
diff --git a/irc/bitchx/files/patch-ag b/irc/bitchx/files/patch-ag
new file mode 100644
index 000000000000..1868a7405c07
--- /dev/null
+++ b/irc/bitchx/files/patch-ag
@@ -0,0 +1,21 @@
+*** Makefile.in.orig	Sun Jan 23 03:30:33 2000
+--- Makefile.in	Sun Jan 23 03:30:56 2000
+***************
+*** 90,97 ****
+  
+  # This command will be used to install the BitchX help files.  If you don't
+  # want to install them, replace with the following:
+! # INSTALL_HELP_CMD = @echo The help files have not been installed.
+! INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR)
+  
+  # This program allows you to use screen/xterm's to put new BitchX windows
+  # on new screen/xterm windows.
+--- 90,97 ----
+  
+  # This command will be used to install the BitchX help files.  If you don't
+  # want to install them, replace with the following:
+! INSTALL_HELP_CMD = @echo 
+! # INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR)
+  
+  # This program allows you to use screen/xterm's to put new BitchX windows
+  # on new screen/xterm windows.
diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist
index 7f5b77fb697b..623958f02338 100644
--- a/irc/bitchx/pkg-plist
+++ b/irc/bitchx/pkg-plist
@@ -1,46 +1,12 @@
-share/bx/BitchX.help
-share/bx/BitchX.ircnames
 share/bx/BitchX.quit
+share/bx/BitchX.ircnames
 share/bx/BitchX.reasons
-share/bx/help/1_General/1_General
-share/bx/help/1_General/4op
-share/bx/help/1_General/about
-share/bx/help/1_General/addforward
-share/bx/help/1_General/addidle
+share/bx/BitchX.help
+share/bx/help/1_General/l
 share/bx/help/1_General/adduser
 share/bx/help/1_General/away
 share/bx/help/1_General/bye
 share/bx/help/1_General/channel
-share/bx/help/1_General/ctcp/action
-share/bx/help/1_General/ctcp/bdcc
-share/bx/help/1_General/ctcp/cdcc
-share/bx/help/1_General/ctcp/clientinfo
-share/bx/help/1_General/ctcp/ctcp
-share/bx/help/1_General/ctcp/echo
-share/bx/help/1_General/ctcp/finger
-share/bx/help/1_General/ctcp/ident
-share/bx/help/1_General/ctcp/invite
-share/bx/help/1_General/ctcp/op
-share/bx/help/1_General/ctcp/ops
-share/bx/help/1_General/ctcp/ping
-share/bx/help/1_General/ctcp/time
-share/bx/help/1_General/ctcp/unban
-share/bx/help/1_General/ctcp/uptime
-share/bx/help/1_General/ctcp/userinfo
-share/bx/help/1_General/ctcp/utc
-share/bx/help/1_General/ctcp/version
-share/bx/help/1_General/ctcp/whoami
-share/bx/help/1_General/ctcp/xdcc
-share/bx/help/1_General/dcc/chat
-share/bx/help/1_General/dcc/close
-share/bx/help/1_General/dcc/closeall
-share/bx/help/1_General/dcc/dcc
-share/bx/help/1_General/dcc/get
-share/bx/help/1_General/dcc/list
-share/bx/help/1_General/dcc/raw
-share/bx/help/1_General/dcc/rename
-share/bx/help/1_General/dcc/resume
-share/bx/help/1_General/dcc/send
 share/bx/help/1_General/describe
 share/bx/help/1_General/disconnect
 share/bx/help/1_General/help
@@ -64,14 +30,104 @@ share/bx/help/1_General/quit
 share/bx/help/1_General/reconnect
 share/bx/help/1_General/say
 share/bx/help/1_General/server
+share/bx/help/1_General/url
 share/bx/help/1_General/silence
 share/bx/help/1_General/spam
 share/bx/help/1_General/topic
 share/bx/help/1_General/unforward
 share/bx/help/1_General/unidle
 share/bx/help/1_General/unuser
-share/bx/help/1_General/url
-share/bx/help/2_Queries/2_Queries
+share/bx/help/1_General/1_General
+share/bx/help/1_General/4op
+share/bx/help/1_General/about
+share/bx/help/1_General/addforward
+share/bx/help/1_General/addidle
+share/bx/help/1_General/uping
+share/bx/help/1_General/offers
+share/bx/help/1_General/k
+share/bx/help/1_General/ver
+share/bx/help/1_General/j
+share/bx/help/1_General/kb
+share/bx/help/1_General/kbi
+share/bx/help/1_General/kickidle
+share/bx/help/1_General/m
+share/bx/help/1_General/chat
+share/bx/help/1_General/addshit
+share/bx/help/1_General/nochat
+share/bx/help/1_General/addlamenick
+share/bx/help/1_General/lamenicklist
+share/bx/help/1_General/unlamenick
+share/bx/help/1_General/unshit
+share/bx/help/1_General/shitlist
+share/bx/help/1_General/addword
+share/bx/help/1_General/unwordkick
+share/bx/help/1_General/bki
+share/bx/help/1_General/ajoin
+share/bx/help/1_General/ajoinlist
+share/bx/help/1_General/unajoin
+share/bx/help/1_General/ban
+share/bx/help/1_General/showwordkick
+share/bx/help/1_General/banstat
+share/bx/help/1_General/bantype
+share/bx/help/1_General/banwords
+share/bx/help/1_General/b
+share/bx/help/1_General/bk
+share/bx/help/1_General/awaylog
+share/bx/help/1_General/awaymsg
+share/bx/help/1_General/gone
+share/bx/help/1_General/back
+share/bx/help/1_General/partall
+share/bx/help/1_General/leave
+share/bx/help/1_General/p
+share/bx/help/1_General/t
+share/bx/help/1_General/wordlist
+share/bx/help/1_General/addnoflood
+share/bx/help/1_General/dcc/close
+share/bx/help/1_General/dcc/closeall
+share/bx/help/1_General/dcc/dcc
+share/bx/help/1_General/dcc/get
+share/bx/help/1_General/dcc/list
+share/bx/help/1_General/dcc/raw
+share/bx/help/1_General/dcc/rename
+share/bx/help/1_General/dcc/resume
+share/bx/help/1_General/dcc/chat
+share/bx/help/1_General/dcc/send
+share/bx/help/1_General/dcc/resend
+share/bx/help/1_General/dcc/reget
+share/bx/help/1_General/dcc/tsend
+share/bx/help/1_General/dcc/tresend
+share/bx/help/1_General/dcc/tget
+share/bx/help/1_General/dcc/treget
+share/bx/help/1_General/dcc/ftp
+share/bx/help/1_General/dcc/activecount
+share/bx/help/1_General/dcc/quietmode
+share/bx/help/1_General/dcc/showpaths
+share/bx/help/1_General/dcc/autorename
+share/bx/help/1_General/dcc/autooverwrite
+share/bx/help/1_General/dcc/autoget
+share/bx/help/1_General/dcc/stats
+share/bx/help/1_General/dcc/exempt
+share/bx/help/1_General/dcc/bot
+share/bx/help/1_General/ctcp/bdcc
+share/bx/help/1_General/ctcp/cdcc
+share/bx/help/1_General/ctcp/clientinfo
+share/bx/help/1_General/ctcp/ctcp
+share/bx/help/1_General/ctcp/echo
+share/bx/help/1_General/ctcp/finger
+share/bx/help/1_General/ctcp/ident
+share/bx/help/1_General/ctcp/invite
+share/bx/help/1_General/ctcp/op
+share/bx/help/1_General/ctcp/ops
+share/bx/help/1_General/ctcp/ping
+share/bx/help/1_General/ctcp/time
+share/bx/help/1_General/ctcp/unban
+share/bx/help/1_General/ctcp/uptime
+share/bx/help/1_General/ctcp/userinfo
+share/bx/help/1_General/ctcp/utc
+share/bx/help/1_General/ctcp/version
+share/bx/help/1_General/ctcp/whoami
+share/bx/help/1_General/ctcp/action
+share/bx/help/1_General/ctcp/xdcc
 share/bx/help/2_Queries/admin
 share/bx/help/2_Queries/flush
 share/bx/help/2_Queries/info
@@ -91,39 +147,46 @@ share/bx/help/2_Queries/users
 share/bx/help/2_Queries/version
 share/bx/help/2_Queries/who
 share/bx/help/2_Queries/whois
+share/bx/help/2_Queries/2_Queries
 share/bx/help/2_Queries/whowas
 share/bx/help/2_Queries/wii
+share/bx/help/2_Queries/ww
 share/bx/help/2_Queries/wilc
-share/bx/help/2_Queries/wilcr
 share/bx/help/2_Queries/wilm
 share/bx/help/2_Queries/wiln
-share/bx/help/2_Queries/ww
-share/bx/help/3_Operators/3_Operators
+share/bx/help/2_Queries/wilcr
+share/bx/help/2_Queries/sc
+share/bx/help/2_Queries/n
+share/bx/help/2_Queries/scan
+share/bx/help/2_Queries/wi
+share/bx/help/2_Queries/scani
+share/bx/help/2_Queries/scanv
+share/bx/help/2_Queries/scano
+share/bx/help/2_Queries/scann
+share/bx/help/2_Queries/scanf
+share/bx/help/2_Queries/scans
 share/bx/help/3_Operators/connect
-share/bx/help/3_Operators/deoper
 share/bx/help/3_Operators/die
-share/bx/help/3_Operators/dline
 share/bx/help/3_Operators/hash
-share/bx/help/3_Operators/helpop
-share/bx/help/3_Operators/helpserv
 share/bx/help/3_Operators/kill
-share/bx/help/3_Operators/kline
-share/bx/help/3_Operators/locop
 share/bx/help/3_Operators/oper
 share/bx/help/3_Operators/rehash
 share/bx/help/3_Operators/restart
 share/bx/help/3_Operators/rping
-share/bx/help/3_Operators/sping
 share/bx/help/3_Operators/squit
+share/bx/help/3_Operators/uping
+share/bx/help/3_Operators/3_Operators
+share/bx/help/3_Operators/wallops
+share/bx/help/3_Operators/sping
+share/bx/help/3_Operators/dline
 share/bx/help/3_Operators/swallop
+share/bx/help/3_Operators/locop
+share/bx/help/3_Operators/deoper
 share/bx/help/3_Operators/tkline
 share/bx/help/3_Operators/unkline
-share/bx/help/3_Operators/uping
-share/bx/help/3_Operators/wallops
-share/bx/help/4_Misc/4_Misc
-share/bx/help/4_Misc/abort
-share/bx/help/4_Misc/beep
-share/bx/help/4_Misc/bind/backspace
+share/bx/help/3_Operators/kline
+share/bx/help/3_Operators/helpserv
+share/bx/help/3_Operators/helpop
 share/bx/help/4_Misc/bind/backward_character
 share/bx/help/4_Misc/bind/backward_history
 share/bx/help/4_Misc/bind/backward_word
@@ -142,8 +205,8 @@ share/bx/help/4_Misc/bind/enter_digraph
 share/bx/help/4_Misc/bind/enter_menu
 share/bx/help/4_Misc/bind/erase_line
 share/bx/help/4_Misc/bind/erase_to_beg_of_line
-share/bx/help/4_Misc/bind/erase_to_end_of_line
 share/bx/help/4_Misc/bind/forward_character
+share/bx/help/4_Misc/bind/erase_to_end_of_line
 share/bx/help/4_Misc/bind/forward_history
 share/bx/help/4_Misc/bind/forward_word
 share/bx/help/4_Misc/bind/highlight_off
@@ -167,6 +230,7 @@ share/bx/help/4_Misc/bind/self_insert
 share/bx/help/4_Misc/bind/send_line
 share/bx/help/4_Misc/bind/shove_to_history
 share/bx/help/4_Misc/bind/stop_irc
+share/bx/help/4_Misc/bind/type_text
 share/bx/help/4_Misc/bind/swap_last_window
 share/bx/help/4_Misc/bind/swap_next_window
 share/bx/help/4_Misc/bind/swap_previous_window
@@ -174,25 +238,11 @@ share/bx/help/4_Misc/bind/switch_channels
 share/bx/help/4_Misc/bind/toggle_insert_mode
 share/bx/help/4_Misc/bind/toggle_stop_screen
 share/bx/help/4_Misc/bind/transpose_characters
-share/bx/help/4_Misc/bind/type_text
 share/bx/help/4_Misc/bind/unclear_screen
 share/bx/help/4_Misc/bind/underline
 share/bx/help/4_Misc/bind/unstop_all_windows
+share/bx/help/4_Misc/bind/backspace
 share/bx/help/4_Misc/bind/yank_from_cutbuffer
-share/bx/help/4_Misc/cd
-share/bx/help/4_Misc/clear
-share/bx/help/4_Misc/digraph
-share/bx/help/4_Misc/encrypt
-share/bx/help/4_Misc/history
-share/bx/help/4_Misc/hostname
-share/bx/help/4_Misc/ircuser
-share/bx/help/4_Misc/mesg
-share/bx/help/4_Misc/mlist
-share/bx/help/4_Misc/mload
-share/bx/help/4_Misc/note
-share/bx/help/4_Misc/rbind
-share/bx/help/4_Misc/realname
-share/bx/help/4_Misc/set/always_split_biggest
 share/bx/help/4_Misc/set/auto_new_nick
 share/bx/help/4_Misc/set/auto_reconnect_delay
 share/bx/help/4_Misc/set/auto_rejoin
@@ -235,6 +285,7 @@ share/bx/help/4_Misc/set/eight_bit_characters
 share/bx/help/4_Misc/set/encrypt_program
 share/bx/help/4_Misc/set/floating_point_math
 share/bx/help/4_Misc/set/flood_after
+share/bx/help/4_Misc/set/history
 share/bx/help/4_Misc/set/flood_rate
 share/bx/help/4_Misc/set/flood_users
 share/bx/help/4_Misc/set/flood_warning
@@ -244,9 +295,8 @@ share/bx/help/4_Misc/set/help_path
 share/bx/help/4_Misc/set/help_prompt
 share/bx/help/4_Misc/set/help_window
 share/bx/help/4_Misc/set/hide_private_channels
-share/bx/help/4_Misc/set/high_bit_escape
 share/bx/help/4_Misc/set/highlight_char
-share/bx/help/4_Misc/set/history
+share/bx/help/4_Misc/set/high_bit_escape
 share/bx/help/4_Misc/set/history_file
 share/bx/help/4_Misc/set/hold_mode
 share/bx/help/4_Misc/set/indent
@@ -265,29 +315,30 @@ share/bx/help/4_Misc/set/menu
 share/bx/help/4_Misc/set/mirc_broken_dcc_resume
 share/bx/help/4_Misc/set/mode_stripper
 share/bx/help/4_Misc/set/nd_space_max
-share/bx/help/4_Misc/set/no_control_log
-share/bx/help/4_Misc/set/no_ctcp_flood
-share/bx/help/4_Misc/set/no_fail_disconnect
 share/bx/help/4_Misc/set/notify_handler
 share/bx/help/4_Misc/set/notify_interval
 share/bx/help/4_Misc/set/notify_level
 share/bx/help/4_Misc/set/notify_on_termination
 share/bx/help/4_Misc/set/notify_userhost_automatic
 share/bx/help/4_Misc/set/novice
+share/bx/help/4_Misc/set/no_control_log
+share/bx/help/4_Misc/set/no_ctcp_flood
+share/bx/help/4_Misc/set/no_fail_disconnect
 share/bx/help/4_Misc/set/num_of_whowas
 share/bx/help/4_Misc/set/pad_char
 share/bx/help/4_Misc/set/quit_message
 share/bx/help/4_Misc/set/realname
 share/bx/help/4_Misc/set/reverse_status_line
+share/bx/help/4_Misc/set/set
+share/bx/help/4_Misc/set/scroll
 share/bx/help/4_Misc/set/reverse_video
 share/bx/help/4_Misc/set/screen_options
-share/bx/help/4_Misc/set/scroll
-share/bx/help/4_Misc/set/scroll_lines
 share/bx/help/4_Misc/set/scrollback
+share/bx/help/4_Misc/set/tab
 share/bx/help/4_Misc/set/scrollback_ratio
+share/bx/help/4_Misc/set/scroll_lines
 share/bx/help/4_Misc/set/security
 share/bx/help/4_Misc/set/send_ignore_msg
-share/bx/help/4_Misc/set/set
 share/bx/help/4_Misc/set/shell
 share/bx/help/4_Misc/set/shell_flags
 share/bx/help/4_Misc/set/shell_limit
@@ -301,6 +352,8 @@ share/bx/help/4_Misc/set/status_away
 share/bx/help/4_Misc/set/status_channel
 share/bx/help/4_Misc/set/status_chanop
 share/bx/help/4_Misc/set/status_clock
+share/bx/help/4_Misc/set/tab_max
+share/bx/help/4_Misc/set/xterm
 share/bx/help/4_Misc/set/status_does_expandos
 share/bx/help/4_Misc/set/status_format
 share/bx/help/4_Misc/set/status_hold
@@ -309,8 +362,8 @@ share/bx/help/4_Misc/set/status_insert
 share/bx/help/4_Misc/set/status_mail
 share/bx/help/4_Misc/set/status_mode
 share/bx/help/4_Misc/set/status_nick
-share/bx/help/4_Misc/set/status_no_repeat
 share/bx/help/4_Misc/set/status_notify
+share/bx/help/4_Misc/set/status_no_repeat
 share/bx/help/4_Misc/set/status_oper
 share/bx/help/4_Misc/set/status_overwrite
 share/bx/help/4_Misc/set/status_query
@@ -321,20 +374,14 @@ share/bx/help/4_Misc/set/status_umode
 share/bx/help/4_Misc/set/status_user
 share/bx/help/4_Misc/set/status_voice
 share/bx/help/4_Misc/set/status_window
+share/bx/help/4_Misc/set/underline_video
 share/bx/help/4_Misc/set/suppress_from_remote_server
 share/bx/help/4_Misc/set/suppress_server_motd
-share/bx/help/4_Misc/set/tab
-share/bx/help/4_Misc/set/tab_max
-share/bx/help/4_Misc/set/underline_video
 share/bx/help/4_Misc/set/user_information
 share/bx/help/4_Misc/set/verbose_ctcp
 share/bx/help/4_Misc/set/warn_of_ignores
-share/bx/help/4_Misc/set/xterm
+share/bx/help/4_Misc/set/always_split_biggest
 share/bx/help/4_Misc/set/xterm_options
-share/bx/help/4_Misc/summon
-share/bx/help/4_Misc/unclear
-share/bx/help/4_Misc/which
-share/bx/help/4_Misc/window/add
 share/bx/help/4_Misc/window/back
 share/bx/help/4_Misc/window/balance
 share/bx/help/4_Misc/window/beep_always
@@ -353,8 +400,8 @@ share/bx/help/4_Misc/window/hide
 share/bx/help/4_Misc/window/hide_others
 share/bx/help/4_Misc/window/hold_mode
 share/bx/help/4_Misc/window/kill
-share/bx/help/4_Misc/window/kill_others
 share/bx/help/4_Misc/window/killswap
+share/bx/help/4_Misc/window/kill_others
 share/bx/help/4_Misc/window/last
 share/bx/help/4_Misc/window/lastlog
 share/bx/help/4_Misc/window/lastlog_level
@@ -390,34 +437,27 @@ share/bx/help/4_Misc/window/stack
 share/bx/help/4_Misc/window/status_special
 share/bx/help/4_Misc/window/swap
 share/bx/help/4_Misc/window/unbind
+share/bx/help/4_Misc/window/add
 share/bx/help/4_Misc/window/window
-share/bx/help/5_Programming/5_Programming
-share/bx/help/5_Programming/alias
-share/bx/help/5_Programming/assign
-share/bx/help/5_Programming/blah
-share/bx/help/5_Programming/bless
-share/bx/help/5_Programming/break
-share/bx/help/5_Programming/call
-share/bx/help/5_Programming/comment
-share/bx/help/5_Programming/continue
-share/bx/help/5_Programming/do
-share/bx/help/5_Programming/dump
-share/bx/help/5_Programming/echo
-share/bx/help/5_Programming/eval
-share/bx/help/5_Programming/exec
-share/bx/help/5_Programming/fe
-share/bx/help/5_Programming/filedialog
-share/bx/help/5_Programming/fontdialog
-share/bx/help/5_Programming/for
-share/bx/help/5_Programming/foreach
-share/bx/help/5_Programming/hook
-share/bx/help/5_Programming/if
-share/bx/help/5_Programming/input
-share/bx/help/5_Programming/load
-share/bx/help/5_Programming/local
-share/bx/help/5_Programming/menu
-share/bx/help/5_Programming/menuitem
-share/bx/help/5_Programming/on/action
+share/bx/help/4_Misc/history
+share/bx/help/4_Misc/hostname
+share/bx/help/4_Misc/4_Misc
+share/bx/help/4_Misc/mesg
+share/bx/help/4_Misc/mlist
+share/bx/help/4_Misc/mload
+share/bx/help/4_Misc/note
+share/bx/help/4_Misc/rbind
+share/bx/help/4_Misc/realname
+share/bx/help/4_Misc/summon
+share/bx/help/4_Misc/unclear
+share/bx/help/4_Misc/which
+share/bx/help/4_Misc/ircuser
+share/bx/help/4_Misc/abort
+share/bx/help/4_Misc/beep
+share/bx/help/4_Misc/cd
+share/bx/help/4_Misc/clear
+share/bx/help/4_Misc/digraph
+share/bx/help/4_Misc/encrypt
 share/bx/help/5_Programming/on/channel_nick
 share/bx/help/5_Programming/on/channel_signoff
 share/bx/help/5_Programming/on/connect
@@ -462,7 +502,6 @@ share/bx/help/5_Programming/on/notify_signoff
 share/bx/help/5_Programming/on/notify_signon
 share/bx/help/5_Programming/on/odd_server_stuff
 share/bx/help/5_Programming/on/on
-share/bx/help/5_Programming/on/on~
 share/bx/help/5_Programming/on/oper_notice
 share/bx/help/5_Programming/on/pong
 share/bx/help/5_Programming/on/public
@@ -471,6 +510,7 @@ share/bx/help/5_Programming/on/public_notice
 share/bx/help/5_Programming/on/public_other
 share/bx/help/5_Programming/on/raw_irc
 share/bx/help/5_Programming/on/redirect
+share/bx/help/5_Programming/on/set
 share/bx/help/5_Programming/on/send_action
 share/bx/help/5_Programming/on/send_ctcp
 share/bx/help/5_Programming/on/send_dcc_chat
@@ -480,7 +520,6 @@ share/bx/help/5_Programming/on/send_public
 share/bx/help/5_Programming/on/send_to_server
 share/bx/help/5_Programming/on/server_lost
 share/bx/help/5_Programming/on/server_notice
-share/bx/help/5_Programming/on/set
 share/bx/help/5_Programming/on/signoff
 share/bx/help/5_Programming/on/silence
 share/bx/help/5_Programming/on/status_update
@@ -495,15 +534,39 @@ share/bx/help/5_Programming/on/window
 share/bx/help/5_Programming/on/window_create
 share/bx/help/5_Programming/on/window_kill
 share/bx/help/5_Programming/on/yell
+share/bx/help/5_Programming/on/action
+share/bx/help/5_Programming/blah
+share/bx/help/5_Programming/bless
+share/bx/help/5_Programming/break
+share/bx/help/5_Programming/call
+share/bx/help/5_Programming/comment
+share/bx/help/5_Programming/continue
+share/bx/help/5_Programming/do
+share/bx/help/5_Programming/dump
+share/bx/help/5_Programming/echo
+share/bx/help/5_Programming/eval
+share/bx/help/5_Programming/exec
+share/bx/help/5_Programming/fe
+share/bx/help/5_Programming/filedialog
+share/bx/help/5_Programming/fontdialog
+share/bx/help/5_Programming/for
+share/bx/help/5_Programming/foreach
+share/bx/help/5_Programming/hook
+share/bx/help/5_Programming/if
+share/bx/help/5_Programming/input
+share/bx/help/5_Programming/load
+share/bx/help/5_Programming/local
+share/bx/help/5_Programming/menu
+share/bx/help/5_Programming/menuitem
 share/bx/help/5_Programming/package
 share/bx/help/5_Programming/parsekey
 share/bx/help/5_Programming/pmpaste
 share/bx/help/5_Programming/pop
+share/bx/help/5_Programming/pretend
+share/bx/help/5_Programming/push
 share/bx/help/5_Programming/popupmenu
 share/bx/help/5_Programming/popupmsg
-share/bx/help/5_Programming/pretend
 share/bx/help/5_Programming/properties
-share/bx/help/5_Programming/push
 share/bx/help/5_Programming/queue
 share/bx/help/5_Programming/quote
 share/bx/help/5_Programming/redirect
@@ -528,8 +591,13 @@ share/bx/help/5_Programming/wait
 share/bx/help/5_Programming/while
 share/bx/help/5_Programming/xecho
 share/bx/help/5_Programming/xeval
+share/bx/help/5_Programming/5_Programming
 share/bx/help/5_Programming/xtype
-share/bx/help/6_Functions/6_Functions
+share/bx/help/5_Programming/alias
+share/bx/help/5_Programming/assign
+share/bx/help/5_Programming/loadtcl
+share/bx/help/5_Programming/saveirc
+share/bx/help/5_Programming/loaddll
 share/bx/help/6_Functions/absstrlen
 share/bx/help/6_Functions/addtabkey
 share/bx/help/6_Functions/after
@@ -558,11 +626,11 @@ share/bx/help/6_Functions/crypt
 share/bx/help/6_Functions/curpos
 share/bx/help/6_Functions/currchans
 share/bx/help/6_Functions/decode
+share/bx/help/6_Functions/eof
 share/bx/help/6_Functions/delarray
 share/bx/help/6_Functions/delitem
 share/bx/help/6_Functions/deuhc
 share/bx/help/6_Functions/encode
-share/bx/help/6_Functions/eof
 share/bx/help/6_Functions/epic
 share/bx/help/6_Functions/fexist
 share/bx/help/6_Functions/filter
@@ -589,10 +657,10 @@ share/bx/help/6_Functions/idle
 share/bx/help/6_Functions/ifinditem
 share/bx/help/6_Functions/igetmatches
 share/bx/help/6_Functions/igmask
+share/bx/help/6_Functions/info
 share/bx/help/6_Functions/igtype
 share/bx/help/6_Functions/index
 share/bx/help/6_Functions/indextoitem
-share/bx/help/6_Functions/info
 share/bx/help/6_Functions/insertw
 share/bx/help/6_Functions/iptoname
 share/bx/help/6_Functions/irclib
@@ -615,11 +683,10 @@ share/bx/help/6_Functions/left
 share/bx/help/6_Functions/leftpc
 share/bx/help/6_Functions/leftw
 share/bx/help/6_Functions/listen
+share/bx/help/6_Functions/mid
 share/bx/help/6_Functions/mask
 share/bx/help/6_Functions/match
 share/bx/help/6_Functions/matchitem
-share/bx/help/6_Functions/menucontrol
-share/bx/help/6_Functions/mid
 share/bx/help/6_Functions/midw
 share/bx/help/6_Functions/mkdir
 share/bx/help/6_Functions/msar
@@ -712,8 +779,9 @@ share/bx/help/6_Functions/winsize
 share/bx/help/6_Functions/winvisible
 share/bx/help/6_Functions/word
 share/bx/help/6_Functions/write
+share/bx/help/6_Functions/6_Functions
 share/bx/help/6_Functions/writeb
-share/bx/help/7_Docs/7_Docs
+share/bx/help/6_Functions/menucontrol
 share/bx/help/7_Docs/About_BitchX
 share/bx/help/7_Docs/Arrays
 share/bx/help/7_Docs/Command_Line
@@ -735,8 +803,8 @@ share/bx/help/7_Docs/Signals
 share/bx/help/7_Docs/Special_Vars
 share/bx/help/7_Docs/Status_Line
 share/bx/help/7_Docs/Text_Highlight
+share/bx/help/7_Docs/7_Docs
 share/bx/help/7_Docs/Updates
-share/bx/help/8_Scripts/2.8script
 share/bx/help/8_Scripts/8_Scripts
 share/bx/help/8_Scripts/action
 share/bx/help/8_Scripts/alias
@@ -763,6 +831,7 @@ share/bx/help/8_Scripts/events
 share/bx/help/8_Scripts/events.hop
 share/bx/help/8_Scripts/fake-dcc
 share/bx/help/8_Scripts/fe
+share/bx/help/8_Scripts/guh
 share/bx/help/8_Scripts/files
 share/bx/help/8_Scripts/finger
 share/bx/help/8_Scripts/fnet
@@ -771,7 +840,6 @@ share/bx/help/8_Scripts/functions
 share/bx/help/8_Scripts/funnyban
 share/bx/help/8_Scripts/genalias
 share/bx/help/8_Scripts/global
-share/bx/help/8_Scripts/guh
 share/bx/help/8_Scripts/history
 share/bx/help/8_Scripts/history-match
 share/bx/help/8_Scripts/imap
@@ -798,13 +866,13 @@ share/bx/help/8_Scripts/mudlike
 share/bx/help/8_Scripts/multi
 share/bx/help/8_Scripts/nemesis
 share/bx/help/8_Scripts/netsplit
+share/bx/help/8_Scripts/ping
 share/bx/help/8_Scripts/netsplit.env
 share/bx/help/8_Scripts/newaway
 share/bx/help/8_Scripts/newformat
 share/bx/help/8_Scripts/nicks
 share/bx/help/8_Scripts/old-dcc
 share/bx/help/8_Scripts/oldping
-share/bx/help/8_Scripts/ping
 share/bx/help/8_Scripts/pipe
 share/bx/help/8_Scripts/prefix
 share/bx/help/8_Scripts/recursion
@@ -827,6 +895,7 @@ share/bx/help/8_Scripts/uhnotify
 share/bx/help/8_Scripts/uping
 share/bx/help/8_Scripts/wallopstat
 share/bx/help/8_Scripts/webster
+share/bx/help/8_Scripts/2.8script
 share/bx/help/8_Scripts/window
 share/bx/help/README_FIRST
 share/bx/plugins/BitchX.hints
@@ -843,12 +912,14 @@ share/bx/plugins/possum.so
 share/bx/plugins/qmail.so
 share/bx/plugins/scan.so
 share/bx/plugins/wavplay.so
+share/bx/plugins/qbx.so
 share/bx/script/actplug.gmz
 share/bx/script/bxglobal
 share/bx/script/bxtcl.tcl
 share/bx/script/file.tcl
 share/bx/script/fserve+vfs.tar.gz
 share/bx/script/menu.bx
+share/bx/script/example-.bitchxrc
 share/bx/translation/ASCII
 share/bx/translation/CP437
 share/bx/translation/CP850
@@ -891,6 +962,8 @@ share/doc/bitchx/bxfaq.html
 @dirrm share/bx/help/4_Misc/bind
 @dirrm share/bx/help/4_Misc/set
 @dirrm share/bx/help/4_Misc/window
+@dirrm share/bx/help/4_Misc/fset
+@dirrm share/bx/help/4_Misc/wset
 @dirrm share/bx/help/4_Misc
 @dirrm share/bx/help/5_Programming/on
 @dirrm share/bx/help/5_Programming