On Mon 2010.12.13 at 23:44 +0100, Jiri B. wrote: > Really no comments? Nobody has tested it?
Can you separate the " = " changes from the actual update? It'll make others more likely to read and comment (and possibly test!). Cheers. > jirib > > On Sat, Dec 11, 2010 at 08:18:45PM +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. > > > >jirib > > > >Index: Makefile > >=================================================================== > >RCS file: /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 11 Dec 2010 19:06:47 -0000 > >@@ -1,50 +1,68 @@ > > # $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 > >-CATEGORIES= net > >+DISTNAME = bitlbee-3.0.1 > >+CATEGORIES = net > > > >-HOMEPAGE= http://bitlbee.org/ > >+HOMEPAGE = http://bitlbee.org/ > > > >-MAINTAINER= Andrew Dalgleish <open...@ajd.net.au> > >+MAINTAINER = Andrew Dalgleish <open...@ajd.net.au> > > > > # GPLv2 > >-PERMIT_PACKAGE_CDROM= Yes > >-PERMIT_PACKAGE_FTP= Yes > >-PERMIT_DISTFILES_CDROM= Yes > >-PERMIT_DISTFILES_FTP= Yes > >+PERMIT_PACKAGE_CDROM = Yes > >+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 > >+WANTLIB += gcrypt gpg-error > > > >-MASTER_SITES= http://get.bitlbee.org/src/ > >+MASTER_SITES = http://get.bitlbee.org/src/ > > > >-MODULES= devel/gettext > >+MODULES = devel/gettext > > > >-DB_DIR?= /var/bitlbee > >-ETCDIR= ${SYSCONFDIR}/bitlbee > >-EXAMPLEDIR= ${PREFIX}/share/examples/bitlbee > >-DOCS= ${WRKSRC}/doc/user-guide/user-guide.html > >-DOCDIR= ${PREFIX}/share/doc/bitlbee/ > >+DB_DIR? = /var/bitlbee > >+ETCDIR = ${SYSCONFDIR}/bitlbee > >+EXAMPLEDIR = ${PREFIX}/share/examples/bitlbee > >+DOCS = ${WRKSRC}/doc/user-guide/user-guide.html > >+DOCDIR = ${PREFIX}/share/doc/bitlbee/ > > > >-LIB_DEPENDS= devel/glib2 \ > >+LIB_DEPENDS = devel/glib2 \ > > security/gnutls > > > >-CONFIGURE_STYLE= simple > >-CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \ > >+CONFIGURE_STYLE = simple > >+CONFIGURE_ARGS += --bindir=${PREFIX}/libexec \ > > --mandir=${PREFIX}/man \ > > --config=${DB_DIR} \ > > --etcdir=${ETCDIR} \ > > --ssl=gnutls > > > >-USE_GMAKE= Yes > >+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 > >+MAKE_ENV = "CC=${CC}" "CFLAGS=${CFLAGS}" > >+FAKE_FLAGS = ETCDIR=${EXAMPLEDIR} > >+FAKE_TARGET = install install-etc > >+SUBST_VARS = DB_DIR > >+ > >+FLAVORS = libpurple otr > >+FLAVOR ?= > >+ > >+.if ${FLAVOR:L:Mlibpurple} > >+CONFIGURE_ARGS += --purple=1 > >+LIB_DEPENDS += net/pidgin,-libpurple \ > >+ devel/silc-toolkit \ > >+ net/meanwhile \ > >+ net/libgadu > >+WANTLIB += purple > >+.endif > >+.if ${FLAVOR:L:Motr} > >+CONFIGURE_ARGS += --otr=1 > >+LIB_DEPENDS += security/libotr > >+WANTLIB += otr > >+.endif > > > >-NO_REGRESS= Yes > >+NO_REGRESS = Yes > > > > # don't hide compile command lines > > pre-configure: > >Index: distinfo > >=================================================================== > >RCS file: /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 11 Dec 2010 19:06:47 -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: /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 11 Dec 2010 19:06:47 -0000 > >@@ -7,3 +7,10 @@ protocols. > > - 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. > >+ * otr - Enables Off-the-Record (OTR) Messaging to have private > >+ conversations. > >Index: pkg/MESSAGE > >=================================================================== > >RCS file: /cvs/ports/net/bitlbee/pkg/MESSAGE,v > >retrieving revision 1.3 > >diff -u -p -r1.3 MESSAGE > >--- pkg/MESSAGE 13 Nov 2004 10:24:57 -0000 1.3 > >+++ pkg/MESSAGE 11 Dec 2010 19:06:47 -0000 > >@@ -5,3 +5,8 @@ To enable bitlbee you have to add a line > > to your /etc/inetd.conf and restart inetd with > > > > # kill -HUP `cat /var/run/inetd.pid` > >+ > >+If you have used previously libpurple flavored bitlbee port 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 /var/bitlbee. >
