Index: head/irc/irssi-otr/Makefile =================================================================== --- head/irc/irssi-otr/Makefile (revision 433449) +++ head/irc/irssi-otr/Makefile (revision 433450) @@ -1,34 +1,37 @@ # Created by: Ashish Shukla # $FreeBSD$ PORTNAME= irssi-otr -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 DISTVERSIONPREFIX= v CATEGORIES= irc MAINTAINER= ashish@FreeBSD.org COMMENT= Plugin for irssi for Off-the-Record (OTR) messaging -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/irssi/src/common.h:irc/irssi \ ${LOCALBASE}/bin/libgcrypt-config:security/libgcrypt -LIB_DEPENDS= libotr.so.5:security/libotr \ +LIB_DEPENDS= libotr.so:security/libotr \ libgcrypt.so:security/libgcrypt RUN_DEPENDS= irssi:irc/irssi USES= autoreconf libtool pkgconfig USE_LDCONFIG= yes USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= cryptodotis GNU_CONFIGURE= yes 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 \ share/irssi/help/otr + +post-patch: + ${GREP} -Rl '$$(oldincludedir)' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} 's,$$(oldincludedir),${LOCALBASE}/include,g' .include Index: head/irc/irssi-otr/distinfo =================================================================== --- head/irc/irssi-otr/distinfo (revision 433449) +++ head/irc/irssi-otr/distinfo (revision 433450) @@ -1,2 +1,3 @@ -SHA256 (cryptodotis-irssi-otr-v1.0.1_GH0.tar.gz) = 3b6baa39adab360cd4f6519b6d4a53db4eee7b070d6a9e716f1655245d3ca89d -SIZE (cryptodotis-irssi-otr-v1.0.1_GH0.tar.gz) = 40334 +TIMESTAMP = 1486319780 +SHA256 (cryptodotis-irssi-otr-v1.0.2_GH0.tar.gz) = 4619208b9c9171aa97a41960b3e892390b6473e2988a056b9fe8e110daa1ae9c +SIZE (cryptodotis-irssi-otr-v1.0.2_GH0.tar.gz) = 40947 Index: head/irc/irssi-otr/files/patch-src_Makefile.am =================================================================== --- head/irc/irssi-otr/files/patch-src_Makefile.am (revision 433449) +++ head/irc/irssi-otr/files/patch-src_Makefile.am (nonexistent) @@ -1,10 +0,0 @@ ---- src/Makefile.am.orig 2014-02-12 18:50:45.000000000 -0600 -+++ src/Makefile.am 2014-07-21 16:43:34.653319339 -0500 -@@ -1,6 +1,6 @@ - AM_CFLAGS = $(LIBOTR_CFLAGS) $(LIBGCRYPT_CFLAGS) $(PACKAGE_FLAGS) - --IRSSI_DIST=/usr/include/irssi -+IRSSI_DIST=/usr/local/include/irssi - IRSSI_INCLUDE = -I$(IRSSI_DIST) \ - -I$(IRSSI_DIST)/src \ - -I$(IRSSI_DIST)/src/fe-common/core \ Property changes on: head/irc/irssi-otr/files/patch-src_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/irssi-otr/files/patch-help_Makefile.am =================================================================== --- head/irc/irssi-otr/files/patch-help_Makefile.am (revision 433449) +++ head/irc/irssi-otr/files/patch-help_Makefile.am (nonexistent) @@ -1,10 +0,0 @@ ---- help/Makefile.am.orig 2014-02-12 18:50:45.000000000 -0600 -+++ help/Makefile.am 2014-07-21 17:08:26.543319563 -0500 -@@ -1,6 +1,6 @@ - # The day Irssi will be able to check in $(prefix), this will change. Until - # then, it's hardcoded. --helpdir = /usr/share/irssi/help -+helpdir = /usr/local/share/irssi/help - help_DATA = otr - - EXTRA_DIST = otr Property changes on: head/irc/irssi-otr/files/patch-help_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/irssi-otr/files/patch-src_module.c =================================================================== --- head/irc/irssi-otr/files/patch-src_module.c (revision 433449) +++ head/irc/irssi-otr/files/patch-src_module.c (revision 433450) @@ -1,53 +1,38 @@ ---- 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 @@ +--- src/module.c.orig 2016-12-07 21:24:08 UTC ++++ src/module.c +@@ -33,6 +33,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, +@@ -91,8 +92,13 @@ end: /* * 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, +@@ -107,7 +113,11 @@ void sig_message_private(SERVER_REC *ser 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 - Index: head/irc/irssi-otr/files/patch-src_otr-ops.c =================================================================== --- head/irc/irssi-otr/files/patch-src_otr-ops.c (revision 433449) +++ head/irc/irssi-otr/files/patch-src_otr-ops.c (revision 433450) @@ -1,25 +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 +--- src/otr-ops.c.orig 2016-12-07 21:24:08 UTC ++++ src/otr-ops.c @@ -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, +@@ -206,8 +207,13 @@ static void ops_handle_msg_event(void *o * 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: