Update to 20080314:

Changes since ircII 20060725:

  o  /on channel_signoff works again
  o  try to split ICB messages at word boundaries
  o  disallow many IRC commands on ICB
  o  /ping works on ICB
  o  revert the utf-8 changes for large lastlog performance reasons.
     there should be a re-implementation coming in the future.

5 files changed, 31 insertions, 22 deletions

diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 60984aabae1..7974bfa6374 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2008/01/04 20:00:32 heinz Exp $
+# $NetBSD: Makefile,v 1.50 2008/11/10 19:25:27 wiz Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
@@ -15,7 +15,7 @@ CONFLICTS=		blackened-[0-9]*
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-VERS=			20060725
+VERS=			20080314
 PLIST_SUBST+=	VERS=${VERS:Q}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/chat/ircII/PLIST b/chat/ircII/PLIST
index f1358f09aeb..55049a8ca3b 100644
--- a/chat/ircII/PLIST
+++ b/chat/ircII/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2006/07/26 02:21:35 mrg Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/11/10 19:25:27 wiz Exp $
 bin/irc
 bin/irc-${VERS}
 bin/ircbug
@@ -349,7 +349,6 @@ share/irc/help/set/dccport${GZSUFFIX}
 share/irc/help/set/debug${GZSUFFIX}
 share/irc/help/set/decrypt_program${GZSUFFIX}
 share/irc/help/set/display${GZSUFFIX}
-share/irc/help/set/display_encoding${GZSUFFIX}
 share/irc/help/set/eight_bit_characters${GZSUFFIX}
 share/irc/help/set/encrypt_program${GZSUFFIX}
 share/irc/help/set/exec_protection${GZSUFFIX}
@@ -372,12 +371,10 @@ share/irc/help/set/hold_mode${GZSUFFIX}
 share/irc/help/set/hold_mode_max${GZSUFFIX}
 share/irc/help/set/indent${GZSUFFIX}
 share/irc/help/set/input_aliases${GZSUFFIX}
-share/irc/help/set/input_encoding${GZSUFFIX}
 share/irc/help/set/input_prompt${GZSUFFIX}
 share/irc/help/set/input_protection${GZSUFFIX}
 share/irc/help/set/insert_mode${GZSUFFIX}
 share/irc/help/set/inverse_video${GZSUFFIX}
-share/irc/help/set/irc_encoding${GZSUFFIX}
 share/irc/help/set/irchost${GZSUFFIX}
 share/irc/help/set/lastlog${GZSUFFIX}
 share/irc/help/set/lastlog_level${GZSUFFIX}
@@ -438,6 +435,7 @@ share/irc/help/set/status_window${GZSUFFIX}
 share/irc/help/set/suppress_server_motd${GZSUFFIX}
 share/irc/help/set/tab${GZSUFFIX}
 share/irc/help/set/tab_max${GZSUFFIX}
+share/irc/help/set/translation${GZSUFFIX}
 share/irc/help/set/underline_video${GZSUFFIX}
 share/irc/help/set/user_information${GZSUFFIX}
 share/irc/help/set/user_wallops${GZSUFFIX}
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index a1345ebea4a..403e0ec626c 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2006/09/07 13:09:50 rillig Exp $
+$NetBSD: distinfo,v 1.29 2008/11/10 19:25:27 wiz Exp $
 
-SHA1 (ircii-20060725.tar.bz2) = 1070667f8bce6fdd5a5dc05af934d79f61ecd42a
-RMD160 (ircii-20060725.tar.bz2) = 9273d491c0a02c6235ff8918778171025d8fd053
-Size (ircii-20060725.tar.bz2) = 560505 bytes
-SHA1 (patch-ac) = 646fe06e22f64057cced1386c70a97f600d0bcb2
-SHA1 (patch-ad) = 9aee81f4c9f257b5c4d30ea95aaf728e9916cf54
+SHA1 (ircii-20080314.tar.bz2) = 120f988d710e142c5d01ef4c9ce5ba8a6365bf69
+RMD160 (ircii-20080314.tar.bz2) = 913ac3d8ff02351249392d43cf8a17fd1e412253
+Size (ircii-20080314.tar.bz2) = 555483 bytes
+SHA1 (patch-ac) = e76fe644474f9cdcec99d4d264303df1ec67251f
+SHA1 (patch-ad) = a8da3adea3b7c61d453e5e5e9f53024b8e1f128f
diff --git a/chat/ircII/patches/patch-ac b/chat/ircII/patches/patch-ac
index 12652f100f7..75ab23e9ae2 100644
--- a/chat/ircII/patches/patch-ac
+++ b/chat/ircII/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/07/22 09:13:11 mrg Exp $
+$NetBSD: patch-ac,v 1.4 2008/11/10 19:25:27 wiz Exp $
 
---- Makefile.in.orig	2005-09-21 13:02:59.000000000 -0700
-+++ Makefile.in	2006-07-22 00:13:12.000000000 -0700
-@@ -137,8 +137,8 @@
+--- Makefile.in.orig	2008-03-14 17:13:15.000000000 +0000
++++ Makefile.in
+@@ -131,8 +131,8 @@ LN = @LN@
  CP = cp
  MV = mv
  SED = sed
@@ -13,7 +13,16 @@ $NetBSD: patch-ac,v 1.3 2006/07/22 09:13:11 mrg Exp $
  
  VERSION = @VERSION@
  
-@@ -159,11 +159,9 @@
+@@ -142,7 +142,7 @@ PROGRAMS = irc ircio ircflush wserv
+ 
+ all: $(PROGRAMS)
+ 
+-install: all installbin installscript installtranslation installman installhelp
++install: all installbin installscript installman installhelp
+ 
+ installeverything: install installflush installio installwserv \
+ 	installscript installtranslation installhelp
+@@ -153,11 +153,9 @@ installbin: installirc installio install
  
  installirc: irc installdirs
  	$(INSTALL) irc $(INSTALL_IRC)-$(VERSION)
@@ -27,12 +36,14 @@ $NetBSD: patch-ac,v 1.3 2006/07/22 09:13:11 mrg Exp $
  
  installscript: installdirs
  	(								\
-@@ -203,7 +201,7 @@
+@@ -208,8 +206,8 @@ installman:
  #	$(INSTALL_DATA) $(topdir)/doc/query-pr.1 $(mandir)
  
  installdirs:
 -	umask 022; $(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \
+-		$(TRANS_PATH) $(INSTALL_SCRIPT) $(HELP_DIR)
 +	$(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \
- 		$(INSTALL_SCRIPT) $(HELP_DIR)
++		$(INSTALL_SCRIPT) $(HELP_DIR)
  
  clena clean:
+ 	cd $(objdir) &&	$(RM) $(PROGRAMS) $(OBJECTS) \
diff --git a/chat/ircII/patches/patch-ad b/chat/ircII/patches/patch-ad
index 6c8cf8a5478..9c8481bda45 100644
--- a/chat/ircII/patches/patch-ad
+++ b/chat/ircII/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.7 2006/09/07 13:09:50 rillig Exp $
+$NetBSD: patch-ad,v 1.8 2008/11/10 19:25:27 wiz Exp $
 
 SunPro defines __STDC__ to 0 by default.
 
---- include/cast_sbox.h.orig	2003-12-08 02:59:48.000000000 +0100
-+++ include/cast_sbox.h	2006-09-07 15:03:47.830134796 +0200
+--- include/cast_sbox.h.orig	2003-12-08 01:59:48.000000000 +0000
++++ include/cast_sbox.h
 @@ -9,7 +9,7 @@
   */