Upgrade to 2.8

3 files changed, 152 insertions, 153 deletions

diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index 6287d7df3bf..cd408cf98dc 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -3,26 +3,18 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1994/10/23 01:26:28 torstenb Exp $
 #
 
-DISTNAME=	ircII2.6
+DISTNAME=	ircii-2.8
+DISTFILES=	ircii-2.8.tar.gz ircii-2.8help.tar.gz
 GNU_CONFIGURE=	YES
 MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/clients/
-EXTRACT_SUFX=	.tar.Z
-WRKSRC=		${WRKDIR}/ircii-2.6
 
 pre-install:
-	mkdir -p ${PREFIX}/bin
-	mkdir -p ${PREFIX}/lib/irc/script
-	mkdir -p ${PREFIX}/lib/irc/translation
-	@if [ ! -f ${DISTDIR}/${DISTNAME}help${EXTRACT_SUFX} ]; then \
-	   echo ">> Sorry, can't find: ${DISTDIR}/${DISTNAME}help${EXTRACT_SUFX}"; \
-	   echo ">> Please obtain this file from:"; \
-	   echo ">>     $(HOME_LOCATION)"; \
-	   echo ">> if you want local helpfiles."; \
-	   exit 1; \
-        fi
-	@tar xzf ${DISTDIR}/${DISTNAME}help${EXTRACT_SUFX} -C ${PREFIX}/lib/irc; \
+	@mkdir -p ${PREFIX}/bin
+	@mkdir -p ${PREFIX}/lib/irc/script
+	@mkdir -p ${PREFIX}/lib/irc/translation
+	@cp -R ${WRKDIR}/help ${PREFIX}/lib/irc/
 
 .include <bsd.port.mk>
diff --git a/irc/ircII/distinfo b/irc/ircII/distinfo
index 54794a8dc86..d397e25ab6c 100644
--- a/irc/ircII/distinfo
+++ b/irc/ircII/distinfo
@@ -1 +1,2 @@
-MD5 (ircII2.6.tar.Z) = f225495716872b738e0d7b329727e50b
+MD5 (ircii-2.8.tar.gz) = fb176a354da2debe59b422ffdb38e856
+MD5 (ircii-2.8help.tar.gz) = acd61c53392a793250f6e86cbf277261
diff --git a/irc/ircII/pkg-plist b/irc/ircII/pkg-plist
index 79552114c4a..e9ab5a3766a 100644
--- a/irc/ircII/pkg-plist
+++ b/irc/ircII/pkg-plist
@@ -1,6 +1,6 @@
 @cwd /usr/local
+bin/irc-2.8
 bin/irc
-bin/irc-2.6
 bin/ircserv
 bin/ircflush
 bin/wserv
@@ -101,81 +101,47 @@ lib/irc/translation/SWEDISH_NAMES_COM
 lib/irc/translation/SWISS
 lib/irc/translation/UNITED_KINGDOM
 lib/irc/translation/UNITED_KINGDOM_COM
