3 files changed, 258 insertions, 220 deletions

diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index 85efccba2511..ae00ddad28c9 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	IrcII Client
-# Version required:	2.9
+# Version required:	4.4S
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ircii-4.4
-CATEGORIES=	irc
-MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/clients/
+DISTNAME=	ircii-4.4S
+CATEGORIES=	irc ipv6
+MASTER_SITES=	ftp://ircftp.au.eterna.com.au/pub/ircII/
 
 MAINTAINER=	torstenb@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	IRCLIB=${PREFIX}/share/irc
-FORBIDDEN=	buffer overflow
+
+USE_BZIP2=	yes
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 MAN1=		ircII.1 ircbug.1
diff --git a/irc/ircII/distinfo b/irc/ircII/distinfo
index 7089dc7e704b..d3307e12ecc4 100644
--- a/irc/ircII/distinfo
+++ b/irc/ircII/distinfo
@@ -1 +1 @@
-MD5 (ircii-4.4.tar.gz) = acc9f39e21d31dfad36e403f76e890ed
+MD5 (ircii-4.4S.tar.bz2) = be61f385aa12a560bc86696944c2a062
diff --git a/irc/ircII/pkg-plist b/irc/ircII/pkg-plist
index d2b1d8c56e93..30eab3bae3d7 100644
--- a/irc/ircII/pkg-plist
+++ b/irc/ircII/pkg-plist
@@ -1,221 +1,23 @@
-bin/irc-4.4
-bin/ircbug
 bin/irc
-bin/ircio
+bin/irc-4.4S
+bin/ircbug
 bin/ircflush
+bin/ircio
 bin/wserv
-share/irc/translation/ASCII
-share/irc/translation/CP437
-share/irc/translation/CP850
-share/irc/translation/DANISH
-share/irc/translation/DEC_MCS
-share/irc/translation/DG_MCS
-share/irc/translation/DUTCH
-share/irc/translation/FINNISH
-share/irc/translation/FRENCH
-share/irc/translation/FRENCH_CANADIAN
-share/irc/translation/GERMAN
-share/irc/translation/HP_MCS
-share/irc/translation/IRV
-share/irc/translation/ITALIAN
-share/irc/translation/JIS
-share/irc/translation/MACINTOSH
-share/irc/translation/NEXT
-share/irc/translation/NORWEGIAN_1
-share/irc/translation/NORWEGIAN_2
-share/irc/translation/POLISH
-share/irc/translation/POLISH_NOPL
-share/irc/translation/PORTUGUESE
-share/irc/translation/PORTUGUESE_COM
-share/irc/translation/RUSSIAN
-share/irc/translation/RUSSIAN_ALT
-share/irc/translation/RUSSIAN_WIN
-share/irc/translation/SPANISH
-share/irc/translation/SWEDISH
-share/irc/translation/SWEDISH_NAMES
-share/irc/translation/SWEDISH_NAMES_COM
-share/irc/translation/SWISS
-share/irc/translation/UNITED_KINGDOM
-share/irc/translation/UNITED_KINGDOM_COM
-share/irc/script/2.8script
-share/irc/script/2.9script
-share/irc/script/action
-share/irc/script/alias
-share/irc/script/autoop
-share/irc/script/basical
-share/irc/script/bigcheese
-share/irc/script/brc
-share/irc/script/channel
-share/irc/script/columns
-share/irc/script/commander
-share/irc/script/compl.mods
-share/irc/script/complete
-share/irc/script/cursor
-share/irc/script/dccchan
-share/irc/script/deutsch
-share/irc/script/disc
-share/irc/script/dmsg
-share/irc/script/edit
-share/irc/script/english
-share/irc/script/events
-share/irc/script/extensions
-share/irc/script/finger
-share/irc/script/flood
-share/irc/script/fnet
-share/irc/script/functions
-share/irc/script/global
-share/irc/script/help
-share/irc/script/log
-share/irc/script/history
-share/irc/script/history-match
-share/irc/script/imap
-share/irc/script/ircIIhelp
-share/irc/script/ircprimer
-share/irc/script/ircrc
-share/irc/script/kickmenu
-share/irc/script/killpath
-share/irc/script/kpstat
-share/irc/script/list
-share/irc/script/lynx_ircrc
-share/irc/script/meta1
-share/irc/script/meta2
-share/irc/script/msg
-share/irc/script/mudlike
-share/irc/script/nemesis
-share/irc/script/netsplit
-share/irc/script/newaway
-share/irc/script/newformat
-share/irc/script/nicks
-share/irc/script/oldping
-share/irc/script/oper
-share/irc/script/ping
-share/irc/script/prefix
-share/irc/script/recursion
-share/irc/script/repeat
-share/irc/script/screen
-share/irc/script/service
-share/irc/script/shell
-share/irc/script/silent
-share/irc/script/smileys
-share/irc/script/tabkey
-share/irc/script/time
-share/irc/script/traces
-share/irc/script/troy
-share/irc/script/uhnotify
-share/irc/script/undernet
-share/irc/script/version
-share/irc/script/voice
-share/irc/script/wallopstat
-share/irc/script/whowas
-share/irc/script/window
-share/irc/help/alias/alias
-share/irc/help/alias/functions
-share/irc/help/alias/quote
-share/irc/help/alias/special
-share/irc/help/alias/width
 share/irc/help/!
 share/irc/help/.date
 share/irc/help/:
 share/irc/help/abort
 share/irc/help/admin
+share/irc/help/alias/alias
+share/irc/help/alias/functions
+share/irc/help/alias/quote
+share/irc/help/alias/special
+share/irc/help/alias/width
 share/irc/help/assign
 share/irc/help/away
 share/irc/help/basics
 share/irc/help/beep
-share/irc/help/bye
-share/irc/help/cd
-share/irc/help/channel
-share/irc/help/clear
-share/irc/help/commands
-share/irc/help/comment
-share/irc/help/connect
-share/irc/help/date
-share/irc/help/deop
-share/irc/help/describe
-share/irc/help/die
-share/irc/help/digraph
-share/irc/help/dmsg
-share/irc/help/dquery
-share/irc/help/echo
-share/irc/help/encrypt
-share/irc/help/etiquette
-share/irc/help/eval
-share/irc/help/exec
-share/irc/help/if
-share/irc/help/exit
-share/irc/help/expressions
-share/irc/help/flush
-share/irc/help/foreach
-share/irc/help/help
-share/irc/help/history
-share/irc/help/hook
-share/irc/help/ignore
-share/irc/help/info
-share/irc/help/input
-share/irc/help/intro
-share/irc/help/invite
-share/irc/help/ison
-share/irc/help/join
-share/irc/help/kick
-share/irc/help/kill
-share/irc/help/lastlog
-share/irc/help/leave
-share/irc/help/links
-share/irc/help/list
-share/irc/help/lusers
-share/irc/help/me
-share/irc/help/menus
-share/irc/help/mload
-share/irc/help/mode
-share/irc/help/motd
-share/irc/help/msg
-share/irc/help/names
-share/irc/help/news
-share/irc/help/newuser
-share/irc/help/nick
-share/irc/help/notice
-share/irc/help/notify
-share/irc/help/oper
-share/irc/help/parsekey
-share/irc/help/part
-share/irc/help/ping
-share/irc/help/query
-share/irc/help/quit
-share/irc/help/quote
-share/irc/help/rbind
-share/irc/help/redirect
-share/irc/help/rehash
-share/irc/help/restart
-share/irc/help/rules
-share/irc/help/save
-share/irc/help/say
-share/irc/help/send
-share/irc/help/sendline
-share/irc/help/server
-share/irc/help/servlist
-share/irc/help/signoff
-share/irc/help/sleep
-share/irc/help/squery
-share/irc/help/squit
-share/irc/help/stats
-share/irc/help/summon
-share/irc/help/time
-share/irc/help/timer
-share/irc/help/topic
-share/irc/help/trace
-share/irc/help/type
-share/irc/help/userhost
-share/irc/help/users
-share/irc/help/version
-share/irc/help/wait
-share/irc/help/wallops
-share/irc/help/which
-share/irc/help/while
-share/irc/help/who
-share/irc/help/whois
-share/irc/help/whowas
-share/irc/help/xecho
-share/irc/help/xtype
 share/irc/help/bind/backspace
 share/irc/help/bind/backward_character
 share/irc/help/bind/backward_history
@@ -243,6 +45,10 @@ share/irc/help/bind/meta1_character
 share/irc/help/bind/meta2_character
 share/irc/help/bind/meta3_character
 share/irc/help/bind/meta4_character
+share/irc/help/bind/meta5_character
+share/irc/help/bind/meta6_character
+share/irc/help/bind/meta7_character
+share/irc/help/bind/meta8_character
 share/irc/help/bind/next_window
 share/irc/help/bind/nothing
 share/irc/help/bind/parse_command
@@ -265,6 +71,15 @@ share/irc/help/bind/transpose_characters
 share/irc/help/bind/type_text
 share/irc/help/bind/unstop_all_windows
 share/irc/help/bind/yank_from_cutbuffer
+share/irc/help/brick
+share/irc/help/bye
+share/irc/help/cat
+share/irc/help/cd
+share/irc/help/channel
+share/irc/help/clear
+share/irc/help/commands
+share/irc/help/comment
+share/irc/help/connect
 share/irc/help/ctcp/action
 share/irc/help/ctcp/clientinfo
 share/irc/help/ctcp/ctcp
@@ -275,6 +90,7 @@ share/irc/help/ctcp/time
 share/irc/help/ctcp/userinfo
 share/irc/help/ctcp/utc
 share/irc/help/ctcp/version
+share/irc/help/date
 share/irc/help/dcc/chat
 share/irc/help/dcc/close
 share/irc/help/dcc/dcc
@@ -285,6 +101,40 @@ share/irc/help/dcc/rename
 share/irc/help/dcc/send
 share/irc/help/dcc/talk
 share/irc/help/dcc/tmsg
+share/irc/help/deop
+share/irc/help/describe
+share/irc/help/die
+share/irc/help/digraph
+share/irc/help/dmsg
+share/irc/help/dquery
+share/irc/help/echo
+share/irc/help/encrypt
+share/irc/help/etiquette
+share/irc/help/eval
+share/irc/help/exec
+share/irc/help/exit
+share/irc/help/expressions
+share/irc/help/flush
+share/irc/help/foreach
+share/irc/help/help
+share/irc/help/history
+share/irc/help/hook
+share/irc/help/icb
+share/irc/help/if
+share/irc/help/ignore
+share/irc/help/info
+share/irc/help/input
+share/irc/help/intro
+share/irc/help/invite
+share/irc/help/ircii/copyright
+share/irc/help/ison
+share/irc/help/join
+share/irc/help/kick
+share/irc/help/kill
+share/irc/help/lastlog
+share/irc/help/leave
+share/irc/help/links
+share/irc/help/list
 share/irc/help/load/2.9script
 share/irc/help/load/action
 share/irc/help/load/alias
@@ -310,18 +160,19 @@ share/irc/help/load/fnet
 share/irc/help/load/functions
 share/irc/help/load/help
 share/irc/help/load/history
+share/irc/help/load/icb
 share/irc/help/load/irciihelp
-share/irc/help/load/msg
 share/irc/help/load/ircprimer
-share/irc/help/load/kpstat
 share/irc/help/load/kickmenu
 share/irc/help/load/killpath
+share/irc/help/load/kpstat
 share/irc/help/load/list
 share/irc/help/load/load
 share/irc/help/load/local
 share/irc/help/load/lynx_ircrc
 share/irc/help/load/meta1
 share/irc/help/load/meta2
+share/irc/help/load/msg
 share/irc/help/load/mudlike
 share/irc/help/load/nemesis
 share/irc/help/load/netsplit
@@ -347,6 +198,17 @@ share/irc/help/load/version
 share/irc/help/load/wallopstat
 share/irc/help/load/whowas
 share/irc/help/load/window
+share/irc/help/lusers
+share/irc/help/me
+share/irc/help/menus
+share/irc/help/mload
+share/irc/help/mode
+share/irc/help/motd
+share/irc/help/msg
+share/irc/help/names
+share/irc/help/news
+share/irc/help/newuser
+share/irc/help/nick
 share/irc/help/note/antiwall
 share/irc/help/note/count
 share/irc/help/note/deny
@@ -368,6 +230,8 @@ share/irc/help/note/user
 share/irc/help/note/waitfor
 share/irc/help/note/wall
 share/irc/help/note/wallops
+share/irc/help/notice
+share/irc/help/notify
 share/irc/help/on/action
 share/irc/help/on/channel_nick
 share/irc/help/on/channel_signoff
@@ -393,10 +257,10 @@ share/irc/help/on/list
 share/irc/help/on/mail
 share/irc/help/on/mode
 share/irc/help/on/msg
