From 86b704fad6911bf9aae53d7d2814ec4eb83b34ce Mon Sep 17 00:00:00 2001
From: Derek Schrock <dereks@lifeofadishwasher.com>
Date: Fri, 28 Apr 2017 00:26:52 -0400
Subject: [PATCH] Install ecurity/cyrus-sasl2-gssapi if GSSAPI

Due to security/cyrus-sasl2-gssapi being split from
security/cyrus-sasl2 GSS auth does not work.

- Install security/cyrus-sasl2-gssapi if GSSAPI_NONE is not selected
- Imply SASL for GSSAPI
- Move duplicate --with-gss to a single GSSAPI_NONE_CONFIGURE_OFF

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=218899
---
 mail/mutt/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d077b82275..e75d476633 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.8.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -149,12 +149,14 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_IMPLIES=	ICONV
 
 # Handle GSSAPI from various places
-GSSAPI_BASE_USES=	gssapi
-GSSAPI_BASE_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_BASE_USES=		gssapi
+GSSAPI_BASE_IMPLIES=	SASL
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
-GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
-GSSAPI_MIT_USES=	gssapi:mit
-GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_HEIMDAL_IMPLIES=	SASL
+GSSAPI_MIT_USES=		gssapi:mit
+GSSAPI_MIT_IMPLIES=		SASL
+GSSAPI_NONE_RUN_DEPENDS_OFF=	cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
+GSSAPI_NONE_CONFIGURE_OFF=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_NONE_CONFIGURE_ON=	--without-gss
 
 HCACHE_NONE_CONFIGURE_ON=	--disable-hcache
-- 
2.12.1