7 files changed, 294 insertions, 110 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index e678c4c45e1f..296d6e5a9bec 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -6,32 +6,33 @@
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.8.9
-PORTREVISION?=	3
+PORTVERSION=	0.8.10
 CATEGORIES?=	irc
-MASTER_SITES=	http://irssi.org/files/
+MASTER_SITES=	http://mirror.irssi.org/
 
 MAINTAINER?=	vanilla@FreeBSD.org
 COMMENT?=	A modular IRC client with many features
 
-CONFLICTS=      irssi-devel-*
+CONFLICTS=	irssi-devel-[0-9]*
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+USE_GNOME=	glib20
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-
-WANT_GNOME=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--with-module
 
 MAN1=		irssi.1
 
-# Set option defaults.
+OPTIONS=	PERL "Enable perl support" on \
+		PROXY "Enable proxy support" off \
+		SOCKS "Enable socks proxy support" off \
+		IPV6 "Enable IPv6" on \
+		BOT "Enable bot" off
+# USE_OPENSSL must be defined before bsd.port.pre.mk so use old schema
+# for WITH_SSL option
 
-.if ! defined(WITH_SSL)
-WITH_SSL=	yes
-.endif
-
-.if ${WITH_SSL:L} == "no"
+.if defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--disable-ssl
 .else
 USE_OPENSSL=	yes
@@ -39,50 +40,9 @@ USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ! defined(WITH_GLIB)
-.if exists(${LOCALBASE}/include/glib-2.0/glib.h)
-WITH_GLIB=	2
-.else
-WITH_GLIB=	1
-.endif
-.endif
-
-.if ! defined(WITH_PERL)
-WITH_PERL=	yes
-.endif
-
-.if ! defined(WITH_PROXY)
-WITH_PROXY=	no
-.endif
-
-.if ! defined(WITH_SOCKS)
-WITH_SOCKS=	no
-.endif
-
-.if ! defined(WITH_IPV6)
-WITH_IPV6=	yes
-.endif
-
-.if ! defined(WITH_BOEHM_GC)
-WITH_BOEHM_GC=	no
-.endif
-
-.if ! defined(WITH_BOT)
-WITH_BOT=	no
-.endif
-
 # Process options.
 
-.if ${WITH_GLIB} == "2"
-USE_GNOME=	glib20
-.elif ${WITH_GLIB} == "1"
-CONFIGURE_ARGS+=	--with-glib1
-USE_GNOME=	glib12
-.else
-.error WITH_GLIB must be set to "1" or "2".
-.endif
-
-.if ${WITH_PERL:L} == "yes"
+.if defined(WITH_PERL)
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=	WITH_PERL=""
@@ -91,61 +51,41 @@ CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
-.if ${WITH_PROXY:L} == "yes"
+.if defined(WITH_PROXY)
 CONFIGURE_ARGS+=	--with-proxy
 PLIST_SUB+=	WITH_PROXY=""
 .else
 PLIST_SUB+=	WITH_PROXY="@comment "
 .endif
 
-.if ${WITH_SOCKS:L} == "yes"
+.if defined(WITH_SOCKS)
 CONFIGURE_ARGS+=	--with-socks
 .endif
 
-.if ${WITH_IPV6:L} == "yes"
+.if defined(WITH_IPV6)
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+=	--enable-ipv6
 CATEGORIES+=	ipv6
 .else
-.error This version of FreeBSD does not support IPv6. Please use WITH_IPV6=no.
+BROKEN=	"This version of FreeBSD does not support IPv6. Please use WITH_IPV6=no"
 .endif
 .endif
 
-.if ${WITH_BOEHM_GC:L} == "yes"
-LIB_DEPENDS+=	gc.1:${PORTSDIR}/devel/boehm-gc
-CONFIGURE_ENV+=	CPPFLAGS=-I${PREFIX}/include
-CONFIGURE_ARGS+=	--with-gc
-.endif
-
-.if ${WITH_BOT:L} == "yes"
+.if defined(WITH_BOT)
 CONFIGURE_ARGS+=	--with-bot
 .endif
 
