On Sat 2010.12.11 at 20:18 +0100, Jiri B. wrote: > Hi, > > patch to update bitlbee to latest version. It also adds flavors for > libpurple backend (tested with Sametime protocol) and OTR (tested > successfully). > > I was using bitlbee from bazaar with libpurple for months before. > > Only issue is if an user used bitlbee with libpurple backend and > wants to switch back to "classic" bitlbee -- after registration of > the user there's error about unsupported protocol (yeah wow), > so removing lines in users' xml files in /var/bitlbee for these > protocols (like Sametime) solves the issue in this specific > situation. I put it in MESSAGE.
Hi, I took your last diff and made a few alterations, namely: - removed the otr flavor and made it default (dependency is small). - no need for groff. - converted to pkg-readmes and fixed grammer (could still use better words) as well as not encouraging the use of pid files. - fixed broken @sample for bitlbee.conf. - minor cosmetic changes I've only lightly tested oscar and xmpp with no FLAVOR and the libpurple FLAVOR. Cheers, Okan Index: Makefile =================================================================== RCS file: /home/open/anoncvs/cvs/ports/net/bitlbee/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- Makefile 22 Nov 2010 10:16:08 -0000 1.35 +++ Makefile 28 Dec 2010 20:17:07 -0000 @@ -1,8 +1,8 @@ # $OpenBSD: Makefile,v 1.35 2010/11/22 10:16:08 espie Exp $ -COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo +COMMENT= IRC proxy to connect to various chat networks -DISTNAME= bitlbee-1.2.7 +DISTNAME= bitlbee-3.0.1 CATEGORIES= net HOMEPAGE= http://bitlbee.org/ @@ -15,7 +15,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 +WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 \ + gcrypt gpg-error otr MASTER_SITES= http://get.bitlbee.org/src/ @@ -28,21 +29,34 @@ DOCS= ${WRKSRC}/doc/user-guide/user-gu DOCDIR= ${PREFIX}/share/doc/bitlbee/ LIB_DEPENDS= devel/glib2 \ - security/gnutls + security/gnutls \ + security/libotr CONFIGURE_STYLE= simple CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \ --mandir=${PREFIX}/man \ --config=${DB_DIR} \ --etcdir=${ETCDIR} \ - --ssl=gnutls + --ssl=gnutls \ + --otr=1 USE_GMAKE= Yes -USE_GROFF = Yes MAKE_ENV= "CC=${CC}" "CFLAGS=${CFLAGS}" FAKE_FLAGS= ETCDIR=${EXAMPLEDIR} FAKE_TARGET= install install-etc SUBST_VARS= DB_DIR + +FLAVORS = libpurple +FLAVOR ?= + +.if ${FLAVOR:L:Mlibpurple} +CONFIGURE_ARGS += --purple=1 +LIB_DEPENDS += net/pidgin,-libpurple \ + devel/silc-toolkit \ + net/meanwhile \ + net/libgadu +WANTLIB += purple +.endif NO_REGRESS= Yes Index: distinfo =================================================================== RCS file: /home/open/anoncvs/cvs/ports/net/bitlbee/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- distinfo 16 May 2010 08:31:28 -0000 1.19 +++ distinfo 28 Dec 2010 19:53:09 -0000 @@ -1,5 +1,5 @@ -MD5 (bitlbee-1.2.7.tar.gz) = RsuMCpMJcMzNCdzksxVcrg== -RMD160 (bitlbee-1.2.7.tar.gz) = Xux//2it6RTT4dpbDhSayWNEaCc= -SHA1 (bitlbee-1.2.7.tar.gz) = 0e0Epf8Y3mfZa6UdihG72ObXjvM= -SHA256 (bitlbee-1.2.7.tar.gz) = OwQrLxrqwyPPXvCLMgPn5aGZuwtN49AJI2zSKPrmvzo= -SIZE (bitlbee-1.2.7.tar.gz) = 510458 +MD5 (bitlbee-3.0.1.tar.gz) = TQDG4JhZtlP5VbFrmI2wrA== +RMD160 (bitlbee-3.0.1.tar.gz) = zGIXnoB+8XXbDCNR2TY/EY4o85Q= +SHA1 (bitlbee-3.0.1.tar.gz) = 86BlHXI7cbCPDa07XLKENgjVwmU= +SHA256 (bitlbee-3.0.1.tar.gz) = QIpzezXbS5xAfj2wmy0ue1KINqaOLXgzcyVLeIEr9gg= +SIZE (bitlbee-3.0.1.tar.gz) = 668353 Index: pkg/DESCR =================================================================== RCS file: /home/open/anoncvs/cvs/ports/net/bitlbee/pkg/DESCR,v retrieving revision 1.3 diff -u -p -r1.3 DESCR --- pkg/DESCR 20 Jun 2004 16:27:49 -0000 1.3 +++ pkg/DESCR 28 Dec 2010 19:57:09 -0000 @@ -1,9 +1,14 @@ Bitlbee is a proxy which accepts connections from any irc-client and allows you to communicate using following instant messaging -protocols. +protocols: - AIM - ICQ - Jabber - MSN - Yahoo + +Flavors: + * libpurple - Enables a backend using purple library allowing + to communicate with even more chat networks like Gadu-Gadu, + MySpaceIM, Groupwise, Sametime, SILC etc. Index: pkg/MESSAGE =================================================================== RCS file: pkg/MESSAGE diff -N pkg/MESSAGE --- pkg/MESSAGE 13 Nov 2004 10:24:57 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -To enable bitlbee you have to add a line like: - -127.0.0.1:6667 stream tcp nowait _bitlbee ${PREFIX}/libexec/bitlbee bitlbee - -to your /etc/inetd.conf and restart inetd with - -# kill -HUP `cat /var/run/inetd.pid` Index: pkg/PLIST =================================================================== RCS file: /home/open/anoncvs/cvs/ports/net/bitlbee/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 11 Jul 2008 01:13:05 -0000 1.13 +++ pkg/PLIST 28 Dec 2010 22:27:57 -0000 @@ -9,9 +9,10 @@ share/bitlbee/ share/bitlbee/help.txt share/doc/bitlbee/ share/doc/bitlbee/user-guide.html +share/doc/pkg-readmes/${FULLPKGNAME} share/examples/bitlbee/ -share/examples/bitlbee/bitlbee.conf @sample ${SYSCONFDIR}/bitlbee/ +share/examples/bitlbee/bitlbee.conf @sample ${SYSCONFDIR}/bitlbee/bitlbee.conf share/examples/bitlbee/motd.txt @sample ${SYSCONFDIR}/bitlbee/motd.txt Index: pkg/README =================================================================== RCS file: pkg/README diff -N pkg/README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/README 28 Dec 2010 20:04:58 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ + +Running BITLBEE on OpenBSD +========================== + +To enable bitlbee, add a line such as: + +127.0.0.1:6667 stream tcp nowait _bitlbee ${PREFIX}/libexec/bitlbee bitlbee + +to your /etc/inetd.conf and restart inetd: + +# pkill -HUP inetd + +If a libpurple flavored bitlbee port was previously used, be aware that +"classic" bitlbee cannot support all protocols supported with purple +library. Remove lines for all protocol accounts unsupported by +"classic" bitlbee in users' xml configuration files in ${DB_DIR}.
