Index: Makefile
===================================================================
--- Makefile	(revision 484819)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	neomutt
 PORTVERSION=	20180716
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	mail
 
@@ -26,11 +26,12 @@
 SHEBANG_FILES=	contrib/smime_keys
 
 OPTIONS_DEFINE=	NLS DOCS SASL IDN FLOCK GPGME NOTMUCH
-OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES
+OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES GSSAPI_BASE
 OPTIONS_MULTI=	HCACHE
 OPTIONS_MULTI_HCACHE=	BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
-OPTIONS_SINGLE=	SCREEN
+OPTIONS_SINGLE=	SCREEN GSSAPI
 OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
 FLOCK_DESC=	Use flock() to lock files
 GPGME_DESC=	Use gpgme to handle pgp
@@ -86,6 +87,14 @@
 SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
 
+# GSSAPI
+GSSAPI_BASE_USES=		gssapi
+GSSAPI_BASE_CONFIGURE_ON=	--gss
+GSSAPI_HEIMDAL_USES=		gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${LOCALBASE}
+GSSAPI_MIT_USES=		gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${LOCALBASE}
+
 NCURSES_USES=	ncurses
 
 DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \