--- Makefile.old	2017-12-19 09:40:35.000000000 -0500
+++ Makefile	2018-01-18 15:12:54.251875000 -0500
@@ -3,7 +3,7 @@
 
 PORTNAME=		nss-pam-ldapd
 PORTVERSION=		0.9.8
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/ \
 			ZI
@@ -27,8 +27,24 @@
 NSLCD_PIDFILE?=		/var/run/nslcd.pid
 NSLCD_SOCKET?=		/var/run/nslcd.ctl
 
-OPTIONS_DEFINE=		KERBEROS
-OPTIONS_DEFAULT=	KERBEROS
+OPTIONS_SINGLE=	KERBEROS
+OPTIONS_SINGLE_KERBEROS=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
+OPTIONS_DEFAULT=	GSSAPI_BASE
+
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_BASE_CONFIGURE_ON= \
+	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+
+GSSAPI_HEIMDAL_USES=gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON= \
+	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+
+GSSAPI_MIT_USES=	gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON= \
+	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+
+GSSAPI_NONE_CONFIGURE_ON= --disable-kerberos
+
 
 .if defined(SLAVE_PORT)
 OPTIONS_DEFINE+=	SASL
@@ -69,10 +85,6 @@
 SUB_LIST+=		CONFIG_FILE="${PREFIX}/etc/${CONFIG_FILE}" \
 			NSLCD_PIDFILE="${NSLCD_PIDFILE}"
 
-.if empty(PORT_OPTIONS:MKERBEROS)
-CONFIGURE_ARGS+=	--disable-kerberos
-.endif
-
 .if ${PORT_OPTIONS:MSASL}
 WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--enable-sasl