update to ircII 20060721. changes include:

  o  default status line now tells you when you are scrolled up
  o  new variables status_scrolled and status_scrolled_lines
  o  new status format modifiers %P and %s
  o  fixed a bug with the input prompt being overtaken
  o  /set translation has been removed.  all encoding support now depends
     on the existance of iconv(3) support, enhancing the capabilities and
     correctness of codeset conversion.  the translation and iso2022_support
     variables have been replaced with input_encoding, display_encoding
     and irc_encoding
  o  /msg -server <servergroup|servername|number> <target> <message>
     now works to send message on specific servers ie, other than the
     current window's server
  o  support new $IRCSERVERSFILE that overrides $LIBDIR/ircII.servers

5 files changed, 20 insertions, 65 deletions

diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 1b2997e3ad5..b17b72efa20 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/06/14 14:23:32 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/07/22 09:13:10 mrg Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
@@ -17,7 +17,7 @@ CONFLICTS=		blackened-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-VERS=			20040820
+VERS=			20060721
 PLIST_SUBST+= 		VERS=${VERS:Q}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/chat/ircII/PLIST b/chat/ircII/PLIST
index ce525757aa5..2bf48c2cf38 100644
--- a/chat/ircII/PLIST
+++ b/chat/ircII/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/06/14 14:23:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/07/22 09:13:10 mrg Exp $
 bin/irc
 bin/irc-${VERS}
 bin/ircbug
@@ -349,6 +349,7 @@ 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}
@@ -371,10 +372,12 @@ 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/iso2022_support${GZSUFFIX}
 share/irc/help/set/lastlog${GZSUFFIX}
@@ -426,6 +429,8 @@ share/irc/help/set/status_notify${GZSUFFIX}
 share/irc/help/set/status_oper${GZSUFFIX}
 share/irc/help/set/status_overwrite${GZSUFFIX}
 share/irc/help/set/status_query${GZSUFFIX}
+share/irc/help/set/status_scrolled${GZSUFFIX}
+share/irc/help/set/status_scrolled_lines${GZSUFFIX}
 share/irc/help/set/status_server${GZSUFFIX}
 share/irc/help/set/status_umode${GZSUFFIX}
 share/irc/help/set/status_user${GZSUFFIX}
@@ -434,7 +439,6 @@ 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/use_old_msg${GZSUFFIX}
 share/irc/help/set/user_information${GZSUFFIX}
@@ -595,39 +599,6 @@ 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/help/alias
 @dirrm share/irc/help/bind
 @dirrm share/irc/help/ctcp
@@ -638,7 +609,6 @@ share/irc/translation/UNITED_KINGDOM_COM
 @dirrm share/irc/help/on
 @dirrm share/irc/help/set
 @dirrm share/irc/help/window
-@dirrm share/irc/translation
 @dirrm share/irc/help
 @unexec ${RMDIR} %D/share/irc/script 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/irc 2>/dev/null || ${TRUE}
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index 3f9dc5610e9..5e1de690f7f 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.25 2005/07/01 04:12:20 grant Exp $
+$NetBSD: distinfo,v 1.26 2006/07/22 09:13:10 mrg Exp $
 
-SHA1 (ircii-20040820.tar.bz2) = 60970833257543c213f44f6046d681a5418d4c42
-RMD160 (ircii-20040820.tar.bz2) = 8be064650062a1dd861d70ce0d5ebd7f99c3448e
-Size (ircii-20040820.tar.bz2) = 559843 bytes
-SHA1 (patch-aa) = fbc75ea374cee67f366ef8b783dd90f13b434831
-SHA1 (patch-ac) = f4633c01dc1ee9136ec5cc13694fe5f9fb8542ac
+SHA1 (ircii-20060721.tar.bz2) = 2ef798a0b832d39fca0ad6a2b45524fc11811a7f
+RMD160 (ircii-20060721.tar.bz2) = 12b622e3bb690cc96d364171d944220da607179a
+Size (ircii-20060721.tar.bz2) = 563148 bytes
+SHA1 (patch-ac) = 646fe06e22f64057cced1386c70a97f600d0bcb2
diff --git a/chat/ircII/patches/patch-aa b/chat/ircII/patches/patch-aa
deleted file mode 100644
index e6687f1c93c..00000000000
--- a/chat/ircII/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/07/01 04:12:20 grant Exp $
-
---- configure.orig	2004-07-03 20:37:00.000000000 +1000
-+++ configure
-@@ -1107,9 +1107,6 @@ then
-     5.*)
-       echo "$ac_t""yes" 1>&6
-       svr4=1
--            if test $ac_cv_prog_gcc = no; then
--        CFLAGS="-Xc $CFLAGS"
--      fi
-       ;;
-   esac
- else
diff --git a/chat/ircII/patches/patch-ac b/chat/ircII/patches/patch-ac
index 20d2c9e71ad..12652f100f7 100644
--- a/chat/ircII/patches/patch-ac
+++ b/chat/ircII/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/04/27 20:55:44 tv Exp $
+$NetBSD: patch-ac,v 1.3 2006/07/22 09:13:11 mrg Exp $
 
---- Makefile.in.orig	Tue Jan  6 00:42:09 2004
-+++ Makefile.in
-@@ -142,8 +142,8 @@ LN = @LN@
+--- 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 @@
  CP = cp
  MV = mv
  SED = sed
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.2 2004/04/27 20:55:44 tv Exp $
  
  VERSION = @VERSION@
  
-@@ -164,11 +164,9 @@ installbin: installirc installio install
+@@ -159,11 +159,9 @@
  
  installirc: irc installdirs
  	$(INSTALL) irc $(INSTALL_IRC)-$(VERSION)
@@ -27,12 +27,12 @@ $NetBSD: patch-ac,v 1.2 2004/04/27 20:55:44 tv Exp $
  
  installscript: installdirs
  	(								\
-@@ -219,7 +217,7 @@ installman:
+@@ -203,7 +201,7 @@
  #	$(INSTALL_DATA) $(topdir)/doc/query-pr.1 $(mandir)
  
  installdirs:
 -	umask 022; $(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \
 +	$(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \
- 		$(TRANS_PATH) $(INSTALL_SCRIPT) $(HELP_DIR)
+ 		$(INSTALL_SCRIPT) $(HELP_DIR)
  
  clena clean: