68 files changed, 74 insertions, 19 deletions

diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index dbbfff2bea34..693b276e89b8 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -37,6 +37,7 @@ ALSA_CONFIGURE_OFF=	--disable-output-alsa
 ALSA_CFLAGS+=		`pkg-config --cflags alsa`
 
 SDL_CONFIGURE_OFF=	--disable-output-sdl
+SDL_USES=		sdl
 SDL_USE=		SDL=sdl,mixer
 
 PLIST_FILES=	bin/adplay %%DATADIR%%/adplug.db man/man1/adplay.1.gz
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index c9fb78c4ce29..76d21015afa5 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -39,6 +39,7 @@ NLS_CONFIGURE_OFF=	--disable-nls
 NLS_PLIST_FILES+=	share/locale/${ii}/LC_MESSAGES/aumix.mo
 .endfor
 
+GTK2_USES=	gnome
 GTK2_USE=	GNOME=gtk20
 GTK2_CONFIGURE_OFF=--without-gtk
 
diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 36a4859d0909..a0445a8f743a 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -76,6 +76,7 @@ PORT_OPTIONS+=	PULSE
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
+USES+=		sdl
 USE_SDL=	sdl sound
 .endif
 
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 33338327f080..cc9515ba9111 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -32,6 +32,7 @@ USES=		cmake \
 		qt:5 \
 		sqlite \
 		gl \
+		gnome \
 		xorg
 
 USE_CXXSTD=	c++11
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index 292b34cb34fb..eed155808da7 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -30,6 +30,7 @@ OPTIONS_DEFINE=	PULSEAUDIO DOCS
 
 PULSEAUDIO_LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 			libpulse.so:audio/pulseaudio
+PULSEAUDIO_USES=	gnome
 PULSEAUDIO_USE=		GNOME=glib20
 PULSEAUDIO_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Canberra \
 				CMAKE_DISABLE_FIND_PACKAGE_PulseAudio
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 64b78f92d2ec..bfca10c0d755 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -56,6 +56,7 @@ PORTAUDIO_CMAKE_BOOL=	WANT_PORTAUDIO
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 SDL_CMAKE_OFF=		WANT_SDL
+SDL_USES=		sdl
 SDL_USE=		SDL=sdl
 
 SNDIO_CMAKE_BOOL=	WANT_SNDIO
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 029c56e36b6a..aaf8d7f3f2f9 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -47,6 +47,7 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulse
 SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_WITH=	libsamplerate
+SDL_USES=		sdl
 SDL_USE=		sdl=sdl
 SDL_CONFIGURE_WITH=	sdl
 SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 5d4e2bd539b9..6287d367a3a4 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -137,6 +137,7 @@ SPEEX_CONFIGURE_OFF=	--without-plugins="speex"
 TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 TREMOR_CONFIGURE_OFF=	--without-plugins="tremor"
 
+VISUAL_USES=		sdl
 VISUAL_USE=		SDL=sdl
 VISUAL_LIB_DEPENDS=	libvisual-0.4.so:graphics/libvisual04
 VISUAL_CONFIGURE_OFF=	--without-optionals="vistest"
diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 5eceae209063..ea8d861d4c2e 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -30,6 +30,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS X11
 OPTIONS_SUB=		yes
+X11_USES=		xorg
 X11_USE=		XORG=x11
 X11_CONFIGURE_WITH=	x
 
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 33516cb0be78..664335f6d902 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	GTK2 DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
 GTK2_USE=	GNOME=cairo,gdkpixbuf2,gtk20
-GTK2_USES=	gettext-runtime
+GTK2_USES=	gettext-runtime gnome
 GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 
diff --git a/devel/ChipmunkPhysics/Makefile b/devel/ChipmunkPhysics/Makefile
index b6b1445d472f..e10bd81cf5a7 100644
--- a/devel/ChipmunkPhysics/Makefile
+++ b/devel/ChipmunkPhysics/Makefile
@@ -26,6 +26,7 @@ PORTDOCS=	*
 PORTEXAMPLES=	*.c *.h
 
 DEMOS_DESC=	Install the demo program (requires GLFW and GLEW)