-lib/irc/help/ALIAS/width
-lib/irc/help/ALIAS/functions
-lib/irc/help/ALIAS/ALIAS
-lib/irc/help/ALIAS/quote
-lib/irc/help/ALIAS/special
-lib/irc/help/BIND/BACKWARD_HISTORY
-lib/irc/help/BIND/BACKWARD_CHARACTER
-lib/irc/help/BIND/ERASE_TO_END_OF_LINE
-lib/irc/help/BIND/BACKWARD_WORD
-lib/irc/help/BIND/BEGINNING_OF_LINE
-lib/irc/help/BIND/BIND
-lib/irc/help/BIND/CLEAR_SCREEN
-lib/irc/help/BIND/COMMAND_COMPLETION
-lib/irc/help/BIND/DELETE_CHARACTER
-lib/irc/help/BIND/DELETE_NEXT_WORD
-lib/irc/help/BIND/DELETE_PREVIOUS_WORD
-lib/irc/help/BIND/END_OF_LINE
-lib/irc/help/BIND/ENTER_DIGRAPH
-lib/irc/help/BIND/ENTER_MENU
-lib/irc/help/BIND/ERASE_LINE
-lib/irc/help/BIND/FORWARD_CHARACTER
-lib/irc/help/BIND/PREVIOUS_WINDOW
-lib/irc/help/BIND/FORWARD_HISTORY
-lib/irc/help/BIND/FORWARD_WORD
-lib/irc/help/BIND/HELP_CHARACTER
-lib/irc/help/BIND/META1_CHARACTER
-lib/irc/help/BIND/META2_CHARACTER
-lib/irc/help/BIND/META3_CHARACTER
-lib/irc/help/BIND/META4_CHARACTER
-lib/irc/help/BIND/NEXT_WINDOW
-lib/irc/help/BIND/NOTHING
-lib/irc/help/BIND/PARSE_COMMAND
-lib/irc/help/BIND/QUIT_IRC
-lib/irc/help/BIND/SWITCH_CHANNELS
-lib/irc/help/BIND/QUOTE_CHARACTER
-lib/irc/help/BIND/REFRESH_SCREEN
-lib/irc/help/BIND/SCROLL_BACKWARD
-lib/irc/help/BIND/SCROLL_END
-lib/irc/help/BIND/SCROLL_FORWARD
-lib/irc/help/BIND/SELF_INSERT
-lib/irc/help/BIND/SEND_LINE
-lib/irc/help/BIND/STOP_IRC
-lib/irc/help/BIND/TOGGLE_INSERT_MODE
-lib/irc/help/BIND/UNSTOP_ALL_WINDOWS
-lib/irc/help/BIND/TOGGLE_STOP_SCREEN
-lib/irc/help/BIND/TYPE_TEXT
-lib/irc/help/BIND/TRANSPOSE_CHARACTERS
-lib/irc/help/BIND/YANK_FROM_CUTBUFFER
-lib/irc/help/BIND/ERASE_TO_BEG_OF_LINE
-lib/irc/help/BIND/REFRESH_INPUTLINE
-lib/irc/help/BIND/keys
-lib/irc/help/BIND/examples
-lib/irc/help/BIND/SCROLL_START
-lib/irc/help/BIND/BACKSPACE
-lib/irc/help/CTCP/USERINFO
-lib/irc/help/CTCP/FINGER
-lib/irc/help/CTCP/TIME
-lib/irc/help/CTCP/UTC
-lib/irc/help/CTCP/CTCP
-lib/irc/help/CTCP/VERSION
-lib/irc/help/CTCP/PING
-lib/irc/help/CTCP/ACTION
-lib/irc/help/CTCP/ECHO
-lib/irc/help/CTCP/CLIENTINFO
-lib/irc/help/DCC/DCC
-lib/irc/help/DCC/GET
-lib/irc/help/DCC/LIST
-lib/irc/help/DCC/RAW
-lib/irc/help/DCC/RENAME
-lib/irc/help/DCC/SEND
-lib/irc/help/DCC/TALK
-lib/irc/help/DCC/TMSG
-lib/irc/help/DCC/CHAT
-lib/irc/help/DCC/CLOSE
-lib/irc/help/LOAD/EDIT
+lib/irc/help/WINDOW/UNBIND
+lib/irc/help/WINDOW/GOTO
+lib/irc/help/WINDOW/GROW
+lib/irc/help/WINDOW/SHRINK
+lib/irc/help/WINDOW/CHANNEL
+lib/irc/help/WINDOW/SCROLL
+lib/irc/help/WINDOW/PROMPT
+lib/irc/help/WINDOW/HOLD_MODE
+lib/irc/help/WINDOW/LEVEL
+lib/irc/help/WINDOW/LOG
+lib/irc/help/WINDOW/NAME
+lib/irc/help/WINDOW/NOTIFY
+lib/irc/help/WINDOW/HIDE_OTHERS
+lib/irc/help/WINDOW/BACK
+lib/irc/help/WINDOW/MOVE
+lib/irc/help/WINDOW/REFNUM
+lib/irc/help/WINDOW/HIDE
+lib/irc/help/WINDOW/SHOW
+lib/irc/help/WINDOW/SWAP
+lib/irc/help/WINDOW/LIST
+lib/irc/help/WINDOW/PUSH
+lib/irc/help/WINDOW/POP
+lib/irc/help/WINDOW/STACK
+lib/irc/help/WINDOW/KILL_OTHERS
+lib/irc/help/WINDOW/PREVIOUS
+lib/irc/help/WINDOW/LASTLOG_LEVEL
+lib/irc/help/WINDOW/SERVER
+lib/irc/help/WINDOW/WINDOW
+lib/irc/help/WINDOW/NEXT
+lib/irc/help/WINDOW/CREATE
+lib/irc/help/WINDOW/LOGFILE
+lib/irc/help/WINDOW/NOTIFY_LEVEL
+lib/irc/help/WINDOW/DELETE
+lib/irc/help/WINDOW/ADD
+lib/irc/help/WINDOW/KILL
+lib/irc/help/WINDOW/NEW
+lib/irc/help/WINDOW/REMOVE
+lib/irc/help/WINDOW/NUMBER
+lib/irc/help/WINDOW/BIND
+lib/irc/help/WINDOW/BALANCE
+lib/irc/help/LOAD/ALIAS
 lib/irc/help/LOAD/BASICAL
 lib/irc/help/LOAD/COMMANDER
 lib/irc/help/LOAD/BIGCHEESE
