On Thu, Dec 16, 2010 at 01:46:27PM +0100, Laurent Ghigonis wrote: >-DB_DIR? = /var/bitlbee >+DB_DIR ?= /var/bitlbee
Grrr :) OK, here's new diff - correcting above stupid error and doesn't change spaces as requested by other tester. Please test, thank you. 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 16 Dec 2010 21:41:53 -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/ @@ -16,6 +16,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 +WANTLIB += gcrypt gpg-error MASTER_SITES= http://get.bitlbee.org/src/ @@ -43,6 +44,23 @@ 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 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 16 Dec 2010 21:41:53 -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 16 Dec 2010 21:41:53 -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 16 Dec 2010 21:41:53 -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.
