From owner-svn-ports-head@freebsd.org  Fri Feb 26 11:27:31 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 623D0AB4843;
 Fri, 26 Feb 2016 11:27:31 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3214A8BF;
 Fri, 26 Feb 2016 11:27:31 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1QBRUhu038939;
 Fri, 26 Feb 2016 11:27:30 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1QBRUSD038938;
 Fri, 26 Feb 2016 11:27:30 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201602261127.u1QBRUSD038938@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Fri, 26 Feb 2016 11:27:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r409598 - head/security/cyrus-sasl2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Feb 2016 11:27:31 -0000

Author: ume
Date: Fri Feb 26 11:27:30 2016
New Revision: 409598
URL: https://svnweb.freebsd.org/changeset/ports/409598

Log:
  Revert r409585 to avoid dependency loop.
  I've completely forgot this issue.
  
  PR:		207512

Modified:
  head/security/cyrus-sasl2/Makefile

Modified: head/security/cyrus-sasl2/Makefile
==============================================================================
--- head/security/cyrus-sasl2/Makefile	Fri Feb 26 11:22:16 2016	(r409597)
+++ head/security/cyrus-sasl2/Makefile	Fri Feb 26 11:27:30 2016	(r409598)
@@ -40,12 +40,11 @@ CPE_VENDOR=	cmu
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \
-			OBSOLETE_CRAM_ATTR SASLAUTHD BDB MYSQL PGSQL
+			OBSOLETE_CRAM_ATTR BDB MYSQL PGSQL
 OPTIONS_RADIO=		SQLITE
 OPTIONS_RADIO_SQLITE=	SQLITE2 SQLITE3
 OPTIONS_GROUP=		PLUGIN
-OPTIONS_GROUP_PLUGIN=	ANONYMOUS CRAM DIGEST GSSAPI LOGIN NTLM OTP PLAIN \
-			SCRAM SRP
+OPTIONS_GROUP_PLUGIN=	ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_DEFAULT=	ANONYMOUS AUTHDAEMOND OBSOLETE_CRAM_ATTR CRAM DIGEST \
 			LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_SUB=		yes
@@ -93,17 +92,6 @@ PLAIN_DESC=		PLAIN authentication
 PLAIN_CONFIGURE_ENABLE=	plain
 SCRAM_DESC=		SCRAM authentication
 SCRAM_CONFIGURE_ENABLE=	scram
-GSSAPI_DESC=		GSSAPI authentication
-GSSAPI_RUN_DEPENDS=	\
-	cyrus-sasl-gssapi>=2.1.26:${PORTSDIR}/security/cyrus-sasl2-gssapi
-LDAPDB_DESC=		LDAPDB plugin
-LDAPDB_RUN_DEPENDS=	\
-	cyrus-sasl-ldapdb>=2.1.26:${PORTSDIR}/security/cyrus-sasl2-ldapdb
-SASLAUTHD_DESC=		use of the saslauth daemon
-SASLAUTHD_RUN_DEPENDS=	saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
-SRP_DESC=		SRP authentication
-SRP_RUN_DEPENDS=	\
-	cyrus-sasl-srp>=2.1.26:${PORTSDIR}/security/cyrus-sasl2-srp
 
 .include <bsd.port.pre.mk>