On sze, jan 09, 2013 at 19:30:17 +0100, Landry Breuil wrote: > On Wed, Jan 09, 2013 at 02:34:10PM +0100, LEVAI Daniel wrote: > > On sze, jan 09, 2013 at 10:35:00 +0000, Stuart Henderson wrote: > > > On 2013/01/09 10:11, LEVAI Daniel wrote: > > [...] > > > > I've been meaning to ask if it would be okay to drop the gnutls dep., > > > > and switch bitlbee to OpenSSL. I've been using it with it since 3.0 beta > > > > times and never had a problem, plus bitlbee would depend on one less pkg > > > > :) I'll cook up a diff if this can be considered. > > [...] > > > So because OpenSSL is in base, and bitlbee is distributed separately > > > in packages, I think we are OK there. > > [...] > > Fwiw that version with the libpurple flavor seems to work with > jabber(+tls) & oscar. You might want to fix the depends though ; > > LIB_DEPENDS devel/silc-toolkit not needed for net/bitlbee,libpurple ? > LIB_DEPENDS net/meanwhile not needed for net/bitlbee,libpurple ? > LIB_DEPENDS net/libgadu not needed for net/bitlbee,libpurple ?
That is right, those are pidgin,-libpurple depends. New diff: Index: Makefile =================================================================== RCS file: /cvs/ports/net/bitlbee/Makefile,v retrieving revision 1.46 diff -p -u -r1.46 Makefile --- Makefile 27 Nov 2012 15:40:56 -0000 1.46 +++ Makefile 10 Jan 2013 10:01:01 -0000 @@ -2,7 +2,7 @@ COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo -DISTNAME= bitlbee-3.0.6 +DISTNAME= bitlbee-3.2 CATEGORIES= net HOMEPAGE= http://bitlbee.org/ @@ -15,8 +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 += gcrypt gpg-error +WANTLIB += c pthread glib-2.0 gmodule-2.0 ssl crypto +WANTLIB += gcrypt MASTER_SITES= http://get.bitlbee.org/src/ @@ -29,7 +29,6 @@ DOCS= ${WRKSRC}/doc/user-guide/user-gu DOCDIR= ${PREFIX}/share/doc/bitlbee/ LIB_DEPENDS= devel/glib2 \ - security/gnutls \ security/libgcrypt CONFIGURE_STYLE= simple @@ -37,7 +36,7 @@ CONFIGURE_ARGS+= --bindir=${PREFIX}/libe --mandir=${PREFIX}/man \ --config=${DB_DIR} \ --etcdir=${ETCDIR} \ - --ssl=gnutls + --ssl=openssl USE_GMAKE= Yes MAKE_ENV= "CC=${CC}" "CFLAGS=${CFLAGS}" @@ -50,10 +49,7 @@ FLAVOR ?= .if ${FLAVOR:L:Mlibpurple} CONFIGURE_ARGS += --purple=1 -LIB_DEPENDS += net/pidgin,-libpurple \ - devel/silc-toolkit \ - net/meanwhile \ - net/libgadu +LIB_DEPENDS += net/pidgin,-libpurple WANTLIB += purple .endif .if ${FLAVOR:L:Motr} Index: distinfo =================================================================== RCS file: /cvs/ports/net/bitlbee/distinfo,v retrieving revision 1.23 diff -p -u -r1.23 distinfo --- distinfo 27 Nov 2012 15:40:56 -0000 1.23 +++ distinfo 10 Jan 2013 10:01:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (bitlbee-3.0.6.tar.gz) = Tz4Wn5qODN95dtLm9Buaj2AgomK1cxqg+R/bZtF0Rug= -SIZE (bitlbee-3.0.6.tar.gz) = 730918 +SHA256 (bitlbee-3.2.tar.gz) = G0OCjpBvVFCZM1Py6+zGwDjwJhxNw/FyLrr6bqPmIDA= +SIZE (bitlbee-3.2.tar.gz) = 666404 Daniel -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
