From owner-svn-ports-all@freebsd.org Sat Jan 28 20:40:56 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 3C087CC59A9; Sat, 28 Jan 2017 20:40:56 +0000 (UTC) (envelope-from zi@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 0FE211622; Sat, 28 Jan 2017 20:40:55 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0SKetXg069709; Sat, 28 Jan 2017 20:40:55 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0SKetel069679; Sat, 28 Jan 2017 20:40:55 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201701282040.v0SKetel069679@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Sat, 28 Jan 2017 20:40:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432650 - in head/irc/irssi-xmpp: . 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: Sat, 28 Jan 2017 20:40:56 -0000 Author: zi Date: Sat Jan 28 20:40:54 2017 New Revision: 432650 URL: https://svnweb.freebsd.org/changeset/ports/432650 Log: - Resolve build failure after update of irc/irssi to 1.0.0 [1] - Bump PORTREVISION [1] - strip(1) installed modules - Add USES+=gettext-runtime as we link against it - Add USE_GNOME+=glib20 as we link against it PR: 215829 [1] Submitted by: p5B2E9A8F@t-online.de Obtained from: upstream commit d56d614b89ecc34845e0f5971c545b893c2c359a Approved by: jadawin@ (maintainer timeout, 3+ weeks) Added: head/irc/irssi-xmpp/files/ head/irc/irssi-xmpp/files/patch-d56d614b89ecc34845e0f5971c545b893c2c359a (contents, props changed) Modified: head/irc/irssi-xmpp/Makefile Modified: head/irc/irssi-xmpp/Makefile ============================================================================== --- head/irc/irssi-xmpp/Makefile Sat Jan 28 20:37:55 2017 (r432649) +++ head/irc/irssi-xmpp/Makefile Sat Jan 28 20:40:54 2017 (r432650) @@ -3,6 +3,7 @@ PORTNAME= irssi-xmpp PORTVERSION= 0.53 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://cybione.org/~irssi-xmpp/files/ @@ -15,7 +16,8 @@ BUILD_DEPENDS= irssi:irc/irssi LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= pkgconfig +USES= gettext-runtime pkgconfig +USE_GNOME= glib20 USE_LDCONFIG= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" DATADIR= ${PREFIX}/share/irssi @@ -30,4 +32,7 @@ post-patch: @${REINPLACE_CMD} -E 's|cd (.+) && (\$${MAKE})|\2 -C \1|' \ ${WRKSRC}/Makefile ${WRKSRC}/src/Makefile +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/irssi/modules/*.so + .include Added: head/irc/irssi-xmpp/files/patch-d56d614b89ecc34845e0f5971c545b893c2c359a ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/irssi-xmpp/files/patch-d56d614b89ecc34845e0f5971c545b893c2c359a Sat Jan 28 20:40:54 2017 (r432650) @@ -0,0 +1,41 @@ +From d56d614b89ecc34845e0f5971c545b893c2c359a Mon Sep 17 00:00:00 2001 +From: benaryorg +Date: Fri, 20 Jan 2017 06:31:28 +0100 +Subject: [PATCH] fix #18 - build with irssi 1.0 + +Signed-off-by: benaryorg +--- + src/core/xmpp-servers.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c +index 405ecd9..b6d9bd5 100644 +--- src/core/xmpp-servers.c ++++ src/core/xmpp-servers.c +@@ -151,7 +151,7 @@ xmpp_server_init_connect(SERVER_CONNECT_REC *connrec) + server->connect_pid = -1; + + if (server->connrec->port <= 0) +- server->connrec->port = (server->connrec->use_ssl) ? ++ server->connrec->port = (server->connrec->use_tls) ? + LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT; + + if (conn->real_jid == NULL) +@@ -335,7 +335,7 @@ lm_open_cb(LmConnection *connection, gboolean success, + g_free(host); + } else + signal_emit("server connecting", 1, server); +- if (server->connrec->use_ssl) ++ if (server->connrec->use_tls) + signal_emit("xmpp server status", 2, server, + "Using SSL encryption."); + else if (lm_ssl_get_use_starttls(lm_connection_get_ssl(server->lmconn))) +@@ -470,7 +470,7 @@ xmpp_server_connect(XMPP_SERVER_REC *server) + return; + error = NULL; + err_msg = NULL; +- if (server->connrec->use_ssl) { ++ if (server->connrec->use_tls) { + if (!set_ssl(server->lmconn, &error, server, FALSE)) { + err_msg = "Cannot init ssl"; + goto err;