Index: head/deskutils/gnome-contacts/Makefile
===================================================================
--- head/deskutils/gnome-contacts/Makefile	(revision 424487)
+++ head/deskutils/gnome-contacts/Makefile	(revision 424488)
@@ -1,64 +1,75 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnome-contacts
 PORTVERSION=	3.18.0
 PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Contacts manager for gnome
 
 BUILD_DEPENDS=	vala>=0.14.0:lang/vala
 LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts \
 		libchamplain-0.12.so:graphics/libchamplain \
-		libcheese-gtk.so:multimedia/cheese \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 		libgee-0.8.so:devel/libgee \
 		libfolks.so:net-im/folks \
 		libnotify.so:devel/libnotify \
 		libgeocode-glib.so:net/geocode-glib \
 		libgstreamer-1.0.so:multimedia/gstreamer1 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libdrm.so:graphics/libdrm \
 		libexpat.so:textproc/expat2 \
 		libcogl.so:graphics/cogl \
 		libclutter-1.0.so:graphics/clutter \
 		libsoup-2.4.so:devel/libsoup \
 		libsecret-1.so:security/libsecret \
 		libnspr4.so:devel/nspr \
 		libtelepathy-glib.so:net-im/telepathy-glib \
 		libglib-2.0.so:devel/glib20
 
 PORTSCOUT=	limitw:1,even
 
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xi xrandr
 USE_GNOME=	cairo evolutiondataserver3 gdkpixbuf2 glib20 gnomedesktop3 \
 		gtk30 intlhack introspection:build
 USE_GL=		egl
 USES=		gettext gmake gnome pathfix perl5 pkgconfig sqlite tar:xz
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-cheese
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV=	XDG_CACHE_HOME=${WRKDIR}
 
 GLIB_SCHEMAS=	org.gnome.Contacts.enums.xml \
 		org.gnome.Contacts.gschema.xml
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	MANPAGES NLS
 OPTIONS_DEFAULT=MANPAGES
 
+OPTIONS_DEFINE_i386=	CHEESE
+OPTIONS_DEFINE_amd64=	CHEESE
+OPTIONS_DEFAULT_i386=	CHEESE
+OPTIONS_DEFAULT_amd64=	CHEESE
+
 MANPAGES_CONFIGURE_ENABLE=	man-pages
 MANPAGES_USE=		GNOME=libxslt:build
 MANPAGES_BUILD_DEPENDS=	docbook-xml>=0:textproc/docbook-xml \
 			docbook-xsl>=0:textproc/docbook-xsl
 
 NLS_CONFIGURE_ENABLE=   nls
 NLS_USES=       gettext
 
+CHEESE_DESC=		Cheese webcam support
+CHEESE_CONFIGURE_WITH=	cheese
+CHEESE_LIB_DEPENDS=	libcheese-gtk.so:multimedia/cheese
+
+post-patch:
+	# touch vala sources to force regen c sources to honor cheese setting
+	${TOUCH} ${WRKSRC}/src/main.vala \
+		${WRKSRC}/src/contacts-avatar-dialog.vala
 
 .include <bsd.port.mk>