o Update to 1.0.1

o Include patches to work with irssi versions >= 0.8.17

Approved by:	ashish (maintainer)

5 files changed, 82 insertions, 16 deletions

diff --git a/irc/irssi-otr/Makefile b/irc/irssi-otr/Makefile
index 09c793522a4b..a45fe8d2b299 100644
--- a/irc/irssi-otr/Makefile
+++ b/irc/irssi-otr/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	irssi-otr
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
 CATEGORIES=	irc
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -26,7 +25,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	cryptodotis
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libotr-inc-prefix=${LOCALBASE}/include
+CONFIGURE_ARGS=	--with-libotr-inc-prefix=${LOCALBASE}/include --with-irssi-module-dir=${LOCALBASE}/lib/irssi/modules
 INSTALL_TARGET=	install-strip
 
 PLIST_FILES=	lib/irssi/modules/libotr.so \
diff --git a/irc/irssi-otr/distinfo b/irc/irssi-otr/distinfo
index 1128179495ad..032f88900b08 100644
--- a/irc/irssi-otr/distinfo
+++ b/irc/irssi-otr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cryptodotis-irssi-otr-v1.0.0_GH0.tar.gz) = bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e
-SIZE (cryptodotis-irssi-otr-v1.0.0_GH0.tar.gz) = 39481
+SHA256 (cryptodotis-irssi-otr-v1.0.1_GH0.tar.gz) = 3b6baa39adab360cd4f6519b6d4a53db4eee7b070d6a9e716f1655245d3ca89d
+SIZE (cryptodotis-irssi-otr-v1.0.1_GH0.tar.gz) = 40334
diff --git a/irc/irssi-otr/files/patch-configure.ac b/irc/irssi-otr/files/patch-configure.ac
deleted file mode 100644
index 930afb2c3014..000000000000
--- a/irc/irssi-otr/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2014-02-12 18:50:45.000000000 -0600
-+++ configure.ac	2014-07-21 17:07:58.763319403 -0500
-@@ -71,7 +71,7 @@
- 
- # Hardcoded here since irssi only searches in $HOME/.irssi/modules or this path
- # which is unfortunate...
--IRSSI_MODULE_DIR="/usr/lib/irssi/modules"
-+IRSSI_MODULE_DIR="/usr/local/lib/irssi/modules"
- AC_SUBST(IRSSI_MODULE_DIR)
- 
- AC_CONFIG_FILES([
diff --git a/irc/irssi-otr/files/patch-src_module.c b/irc/irssi-otr/files/patch-src_module.c
new file mode 100644
index 000000000000..0712db3fadbc
--- /dev/null
+++ b/irc/irssi-otr/files/patch-src_module.c
@@ -0,0 +1,53 @@
+--- src/module.c	2014-02-12 18:50:45.000000000 -0600
++++ src/module.c	2016-04-07 17:35:00.000000000 +0530
+@@ -32,6 +32,7 @@
+ #include "otr.h"
+ #include "otr-formats.h"
+ #include "utils.h"
++#include "irssi-version.h"
+ 
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ 
+@@ -90,8 +91,13 @@ static void sig_server_sendmsg(SERVER_REC *server, const char *target,
+ /*
+  * Pipes all incoming private messages through OTR
+  */
++#if IRSSI_VERSION_DATE > 20141206
+ void sig_message_private(SERVER_REC *server, const char *msg,
+-		const char *nick, const char *address)
++		const char *nick, const char *address, const char *target)
++#else
++void sig_message_private(SERVER_REC *server, const char *msg,
++                const char *nick, const char *address)
++#endif
+ {
+ 	int ret;
+ 	char *new_msg = NULL;
+@@ -106,7 +112,11 @@ void sig_message_private(SERVER_REC *server, const char *msg,
+ 
+ 	if (!new_msg) {
+ 		/* This message was not OTR */
+-		signal_continue(4, server, msg, nick, address);
++#if IRSSI_VERSION_DATE > 20141206
++		signal_continue(5, server, msg, nick, address, target);
++#else
++                signal_continue(4, server, msg, nick, address);
++#endif
+ 	} else {
+ 		/*
+ 		 * Check for /me IRC marker and if so, handle it so the user does not
+@@ -371,3 +371,13 @@ void otr_deinit(void)
+  
+ 	theme_unregister();
+ }
++
++#ifdef IRSSI_ABI_VERSION
++/*
++ * irssi abicheck()
++ */
++void otr_abicheck(int *version)
++{
++	*version = IRSSI_ABI_VERSION;
++}
++#endif
+ 
diff --git a/irc/irssi-otr/files/patch-src_otr-ops.c b/irc/irssi-otr/files/patch-src_otr-ops.c
new file mode 100644
index 000000000000..58c87d5f9686
--- /dev/null
+++ b/irc/irssi-otr/files/patch-src_otr-ops.c
@@ -0,0 +1,25 @@
+--- src/otr-ops.c	2014-02-12 18:50:45.000000000 -0600
++++ src/otr-ops.c	2016-04-07 17:35:00.000000000 +0530
+@@ -21,6 +21,7 @@
+ 
+ #include "key.h"
+ #include "module.h"
++#include "irssi-version.h"
+ 
+ static OtrlPolicy OTR_DEFAULT_POLICY =
+ 	OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE;
+@@ -206,8 +207,13 @@ static void ops_handle_msg_event(void *opdata, OtrlMessageEvent msg_event,
+ 		 * submit a patch or email me a better way.
+ 		 */
+ 		signal_remove("message private", (SIGNAL_FUNC) sig_message_private);
+-		signal_emit("message private", 4, server, message, username,
++#if IRSSI_VERSION_DATE > 20141206
++		signal_emit("message private", 5, server, message, username, server->nick,
+ 				IRSSI_CONN_ADDR(server));
++#else
++                signal_emit("message private", 4, server, message, username,
++                                IRSSI_CONN_ADDR(server));
++#endif
+ 		signal_add_first("message private", (SIGNAL_FUNC) sig_message_private);
+ 		break;
+ 	case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED: