Upgrade to 0.8.12.

PR:		ports/117087
Submitted by:	Andris Raugulis <ar.at.null.lv>

5 files changed, 12 insertions, 48 deletions

diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index bba1a8437a27..4e37bd42ed90 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	irssi
-PORTVERSION=	0.8.11
-PORTREVISION?=	1
+PORTVERSION=	0.8.12
 CATEGORIES?=	irc
 MASTER_SITES=	http://mirror.irssi.org/
 
@@ -19,7 +18,7 @@ CONFLICTS=	irssi-devel-[0-9]*
 USE_BZIP2=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-module
+USE_GMAKE=	yes
 WANT_PERL=	yes
 
 MAN1=		irssi.1
@@ -42,7 +41,7 @@ USE_OPENSSL=	yes
 
 # Process options.
 
-.if defined(WITH_PERL)
+.if !defined(WITHOUT_PERL)
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=	WITH_PERL=""
@@ -62,7 +61,7 @@ PLIST_SUB+=	WITH_PROXY="@comment "
 CONFIGURE_ARGS+=	--with-socks
 .endif
 
-.if defined(WITH_IPV6)
+.if !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 CATEGORIES+=	ipv6
 .endif
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index 5761878da908..db41dd143340 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1,3 +1,3 @@
-MD5 (irssi-0.8.11.tar.bz2) = b62417fb3dba9e36eaebea0410a67cd3
-SHA256 (irssi-0.8.11.tar.bz2) = 425cf24f13bfda05c6a468523cd2874d05675ea1bc4e37a8c284f2f78c2dd6b2
-SIZE (irssi-0.8.11.tar.bz2) = 933075
+MD5 (irssi-0.8.12.tar.bz2) = e407b557b3cfc7c91ce4de2571dd79cb
+SHA256 (irssi-0.8.12.tar.bz2) = 462d634bb509cc2bdd550ee5c7b269495f3173721b7404f162ad1f69b49bfff0
+SIZE (irssi-0.8.12.tar.bz2) = 935918 
diff --git a/irc/irssi/files/patch-aa b/irc/irssi/files/patch-aa
deleted file mode 100644
index 3703ad902d46..000000000000
--- a/irc/irssi/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/irc/core/irc.c.orig	Fri Oct 10 17:30:03 2003
-+++ src/irc/core/irc.c	Sat Dec 27 22:20:56 2003
-@@ -108,9 +108,14 @@
- 	int send_now;
- 
-         g_get_current_time(&now);
--	send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 &&
--		(server->cmdcount < server->max_cmds_at_once ||
--		 server->cmd_queue_speed <= 0);
-+
-+	if (getenv("IRSSI_NOTHROTTLE")) {
-+		send_now = TRUE;
-+	} else {
-+		send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 &&
-+			(server->cmdcount < server->max_cmds_at_once ||
-+		 	server->cmd_queue_speed <= 0);
-+	}
- 
-         irc_send_cmd_full(server, cmd, send_now, FALSE, FALSE);
- }
diff --git a/irc/irssi/files/patch-src-core-log.c b/irc/irssi/files/patch-src-core-log.c
deleted file mode 100644
index 2d97d87debaf..000000000000
--- a/irc/irssi/files/patch-src-core-log.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: src/core/log.c
-===================================================================
---- src/core/log.c	(revision 4490)
-+++ src/core/log.c	(revision 4491)
-@@ -299,9 +299,7 @@
- 		if ((level & rec->level) == 0)
- 			continue;
- 
--		if (item == NULL) {
--			if (rec->temp == 0) log_write_rec(rec, str, level);
--		} else if (rec->items == NULL)
-+		if (rec->items == NULL)
- 			fallbacks = g_slist_append(fallbacks, rec);
- 		else if (log_item_find(rec, LOG_ITEM_TARGET, item,
- 				       server_tag) != NULL)
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index b80c7a1ef404..024d90b3351b 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -70,7 +70,6 @@ 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
@@ -150,6 +149,7 @@ include/irssi/src/lib-popt/poptint.h
 %%DOCSDIR%%/signals.txt
 %%DOCSDIR%%/special_vars.txt
 %%DOCSDIR%%/startup-HOWTO.html
+%%DATADIR%%/help/accept
 %%DATADIR%%/help/action
 %%DATADIR%%/help/admin
 %%DATADIR%%/help/alias
@@ -258,8 +258,8 @@ include/irssi/src/lib-popt/poptint.h
 %%DATADIR%%/help/unsilence
 %%DATADIR%%/help/upgrade
 %%DATADIR%%/help/uping
-%%DATADIR%%/help/ver
 %%DATADIR%%/help/userhost
+%%DATADIR%%/help/ver
 %%DATADIR%%/help/version
 %%DATADIR%%/help/voice
 %%DATADIR%%/help/wait
@@ -294,13 +294,13 @@ include/irssi/src/lib-popt/poptint.h
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi
-@dirrm lib/irssi/modules
-@dirrm lib/irssi
-@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
+@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