+DEMOS_USES=		gl
 DEMOS_USE=		GL=glew
 DEMOS_LIB_DEPENDS=	libglfw.so:graphics/glfw2
 DEMOS_CMAKE_OFF=	-DBUILD_DEMOS=OFF
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index ea871dcaea1a..20882b319d77 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -60,8 +60,10 @@ AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 DOCS_PLIST_FILES=	${README_FILES:S|^|${DOCSDIR_REL}/|}
 DOCS_PLIST_FILES+=	${DOC_FILES:S|^|${DOCSDIR_REL}/|}
 GNOME_CONFIGURE_WITH=	gnome
+GNOME_USES=	gnome
 GNOME_USE=	GNOME=gtk20,libgnome,libgnomeui,pango
 GTK_CONFIGURE_WITH=	gtk
+GTK_USES=	gnome
 GTK_USE=	GNOME=gtk20
 IPV6_CONFIGURE_ENABLE=	rfc2553
 
diff --git a/devel/stlink/Makefile b/devel/stlink/Makefile
index 883b88e696ef..92582bfc9c33 100644
--- a/devel/stlink/Makefile
+++ b/devel/stlink/Makefile
@@ -13,6 +13,7 @@ LICENSE=	BSD3CLAUSE
 OPTIONS_DEFINE=		GTK3 DOCS
 OPTIONS_SUB=		yes
 GTK3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-pacth-turn-off-gtk
+GTK3_USES=		gnome
 GTK3_USE=		GNOME=gtk30
 
 USE_GITHUB=	yes
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index efba90a71a7d..a350fb96d329 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -33,6 +33,7 @@ PORTSCOUT=	limit:^0\.
 
 OPTIONS_DEFINE=	SDL
 OPTIONS_SUB=	yes
+SDL_USES=		sdl
 SDL_USE=		SDL=sdl
 SDL_CONFIGURE_ENABLE=	sdl
 
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 7539931af416..71519cb71872 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -55,6 +55,7 @@ VERYSLOW_CONFIGURE_ON=	--enable-veryslow
 
 .if ${PORT_OPTIONS:MSDL}
 PKGNAMESUFFIX=	-sdl
+USES+=		sdl
 USE_SDL=	sdl
 CONFIGURE_ARGS+=	--target=sdl
 .else
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 80db1745412c..73555e07be2f 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -73,6 +73,7 @@ DEBUGGER_DESC=		Debugger support
 DEBUGGER_CONFIGURE_ENABLE=	debugger
 DEBUGGER_IMPLIES=	DISASM
 DEBUGGER_GUI_DESC=	GTK+ 2 GUI debugger support
+DEBUGGER_GUI_USES=	gnome
 DEBUGGER_GUI_USE=	GNOME=gtk20
 DEBUGGER_GUI_CONFIGURE_ENABLE=	debugger-gui
 DEBUGGER_GUI_IMPLIES=	DEBUGGER
@@ -142,10 +143,12 @@ RFB_CONFIGURE_WITH=	rfb
 SB16_DESC=		Sound Blaster 16 emulation
 SB16_CONFIGURE_ENABLE=	sb16
 SDL1_DESC=		Simple Direct Media Layer 1 support
+SDL1_USES=		sdl
 SDL1_USE=		SDL=sdl
 SDL1_CONFIGURE_WITH=	sdl
 SDL1_PREVENTS=		SDL2
 SDL2_DESC=		Simple Direct Media Layer 2 support
+SDL2_USES=		sdl
 SDL2_USE=		SDL=sdl2
 SDL2_CONFIGURE_WITH=	sdl2
 SHOW_IPS_DESC=		Show IPS in status bar or log file
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index d2e3ba86d7d9..968ea35f9197 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -44,6 +44,7 @@ GTK2_CONFIGURE_ON=	--with-gtk
 GTK3_USE=		GNOME=gtk30
 GTK3_CONFIGURE_ON=	--with-gtk
 GTK3_CONFIGURE_ENABLE=	gtk3
+SDL_USES=		sdl
 SDL_USE=		SDL=sdl
 SDL_CONFIGURE_WITH=	sdl
 SDL_CONFIGURE_ON=	--without-gtk
diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index c258f16e5464..b9a77d841ffb 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -40,6 +40,7 @@ DOXYGEN_CONFIGURE_ENABLE=	full-doc
 
 EBICS_DESC=		Enable EBICS backend
 EBICS_LIB_DEPENDS=	libxmlsec1.so:security/xmlsec1
