- Update to v3.0

- Add LICENSE information

4 files changed, 22 insertions, 49 deletions

diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 7b82fcf683a9..5920834dfede 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bitlbee
-PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTVERSION=	3.0
 CATEGORIES=	irc
 MASTER_SITES=	http://get.bitlbee.org/src/ \
 		${MASTER_SITE_LOCAL}
@@ -32,11 +31,13 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 OPTIONS=	DEBUG "Enable debug support" Off \
 		IPV6 "Enable IPv6 support" On \
 		OPENSSL "Use OpenSSL rather than GnuTLS" Off \
+		OTR "Enable OTR encryption support" Off \
 		MSN "Enable MSN protocol support" On \
 		JABBER "Enable Jabber (XMPP) protocol support" On \
 		OSCAR "Enable OSCAR (ICQ, AIM) protocol support" On \
 		YAHOO "Enable Yahoo! protocol support" On \
-		TWITTER "Enable Twitter protocol support" On
+		TWITTER "Enable Twitter protocol support" On \
+		LIBPURPLE "Use libpurple for protocol support" Off
 
 CONFIGURE_ARGS=	--config=/var/db/bitlbee --strip=0
 
@@ -66,6 +67,13 @@ CONFIGURE_ARGS+=--ssl=gnutls
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
 .endif
 
+.if defined(WITH_OTR)
+CONFIGURE_ARGS+=--otr=1
+LIB_DEPENDS+=	otr.4:${PORTSDIR}/security/libotr
+.else
+CONFIGURE_ARGS+=--otr=0
+.endif
+
 .if defined(WITH_MSN)
 CONFIGURE_ARGS+=--msn=1
 .else
@@ -96,6 +104,13 @@ CONFIGURE_ARGS+=--twitter=1
 CONFIGURE_ARGS+=--twitter=0
 .endif
 
+.if defined(WITH_LIBPURPLE)
+CONFIGURE_ARGS+=--purple=1
+LIB_DEPENDS+=	purple.7:${PORTSDIR}/net-im/libpurple
+.else
+CONFIGURE_ARGS+=--purple=0
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|^EFLAGS=|EFLAGS=${LDFLAGS}|" \
@@ -108,11 +123,6 @@ post-patch:
 	@${REINPLACE_CMD} \
 		-e "s:/var/lib/bitlbee:/var/db/bitlbee:" \
 		${WRKSRC}/doc/bitlbee.8
-.if ${OSVERSION} < 700042
-	@${REINPLACE_CMD} \
-		-e "s:-iquote:-I:g" \
-		${WRKSRC}/configure
-.endif
 
 post-install:
 	${MKDIR} ${PREFIX}/etc/bitlbee
diff --git a/irc/bitlbee/distinfo b/irc/bitlbee/distinfo
index 9586edca44eb..6e2f28492b4c 100644
--- a/irc/bitlbee/distinfo
+++ b/irc/bitlbee/distinfo
@@ -1,3 +1,3 @@
-MD5 (bitlbee-1.2.8.tar.gz) = e1fbbd9d96ec7c2377b1b286689c1b83
-SHA256 (bitlbee-1.2.8.tar.gz) = 3a061b88776699001b774bc323e0a0ffdcd5cde6dec2dda965bc1aa2f2ee8e86
-SIZE (bitlbee-1.2.8.tar.gz) = 513768
+MD5 (bitlbee-3.0.tar.gz) = 455fc8070d758c2bb3442ef4c709ad69
+SHA256 (bitlbee-3.0.tar.gz) = 146d6ec238454c1e735bdb35e8a5f15f913f5eb14d240e8ccd87f205a3376698
+SIZE (bitlbee-3.0.tar.gz) = 662460
diff --git a/irc/bitlbee/files/bitlbee.in b/irc/bitlbee/files/bitlbee.in
index 85bf75fe5b7e..b28069a72778 100644
--- a/irc/bitlbee/files/bitlbee.in
+++ b/irc/bitlbee/files/bitlbee.in
@@ -23,6 +23,6 @@ load_rc_config $name
 
 required_files="${bitlbee_config}"
 command="%%PREFIX%%/sbin/bitlbee"
-command_args="-D -u ${bitlbee_user} -c ${bitlbee_config} ${bitlbee_flags}"
+command_args="-F -u ${bitlbee_user} -c ${bitlbee_config} ${bitlbee_flags}"
 
 run_rc_command "$1"
diff --git a/irc/bitlbee/files/patch-protocols-twitter-twitter_lib.c b/irc/bitlbee/files/patch-protocols-twitter-twitter_lib.c
deleted file mode 100644
index 6438938f02c2..000000000000
--- a/irc/bitlbee/files/patch-protocols-twitter-twitter_lib.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- protocols/twitter/twitter_lib.c.orig	2010-07-04 17:26:16.000000000 +0000
-+++ protocols/twitter/twitter_lib.c	2010-07-26 11:39:17.000000000 +0000
-@@ -65,6 +65,8 @@ static void twitter_groupchat_init(struc
-  */
- static void txu_free(struct twitter_xml_user *txu)
- {
-+	if (txu == NULL)

-+		return;

- 	g_free(txu->name);
- 	g_free(txu->screen_name);
- 	g_free(txu);
-@@ -88,6 +90,8 @@ static void txs_free(struct twitter_xml_
- static void txl_free(struct twitter_xml_list *txl)
- {
- 	GSList *l;
-+	if (txl == NULL)

-+		return;

- 	for ( l = txl->list; l ; l = g_slist_next(l) )
- 		if (txl->type == TXL_STATUS)
- 			txs_free((struct twitter_xml_status *)l->data);
-@@ -472,6 +476,9 @@ static void twitter_groupchat(struct im_
- 	for ( l = list; l ; l = g_slist_next(l) )
- 	{
- 		status = l->data;
-+		if (status->user == NULL || status->text == NULL)

-+			continue;

-+

- 		twitter_add_buddy(ic, status->user->screen_name, status->user->name);
- 		
- 		strip_html(status->text);
-@@ -735,4 +742,4 @@ void twitter_friendships_create_destroy(
- 	args[0] = "screen_name";
- 	args[1] = who;
- 	twitter_http(ic, create ? TWITTER_FRIENDSHIPS_CREATE_URL : TWITTER_FRIENDSHIPS_DESTROY_URL, twitter_http_post, ic, 1, args, 2);
--}
-\ No newline at end of file
-+}