-share/irc/help/on/names
 share/irc/help/on/msg_group
-share/irc/help/on/note
+share/irc/help/on/names
 share/irc/help/on/nickname
+share/irc/help/on/note
 share/irc/help/on/notice
 share/irc/help/on/notify_signoff
 share/irc/help/on/notify_signon
@@ -420,10 +284,29 @@ share/irc/help/on/talk
 share/irc/help/on/timer
 share/irc/help/on/topic
 share/irc/help/on/wall
-share/irc/help/on/who
 share/irc/help/on/wallop
+share/irc/help/on/who
 share/irc/help/on/window
 share/irc/help/on/window_kill
+share/irc/help/on/window_swap
+share/irc/help/oper
+share/irc/help/parsekey
+share/irc/help/part
+share/irc/help/ping
+share/irc/help/query
+share/irc/help/quit
+share/irc/help/quote
+share/irc/help/rbind
+share/irc/help/redirect
+share/irc/help/rehash
+share/irc/help/restart
+share/irc/help/rules
+share/irc/help/save
+share/irc/help/say
+share/irc/help/send
+share/irc/help/sendline
+share/irc/help/server
+share/irc/help/servlist
 share/irc/help/set/always_split_biggest
 share/irc/help/set/auto_unmark_away
 share/irc/help/set/auto_whowas
@@ -442,9 +325,9 @@ share/irc/help/set/command_mode
 share/irc/help/set/continued_line
 share/irc/help/set/ctcp_reply_backlog_seconds
 share/irc/help/set/ctcp_reply_flood_size
-share/irc/help/set/debug
 share/irc/help/set/ctcp_reply_ignore_seconds
 share/irc/help/set/dcc_block_size
+share/irc/help/set/debug
 share/irc/help/set/display
 share/irc/help/set/eight_bit_characters
 share/irc/help/set/encrypt_program
@@ -466,25 +349,29 @@ share/irc/help/set/hold_mode
 share/irc/help/set/hold_mode_max
 share/irc/help/set/indent
 share/irc/help/set/input_aliases
-share/irc/help/set/insert_mode
 share/irc/help/set/input_prompt
 share/irc/help/set/input_protection
+share/irc/help/set/insert_mode
 share/irc/help/set/inverse_video
+share/irc/help/set/irchost
 share/irc/help/set/lastlog
 share/irc/help/set/lastlog_level
 share/irc/help/set/load_path
 share/irc/help/set/log
 share/irc/help/set/logfile
 share/irc/help/set/mail
+share/irc/help/set/make_notice_msg
 share/irc/help/set/max_recursions
 share/irc/help/set/menu
 share/irc/help/set/minimum_servers
 share/irc/help/set/minimum_users
+share/irc/help/set/no_ask_nickname
 share/irc/help/set/no_ctcp_flood
 share/irc/help/set/notify_handler
 share/irc/help/set/notify_level
 share/irc/help/set/notify_on_termination
 share/irc/help/set/novice
+share/irc/help/set/old_encrypt_program
 share/irc/help/set/pause_after_motd
 share/irc/help/set/realname
 share/irc/help/set/same_window_only
@@ -530,10 +417,33 @@ share/irc/help/set/user_wallops
 share/irc/help/set/verbose_ctcp
 share/irc/help/set/warn_of_ignores
 share/irc/help/set/xterm_options
+share/irc/help/set/xterm_path
+share/irc/help/signoff
+share/irc/help/sleep
+share/irc/help/squery
+share/irc/help/squit
+share/irc/help/stats
+share/irc/help/summon
+share/irc/help/time
+share/irc/help/timer
+share/irc/help/topic
+share/irc/help/trace
+share/irc/help/type
+share/irc/help/userhost
+share/irc/help/users
+share/irc/help/version
+share/irc/help/wait
+share/irc/help/wallops
+share/irc/help/which
+share/irc/help/while
+share/irc/help/who
+share/irc/help/whois
+share/irc/help/whowas
 share/irc/help/window/add
 share/irc/help/window/addgroup
 share/irc/help/window/back
 share/irc/help/window/balance
+share/irc/help/window/bind
 share/irc/help/window/channel
 share/irc/help/window/create
 share/irc/help/window/delete
@@ -556,12 +466,13 @@ share/irc/help/window/name
 share/irc/help/window/new
 share/irc/help/window/next
 share/irc/help/window/notify
