Index: head/www/serf/Makefile
===================================================================
--- head/www/serf/Makefile	(revision 492690)
+++ head/www/serf/Makefile	(revision 492691)
@@ -1,64 +1,64 @@
 # Created by: Craig Rodrigues <rodrigc@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	serf
 PORTVERSION=	1.3.9
 PORTREVISION=	3
 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:devel/apr1
 
 USES=		scons ssl tar:bzip2 cpe
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_RADIO=	KERBEROS
-OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE
+OPTIONS_DEFINE=		DOCS
+OPTIONS_RADIO=		KERBEROS
+OPTIONS_RADIO_KERBEROS=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
-HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
-HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
-MIT_DESC=		MIT Kerberos (security/krb5)
-MIT_LIB_DEPENDS=	libkrb5.so.3:security/krb5
-HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
+GSSAPI_BASE_DESC=		Heimdal Kerberos (base)
+GSSAPI_HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
+GSSAPI_MIT_DESC=		MIT Kerberos (security/krb5)
+GSSAPI_HEIMDAL_LIB_DEPENDS=	libkrb5.so.26:security/heimdal
+GSSAPI_MIT_LIB_DEPENDS=		libkrb5.so.3:security/krb5
 
 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}
 TEST_TARGET=	check  # some tests fail
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MHEIMDAL_BASE}
+.if ${PORT_OPTIONS:MGSSAPI_BASE}
 SCONS_ARGS+=	GSSAPI="/usr"
 .endif
-.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL}
+.if ${PORT_OPTIONS:MGSSAPI_MIT} || ${PORT_OPTIONS:MGSAPI_HEIMDAL}
 SCONS_ARGS+=    GSSAPI="${LOCALBASE}"
 .endif
 
 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-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so
 
 .include <bsd.port.pre.mk>
 
 MAKE_ARGS=	${SCONS_ARGS}
 
 .include <bsd.port.post.mk>