From 4b433cd8c6c7289e50f3a51a45b7439bb4e1cc64 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 11 Apr 2016 12:42:08 +0000
Subject: [PATCH] Update irc/bitlbee to 3.4.2

---
 irc/bitlbee/Makefile                   |  3 +--
 irc/bitlbee/distinfo                   |  4 ++--
 irc/bitlbee/files/patch-irc__channel.c | 11 -----------
 3 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 irc/bitlbee/files/patch-irc__channel.c

diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 229be763b8f9..1a73b6620c6b 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bitlbee
-PORTVERSION=	3.4.1
-PORTREVISION=	5
+PORTVERSION=	3.4.2
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		LOCAL/brix
diff --git a/irc/bitlbee/distinfo b/irc/bitlbee/distinfo
index 7e6e57652e53..55e305ec8ff0 100644
--- a/irc/bitlbee/distinfo
+++ b/irc/bitlbee/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.4.1.tar.gz) = 500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1
-SIZE (bitlbee-3.4.1.tar.gz) = 688072
+SHA256 (bitlbee-3.4.2.tar.gz) = 69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57
+SIZE (bitlbee-3.4.2.tar.gz) = 719456
diff --git a/irc/bitlbee/files/patch-irc__channel.c b/irc/bitlbee/files/patch-irc__channel.c
deleted file mode 100644
index 46e1c9495480..000000000000
--- a/irc/bitlbee/files/patch-irc__channel.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- irc_channel.c.orig	2015-07-20 20:09:00 UTC
-+++ irc_channel.c
-@@ -444,7 +444,7 @@ void irc_channel_auto_joins(irc_t *irc, 
- 			   can only auto-join them if their account is online. */
- 			char *acc_s;
- 
--			if (!aj || (ic->flags & IRC_CHANNEL_JOINED)) {
-+			if (!aj && !(ic->flags & IRC_CHANNEL_JOINED)) {
- 				/* Only continue if this one's marked as auto_join
- 				   or if we're in it already. (Possible if the
- 				   client auto-rejoined it before identyfing.) */