Add support for irssi>=0.8.18 and update distinfo for irssi-0.8.19 update

4 files changed, 47 insertions, 6 deletions

diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile
index cfb58b90cb8..13cb6085934 100644
--- a/chat/irssi-icb/Makefile
+++ b/chat/irssi-icb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2014/09/30 08:59:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.39 2016/08/14 21:15:12 leot Exp $
 #
 
 DISTNAME=	irssi-icb-0.15
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	https://github.com/downloads/jperkin/irssi-icb/
 DISTFILES=	${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
diff --git a/chat/irssi-icb/distinfo b/chat/irssi-icb/distinfo
index a6e0690b2b6..6dec7201e93 100644
--- a/chat/irssi-icb/distinfo
+++ b/chat/irssi-icb/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2015/11/03 01:20:20 agc Exp $
+$NetBSD: distinfo,v 1.23 2016/08/14 21:15:12 leot Exp $
 
-SHA1 (irssi-0.8.17.tar.bz2) = 3bdee9a1c1f3e99673143c275d2c40275136664a
-RMD160 (irssi-0.8.17.tar.bz2) = 0ee6f41a4725c8498030d2c524e202df78a2aff6
-SHA512 (irssi-0.8.17.tar.bz2) = e3d9b130c46e6977400f5a75374cf3e32d5a6e6907b2fd4c920463b5413575708b094c9fa38151997a120ce581de26092424296510ca93b3eee7b0844be45953
-Size (irssi-0.8.17.tar.bz2) = 1102196 bytes
+SHA1 (irssi-0.8.19.tar.gz) = a457a7141e700c9fffe9fe744f2343917113d1a1
+RMD160 (irssi-0.8.19.tar.gz) = 74e75311e346a6840793fca6c16c035f81730b77
+SHA512 (irssi-0.8.19.tar.gz) = 9ae240b71a542b8eee8093f97aa8da88078e89f901d666f6c084cd3de9965ec276934097d9a12bf3888fb7134628b4b21358b6ae40e158b839f73d3b934310b4
+Size (irssi-0.8.19.tar.gz) = 1565074 bytes
 SHA1 (irssi-icb-0.15.tar.gz) = c5a739960eb98e6686a94f6d4662cfab5a95d447
 RMD160 (irssi-icb-0.15.tar.gz) = b947a341e1fc2f6d42bee3cb7b738bfdbb0a031d
 SHA512 (irssi-icb-0.15.tar.gz) = 00af04d14c2c6b65eaf93f9859e6f9f51be4bc8b270c602f4f3b2cc722b148f35c29c7efb12432b063dd41095cf823f2ad329515b0298d0c541742199f3c5fa5
@@ -11,4 +11,6 @@ Size (irssi-icb-0.15.tar.gz) = 306973 bytes
 SHA1 (patch-am) = 3bd9e38d0fde6d99d9b6a6ad67268bd63a8a92e2
 SHA1 (patch-an) = bca7fff754b60b49a6322bd5595a4a7f4003a828
 SHA1 (patch-src_core_Makefile.in) = d052d78b4f084da51498f1df934ca16412b8e5a0
+SHA1 (patch-src_core_icb-core.c) = fc0f99c383b6452d09641c2b5f049166370d1fc2
+SHA1 (patch-src_fe-common_fe-icb.c) = 47ca218d295a818028102ca041cf4b9c2053276b
 SHA1 (patch-src_fe-common_module-formats.c) = 5af701e6919051c834c52e6932e0028324362b9f
diff --git a/chat/irssi-icb/patches/patch-src_core_icb-core.c b/chat/irssi-icb/patches/patch-src_core_icb-core.c
new file mode 100644
index 00000000000..83e6ce64bba
--- /dev/null
+++ b/chat/irssi-icb/patches/patch-src_core_icb-core.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_core_icb-core.c,v 1.1 2016/08/14 21:15:12 leot Exp $
+
+Add `void MODULENAME ## _abicheck(int *version)' function required by
+irssi>=0.8.18.
+
+--- src/core/icb-core.c.orig	2002-05-20 04:17:44.000000000 +0000
++++ src/core/icb-core.c
+@@ -156,3 +156,11 @@ void icb_core_deinit(void)
+ 	signal_emit("chat protocol deinit", 1, chat_protocol_find("ICB"));
+ 	chat_protocol_unregister("ICB");
+ }
++
++#ifdef IRSSI_ABI_VERSION
++void
++icb_core_abicheck(int * version)
++{
++	*version = IRSSI_ABI_VERSION;
++}
++#endif
diff --git a/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c b/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c
new file mode 100644
index 00000000000..d786ac72724
--- /dev/null
+++ b/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_fe-common_fe-icb.c,v 1.1 2016/08/14 21:15:12 leot Exp $
+
+Add `void MODULENAME ## _abicheck(int *version)' function required by
+irssi>=0.8.18.
+
+--- src/fe-common/fe-icb.c.orig	2011-06-13 18:10:41.000000000 +0000
++++ src/fe-common/fe-icb.c
+@@ -531,3 +531,11 @@ void fe_icb_deinit(void)
+ 
+ 	signal_remove("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
+ }
++
++#ifdef IRSSI_ABI_VERSION
++void
++fe_icb_abicheck(int * version)
++{
++	*version = IRSSI_ABI_VERSION;
++}
++#endif