Index: devel/gnome-vfs/Makefile
===================================================================
--- devel/gnome-vfs/Makefile	(revision 464073)
+++ devel/gnome-vfs/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.24.4
-PORTREVISION?=	8
+PORTREVISION=	9
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -38,6 +38,7 @@
 		--with-hal-mount=/sbin/mount \
 		--with-hal-umount=/sbin/umount \
 		ac_cv_header_sys_inotify_h=no
+CONFIGURE_ENV+=	KRB5_CONFIG=${KRB5CONFIG}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -48,43 +49,27 @@
 		desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
 		system_http_proxy.schemas system_smb.schemas
 
-OPTIONS_DEFINE=	SAMBA MDNS HAL
-OPTIONS_DEFAULT=SAMBA MDNS HAL
-SAMBA_DESC=	Enable SMB volume support
-MDNS_DESC=	Enable Bonjour/Rendezvous support
+OPTIONS_DEFINE=			SAMBA MDNS HAL FAM
+OPTIONS_DEFAULT=		SAMBA MDNS HAL FAM GSSAPI_BASE
+OPTIONS_SINGLE=			KERBEROS
+OPTIONS_SINGLE_KERBEROS=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
+OPTIONS_SUB=			yes
+SAMBA_DESC=			Enable SMB volume support
+SAMBA_USES=			samba:lib
+SAMBA_CONFIGURE_WITH=		samba-includes=${SAMBAINCLUDES} samba-libs=${SAMBALIBS}
+MDNS_DESC=			Enable Bonjour/Rendezvous support
+MDNS_CONFIGURE_ENABLE=		avahi
+MDNS_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
+HAL_CONFIGURE_ENABLE=		hal
+HAL_LIB_DEPENDS=		libhal.so:sysutils/hal
+FAM_USES=			fam
+FAM_CONFIGURE_ENABLE=		fam
+GSSAPI_BASE_USES=		gssapi
+GSSAPI_MIT_USES=		gssapi:mit
+GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 
 .include <bsd.port.options.mk>
 
-.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
-USES+=		fam
-.endif
-
-.if exists(${LOCALBASE}/lib/libkrb5.so)
-LIB_DEPENDS+=	libkrb5.so:security/heimdal
-.endif
-
-.if ${PORT_OPTIONS:MHAL}
-CONFIGURE_ARGS+=--enable-hal
-LIB_DEPENDS+=	libhal.so:sysutils/hal
-.else
-CONFIGURE_ARGS+=--disable-hal
-.endif
-
-.if ${PORT_OPTIONS:MSAMBA}
-CONFIGURE_ARGS+=--with-samba-includes=${SAMBAINCLUDES} --with-samba-libs=${SAMBALIBS}
-USES+=		samba:lib
-PLIST_SUB+=	SAMBA=""
-.else
-PLIST_SUB+=	SAMBA="@comment "
-CONFIGURE_ARGS+=--disable-samba
-.endif
-
-.if ${PORT_OPTIONS:MMDNS}
-LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
-.else
-CONFIGURE_ARGS+=--disable-avahi
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in