Index: head/sysutils/gnome-control-center/Makefile
===================================================================
--- head/sysutils/gnome-control-center/Makefile	(revision 493234)
+++ head/sysutils/gnome-control-center/Makefile	(revision 493235)
@@ -1,72 +1,67 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.28.2
 PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 3 project
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas #\
 #		docbook-xsl>=0:textproc/docbook-xsl
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libcups.so:print/cups \
 		libpulse.so:audio/pulseaudio \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 		libupower-glib.so:sysutils/upower \
 		libaccountsservice.so:sysutils/accountsservice \
 		libcolord.so:graphics/colord \
 		libcolord-gtk.so:graphics/colord-gtk \
 		libibus-1.0.so:textproc/ibus \
 		libsoup-2.4.so:devel/libsoup \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libpwquality.so:security/libpwquality \
 		libgtop-2.0.so:devel/libgtop \
 		libgrilo-0.3.so:net/grilo \
 		libpolkit-gobject-1.so:sysutils/polkit
 RUN_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
 		cantarell-fonts>=0:x11-fonts/cantarell-fonts \
 		gcm-calibrate:graphics/gnome-color-manager
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib gettext gnome localbase:ldflags meson \
 		pkgconfig python:3.6+,build samba:lib tar:xz
 USE_GNOME=	cairo gnomedesktop3 libxml2
 USE_XORG=	x11 xi
 #USE_GSTREAMER1=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.ControlCenter.gschema.xml
 
 OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	WAYLAND
-OPTIONS_DEFAULT=WAYLAND
-
-OPTIONS_DEFINE_i386=	CHEESE
-OPTIONS_DEFAULT_i386=	CHEESE
-OPTIONS_DEFINE_amd64=	CHEESE
-OPTIONS_DEFAULT_amd64=	CHEESE
+OPTIONS_DEFINE=	WAYLAND CHEESE
+OPTIONS_DEFAULT=WAYLAND CHEESE
 
 CHEESE_DESC=	Cheese webcam support
 CHEESE_LIB_DEPENDS=	libcheese.so:multimedia/cheese
 CHEESE_MESON_TRUE=	cheese
 
 WAYLAND_MESON_TRUE=	wayland
 WAYLAND_LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
 
 .include <bsd.port.mk>