@@ -200,12 +166,11 @@ lib/irc/help/LOAD/KPSTAT
 lib/irc/help/LOAD/LIST
 lib/irc/help/LOAD/LOAD
 lib/irc/help/LOAD/LOCAL
-lib/irc/help/LOAD/LOG
 lib/irc/help/LOAD/MUDLIKE
 lib/irc/help/LOAD/PREFIX
 lib/irc/help/LOAD/NEMESIS
-lib/irc/help/LOAD/NETSPLIT
 lib/irc/help/LOAD/NICKS
+lib/irc/help/LOAD/NETSPLIT
 lib/irc/help/LOAD/OPER
 lib/irc/help/LOAD/RECURSION
 lib/irc/help/LOAD/SILENT
@@ -217,7 +182,7 @@ lib/irc/help/LOAD/WALLOPSTAT
 lib/irc/help/LOAD/TRACES
 lib/irc/help/LOAD/TROY
 lib/irc/help/LOAD/VERSION
-lib/irc/help/LOAD/VOICE
+lib/irc/help/LOAD/NEWAWAY
 lib/irc/help/LOAD/WHOWAS
 lib/irc/help/LOAD/TABKEY
 lib/irc/help/LOAD/WINDOW
@@ -234,8 +199,8 @@ lib/irc/help/LOAD/SCREEN
 lib/irc/help/LOAD/suggestions
 lib/irc/help/LOAD/LYNX_IRCRC
 lib/irc/help/LOAD/ACTION
-lib/irc/help/LOAD/ALIAS
-lib/irc/help/NOTE/COUNT
+lib/irc/help/LOAD/EDIT
+lib/irc/help/NOTE/LS
 lib/irc/help/NOTE/DENY
 lib/irc/help/NOTE/FIND
 lib/irc/help/NOTE/FLAG
@@ -255,8 +220,8 @@ lib/irc/help/NOTE/WALL
 lib/irc/help/NOTE/WALLOPS
 lib/irc/help/NOTE/KEY
 lib/irc/help/NOTE/ANTIWALL
-lib/irc/help/NOTE/LS
-lib/irc/help/ON/CHANNEL_SIGNOFF
+lib/irc/help/NOTE/COUNT
+lib/irc/help/ON/ACTION
 lib/irc/help/ON/CHANNEL_NICK
 lib/irc/help/ON/EXEC_ERRORS
 lib/irc/help/ON/CONNECT
@@ -311,8 +276,8 @@ lib/irc/help/ON/WINDOW
 lib/irc/help/ON/WINDOW_KILL
 lib/irc/help/ON/HOOK
 lib/irc/help/ON/numeric
-lib/irc/help/ON/ACTION
-lib/irc/help/SET/AUTO_UNMARK_AWAY
+lib/irc/help/ON/CHANNEL_SIGNOFF
+lib/irc/help/SET/NOTIFY_HANDLER
 lib/irc/help/SET/BEEP_WHEN_AWAY
 lib/irc/help/SET/AUTO_WHOWAS
 lib/irc/help/SET/BEEP
@@ -413,61 +378,90 @@ lib/irc/help/SET/NO_CTCP_FLOOD
 lib/irc/help/SET/NOTIFY_LEVEL
 lib/irc/help/SET/XTERM_OPTIONS
 lib/irc/help/SET/ALWAYS_SPLIT_BIGGEST