-share/irc/help/window/number
 share/irc/help/window/notify_level
+share/irc/help/window/number
 share/irc/help/window/pop
 share/irc/help/window/previous
 share/irc/help/window/prompt
 share/irc/help/window/push
+share/irc/help/window/query
 share/irc/help/window/refnum
 share/irc/help/window/remove
 share/irc/help/window/scroll
@@ -571,4 +482,130 @@ share/irc/help/window/shrink
 share/irc/help/window/stack
 share/irc/help/window/sticky
 share/irc/help/window/swap
+share/irc/help/window/unbind
 share/irc/help/window/window
+share/irc/help/xecho
+share/irc/help/xtype
+share/irc/script/2.8script
+share/irc/script/2.9script
+share/irc/script/action
+share/irc/script/alias
+share/irc/script/autoop
+share/irc/script/basical
+share/irc/script/bigcheese
+share/irc/script/brc
+share/irc/script/channel
+share/irc/script/columns
+share/irc/script/commander
+share/irc/script/compl.mods
+share/irc/script/complete
+share/irc/script/cursor
+share/irc/script/dccchan
+share/irc/script/default
+share/irc/script/deutsch
+share/irc/script/disc
+share/irc/script/dmsg
+share/irc/script/edit
+share/irc/script/english
+share/irc/script/events
+share/irc/script/extensions
+share/irc/script/finger
+share/irc/script/flood
+share/irc/script/fnet
+share/irc/script/functions
+share/irc/script/global
+share/irc/script/help
+share/irc/script/history
+share/irc/script/history-match
+share/irc/script/icb
+share/irc/script/imap
+share/irc/script/ircIIhelp
+share/irc/script/ircprimer
+share/irc/script/ircrc
+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
+share/irc/script/msg
+share/irc/script/mudlike
+share/irc/script/nemesis
+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/otherstatus
+share/irc/script/ping
+share/irc/script/prefix
+share/irc/script/recursion
+share/irc/script/repeat
+share/irc/script/screen
+share/irc/script/service
+share/irc/script/shell
+share/irc/script/silent
+share/irc/script/smileys
+share/irc/script/tabkey
+share/irc/script/time
+share/irc/script/times
+share/irc/script/traces
+share/irc/script/troy
+share/irc/script/uhnotify
+share/irc/script/undernet
+share/irc/script/version
+share/irc/script/voice
+share/irc/script/wallopstat
+share/irc/script/whowas
+share/irc/script/window
+share/irc/translation/ASCII
+share/irc/translation/CP437
+share/irc/translation/CP850
+share/irc/translation/DANISH
+share/irc/translation/DEC_MCS
+share/irc/translation/DG_MCS
+share/irc/translation/DUTCH
+share/irc/translation/FINNISH
+share/irc/translation/FRENCH
+share/irc/translation/FRENCH_CANADIAN
+share/irc/translation/GERMAN
+share/irc/translation/HP_MCS
+share/irc/translation/IRV
+share/irc/translation/ITALIAN
+share/irc/translation/JIS
+share/irc/translation/MACINTOSH
+share/irc/translation/NEXT
+share/irc/translation/NORWEGIAN_1
+share/irc/translation/NORWEGIAN_2
+share/irc/translation/POLISH
+share/irc/translation/POLISH_NOPL
+share/irc/translation/PORTUGUESE
+share/irc/translation/PORTUGUESE_COM
+share/irc/translation/RUSSIAN
+share/irc/translation/RUSSIAN_ALT
+share/irc/translation/RUSSIAN_WIN
+share/irc/translation/SPANISH
+share/irc/translation/SWEDISH
+share/irc/translation/SWEDISH_NAMES
+share/irc/translation/SWEDISH_NAMES_COM
+share/irc/translation/SWISS
+share/irc/translation/UNITED_KINGDOM
+share/irc/translation/UNITED_KINGDOM_COM
+@dirrm share/irc/translation
+@dirrm share/irc/script
+@dirrm share/irc/help/alias
+@dirrm share/irc/help/bind
+@dirrm share/irc/help/ctcp
+@dirrm share/irc/help/dcc
+@dirrm share/irc/help/on
+@dirrm share/irc/help/load
+@dirrm share/irc/help/note
+@dirrm share/irc/help/set
+@dirrm share/irc/help/window
+@dirrm share/irc/help/ircii
+@dirrm share/irc/help
+@dirrm share/irc