From owner-svn-ports-head@FreeBSD.ORG  Sun Jan 12 13:15:02 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DB8A4317;
 Sun, 12 Jan 2014 13:15:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AE3A510D6;
 Sun, 12 Jan 2014 13:15:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CDF26M022084;
 Sun, 12 Jan 2014 13:15:02 GMT (envelope-from brix@svn.freebsd.org)
Received: (from brix@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CDF28c022081;
 Sun, 12 Jan 2014 13:15:02 GMT (envelope-from brix@svn.freebsd.org)
Message-Id: <201401121315.s0CDF28c022081@svn.freebsd.org>
From: Henrik Brix Andersen <brix@FreeBSD.org>
Date: Sun, 12 Jan 2014 13:15:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339502 - head/irc/bitlbee
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.17
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: Sun, 12 Jan 2014 13:15:02 -0000

Author: brix
Date: Sun Jan 12 13:15:02 2014
New Revision: 339502
URL: http://svnweb.freebsd.org/changeset/ports/339502

Log:
  - Update to v3.2.1
  - Add staging support
  - OTR requires GnuTLS support
  
  PR:		ports/182379, ports/184506

Modified:
  head/irc/bitlbee/Makefile
  head/irc/bitlbee/distinfo

Modified: head/irc/bitlbee/Makefile
==============================================================================
--- head/irc/bitlbee/Makefile	Sun Jan 12 13:07:50 2014	(r339501)
+++ head/irc/bitlbee/Makefile	Sun Jan 12 13:15:02 2014	(r339502)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bitlbee
-PORTVERSION=	3.2
-PORTREVISION=	2
+PORTVERSION=	3.2.1
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		${MASTER_SITE_LOCAL}
@@ -34,7 +33,7 @@ OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
 OPTIONS_MULTI=		PROTO
 OPTIONS_MULTI_PROTO=	JABBER LIBPURPLE MSN OSCAR TWITTER YAHOO
 
-OTR_DESC=		Off-the-Record Messaging support
+OTR_DESC=		Off-the-Record Messaging support (Requires GnuTLS)
 LIBPURPLE_DESC=		Use libpurple for protocol support
 MSN_DESC=		Microsoft Messenger support
 OSCAR_DESC=		OSCAR (ICQ, AIM) support
@@ -48,9 +47,12 @@ CONFIGURE_ARGS=	--config=/var/db/bitlbee
 USERS=		bitlbee
 GROUPS=		bitlbee
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MOTR}
+IGNORE=Off-the-Record Messaging support requires GnuTLS support
+.endif
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--debug=1
 .else
@@ -129,14 +131,14 @@ post-patch:
 		${WRKSRC}/doc/bitlbee.8
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/bitlbee
+	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/bitlbee
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/doc/@} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/doc/@} ${STAGEDIR}/${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${STAGEDIR}/${EXAMPLESDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 

Modified: head/irc/bitlbee/distinfo
==============================================================================
--- head/irc/bitlbee/distinfo	Sun Jan 12 13:07:50 2014	(r339501)
+++ head/irc/bitlbee/distinfo	Sun Jan 12 13:15:02 2014	(r339502)
@@ -1,2 +1,2 @@
-SHA256 (bitlbee-3.2.tar.gz) = 1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030
-SIZE (bitlbee-3.2.tar.gz) = 666404
+SHA256 (bitlbee-3.2.1.tar.gz) = 00f411dd7d6d28f30f0e73e46c9cbe88b4006e7f03adfe07b90a97280a290f59
+SIZE (bitlbee-3.2.1.tar.gz) = 657595