+EBICS_USES=		gnome
 EBICS_USE=		GNOME=libxml2,libxslt
 EBICS_CONFIGURE_OFF=	--with-backends="aqhbci aqnone aqofxconnect aqpaypal"
 
diff --git a/games/cataclysm-dda/Makefile b/games/cataclysm-dda/Makefile
index de80f42f9544..b5b2a217f4cc 100644
--- a/games/cataclysm-dda/Makefile
+++ b/games/cataclysm-dda/Makefile
@@ -40,7 +40,7 @@ NCURSES_USES=			ncurses
 SDL_CONFLICTS_INSTALL=		${PORTNAME}-[0-9]*
 SDL_CONFLICTS_INSTALL_OFF=	${PORTNAME}-sdl-[0-9]*
 SDL_USE=			SDL=image2,ttf2
-SDL_USES=			pkgconfig
+SDL_USES=			pkgconfig sdl
 SDL_MAKE_ARGS=			TILES=1 TILESTARGET=cataclysm
 SDL_CPPFLAGS=			$$(sdl2-config --cflags)
 SDL_LDFLAGS=			$$(sdl2-config --libs)
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index 5064be2b5ed7..39cf91d2d2ac 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -24,6 +24,7 @@ OPTIONS_DEFINE=	OPENGL DOCS
 OPENGL_CONFIGURE_WITH=	opengl
 OPENGL_CXXFLAGS=	-I${LOCALBASE}/include
 OPENGL_LDFLAGS=		-L${LOCALBASE}/lib
+OPENGL_USES=	gl
 OPENGL_USE=	GL=glut
 
 post-install-OPENGL-on:
diff --git a/games/digger-vgl/Makefile b/games/digger-vgl/Makefile
index b9d616fb3dae..85db10899656 100644
--- a/games/digger-vgl/Makefile
+++ b/games/digger-vgl/Makefile
@@ -16,6 +16,7 @@ MAKEFILE=	Makefile.fbsd
 
 OPTIONS_DEFINE=	SOUND DOCS
 
+SOUND_USES=	sdl
 SOUND_USE=	SDL=sdl
 SOUND_MAKE_ENV= SOUND=yes
 SOUND_VARS=	PKGMESSAGE=${PKGDIR}/pkg-message.sound
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 9ce42b9b1c8d..434571f3a894 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -60,6 +60,7 @@ JACK_IMPLIES=		CLIENTS
 OPTIMIZED_CFLAGS_CFLAGS=\
 			-O3 -funroll-loops -fomit-frame-pointer -fno-common \
 			-fexpensive-optimizations -fstrict-aliasing -ffast-math
+SDL_USES=		sdl
 SDL_USE=		sdl=sdl
 SDL_CONFIGURE_ON=	--with-sdl-prefix=${LOCALBASE}
 SDL_CONFIGURE_OFF=	--disable-sdl
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index ae2e6ccd4d29..d449e749c4bc 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS=	${PYNUMPY}
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
-USES=		cmake compiler:c++14-lang gl jpeg python:3.7 shebangfix xorg
+USES=		cmake compiler:c++14-lang gl gnome jpeg python:3.7 shebangfix \
+		xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
diff --git a/graphics/libsixel/Makefile b/graphics/libsixel/Makefile
index e787475e7deb..7c33025d6f25 100644
--- a/graphics/libsixel/Makefile
+++ b/graphics/libsixel/Makefile
@@ -37,7 +37,7 @@ JPEG_CPPFLAGS=		-I${LOCALBASE}/include
 JPEG_LDFLAGS=		-L${LOCALBASE}/lib
 
 PIXBUF_CONFIGURE_WITH=	gdk-pixbuf2
