From owner-svn-ports-head@freebsd.org  Mon Jul 20 20:26:41 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 E08E99A4863;
 Mon, 20 Jul 2015 20:26:41 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 C5EE91987;
 Mon, 20 Jul 2015 20:26:41 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KKQfIv041794;
 Mon, 20 Jul 2015 20:26:41 GMT (envelope-from garga@FreeBSD.org)
Received: (from garga@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KKQfCH041792;
 Mon, 20 Jul 2015 20:26:41 GMT (envelope-from garga@FreeBSD.org)
Message-Id: <201507202026.t6KKQfCH041792@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: garga set sender to
 garga@FreeBSD.org using -f
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 20 Jul 2015 20:26:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r392599 - in head/irc/bitlbee: . 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jul 2015 20:26:42 -0000

Author: garga
Date: Mon Jul 20 20:26:40 2015
New Revision: 392599
URL: https://svnweb.freebsd.org/changeset/ports/392599

Log:
  - Fix a regression introduced in 3.4 that broke auto_join channels
  - Bump PORTREVISION

Added:
  head/irc/bitlbee/files/patch-irc__channel.c   (contents, props changed)
Modified:
  head/irc/bitlbee/Makefile

Modified: head/irc/bitlbee/Makefile
==============================================================================
--- head/irc/bitlbee/Makefile	Mon Jul 20 20:03:29 2015	(r392598)
+++ head/irc/bitlbee/Makefile	Mon Jul 20 20:26:40 2015	(r392599)
@@ -2,6 +2,7 @@
 
 PORTNAME=	bitlbee
 PORTVERSION=	3.4.1
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		LOCAL/brix

Added: head/irc/bitlbee/files/patch-irc__channel.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/bitlbee/files/patch-irc__channel.c	Mon Jul 20 20:26:40 2015	(r392599)
@@ -0,0 +1,11 @@
+--- 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.) */