-lib/irc/help/WINDOW/BALANCE
-lib/irc/help/WINDOW/GOTO
-lib/irc/help/WINDOW/GROW
-lib/irc/help/WINDOW/SHRINK
-lib/irc/help/WINDOW/CHANNEL
-lib/irc/help/WINDOW/SCROLL
-lib/irc/help/WINDOW/PROMPT
-lib/irc/help/WINDOW/HOLD_MODE
-lib/irc/help/WINDOW/LEVEL
-lib/irc/help/WINDOW/LOG
-lib/irc/help/WINDOW/NAME
-lib/irc/help/WINDOW/NOTIFY
-lib/irc/help/WINDOW/HIDE_OTHERS
-lib/irc/help/WINDOW/BACK
-lib/irc/help/WINDOW/MOVE
-lib/irc/help/WINDOW/REFNUM
-lib/irc/help/WINDOW/HIDE
-lib/irc/help/WINDOW/SHOW
-lib/irc/help/WINDOW/SWAP
-lib/irc/help/WINDOW/LIST
-lib/irc/help/WINDOW/PUSH
-lib/irc/help/WINDOW/POP
-lib/irc/help/WINDOW/STACK
-lib/irc/help/WINDOW/KILL_OTHERS
-lib/irc/help/WINDOW/PREVIOUS
-lib/irc/help/WINDOW/LASTLOG_LEVEL
-lib/irc/help/WINDOW/SERVER
-lib/irc/help/WINDOW/WINDOW
-lib/irc/help/WINDOW/NEXT
-lib/irc/help/WINDOW/CREATE
-lib/irc/help/WINDOW/LOGFILE
-lib/irc/help/WINDOW/NOTIFY_LEVEL
-lib/irc/help/WINDOW/DELETE
-lib/irc/help/WINDOW/ADD
-lib/irc/help/WINDOW/KILL
-lib/irc/help/WINDOW/NEW
-lib/irc/help/WINDOW/REMOVE
-lib/irc/help/WINDOW/NUMBER
-lib/irc/help/ircII/programming
+lib/irc/help/SET/REALNAME
+lib/irc/help/SET/AUTO_UNMARK_AWAY
+lib/irc/help/DCC/CLOSE
+lib/irc/help/DCC/GET
+lib/irc/help/DCC/LIST
+lib/irc/help/DCC/RAW
+lib/irc/help/DCC/RENAME
+lib/irc/help/DCC/SEND
+lib/irc/help/DCC/TALK
+lib/irc/help/DCC/TMSG
+lib/irc/help/DCC/CHAT
+lib/irc/help/DCC/DCC
+lib/irc/help/ircII/server_lists
 lib/irc/help/ircII/ircII
 lib/irc/help/ircII/status_line
 lib/irc/help/ircII/command_line_args
 lib/irc/help/ircII/signals
 lib/irc/help/ircII/environment_vars
 lib/irc/help/ircII/COPYRIGHT
