From owner-svn-ports-all@freebsd.org Sun Feb 5 20:27:05 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83CB9CD1239; Sun, 5 Feb 2017 20:27:05 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BD45F7; Sun, 5 Feb 2017 20:27:05 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v15KR4wJ059851; Sun, 5 Feb 2017 20:27:04 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v15KR4uL059847; Sun, 5 Feb 2017 20:27:04 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <201702052027.v15KR4uL059847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Sun, 5 Feb 2017 20:27:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433450 - in head/irc/irssi-otr: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2017 20:27:05 -0000 Author: ashish Date: Sun Feb 5 20:27:03 2017 New Revision: 433450 URL: https://svnweb.freebsd.org/changeset/ports/433450 Log: - Update to 1.0.2 - Correct LICENSE to be GPLv2+ - Fix LIB_DEPENDS Deleted: head/irc/irssi-otr/files/patch-help_Makefile.am head/irc/irssi-otr/files/patch-src_Makefile.am Modified: head/irc/irssi-otr/Makefile head/irc/irssi-otr/distinfo head/irc/irssi-otr/files/patch-src_module.c head/irc/irssi-otr/files/patch-src_otr-ops.c Modified: head/irc/irssi-otr/Makefile ============================================================================== --- head/irc/irssi-otr/Makefile Sun Feb 5 20:12:49 2017 (r433449) +++ head/irc/irssi-otr/Makefile Sun Feb 5 20:27:03 2017 (r433450) @@ -2,19 +2,19 @@ # $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 @@ -31,4 +31,7 @@ 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 Modified: head/irc/irssi-otr/distinfo ============================================================================== --- head/irc/irssi-otr/distinfo Sun Feb 5 20:12:49 2017 (r433449) +++ head/irc/irssi-otr/distinfo Sun Feb 5 20:27:03 2017 (r433450) @@ -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 Modified: head/irc/irssi-otr/files/patch-src_module.c ============================================================================== --- head/irc/irssi-otr/files/patch-src_module.c Sun Feb 5 20:12:49 2017 (r433449) +++ head/irc/irssi-otr/files/patch-src_module.c Sun Feb 5 20:27:03 2017 (r433450) @@ -1,6 +1,6 @@ ---- 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" @@ -8,7 +8,7 @@ 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 */ @@ -23,7 +23,7 @@ { 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 */ @@ -36,18 +36,3 @@ } 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 - Modified: head/irc/irssi-otr/files/patch-src_otr-ops.c ============================================================================== --- head/irc/irssi-otr/files/patch-src_otr-ops.c Sun Feb 5 20:12:49 2017 (r433449) +++ head/irc/irssi-otr/files/patch-src_otr-ops.c Sun Feb 5 20:27:03 2017 (r433450) @@ -1,5 +1,5 @@ ---- 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" @@ -8,7 +8,7 @@ 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);