Index: head/irc/bitlbee/Makefile
===================================================================
--- head/irc/bitlbee/Makefile	(revision 392598)
+++ head/irc/bitlbee/Makefile	(revision 392599)
@@ -1,104 +1,105 @@
 # $FreeBSD$
 
 PORTNAME=	bitlbee
 PORTVERSION=	3.4.1
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		LOCAL/brix
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	IRC to other chat networks gateway
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 
 SUB_FILES=	pkg-message
 PORTDOCS=	AUTHORS CHANGES CREDITS FAQ README
 PORTEXAMPLES=	bitlbee.conf motd.txt
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
 USE_RC_SUBR=	bitlbee
 USE_GNOME=	glib20
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES OTR
 
 OPTIONS_SINGLE=		EVENTS SSL
 OPTIONS_SINGLE_EVENTS=	GLIB LIBEVENT
 OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS NSS
 
 OPTIONS_MULTI=		PROTO
 OPTIONS_MULTI_PROTO=	JABBER LIBPURPLE MSN OSCAR SKYPE TWITTER YAHOO
 
 OTR_DESC=		Off-the-Record Messaging support
 LIBPURPLE_DESC=		Use libpurple for protocol support
 MSN_DESC=		Microsoft Messenger support
 OSCAR_DESC=		OSCAR (ICQ, AIM) support
 SKYPE_DESC=		Skype support
 TWITTER_DESC=		Twitter support
 YAHOO_DESC=		Yahoo! Messenger support
 GLIB_DESC=		Use glib as event handler
 LIBEVENT_DESC=		Use libevent as event handler
 
 OPTIONS_DEFAULT=	GLIB GNUTLS JABBER OSCAR TWITTER YAHOO
 
 CONFIGURE_ARGS=	--config=/var/db/bitlbee --strip=0
 
 DEBUG_CONFIGURE_ON=	--debug=1
 GNUTLS_CONFIGURE_ON=	--ssl=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
 			libgcrypt.so:${PORTSDIR}/security/libgcrypt
 JABBER_CONFIGURE_OFF=	--jabber=0
 LIBEVENT_CONFIGURE_ON=	--events=libevent --libevent=${LOCALBASE}
 LIBEVENT_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 LIBPURPLE_CONFIGURE_ON=	--purple=1
 LIBPURPLE_LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple
 MSN_CONFIGURE_OFF=	--msn=0
 NSS_CONFIGURE_ON=	--ssl=nss
 NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
 OPENSSL_CONFIGURE_ON=	--ssl=openssl
 OSCAR_CONFIGURE_OFF=	--oscar=0
 OTR_CONFIGURE_ON=	--otr=1
 OTR_LIB_DEPENDS=	libotr.so:${PORTSDIR}/security/libotr
 SKYPE_CONFIGURE_ON=	--skype=1
 SKYPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Skype4Py>0:${PORTSDIR}/net-im/py-skype4py
 SKYPE_USES=		python
 TWITTER_CONFIGURE_OFF=	--twitter=0
 YAHOO_CONFIGURE_OFF=	--yahoo=0
 
 USERS=		bitlbee
 GROUPS=		bitlbee
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^\(EFLAGS=.*\)|\1 ${LDFLAGS}|" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s:/etc/bitlbee/motd.txt:${ETCDIR}/motd.txt:" \
 		-e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/bitlbee.conf
 	@${REINPLACE_CMD} -e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/doc/bitlbee.8
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/bitlbee
 .if ${PORT_OPTIONS:MSKYPE}
 	${MV} ${STAGEDIR}${PREFIX}/etc/skyped/skyped.conf \
 		${STAGEDIR}${PREFIX}/etc/skyped/skyped.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/skyped/skyped.cnf \
 		${STAGEDIR}${PREFIX}/etc/skyped/skyped.cnf.sample
 .endif
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/doc/@} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/irc/bitlbee/files/patch-irc__channel.c
===================================================================
--- head/irc/bitlbee/files/patch-irc__channel.c	(nonexistent)
+++ head/irc/bitlbee/files/patch-irc__channel.c	(revision 392599)
@@ -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.) */

Property changes on: head/irc/bitlbee/files/patch-irc__channel.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property