-lib/irc/help/ircII/server_lists
-lib/irc/help/CHANNEL
-lib/irc/help/AWAY
-lib/irc/help/newuser
-lib/irc/help/BYE
-lib/irc/help/CD
-lib/irc/help/CLEAR
-lib/irc/help/CONNECT
-lib/irc/help/etiquette
-lib/irc/help/COMMENT
+lib/irc/help/ircII/programming
+lib/irc/help/BIND/BACKSPACE
+lib/irc/help/BIND/BACKWARD_CHARACTER
+lib/irc/help/BIND/ERASE_TO_END_OF_LINE
+lib/irc/help/BIND/BACKWARD_WORD
+lib/irc/help/BIND/BEGINNING_OF_LINE
+lib/irc/help/BIND/BIND
+lib/irc/help/BIND/CLEAR_SCREEN
+lib/irc/help/BIND/COMMAND_COMPLETION
+lib/irc/help/BIND/DELETE_CHARACTER
+lib/irc/help/BIND/DELETE_NEXT_WORD
+lib/irc/help/BIND/DELETE_PREVIOUS_WORD
+lib/irc/help/BIND/END_OF_LINE
+lib/irc/help/BIND/ENTER_DIGRAPH
+lib/irc/help/BIND/ENTER_MENU
+lib/irc/help/BIND/ERASE_LINE
+lib/irc/help/BIND/FORWARD_CHARACTER
+lib/irc/help/BIND/PREVIOUS_WINDOW
+lib/irc/help/BIND/FORWARD_HISTORY
+lib/irc/help/BIND/FORWARD_WORD
+lib/irc/help/BIND/NOTHING
+lib/irc/help/BIND/HELP_CHARACTER
+lib/irc/help/BIND/META1_CHARACTER
+lib/irc/help/BIND/META2_CHARACTER
+lib/irc/help/BIND/META3_CHARACTER
+lib/irc/help/BIND/META4_CHARACTER
+lib/irc/help/BIND/NEXT_WINDOW
+lib/irc/help/BIND/PARSE_COMMAND
+lib/irc/help/BIND/QUIT_IRC
+lib/irc/help/BIND/SWITCH_CHANNELS
+lib/irc/help/BIND/QUOTE_CHARACTER
+lib/irc/help/BIND/REFRESH_SCREEN
+lib/irc/help/BIND/SCROLL_BACKWARD
+lib/irc/help/BIND/SCROLL_END
+lib/irc/help/BIND/SCROLL_FORWARD
+lib/irc/help/BIND/SELF_INSERT
+lib/irc/help/BIND/SEND_LINE
+lib/irc/help/BIND/STOP_IRC
+lib/irc/help/BIND/TOGGLE_INSERT_MODE
+lib/irc/help/BIND/UNSTOP_ALL_WINDOWS
+lib/irc/help/BIND/TOGGLE_STOP_SCREEN
+lib/irc/help/BIND/TYPE_TEXT
+lib/irc/help/BIND/keys
+lib/irc/help/BIND/TRANSPOSE_CHARACTERS
+lib/irc/help/BIND/YANK_FROM_CUTBUFFER
+lib/irc/help/BIND/ERASE_TO_BEG_OF_LINE
+lib/irc/help/BIND/REFRESH_INPUTLINE
+lib/irc/help/BIND/examples
+lib/irc/help/BIND/SCROLL_START
+lib/irc/help/BIND/BACKWARD_HISTORY
+lib/irc/help/CTCP/CLIENTINFO
+lib/irc/help/CTCP/FINGER
+lib/irc/help/CTCP/TIME
+lib/irc/help/CTCP/UTC
+lib/irc/help/CTCP/CTCP
+lib/irc/help/CTCP/VERSION
+lib/irc/help/CTCP/PING
+lib/irc/help/CTCP/ACTION
+lib/irc/help/CTCP/ECHO
+lib/irc/help/CTCP/USERINFO
+lib/irc/help/ALIAS/width
+lib/irc/help/ALIAS/functions
+lib/irc/help/ALIAS/ALIAS
+lib/irc/help/ALIAS/quote
+lib/irc/help/ALIAS/special
 lib/irc/help/DATE
 lib/irc/help/intro
 lib/irc/help/DEOP
@@ -489,6 +483,7 @@ lib/irc/help/HELP
 lib/irc/help/HISTORY
 lib/irc/help/IGNORE
 lib/irc/help/FLUSH
+lib/irc/help/MSG
 lib/irc/help/INFO
 lib/irc/help/news
 lib/irc/help/INVITE
@@ -504,7 +499,6 @@ lib/irc/help/MLOAD
 lib/irc/help/NOTICE
 lib/irc/help/MODE
 lib/irc/help/MOTD
-lib/irc/help/MSG
 lib/irc/help/NAMES
 lib/irc/help/rules
 lib/irc/help/NICK
@@ -546,15 +540,27 @@ lib/irc/help/SENDLINE
 lib/irc/help/basics
 lib/irc/help/TIMER
 lib/irc/help/expressions
-lib/irc/help/.date.gz
+lib/irc/help/DISCONNECT
 lib/irc/help/commands
 lib/irc/help/HOOK
 lib/irc/help/PARSEKEY
 lib/irc/help/BEEP
 lib/irc/help/USERHOST
+lib/irc/help/:
 lib/irc/help/INPUT
 lib/irc/help/PING
-lib/irc/help/:
 lib/irc/help/menus
 lib/irc/help/#
 lib/irc/help/!
+lib/irc/help/RBIND
+lib/irc/help/ABORT
+lib/irc/help/.date
+lib/irc/help/CHANNEL
+lib/irc/help/AWAY
+lib/irc/help/newuser
+lib/irc/help/BYE
+lib/irc/help/CD
+lib/irc/help/CLEAR
+lib/irc/help/CONNECT
+lib/irc/help/etiquette
+lib/irc/help/COMMENT