Index: mail/mutt/Makefile
===================================================================
--- mail/mutt/Makefile
+++ 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_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