Hi!
Based on jirib@'s and okan@'s work [1], this an update to 3.0.3. Minor changes in the DESCR, and I think it should only depend on gcrypt and gpg-error when using the OTR flavor. This is in the openbsd-wip github repo also. Index: Makefile =================================================================== RCS file: /cvs/ports/net/bitlbee/Makefile,v retrieving revision 1.38 diff -p -u -r1.38 Makefile --- Makefile 12 Jun 2011 08:09:26 -0000 1.38 +++ Makefile 15 Sep 2011 09:35:33 -0000 @@ -1,12 +1,10 @@ # $OpenBSD: Makefile,v 1.38 2011/06/12 08:09:26 ajacoutot 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.3 CATEGORIES= net -REVISION= 2 - HOMEPAGE= http://bitlbee.org/ MAINTAINER= Andrew Dalgleish <open...@ajd.net.au> @@ -17,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 tasn1 +WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 MASTER_SITES= http://get.bitlbee.org/src/ @@ -40,11 +38,27 @@ CONFIGURE_ARGS+= --bindir=${PREFIX}/libe --ssl=gnutls 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 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 gcrypt gpg-error +.endif NO_REGRESS= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/net/bitlbee/distinfo,v retrieving revision 1.19 diff -p -u -r1.19 distinfo --- distinfo 16 May 2010 08:31:28 -0000 1.19 +++ distinfo 15 Sep 2011 09:35:33 -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.3.tar.gz) = T+aI46gO/gEXQ/TJJlwDEA== +RMD160 (bitlbee-3.0.3.tar.gz) = S1N4ce7xu1toORBbx7yfJWfluOE= +SHA1 (bitlbee-3.0.3.tar.gz) = QUDreqosajn6BZ0Z+PuuwNeh6/8= +SHA256 (bitlbee-3.0.3.tar.gz) = gsp1iTfOe+2qtJ7ex19K1FoxAqw76qkytkw0+7HjryU= +SIZE (bitlbee-3.0.3.tar.gz) = 676417 Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/net/bitlbee/pkg/DESCR,v retrieving revision 1.3 diff -p -u -r1.3 DESCR --- pkg/DESCR 20 Jun 2004 16:27:49 -0000 1.3 +++ pkg/DESCR 15 Sep 2011 09:35:33 -0000 @@ -1,9 +1,16 @@ 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 + - AIM/ICQ (oscar) + - XMPP/Jabber + - MSN Messenger + - Yahoo! Messenger + - Twitter (and API compatible services like identi.ca) + +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: 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: /cvs/ports/net/bitlbee/pkg/PLIST,v retrieving revision 1.14 diff -p -u -r1.14 PLIST --- pkg/PLIST 11 May 2011 12:03:19 -0000 1.14 +++ pkg/PLIST 15 Sep 2011 09:35:33 -0000 @@ -10,9 +10,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 15 Sep 2011 09:35:33 -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}. Daniel [1] - http://marc.info/?l=openbsd-ports&m=129357871204872&w=2 -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
