Update to version 0.8.10, based on PR #32432 from Juha-Matti Tilli:

- Recode support
- Isupport (005 numeric)
- Passive DCC support.
- Many memleak fixes.
- Network specific ignoring.
- Updated internal error handling.
- Complete 64bit support.
- Revised default aliases.
- Updated paste detection and settings.
- Tons of bugfixes.
- Other changes

The 'pre-install' hack from the pr is no longer needed after a fix from
jlam. Don't delete the patch-ae, which was removed in the pr.
Recode support won't work at the moment on NetBSD.

Bump the version for irssi-icb, due too the upgrade of irssi.

9 files changed, 167 insertions, 53 deletions

diff --git a/chat/irssi/MESSAGE b/chat/irssi/MESSAGE
new file mode 100644
index 00000000000..1c4614b33e0
--- /dev/null
+++ b/chat/irssi/MESSAGE
@@ -0,0 +1,11 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/01/17 21:45:52 veego Exp $
+
+This version of irssi has support for character set conversions. Irssi is
+able to transliterate unavailable characters if transliteration is
+supported by GLib.
+This is currently only supported on systems which use the gnu iconv for
+glib2. Enabling it on systems without the gnu iconv will case the following
+warning: Transliterations not supported in this system
+
+===========================================================================
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index 0fc02bbc98a..9ee83c34d91 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2005/12/29 06:21:33 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/01/17 21:45:52 veego Exp $
 
 DISTNAME=		${IRSSI_DISTNAME}
-PKGREVISION=		7
 CATEGORIES=		chat
-MASTER_SITES=		http://real.irssi.org/files/
+MASTER_SITES=		http://www.irssi.org/files/
 EXTRACT_SUFX=		${IRSSI_EXTRACT_SUFX}
 
 MAINTAINER=		mutru@iki.fi
diff --git a/chat/irssi/Makefile.common b/chat/irssi/Makefile.common
index e7977249d9b..3a1a62ba5cf 100644
--- a/chat/irssi/Makefile.common
+++ b/chat/irssi/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.3 2003/12/11 20:18:58 veego Exp $
+# $NetBSD: Makefile.common,v 1.4 2006/01/17 21:45:52 veego Exp $
 
 # Specific distribution information.
-IRSSI_VERSION=		0.8.9
+IRSSI_VERSION=		0.8.10
 IRSSI_DISTNAME=		irssi-${IRSSI_VERSION}
 IRSSI_EXTRACT_SUFX=	.tar.bz2
 IRSSI_DISTFILE=		${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
diff --git a/chat/irssi/PLIST b/chat/irssi/PLIST
index ae125390a84..ebe3aad929f 100644
--- a/chat/irssi/PLIST
+++ b/chat/irssi/PLIST
@@ -1,5 +1,122 @@
-@comment $NetBSD: PLIST,v 1.7 2005/03/19 15:32:25 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/01/17 21:45:52 veego Exp $
 bin/irssi
+include/irssi/config.h
+include/irssi/irssi-version.h
+include/irssi/src/common.h
+include/irssi/src/core/args.h
+include/irssi/src/core/channel-rec.h
+include/irssi/src/core/channel-setup-rec.h
+include/irssi/src/core/channels-setup.h
+include/irssi/src/core/channels.h
+include/irssi/src/core/chat-protocols.h
+include/irssi/src/core/chatnet-rec.h
+include/irssi/src/core/chatnets.h
+include/irssi/src/core/commands.h
+include/irssi/src/core/core.h
+include/irssi/src/core/expandos.h
+include/irssi/src/core/ignore.h
+include/irssi/src/core/levels.h
+include/irssi/src/core/line-split.h
+include/irssi/src/core/log.h
+include/irssi/src/core/masks.h
+include/irssi/src/core/misc.h
+include/irssi/src/core/module.h
+include/irssi/src/core/modules-load.h
+include/irssi/src/core/modules.h
+include/irssi/src/core/net-disconnect.h
+include/irssi/src/core/net-nonblock.h
+include/irssi/src/core/net-sendbuffer.h
+include/irssi/src/core/network.h
+include/irssi/src/core/nick-rec.h
+include/irssi/src/core/nicklist.h
+include/irssi/src/core/nickmatch-cache.h
+include/irssi/src/core/pidwait.h
+include/irssi/src/core/queries.h
+include/irssi/src/core/query-rec.h
+include/irssi/src/core/rawlog.h
+include/irssi/src/core/recode.h
+include/irssi/src/core/server-connect-rec.h
+include/irssi/src/core/server-rec.h
+include/irssi/src/core/server-setup-rec.h
+include/irssi/src/core/servers-reconnect.h
+include/irssi/src/core/servers-setup.h
+include/irssi/src/core/servers.h
+include/irssi/src/core/session.h
+include/irssi/src/core/settings.h
+include/irssi/src/core/signals.h
+include/irssi/src/core/special-vars.h
+include/irssi/src/core/window-item-def.h
+include/irssi/src/core/window-item-rec.h
+include/irssi/src/core/write-buffer.h
+include/irssi/src/fe-common/core/autorun.h
+include/irssi/src/fe-common/core/chat-completion.h
+include/irssi/src/fe-common/core/command-history.h
+include/irssi/src/fe-common/core/completion.h
+include/irssi/src/fe-common/core/fe-channels.h
+include/irssi/src/fe-common/core/fe-common-core.h
+include/irssi/src/fe-common/core/fe-core-commands.h
+include/irssi/src/fe-common/core/fe-exec.h
+include/irssi/src/fe-common/core/fe-messages.h
+include/irssi/src/fe-common/core/fe-queries.h
+include/irssi/src/fe-common/core/fe-recode.h
+include/irssi/src/fe-common/core/fe-windows.h
+include/irssi/src/fe-common/core/formats.h
+include/irssi/src/fe-common/core/hilight-text.h
+include/irssi/src/fe-common/core/keyboard.h
+include/irssi/src/fe-common/core/module-formats.h
+include/irssi/src/fe-common/core/module.h
+include/irssi/src/fe-common/core/printtext.h
+include/irssi/src/fe-common/core/themes.h
+include/irssi/src/fe-common/core/translation.h
+include/irssi/src/fe-common/core/utf8.h
+include/irssi/src/fe-common/core/window-activity.h
+include/irssi/src/fe-common/core/window-items.h
+include/irssi/src/fe-common/core/windows-layout.h
+include/irssi/src/fe-common/irc/dcc/fe-dcc.h
+include/irssi/src/fe-common/irc/dcc/module-formats.h
+include/irssi/src/fe-common/irc/dcc/module.h
+include/irssi/src/fe-common/irc/fe-irc-server.h
+include/irssi/src/fe-common/irc/module-formats.h
+include/irssi/src/fe-common/irc/module.h
+include/irssi/src/fe-common/irc/notifylist/module-formats.h
+include/irssi/src/fe-common/irc/notifylist/module.h
+include/irssi/src/irc/core/bans.h
+include/irssi/src/irc/core/channel-rejoin.h
+include/irssi/src/irc/core/ctcp.h
+include/irssi/src/irc/core/irc-channels.h
+include/irssi/src/irc/core/irc-chatnets.h
+include/irssi/src/irc/core/irc-commands.h
+include/irssi/src/irc/core/irc-masks.h
+include/irssi/src/irc/core/irc-nicklist.h
+include/irssi/src/irc/core/irc-queries.h
+include/irssi/src/irc/core/irc-servers-setup.h
+include/irssi/src/irc/core/irc-servers.h
+include/irssi/src/irc/core/irc.h
+include/irssi/src/irc/core/mode-lists.h
+include/irssi/src/irc/core/modes.h
+include/irssi/src/irc/core/module.h
+include/irssi/src/irc/core/netsplit.h
+include/irssi/src/irc/core/servers-idle.h
+include/irssi/src/irc/core/servers-redirect.h
+include/irssi/src/irc/dcc/dcc-chat.h
+include/irssi/src/irc/dcc/dcc-file-rec.h
+include/irssi/src/irc/dcc/dcc-file.h
+include/irssi/src/irc/dcc/dcc-get.h
+include/irssi/src/irc/dcc/dcc-queue.h
+include/irssi/src/irc/dcc/dcc-rec.h
+include/irssi/src/irc/dcc/dcc-send.h
+include/irssi/src/irc/dcc/dcc-server.h
+include/irssi/src/irc/dcc/dcc.h
+include/irssi/src/irc/dcc/module.h
+include/irssi/src/irc/flood/module.h
+include/irssi/src/irc/notifylist/module.h
+include/irssi/src/irc/notifylist/notify-setup.h
+include/irssi/src/irc/notifylist/notifylist.h
+include/irssi/src/lib-config/iconfig.h
+include/irssi/src/lib-config/module.h
+include/irssi/src/lib-popt/findme.h
+include/irssi/src/lib-popt/popt.h
+include/irssi/src/lib-popt/poptint.h
 lib/irssi/modules/libirc_proxy.la
 man/man1/irssi.1
 share/doc/irssi/botnet.txt
@@ -39,6 +156,7 @@ share/irssi/help/disconnect
 share/irssi/help/echo
 share/irssi/help/eval
 share/irssi/help/exec
+share/irssi/help/flushbuffer
 share/irssi/help/flushbuffers
 share/irssi/help/format
 share/irssi/help/hash
@@ -73,6 +191,7 @@ share/irssi/help/msg
 share/irssi/help/names
 share/irssi/help/nctcp
 share/irssi/help/netsplit
+share/irssi/help/network
 share/irssi/help/nick
 share/irssi/help/note
 share/irssi/help/notice
@@ -85,6 +204,7 @@ share/irssi/help/query
 share/irssi/help/quit
 share/irssi/help/quote
 share/irssi/help/rawlog
+share/irssi/help/recode
 share/irssi/help/reconnect
 share/irssi/help/rehash
 share/irssi/help/reload
@@ -159,3 +279,18 @@ share/irssi/themes/default.theme
 @dirrm share/doc/irssi
 @dirrm lib/irssi/modules
 @dirrm lib/irssi
+@dirrm include/irssi/src/lib-popt
+@dirrm include/irssi/src/lib-config
+@dirrm include/irssi/src/irc/notifylist
+@dirrm include/irssi/src/irc/flood
+@dirrm include/irssi/src/irc/dcc
+@dirrm include/irssi/src/irc/core
+@dirrm include/irssi/src/irc
+@dirrm include/irssi/src/fe-common/irc/notifylist
+@dirrm include/irssi/src/fe-common/irc/dcc
+@dirrm include/irssi/src/fe-common/irc
+@dirrm include/irssi/src/fe-common/core
+@dirrm include/irssi/src/fe-common
+@dirrm include/irssi/src/core
+@dirrm include/irssi/src
+@dirrm include/irssi
diff --git a/chat/irssi/distinfo b/chat/irssi/distinfo
index a603b2779be..94189ddac7d 100644
--- a/chat/irssi/distinfo
+++ b/chat/irssi/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.22 2005/11/11 16:01:20 tonio Exp $
+$NetBSD: distinfo,v 1.23 2006/01/17 21:45:52 veego Exp $
 
-SHA1 (irssi-0.8.9.tar.bz2) = 57799a1e99ac5f6694eb6fd049d39a4e2e51f576
-RMD160 (irssi-0.8.9.tar.bz2) = 7a0a2a639c041802bfddd458c35bccaec8084013
-Size (irssi-0.8.9.tar.bz2) = 816465 bytes
+SHA1 (irssi-0.8.10.tar.bz2) = 055eef31ed7a52e30d9a63d803306570c7cd3393
+RMD160 (irssi-0.8.10.tar.bz2) = d2deaca1bf81184b6120bf5804de73b3ef0ac37b
+Size (irssi-0.8.10.tar.bz2) = 933152 bytes
 SHA1 (patch-aa) = 45d8161733f58ab3733022c823933bb1cc93a8e2
-SHA1 (patch-ab) = c395fbeeb2dd15490f04f2cb2c94daf6c5955e85
-SHA1 (patch-ac) = 9572891333279dc368f44c52f9584c34f10d7aa1
-SHA1 (patch-ad) = 7629117264f84c4f20697200456f91662b52f724
+SHA1 (patch-ab) = 5b5f39cfcad179e0872fda9bc0016ce263df6834
 SHA1 (patch-ae) = 158de7394abec0cab8fe2c8fea158fd97377cb1f
-SHA1 (patch-af) = 3603d84e9e3b5f589c94775e261dedcacff09cf0
+SHA1 (patch-af) = be896e7a4ed6fa9a76f9e3584035c209136a3df3
diff --git a/chat/irssi/patches/patch-ab b/chat/irssi/patches/patch-ab
index 3e2d63b1490..5ff48d1ac20 100644
--- a/chat/irssi/patches/patch-ab
+++ b/chat/irssi/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2002/12/02 12:19:20 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2006/01/17 21:45:52 veego Exp $
 
---- Makefile.in.orig	Tue Nov 19 11:14:30 2002
-+++ Makefile.in
-@@ -117,7 +117,7 @@ sedpath = @sedpath@
- 
+--- Makefile.in.orig	2005-12-11 10:45:48.000000000 +0100
++++ Makefile.in	2005-12-12 19:03:38.000000000 +0100
+@@ -254,7 +254,7 @@
+ target_alias = @target_alias@
+ @BUILD_PLUGINS_TRUE@PLUGINS = plugins
  SUBDIRS = src docs scripts
- 
 -confdir = $(sysconfdir)
 +confdir = $(datadir)/examples/@PACKAGE@
  conf_DATA = irssi.conf
- 
  themedir = $(datadir)/irssi/themes
+ theme_DATA = default.theme colorless.theme
diff --git a/chat/irssi/patches/patch-ac b/chat/irssi/patches/patch-ac
deleted file mode 100644
index 76da02abfc9..00000000000
--- a/chat/irssi/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2005/03/20 05:05:59 reed Exp $
-
---- src/core/network.c.orig	Wed Mar 16 20:01:11 2005
-+++ src/core/network.c	Wed Mar 16 20:03:31 2005
-@@ -607,7 +607,11 @@
- int net_hosterror_notfound(int error)
- {
- #ifdef HAVE_IPV6
-+#ifdef EAI_NODATA
- 	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
-+#else
-+	return error != 1 && (error == EAI_NONAME);
-+#endif
- #else
- 	return error == HOST_NOT_FOUND || error == NO_ADDRESS;
- #endif
diff --git a/chat/irssi/patches/patch-ad b/chat/irssi/patches/patch-ad
deleted file mode 100644
index 42cb2169e67..00000000000
--- a/chat/irssi/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2005/06/26 20:25:48 snj Exp $
-
---- src/fe-common/core/fe-exec.c.orig	2005-06-26 12:55:47.000000000 -0700
-+++ src/fe-common/core/fe-exec.c	2005-06-26 12:56:03.000000000 -0700
-@@ -347,7 +347,7 @@ static void process_exec(PROCESS_REC *re
- static void sig_exec_input_reader(PROCESS_REC *rec)
- {
-         char tmpbuf[512], *str;
--        unsigned int recvlen;
-+        gsize recvlen;
- 	int err, ret;
- 
- 	g_return_if_fail(rec != NULL);
diff --git a/chat/irssi/patches/patch-af b/chat/irssi/patches/patch-af
index 1d097a88ca6..70ad68db147 100644
--- a/chat/irssi/patches/patch-af
+++ b/chat/irssi/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2005/11/11 16:01:20 tonio Exp $
+$NetBSD: patch-af,v 1.2 2006/01/17 21:45:52 veego Exp $
 
---- configure.orig	2003-12-11 00:23:05.000000000 +0100
+--- configure.orig	2005-12-11 11:45:39.000000000 +0200
 +++ configure
-@@ -22842,7 +22842,7 @@ echo "$as_me: error: error compiling tes
+@@ -25371,7 +25371,7 @@
     { (exit 1); exit 1; }; }
  fi