From 24b8f4152688325ded4a4878c6bd37c8aa9923fd Mon Sep 17 00:00:00 2001 From: alek Date: Fri, 17 Dec 2004 15:41:15 +0000 Subject: [PATCH] - Disable SSL support for real - Rename no_msn FLAVOR to no_ssl - Bump PKGNAME - Add WANTLIB markers Problem spotted by newlib-depends-check and fixed by MAINTAINER ok naddy@ --- net/bitlbee/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index 89e6c081844..811fc0b6721 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2004/11/13 13:39:40 alek Exp $ +# $OpenBSD: Makefile,v 1.16 2004/12/17 15:41:15 alek Exp $ COMMENT= "IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo" DISTNAME= bitlbee-0.91 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= net HOMEPAGE= http://bitlbee.org @@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes - +WANTLIB= c gcrypt gpg-error iconv intl z MASTER_SITES= http://get.bitlbee.org/src/ @@ -28,24 +28,24 @@ DOCDIR= ${PREFIX}/share/doc/bitlbee/ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= glib-2.0.0.0::devel/glib2 -# I am told gnutls does not build on all arches -# This is only used for connecting to MSN, so I've added a no_msn FLAVOR -FLAVORS= no_msn +# I am told gnutls does not build on all arches, so I've added a no_ssl FLAVOR +# SSL is required for MSN support, and is optional for Jabber +FLAVORS= no_ssl FLAVOR?= -.if ${FLAVOR:L:Mno_msn} -CONFIGURE_ARGS+= --msn=0 +.if ${FLAVOR:L:Mno_ssl} +CONFIGURE_ARGS+= --msn=0 \ + --ssl=bogus .else LIB_DEPENDS+= gnutls.8::security/gnutls .endif - CONFIGURE_STYLE= simple CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec \ --mandir=${PREFIX}/man \ --config=${DB_DIR} \ --etcdir=${ETCDIR} \ - --tcpd=0 + --flood=1 USE_GMAKE= Yes MAKE_ENV= CC="${CC}"