Index: head/www/serf/Makefile
===================================================================
--- head/www/serf/Makefile	(revision 411400)
+++ head/www/serf/Makefile	(revision 411401)
@@ -1,58 +1,69 @@
 # Created by: Craig Rodrigues <rodrigc@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	serf
 PORTVERSION=	1.3.8
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	APACHE/serf
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Serf HTTP client library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
 
 USES=		scons tar:bzip2 cpe
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS GSSAPI
+OPTIONS_DEFINE=	DOCS
+OPTIONS_RADIO=	KERBEROS
+OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE
 
+HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
+HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
+MIT_DESC=		MIT Kerberos (security/krb5)
+MIT_LIB_DEPENDS=	libkrb5.so.3:${PORTSDIR}/security/krb5
+HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:${PORTSDIR}/security/heimdal
+
 SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
 SCONS_ARGS+=	APU=${LOCALBASE}/bin/apu-1-config
 SCONS_ARGS+=	OPENSSL=${OPENSSLBASE}
 SCONS_ARGS+=	PREFIX=${PREFIX}
 SCONS_ARGS+=	CC=${CC}
 SCONS_ARGS+=	CFLAGS="${CFLAGS}"
 INSTALL_TARGET=	install --install-sandbox=${STAGEDIR}
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGSSAPI}
+.if ${PORT_OPTIONS:MHEIMDAL_BASE}
 SCONS_ARGS+=	GSSAPI="/usr"
+.endif
+.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL}
+SCONS_ARGS+=    GSSAPI="${LOCALBASE}"
 .endif
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_CMD} ${SCONS_ARGS})
 
 do-install:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_CMD} ${SCONS_ARGS} ${INSTALL_TARGET})
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e '/^Requires.private/s/(libssl|libcrypto)//g' \
 		-e '/^Libs.private/s|$$| -L${OPENSSLLIB} -lssl -lcrypto|' \
 		${WRKSRC}/build/serf.pc.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so
 
 regression-test check: build
 	@(cd ${WRKSRC} && ${MAKE_CMD} check)
 
 .include <bsd.port.mk>