-pre-extract:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "	WITH_GLIB=1|2		Select a GLib version to use [auto]"
-	@${ECHO} "	WITH_PERL=yes|no	Enable Perl support [yes]"
-	@${ECHO} "	WITH_PROXY=yes|no	Enable irssi-proxy [no]"
-	@${ECHO} "	WITH_SOCKS=yes|no	Enable Socks support [no]"
-	@${ECHO} "	WITH_IPV6=yes|no	Enable IPv6 support [yes]"
-	@${ECHO} "	WITH_SSL=yes|no		Enable SSL support [yes]"
-	@${ECHO} "	WITH_BOEHM_GC=yes|no	Enable GC support [no]"
-	@${ECHO} "	WITH_BOT=yes|no		Enable BOT support [no]"
-	@${ECHO} ""
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e 's|/etc|${PREFIX}&|' \
 		${WRKSRC}/docs/irssi.1
 
-pre-configure:
-	@cd ${WRKSRC} && ${MV} irssi.conf irssi.conf.sample || ${TRUE}
+post-configure:
+	@${MV} ${WRKSRC}/irssi.conf ${WRKSRC}/irssi.conf.sample
 
 post-install:
-	@if [ ! -f ${LOCALBASE}/etc/irssi.conf ]; then \
+	@if [ ! -f ${PREFIX}/etc/irssi.conf ]; then \
 		${ECHO} "Installing default configuration file."; \
-		${INSTALL_DATA} ${WRKSRC}/irssi.conf.sample ${LOCALBASE}/etc/irssi.conf ; \
+		${INSTALL_DATA} ${WRKSRC}/irssi.conf.sample ${PREFIX}/etc/irssi.conf ; \
 	fi
 
 .include <bsd.port.post.mk>
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index 1875580d2784..5f3510ebc72b 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1,2 +1,3 @@
-MD5 (irssi-0.8.9.tar.bz2) = 6610ee0e27922f447e40828cf7dee507
-SIZE (irssi-0.8.9.tar.bz2) = 816465
+MD5 (irssi-0.8.10.tar.bz2) = 4b83d4047670eb75bd14ae1bdd68dc38
+SHA256 (irssi-0.8.10.tar.bz2) = 47344b444d78ad5965eb40cc4c8df8450fdc54135e2b058710ee8c500b958d6c
+SIZE (irssi-0.8.10.tar.bz2) = 933152
diff --git a/irc/irssi/files/patch-Makefile.in b/irc/irssi/files/patch-Makefile.in
index 294e8838ef81..ad0f81678883 100644
--- a/irc/irssi/files/patch-Makefile.in
+++ b/irc/irssi/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig	Sun Nov 23 15:15:19 2003
-+++ Makefile.in	Sun Nov 23 15:24:26 2003
-@@ -119,7 +119,7 @@
+--- Makefile.in.orig	Sun Dec 11 15:57:00 2005
++++ Makefile.in	Sun Dec 11 15:57:45 2005
+@@ -255,7 +255,7 @@
+ @BUILD_PLUGINS_TRUE@PLUGINS = plugins
  SUBDIRS = src docs scripts
- 
  confdir = $(sysconfdir)
 -conf_DATA = irssi.conf
 +conf_DATA = irssi.conf.sample
- 
  themedir = $(datadir)/irssi/themes
  theme_DATA = default.theme colorless.theme
-@@ -459,8 +459,8 @@
- 
+ pkginclude_HEADERS = config.h irssi-version.h
+@@ -784,8 +784,8 @@
+ # create default-config.h
  config.h: default-config.h default-theme.h
  
 -default-config.h: $(srcdir)/irssi.conf
diff --git a/irc/irssi/files/patch-eai_nodata b/irc/irssi/files/patch-eai_nodata
deleted file mode 100644
index 3d5d32db54fc..000000000000
--- a/irc/irssi/files/patch-eai_nodata
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/network.c.orig	Sat Feb  7 12:48:34 2004
-+++ src/core/network.c	Sat Feb  7 12:49:40 2004
-@@ -607,7 +607,7 @@
- int net_hosterror_notfound(int error)
- {
- #ifdef HAVE_IPV6
--	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
-+	return error != 1 && (error == EAI_NONAME);
- #else
- 	return error == HOST_NOT_FOUND || error == NO_ADDRESS;
- #endif
diff --git a/irc/irssi/files/patch-perl-Makefile b/irc/irssi/files/patch-perl-Makefile
index a6d4d95a0a93..acc9c7fe8e4f 100644
--- a/irc/irssi/files/patch-perl-Makefile
+++ b/irc/irssi/files/patch-perl-Makefile
@@ -1,6 +1,6 @@
---- src/perl/Makefile.in.orig	Tue Feb 22 09:11:53 2005
-+++ src/perl/Makefile.in	Tue Feb 22 09:12:11 2005
-@@ -467,7 +467,7 @@
+--- src/perl/Makefile.in.orig	Sun Dec 11 15:58:14 2005
++++ src/perl/Makefile.in	Sun Dec 11 15:58:41 2005
+@@ -681,7 +681,7 @@
  
  install-exec-local:
  	for dir in $(perl_dirs); do \
diff --git a/irc/irssi/files/patch-tabcomp b/irc/irssi/files/patch-tabcomp
new file mode 100644
index 000000000000..d7b5df8e9b6e
--- /dev/null
+++ b/irc/irssi/files/patch-tabcomp
@@ -0,0 +1,121 @@
+--- src/fe-common/core/utf8.h.orig	Fri Dec  9 01:32:44 2005
++++ src/fe-common/core/utf8.h	Mon Dec 12 12:13:50 2005
+@@ -18,6 +18,10 @@
+    Make sure out is at least 6 x length of str. */
+ void utf16_to_utf8(const unichar *str, char *out);
+ 
++/* unichar -> UTF-8 string with position transformed. The NUL is copied as well.
++   Make sure out is at least 6 x length of str. */
++void utf16_to_utf8_with_pos(const unichar *str, int spos, char *out, int *opos);
++
+ /* XXX I didn't check the encoding range of big5+. This is standard big5. */
+ #define is_big5_los(lo) (0x40 <= (lo) && (lo) <= 0x7E) /* standard */
+ #define is_big5_lox(lo) (0x80 <= (lo) && (lo) <= 0xFE) /* extended */
+--- src/fe-common/core/utf8.c.orig	Fri Dec  9 01:32:44 2005
++++ src/fe-common/core/utf8.c	Mon Dec 12 12:15:20 2005
+@@ -182,6 +182,24 @@
+ 	*out = '\0';
+ }
+ 
++void utf16_to_utf8_with_pos(const unichar *str, int spos, char *out, int *opos)
++{
++	int len;
++	const unichar *sstart = str;
++	char *ostart = out;
++
++	*opos = 0;
++	while (*str != '\0') {
++		len = utf16_char_to_utf8(*str, out);
++		out += len;
++
++		str++;
++		if(str - sstart == spos)
++			*opos = out - ostart;
++	}
++	*out = '\0';
++}
++
+ static const unichar wcc[] = {
+ 	0x0, 0x300, 0x34F, 0x360, 0x363, 0x483, 0x487, 0x488, 0x48A, 0x591,
+ 	0x5A2, 0x5A3, 0x5BA, 0x5BB, 0x5BE, 0x5BF, 0x5C0, 0x5C1, 0x5C3, 0x5C4,
+--- src/fe-text/gui-entry.c.orig	Fri Dec  9 01:32:46 2005
++++ src/fe-text/gui-entry.c	Mon Dec 12 12:26:13 2005
+@@ -81,6 +81,24 @@
+ 	*out = '\0';
+ }
+ 
++void unichars_to_big5_with_pos(const unichar *str, int spos, char *out, int *opos)
++{
++	const unichar *sstart = str;
++	char *ostart = out;
++
++	*opos = 0;
++	while(*str != '\0')
++	{
++		if(*str > 0xff)
++			*out ++ = (*str >> 8) & 0xff;
++		*out ++ = *str & 0xff;
++		str ++;
++		if(str - sstart == spos)
++			*opos = out - ostart;
++	}
++	*out = '\0';
++}
++
+ int strlen_big5(const unsigned char *str)
+ {
+ 	int len=0;
+@@ -367,6 +385,29 @@
+ 		else
+ 			for (i = 0; i <= entry->text_len; i++)
+ 				buf[i] = entry->text[i];
++	}
++	return buf;
++}
++
++char *gui_entry_get_text_and_pos(GUI_ENTRY_REC *entry, int *pos)
++{
++	char *buf;
++	int i;
++
++	g_return_val_if_fail(entry != NULL, NULL);
++
++	buf = g_malloc(entry->text_len*6 + 1);
++	if (entry->utf8)
++		utf16_to_utf8_with_pos(entry->text, entry->pos, buf, pos);
++	else {
++		if(term_type==TERM_TYPE_BIG5)
++			unichars_to_big5_with_pos(entry->text, entry->pos, buf, pos);
++		else
++		{
++			for (i = 0; i <= entry->text_len; i++)
++				buf[i] = entry->text[i];
++			*pos = entry->pos;
++		}
+ 	}
+ 	return buf;
+ }
+--- src/fe-text/gui-readline.c.orig	Fri Dec  9 01:32:46 2005
++++ src/fe-text/gui-readline.c	Mon Dec 12 12:32:35 2005
+@@ -778,9 +778,7 @@
+ 	char *text, *line;
+ 	int pos;
+ 
+-	pos = gui_entry_get_pos(active_entry);
+-
+-        text = gui_entry_get_text(active_entry);
++        text = gui_entry_get_text_and_pos(active_entry, &pos);
+ 	line = word_complete(active_win, text, &pos, erase);
+ 	g_free(text);
+ 
+@@ -806,9 +804,7 @@
+ 	char *text, *line;
+ 	int pos;
+ 
+-	pos = gui_entry_get_pos(active_entry);
+-
+-        text = gui_entry_get_text(active_entry);
++        text = gui_entry_get_text_and_pos(active_entry, &pos);
+ 	line = auto_word_complete(text, &pos);
+ 	g_free(text);
+ 
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 36dc918831e6..da365160b59e 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,9 +1,124 @@
 bin/irssi
 etc/irssi.conf
 etc/irssi.conf.sample
