Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Nov 2015 15:04:38 +0000 (UTC)
From:      Martin Matuska <mm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402162 - head/net-im/jabberd
Message-ID:  <201511211504.tALF4cf0066495@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mm
Date: Sat Nov 21 15:04:37 2015
New Revision: 402162
URL: https://svnweb.freebsd.org/changeset/ports/402162

Log:
  Always depend on gsasl and remove old commented options

Modified:
  head/net-im/jabberd/Makefile

Modified: head/net-im/jabberd/Makefile
==============================================================================
--- head/net-im/jabberd/Makefile	Sat Nov 21 14:09:12 2015	(r402161)
+++ head/net-im/jabberd/Makefile	Sat Nov 21 15:04:37 2015	(r402162)
@@ -13,12 +13,13 @@ COMMENT=	Online presence and instant mes
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libgsasl.so:${PORTSDIR}/security/gsasl \
 		libidn.so:${PORTSDIR}/dns/libidn \
 		libudns.so:${PORTSDIR}/dns/udns
 
 OPTIONS_DEFINE=	MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \
-		DOCS SUPERSEDED EXPERIMENTAL GSASL
-OPTIONS_DEFAULT=MYSQL DEBUG GSASL
+		DOCS SUPERSEDED EXPERIMENTAL
+OPTIONS_DEFAULT=MYSQL DEBUG
 OPTIONS_SUB=	yes
 
 GNU_CONFIGURE=	yes
@@ -32,6 +33,7 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--sysconfdir=${PREFIX}/etc/jabberd \
 		--enable-ssl --enable-mio=kqueue \
 		--disable-tests \
+		--with-sasl=gsasl \
 		--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
 		--with-extra-library-path="${LOCALBASE}/lib ${ELP}"
 
@@ -92,14 +94,6 @@ PIPE_DESC=		Enable pipe (auth/reg)
 ANON_CONFIGURE_ENABLE=	anon
 ANON_DESC=		Enable anonymous (auth/reg)
 
-#CYRUS_CONFIGURE_ON=	--with-sasl=cyrus
-#CYRUS_DESC=		Use Cyrus SASL backend (not supported)
-#CYRUS_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-
-GSASL_CONFIGURE_ON=	--with-sasl=gsasl
-GSASL_DESC=		Use GSASL backend
-GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
-
 SUPERSEDED_CONFIGURE_ENABLE=	superseded
 SUPERSEDED_DESC=	Enable superseded features (ns_TIME)
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511211504.tALF4cf0066495>