Index: head/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c =================================================================== --- head/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c (revision 490477) +++ head/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c (nonexistent) @@ -1,57 +0,0 @@ -From 0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc Mon Sep 17 00:00:00 2001 -From: benaryorg -Date: Fri, 20 Jan 2017 06:31:28 +0100 -Subject: [PATCH] fix build with irssi 1.0 - -use_ssl field of SERVER_CONNECT_REC has been renamed to use_tls. - -Original patch from darix. - -Signed-off-by: benaryorg ---- - src/core/xmpp-servers.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c -index 405ecd9..8d0b62d 100644 ---- src/core/xmpp-servers.c.orig -+++ src/core/xmpp-servers.c -@@ -32,6 +32,11 @@ - #include "rosters-tools.h" - #include "tools.h" - -+/* IRSSI_ABI_VERSION was introduced in 0.8.18 */ -+#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6 -+# define use_tls use_ssl -+#endif -+ - static void - channels_join(SERVER_REC *server, const char *data, int automatic) - { -@@ -151,7 +156,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 +340,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 +475,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; Property changes on: head/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c ___________________________________________________________________ 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-xmpp/Makefile =================================================================== --- head/irc/irssi-xmpp/Makefile (revision 490477) +++ head/irc/irssi-xmpp/Makefile (revision 490478) @@ -1,39 +1,38 @@ # Created by: Philippe Audeoud # $FreeBSD$ PORTNAME= irssi-xmpp -PORTVERSION= 0.53 -PORTREVISION= 3 +PORTVERSION= 0.54 CATEGORIES= irc MASTER_SITES= http://cybione.org/~irssi-xmpp/files/ MAINTAINER= jadawin@FreeBSD.org COMMENT= Irssi plugin to connect to Jabber network LICENSE= GPLv2 BUILD_DEPENDS= irssi:irc/irssi LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gettext-runtime pkgconfig USE_GNOME= glib20 USE_LDCONFIG= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" DATADIR= ${PREFIX}/share/irssi DOCSDIR= ${PREFIX}/share/doc/irssi CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_i386= -fPIC OPTIONS_DEFINE= DOCS post-patch: # Try to unbreak parallel builds (-jX) @${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 Index: head/irc/irssi-xmpp/distinfo =================================================================== --- head/irc/irssi-xmpp/distinfo (revision 490477) +++ head/irc/irssi-xmpp/distinfo (revision 490478) @@ -1,2 +1,3 @@ -SHA256 (irssi-xmpp-0.53.tar.gz) = 6487362d23af7b9c185d8ac74e6b651e697cacc01de8bb9c750db1752140536f -SIZE (irssi-xmpp-0.53.tar.gz) = 65649 +TIMESTAMP = 1515367493 +SHA256 (irssi-xmpp-0.54.tar.gz) = 1033cc6bf03abaacdb083e1fbe7d75d8a62622339e06d889422d8f0705fa7776 +SIZE (irssi-xmpp-0.54.tar.gz) = 65618