+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
 @exec mkdir -p %D/lib/irssi/modules
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.a
-%%WITH_PROXY%%lib/irssi/modules/libirc_proxy.la
 %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so
 %%WITH_PROXY%%lib/irssi/modules/libirc_proxy.so.0
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Irssi.pm
@@ -57,6 +172,7 @@ etc/irssi.conf.sample
 %%DATADIR%%/help/echo
 %%DATADIR%%/help/eval
 %%DATADIR%%/help/exec
+%%DATADIR%%/help/flushbuffer
 %%DATADIR%%/help/flushbuffers
 %%DATADIR%%/help/format
 %%DATADIR%%/help/hash
@@ -91,6 +207,7 @@ etc/irssi.conf.sample
 %%DATADIR%%/help/names
 %%DATADIR%%/help/nctcp
 %%DATADIR%%/help/netsplit
+%%DATADIR%%/help/network
 %%DATADIR%%/help/nick
 %%DATADIR%%/help/note
 %%DATADIR%%/help/notice
@@ -103,6 +220,7 @@ etc/irssi.conf.sample
 %%DATADIR%%/help/quit
 %%DATADIR%%/help/quote
 %%DATADIR%%/help/rawlog
+%%DATADIR%%/help/recode
 %%DATADIR%%/help/reconnect
 %%DATADIR%%/help/rehash
 %%DATADIR%%/help/reload
@@ -180,3 +298,18 @@ etc/irssi.conf.sample
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
+@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