-PIXBUF_USES=		gettext
+PIXBUF_USES=		gettext gnome
 PIXBUF_USE=		gnome=glib20,gdkpixbuf2
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 54db21332a1d..6724646f3916 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -269,6 +269,7 @@ OPENGL_LIB_DEPENDS=	${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkit
 
 # GUI
 
+GTK2_USES=		gnome
 GTK2_USE=		GNOME=cairo,gdkpixbuf2,gtk20
 GTK2_CMAKE_BOOL=	WITH_GTK
 GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 00e6692cafe6..1d313c770c2b 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -96,6 +96,7 @@ QT5_USE=		qt=buildtools_build,core,gui,opengl,qmake_build,webkit
 QT5_CMAKE_ON=		-DDESIRED_QT_VERSION=5
 QT5_VARS=		FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
 QT5_VARS_OFF=		FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
+SDL_USES=		sdl
 SDL_USE=		sdl=sdl
 SDL_VARS=		FORCE_REQUIRE+=SDL
 SDL_VARS_OFF=		FORCE_IGNORE+=SDL
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 31b1346f5899..d962c427322d 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -99,6 +99,7 @@ QT5_USE=		qt=buildtools_build,core,gui,opengl,qmake_build,webkit
 QT5_CMAKE_ON=		-DDESIRED_QT_VERSION=5
 QT5_VARS=		FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
 QT5_VARS_OFF=		FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
+SDL_USES=		sdl
 SDL_USE=		sdl=sdl
 SDL_VARS=		FORCE_REQUIRE+=SDL
 SDL_VARS_OFF=		FORCE_IGNORE+=SDL
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 478cb7fec35e..4a60b0922f4d 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -40,7 +40,7 @@ IO_DESC=	Without I/O restrictions (security risk)
 
 IO_CONFIGURE_ON=	--disable-io-restrictions
 STATIC_CONFIGURE_ON=	--enable-static
-X11_USES=		xorg
+X11_USES=		sdl xorg
 X11_USE=		XORG=xpm,sm,ice,x11 SDL=sdl
 X11_CONFIGURE_OFF=	--without-x
 
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index f7777ea01335..859d5f82d062 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -45,7 +45,7 @@ AALIB_CONFIGURE_ON=	ac_cv_aalib_ver_ok=yes
 
 GTK2_DESC=		GTK+ User Interface (experimental)
 GTK2_USE=		GNOME=gtk20
-GTK2_USES=		pkgconfig
+GTK2_USES=		gnome pkgconfig
 GTK2_CONFIGURE_WITH=	gtk-driver
 
 X11_USES=		xorg
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index 2f3cacb3b2c8..bf6cabf2bb8f 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -51,10 +51,11 @@ V4L_CONFIGURE_ON=	--enable-video=yes
 V4L_CONFIGURE_OFF=	--enable-video=no
 
 PYTHON_USE=		GNOME=pygtk2
-PYTHON_USES=		python:2.7
+PYTHON_USES=		gnome python:2.7
 PYTHON_CONFIGURE_ON=	--with-python=yes
 PYTHON_CONFIGURE_OFF=	--with-python=no
 
+GTK2_USES=	gnome
 GTK2_USE=	GNOME=gtk20
 GTK2_CONFIGURE_ON=	--with-gtk=yes
 GTK2_CONFIGURE_OFF=	--with-gtk=no
diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile
index 26327d238eab..a816c77ce373 100644
--- a/graphics/zgv/Makefile
+++ b/graphics/zgv/Makefile
@@ -25,6 +25,7 @@ OPTIONS_DEFINE=	SDL DOCS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSDL}
+USES+=		sdl
 USE_SDL=	sdl
 MAKE_ENV+=	BACKEND=SDL
 CPPFLAGS+=	$$(${SDL_CONFIG} --cflags)
diff --git a/lang/julia06/Makefile b/lang/julia06/Makefile
index f1452892f9a2..15109b7c4973 100644
--- a/lang/julia06/Makefile
+++ b/lang/julia06/Makefile
@@ -93,6 +93,7 @@ GPL_LIBS_MAKE_ARGS=	USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_FFTW=1
 GPL_LIBS_VARS=	USE_GPL_LIBS=1
 
 DESKTOP_DESC=	Install icon, .desktop and appdata files
+DESKTOP_USES=	gnome
 DESKTOP_VARS=	INSTALL_TARGET+=install-desktop \
 		INSTALLS_ICONS=yes
 
diff --git a/lang/julia07/Makefile b/lang/julia07/Makefile
index 4c693bfcd365..eaa9afed575d 100644
--- a/lang/julia07/Makefile
+++ b/lang/julia07/Makefile
@@ -87,6 +87,7 @@ GPL_LIBS_MAKE_ARGS=	USE_SYSTEM_SUITESPARSE=0
 GPL_LIBS_VARS=	USE_GPL_LIBS=1
 
 DESKTOP_DESC=	Install icon, .desktop and appdata files
+DESKTOP_USES=	gnome
 DESKTOP_VARS=	INSTALL_TARGET+=install-desktop \
 		INSTALLS_ICONS=yes
 
