Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Jan 2014 13:15:02 +0000 (UTC)
From:      Henrik Brix Andersen <brix@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339502 - head/irc/bitlbee
Message-ID:  <201401121315.s0CDF28c022081@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401121315.s0CDF28c022081>