diff --git a/lang/julia10/Makefile b/lang/julia10/Makefile
index 2cce61fde195..5d7dd3a79cf7 100644
--- a/lang/julia10/Makefile
+++ b/lang/julia10/Makefile
@@ -91,6 +91,7 @@ GPL_LIBS_MAKE_ARGS=	USE_SYSTEM_SUITESPARSE=0
 GPL_LIBS_VARS=	USE_GPL_LIBS=1
 
 DESKTOP_DESC=	Install icon, .desktop and appdata files
+DESKTOP_USES=	gnome
 DESKTOP_VARS=	INSTALL_TARGET+=install-desktop \
 		INSTALLS_ICONS=yes
 
diff --git a/lang/julia11/Makefile b/lang/julia11/Makefile
index dbcb0322bee0..cbf37e504b38 100644
--- a/lang/julia11/Makefile
+++ b/lang/julia11/Makefile
@@ -91,6 +91,7 @@ GPL_LIBS_MAKE_ARGS=	USE_SYSTEM_SUITESPARSE=0
 GPL_LIBS_VARS=	USE_GPL_LIBS=1
 
 DESKTOP_DESC=	Install icon, .desktop and appdata files
+DESKTOP_USES=	gnome
 DESKTOP_VARS=	INSTALL_TARGET+=install-desktop \
 		INSTALLS_ICONS=yes
 
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index 5eea28fea90c..4e9197fc631c 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -32,6 +32,7 @@ OPTIONS_SUB=	yes
 APACHE_DESC=	Build Apache modules
 UI_DESC=	UI (GTK)
 
+UI_USES=	gnome
 UI_USE=		gnome=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
 UI_CMAKE_BOOL=	WITH_UI
 
diff --git a/lang/tinypy/Makefile b/lang/tinypy/Makefile
index bf4c67005d72..ce57f3ccc47d 100644
--- a/lang/tinypy/Makefile
+++ b/lang/tinypy/Makefile
@@ -30,6 +30,7 @@ PYGAME_DESC=	PyGame support (requires SDL)
 
 .if ${PORT_OPTIONS:MPYGAME}
 PYDISTUTILS_BUILD_TARGET+=	pygame
+USES+=		sdl
 USE_SDL=	sdl
 PORTEXAMPLES=	*
 .endif
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index 20bade4db038..b2ae13a94a80 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -62,7 +62,7 @@ HTTP_DESC=		Enable HTTP (beta quality)
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libjansson.so:devel/jansson \
 			libical.so:devel/libical
-HTTP_USES=		pkgconfig
+HTTP_USES=		gnome pkgconfig
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index 88fb51350dd6..dfbb960a5865 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -62,6 +62,7 @@ HTTP_LIB_DEPENDS=	libical.so:devel/libical \
 # Need additional patch to opendkim
 #HTTP_LIB_DEPENDS+=	libopendkim.so:mail/opendkim
 #HTTP_CPPFLAGS+=	-I${LOCALBASE}/include/opendkim
+HTTP_USES=		gnome
 HTTP_USE=		GNOME=libxml2
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index 2d2e543e8076..47e459391bce 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	X11 DOCS
 
 X11_USE=		XORG=x11,xau,xcb,xdmcp,xt
 X11_LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs
-X11_USES=		localbase
+X11_USES=		localbase xorg
 X11_CONFIGURE_ENV_OFF=	ac_cv_header_X11_X_h=no
 
 post-patch:
diff --git a/multimedia/audacious-plugins-gtk3/Makefile b/multimedia/audacious-plugins-gtk3/Makefile
index 82138c35afb5..d0ccd5de7a73 100644
--- a/multimedia/audacious-plugins-gtk3/Makefile
+++ b/multimedia/audacious-plugins-gtk3/Makefile
@@ -116,6 +116,7 @@ SCROBBLER_LIB_DEPENDS=	libcurl.so:ftp/curl
 SCROBBLER_CONFIGURE_ENABLE=	scrobbler2
 SDL_CONFIGURE_ON=	--enable-sdlout --with-libsdl=2
 SDL_CONFIGURE_OFF=	--disable-sdlout
+SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
 SID_CONFIGURE_ENABLE=	sid
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index e88b30e8ea18..dedae0e582be 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -105,6 +105,7 @@ SCROBBLER_LIB_DEPENDS=	libcurl.so:ftp/curl
 SCROBBLER_CONFIGURE_ENABLE=	scrobbler2
 SDL_CONFIGURE_ON=	--enable-sdlout --with-libsdl=2
 SDL_CONFIGURE_OFF=	--disable-sdlout
+SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
 SID_CONFIGURE_ENABLE=	sid
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index e75ef2bfbe6b..c7929b46d798 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -30,6 +30,7 @@ OPTIONS_SUB=	yes
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_CONFIGURE_OFF=	ac_cv_path_IMLIB2_CONFIG=no
 
+PIXBUF_USES=	gnome
 PIXBUF_USE=	GNOME=gdkpixbuf
 PIXBUF_CONFIGURE_OFF=	ac_cv_path_GDKPIXBUF_CONFIG=no
 
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index dd1300e1bdae..c79502563e6b 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -47,6 +47,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS GNOME
 
+GNOME_USES=		gnome
 GNOME_USE=		GNOME=libgnomeui
 GNOME_CONFIGURE_WITH=	gnome
 
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index c7402356cc58..41d01b949df7 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -408,6 +408,7 @@ LIBRTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 LIBRTMP_CONFIGURE_ENABLE=	librtmp
 
 # sdl
+SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 SDL_CONFIGURE_ENABLE=	sdl2
 
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index 5c1c4c69fc17..d60185ae615e 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -38,6 +38,7 @@ CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --X11-path="${LOCALBASE}" \
 
 SSL_USES=		ssl
 SSL_CONFIGURE_ENABLE=	ssl
+OPENGL_USES=	gl
 OPENGL_USE=	GL=gl GL=glu
 OPENGL_CONFIGURE_ENABLE=3d
 XVIDEO_LIB_DEPENDS=	libXv.so:x11/libXv
diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index bcb39aba91d5..94494c56a3b0 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 		youtube_dl>0:www/youtube_dl
 #		${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3@${PY_FLAVOR}
 
-USES=		gettext gmake python:3.5+ shebangfix
+USES=		gettext gmake gnome python:3.5+ shebangfix
 
 USE_GITHUB=	yes
 
@@ -42,7 +42,6 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 GTK3_VARS=	MAKE_ENV+=GPODDER_INSTALL_UIS="cli gtk"
 GTK3_RUN_DEPENDS+=	xdg-open:devel/xdg-utils
-GTK3_USES=	gnome
 GTK3_USE=	GNOME=pygobject3
 
 .if empty(GTK3)
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 0b475a7ccba1..743aeb6f89c0 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -28,6 +28,7 @@ DOCS=		AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \
 
 OPTIONS_DEFINE=	SDL DOCS
 
+SDL_USES=	sdl
 SDL_USE=	SDL=sdl
 SDL_CONFIGURE_ENABLE=	sdl
 
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 468420d42b48..205b52f09a34 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -22,8 +22,10 @@ PORTDOCS=	libmpeg2.txt README
 
 OPTIONS_DEFINE=	DOCS SDL X11
 
+SDL_USES=	sdl
 SDL_USE=	SDL=sdl
 SDL_CONFIGURE_ENABLE=	sdl
+X11_USES=	xorg
 X11_USE=	XORG=x11,xext,sm,ice,xv
 X11_CONFIGURE_WITH=	x
 
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 144d3b8f8450..396a4f9ed03a 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -30,6 +30,7 @@ PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 OPTIONS_DEFINE=	PULSEAUDIO
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+PULSEAUDIO_USES=	gnome
 PULSEAUDIO_USE=		GNOME=glib20
 PULSEAUDIO_CMAKE_BOOL=	WITH_PulseAudio
 
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index ef49153db797..5f83c8eda2ed 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -53,6 +53,7 @@ PHONON_USE=	QT=phonon4
 PHONON_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON
 
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
+XINE_USES=	xorg
 XINE_USE=	XORG=x11,xcb
 XINE_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Xine=ON
 
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 2d53b44e23da..437611b0abf6 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -87,6 +87,7 @@ FAAC_LIB_DEPENDS=		libfaac.so:audio/faac
 FAAC_CONFIGURE_ENABLE=		faac
 FAAC_CONFIGURE_ON=		--with-faac-prefix=${LOCALBASE}
 
+LIBXML2_USES=			gnome
 LIBXML2_USE=			GNOME=libxml2
 LIBXML2_CONFIGURE_ENABLE=	libxml2
 
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 5f14831eb7a2..e3e2aa336182 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -174,7 +174,7 @@ NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
 NOTIFYDESKTOP_CONFIGURE_WITH=	libnotify=${LOCALBASE}
 NOTIFYDESKTOP_USE=		GNOME=gdkpixbuf2
-NOTIFYDESKTOP_USES=		gettext-runtime
+NOTIFYDESKTOP_USES=		gettext-runtime gnome
 
 NOTIFYEMAIL_LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 NOTIFYEMAIL_CONFIGURE_ENABLE=	notify_email
diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index 2ee33788a442..9f0bd290dc67 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -77,6 +77,7 @@ RESAMPLEDLL_CONFIGURE_ENABLE=	resample-dll
 SAMPLERATE_CONFIGURE_ENABLE=	libsamplerate
 SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SDL_CONFIGURE_ENABLE=		sdl
+SDL_USES=			sdl
 SDL_USE=			SDL=sdl
 SHARED_CONFIGURE_ENABLE=	shared
 SOUND_CONFIGURE_ENABLE=		sound
diff --git a/net/samba410/Makefile b/net/samba410/Makefile
index 0032b29aea9b..65faf8e5c8de 100644
--- a/net/samba410/Makefile
+++ b/net/samba410/Makefile
@@ -345,7 +345,7 @@ QUOTAS_CONFIGURE_WITH=		quotas
 SPOTLIGHT_CONFIGURE_ENABLE=	spotlight
 SPOTLIGHT_BUILD_DEPENDS=	tracker>=1.4.1:sysutils/tracker
 SPOTLIGHT_RUN_DEPENDS=		tracker>=1.4.1:sysutils/tracker
-SPOTLIGHT_USES=			bison
+SPOTLIGHT_USES=			bison gnome
 SPOTLIGHT_USE=			gnome=glib20
 
 SYSLOG_CONFIGURE_WITH=		syslog
diff --git a/net/samba48/Makefile b/net/samba48/Makefile
index 00e953cf392b..4e30bc5d2d4d 100644
--- a/net/samba48/Makefile
+++ b/net/samba48/Makefile
@@ -330,7 +330,7 @@ QUOTAS_CONFIGURE_WITH=		quotas
 SPOTLIGHT_CONFIGURE_ENABLE=	spotlight
 SPOTLIGHT_BUILD_DEPENDS=	tracker>=1.4.1:sysutils/tracker
 SPOTLIGHT_RUN_DEPENDS=		tracker>=1.4.1:sysutils/tracker
-SPOTLIGHT_USES=			bison
+SPOTLIGHT_USES=			bison gnome
 SPOTLIGHT_USE=			gnome=glib20
 
 SYSLOG_CONFIGURE_WITH=		syslog
diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile
index 91c701be38d2..469eb7baf298 100644
--- a/security/py-keyrings.alt/Makefile
+++ b/security/py-keyrings.alt/Makefile
@@ -33,6 +33,7 @@ KEYCZAR_DESC=		Install keyczar to support keyring encryption
 PYFS_DESC=		Install pyfilesystem to support the pyfs backend
 
 ENCRYPTED_FILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto@${PY_FLAVOR}
+GNOME_KEYRING_USES=		gnome
 GNOME_KEYRING_USE=		GNOME=pygobject3
 KEYCZAR_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar@${PY_FLAVOR}
 PYFS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs@${PY_FLAVOR}
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index a68deeeb1e2d..f6870c2771cd 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -40,6 +40,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMATETERMINAL}
+USES+=		mate
 USE_MATE=	desktop
 .endif
 
diff --git a/security/truecrypt/Makefile b/security/truecrypt/Makefile
index 532925d54b30..c4e67c76a3e4 100644
--- a/security/truecrypt/Makefile
+++ b/security/truecrypt/Makefile
@@ -46,6 +46,7 @@ PLIST_FILES+=	%%DOCSDIR%%/License.txt
 .endif
 
 .if ${PORT_OPTIONS:MX11}
+USES+=		gnome
 USE_GNOME=	gtk20
 NOGUI=
 .else
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index cca2a38ff39c..d9c9dfc35712 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GTK based system monitor
 
 LICENSE=	GPLv3
 
-USES=		gmake pkgconfig tar:bzip2
+USES=		gmake gnome pkgconfig tar:bzip2
 USE_RC_SUBR=	gkrellmd
 
 OPTIONS_DEFINE=		DOCS CLIENT NLS NTLM OPENSSL
@@ -22,7 +22,7 @@ OPTIONS_SUB=		yes
 
 CLIENT_DESC=		GKrellM Client
 CLIENT_CONFLICTS=	gkrellm-[^2].* gkrellm[^2]-[^2].*
-CLIENT_USES=		gnome xorg
+CLIENT_USES=		xorg
 CLIENT_USE=		GNOME=gtk20 XORG=sm,x11
 CLIENT_USE_OFF=		GNOME=glib20
 CLIENT_VARS_OFF=	BUILD_WRKSRC=${WRKSRC}/server \
diff --git a/sysutils/hoz/Makefile b/sysutils/hoz/Makefile
index 8d04af74b960..66d0aa71a7a0 100644
--- a/sysutils/hoz/Makefile
+++ b/sysutils/hoz/Makefile
@@ -13,7 +13,6 @@ COMMENT=	File splitter, GTK and CLI versions
 
 BROKEN=		unfetchable
 
-USE_GNOME=	#
 USES=		gmake pkgconfig
 
 MAKE_ARGS=	CC="${CC}"
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 4b5baab6d07c..20d801356ea5 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -30,6 +30,7 @@ USES=		alias gmake iconv libtool shebangfix ssl
 
 SHEBANG_FILES=	src/webhttrack
 
+ICONS_USES=	gnome
 ICONS_VARS=	INSTALLS_ICONS=yes
 
 .include <bsd.port.options.mk>
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 0087262e891a..221ffa18fce2 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -88,6 +88,7 @@ SPAWNFCGI_RUN_DEPENDS=	spawn-fcgi:www/spawn-fcgi
 VALGRIND_BUILD_DEPENDS=	valgrind:devel/valgrind
 VALGRIND_RUN_DEPENDS=	valgrind:devel/valgrind
 VALGRIND_CONFIGURE_WITH=valgrind
+WEBDAV_USES=		gnome
 WEBDAV_USE=		GNOME=libxml2
 WEBDAV_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 			libsqlite3.so:databases/sqlite3
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 0599e6e96df8..aa261fd0c879 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -33,6 +33,7 @@ EXPAT_CONFIGURE_WITH=	expat
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 GSSAPI_CONFIGURE_WITH=	gssapi
 LIBXML_CONFIGURE_WITH=	libxml2
+LIBXML_USES=		gnome
 LIBXML_USE=		GNOME=libxml2
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index c3ecb916c486..a3e5aed2498f 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -166,6 +166,7 @@ HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
 HTTP_SSL_USES=			ssl
 HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
 HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
+HTTP_XSLT_USES=			gnome
 HTTP_XSLT_USE=			GNOME=libxml2,libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile
index d38b40b254ca..d83149372398 100644
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@@ -59,7 +59,7 @@ GSTREAMER_MAKE_ENV=	USE_GSTREAMER=1
 GSTREAMER_MAKE_ENV_OFF=	USE_GSTREAMER=0
 GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1
 GSTREAMER_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer@${PY_FLAVOR}
-GSTREAMER_USES=		gettext-runtime pkgconfig
+GSTREAMER_USES=		gettext-runtime gnome pkgconfig
 GSTREAMER_USE=		GNOME=glib20
 OPENCV_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv2.so:graphics/py-opencv@${PY_FLAVOR}
 PIL_DESC=		Text and window rendering support via Pillow
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index c2378ad15d1c..68211891d9a2 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -65,6 +65,7 @@ CAIRO_CONFIGURE_OFF=	--with-type-engines="xcore,xft"
 
 SIXEL_CONFIGURE_ENABLE=	sixel
 
+REGIS_USES=		sdl
 REGIS_USE=		SDL=ttf
 
 .include <bsd.port.options.mk>
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index 885c4367a1ed..672c543d97de 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -25,7 +25,7 @@ OPTIONS_SUB=	yes
 
 GNEE_DESC=	GUI frontend
 GNEE_CONFIGURE_ENABLE=	gui
-GNEE_USES=	pkgconfig
+GNEE_USES=	gnome pkgconfig
 GNEE_USE=	GNOME=gtk20
 
 GNEE_DESKTOP_ENTRIES=	"Gnee" "" "${PORTNAME}.png" \