Add USES=xorg USES=gl, ports categories e and g

Add USES=xorg and USES=gl to ports in categories starting with 'e' and 'g'.
While here, try to sprinkle other USES (mostly gnome and sdl) as needed.

36 files changed, 44 insertions, 14 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 1e9faa3de7d8..8b3dc4dcec27 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -96,7 +96,7 @@ CONSOLE_VARS=		GUI=no
 GNOME_PLIST_SUB=	GUI="" DESKTOP=""
 GNOME_IMPLIES=		NLS
 GNOME_USE=		GNOME=gdkpixbuf2,libgnomeui XORG=ice,sm,xorgproto,x11,xpm,xt
-GNOME_USES=		desktop-file-utils gnome
+GNOME_USES=		desktop-file-utils gnome xorg
 GNOME_VARS=		GUI=gnome2 INSTALLS_ICONS=yes
 
 GTK2_PLIST_SUB=		GUI="" DESKTOP=""
diff --git a/editors/wordgrinder/Makefile b/editors/wordgrinder/Makefile
index 0c3299821d17..254f599dc92c 100644
--- a/editors/wordgrinder/Makefile
+++ b/editors/wordgrinder/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=X11
 X11_DESC=	Support running in an X window in addition to console
 X11_PLIST_FILES=bin/xwordgrinder
 X11_USE=	xorg=x11,xft
-X11_USES=	pkgconfig
+X11_USES=	pkgconfig xorg
 X11_ALL_TARGET_OFF=unix
 
 post-patch:
diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile
index 1eae72910b7c..3345b0726159 100644
--- a/emulators/gngb/Makefile
+++ b/emulators/gngb/Makefile
@@ -23,6 +23,7 @@ PLIST_FILES=	bin/gngb \
 
 OPTIONS_DEFINE=	OPENGL
 
+OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_CONFIGURE_ENABLE=gl
 
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index a2bd3dd72ccc..c41e5aa3ed77 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -30,6 +30,7 @@ OPTIONS_SUB=
 LIBNOTIFY_DESC=		Desktop notification support
 
 X11_CONFIGURE_WITH=	x gtk2 gtkmm
+X11_USES=		gnome xorg
 X11_USE=		xorg=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst \
 			gnome=gdkpixbuf2,gtk20,gtkmm24
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
diff --git a/emulators/qemu40/Makefile b/emulators/qemu40/Makefile
index bdefb542006f..d2e614aa75a8 100644
--- a/emulators/qemu40/Makefile
+++ b/emulators/qemu40/Makefile
@@ -55,7 +55,7 @@ X11_USES=	sdl
 X11_CONFIGURE_ENABLE=	sdl
 GTK3_LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon
 GTK3_USE=	GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext
-GTK3_USES=	gettext gl
+GTK3_USES=	gettext gl xorg
 GTK3_CONFIGURE_OFF=	--disable-gtk --disable-vte
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=	--disable-gnutls
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 18ca8698fcfd..99cbd722d334 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -60,11 +60,11 @@ DEBUG_VARS_OFF=		KMK_BUILDTYPE=release
 OPENGL_CONFIGURE_OFF=	--disable-opengl
 OPENGL_IMPLIES=		X11
 OPENGL_USE=		GL=gl,glu XORG=xcomposite,xdamage,xfixes
-OPENGL_USES=		gl
+OPENGL_USES=		gl xorg
 X11_BUILD_DEPENDS=	${LOCALBASE}/include/xorg/compiler.h:x11-servers/xorg-server
 X11_RUN_DEPENDS=	xrandr:x11/xrandr
 X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
-X11_USES=		pkgconfig
+X11_USES=		pkgconfig xorg
 X11_VARS=		VBOX_WITH_X11=1
 
 .include <bsd.port.options.mk>
diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile
index 33eb034d2ff6..9f3a15d01a22 100644
--- a/games/assaultcube/Makefile
+++ b/games/assaultcube/Makefile
@@ -40,6 +40,7 @@ OPTIONS_DEFAULT=	CLIENT DEDICATED
 
 CLIENT_DESC=	Build client
 CLIENT_USES=		gettext-runtime openal:al
+CLIENT_USES=		gl xorg
 CLIENT_USE=		GL=gl SDL=image,sdl XORG=x11
 CLIENT_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 			libcurl.so:ftp/curl
diff --git a/games/bloodfrontier/Makefile b/games/bloodfrontier/Makefile
index a831b310ec1c..0eed8aee072c 100644
--- a/games/bloodfrontier/Makefile
+++ b/games/bloodfrontier/Makefile
@@ -37,6 +37,7 @@ OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED
 OPTIONS_DEFAULT=	CLIENT DEDICATED OPTIMIZED_CFLAGS
 
 CLIENT_DESC=		Build client
+CLIENT_USES=		gl sdl xorg
 CLIENT_USE=		GL=gl SDL=image,mixer,sdl XORG=x11
 CLIENT_ALL_TARGET=	client
 CLIENT_PLIST_FILES=	bin/bfclient libexec/bfclient \
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 55c5e7837be2..a9df40fe4801 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -34,6 +34,7 @@ OPTIONS_SUB=	yes
 
 FLAVOR_DESC=	Clients and servers
 CLIENT_DESC=	Build client
+CLIENT_USES=			gl xorg
 CLIENT_USE=			GL=gl,glu SDL=image,mixer,sdl XORG=x11
 CLIENT_LDFLAGS=			-lX11
 CLIENT_ALL_TARGET=		client
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 2c537cd3a1be..414132aea052 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -46,6 +46,7 @@ FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 SMPEG_DESC=		Video playback support
 SMPEG_LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 X11_DESC=		X11 window manager support
+X11_USES=		xorg
 X11_USE=		xorg=x11
 X11_CONFIGURE_ON=	--with-X=yes
 X11_CONFIGURE_OFF=	--with-X=no
diff --git a/games/freeminer/Makefile b/games/freeminer/Makefile
index 94ce89d6e4df..60cec5996b2d 100644
--- a/games/freeminer/Makefile
+++ b/games/freeminer/Makefile
@@ -44,6 +44,7 @@ CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
 CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
 			libIrrlicht.so:x11-toolkits/irrlicht
 CLIENT_USES=		jpeg
+CLIENT_USES=		gl xorg
 CLIENT_USE=		GL=gl XORG=x11
 SERVER_CMAKE_ON=	-DBUILD_SERVER=1
 SERVER_CMAKE_OFF=	-DBUILD_SERVER=0
diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile
index 6fc558fda8f3..86b86ed29a7d 100644
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 OPTIONS_DEFINE=	DOCS OPENGL
 OPTIONS_SUB=	yes
 
+OPENGL_USES=	gl
 OPENGL_USE=	gl=gl,glu,glew
 OPENGL_CMAKE_ON=-DOPENGL_BACKEND=OpenGL
 
diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile
index 0da1577bce3e..22c014360a4f 100644
--- a/games/kobodeluxe/Makefile
+++ b/games/kobodeluxe/Makefile
@@ -30,6 +30,7 @@ PORTDATA=	*
 OPTIONS_DEFINE=	DOCS OPENGL
 OPTIONS_DEFAULT=OPENGL
 
+OPENGL_USES=	gl
 OPENGL_USE=	GL=gl
 OPENGL_CONFIGURE_ENABLE=	opengl
 
diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index aca2c52bef78..f1ff80de5090 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -45,7 +45,7 @@ CLIENT_DESC=		Build client
 CLIENT_CMAKE_BOOL=	BUILD_CLIENT
 CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
 			libIrrlicht.so:x11-toolkits/irrlicht
-CLIENT_USES=		gl jpeg
+CLIENT_USES=		gl jpeg xorg
 CLIENT_USE=		GL=gl XORG=x11,xext,xxf86vm
 SERVER_DESC=		Build server
 SERVER_CMAKE_BOOL=	BUILD_SERVER
diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile
index 01438e708d05..b34c213ee1d0 100644
--- a/games/powder-toy/Makefile
+++ b/games/powder-toy/Makefile
@@ -38,6 +38,7 @@ SSE_MAKE_ARGS_OFF=	--no-sse
 SSE3_DESC=		Enable SSE3 optimizations
 SSE3_MAKE_ARGS=		--sse3
 SSE3_IMPLIES=		SSE
+OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glu,glew
 OPENGL_MAKE_ARGS=	--opengl --opengl-renderer
 OPENGL_BROKEN=		Application dies with SIGBUS at startup
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 0e010fa8ec3a..705d69ae2aff 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -48,6 +48,7 @@ CLIENTS_BUILD_DEPENDS=	icotool:graphics/icoutils
 CLIENTS_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
 			libcurl.so:ftp/curl
 CLIENTS_USES=		pkgconfig
+CLIENTS_USES=		gl xorg
 CLIENTS_USE=		gl=glu xorg=xext
 CLIENTS_CONFIGURE_OFF=	--with-clients=""
 CLIENTS_VERS=		INSTALLS_ICONS=yes
@@ -76,10 +77,12 @@ VORBIS_CONFIGURE_ON=	--with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE}
 VORBIS_CONFIGURE_OFF=	--disable-vorbis
 VORBIS_IMPLIES=		CLIENTS
 XXF86DGA_DESC=		XFree86 DGA Extension support
+XXF86DGA_USES=		xorg
 XXF86DGA_USE=		xorg=xxf86dga
 XXF86DGA_CONFIGURE_OFF=	--disable-dga
 XXF86DGA_IMPLIES=	CLIENTS
 XXF86VM_DESC=		XFree86 Vidmode Extension support
+XXF86VM_USES=		xorg
 XXF86VM_USE=		xorg=xxf86vm
 XXF86VM_CONFIGURE_OFF=	--disable-vidmode
 XXF86VM_IMPLIES=	CLIENTS
diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile
index fde193763244..133107819948 100644
--- a/games/redeclipse/Makefile
+++ b/games/redeclipse/Makefile
@@ -35,7 +35,7 @@ OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED
 OPTIONS_DEFAULT=	CLIENT DEDICATED OPTIMIZED_CFLAGS
 
 CLIENT_DESC=		Build client
-CLIENT_USES=		gl sdl
+CLIENT_USES=		gl sdl xorg
 CLIENT_USE=		GL=gl SDL=image2,mixer2,sdl2 XORG=x11
 CLIENT_ALL_TARGET=	client
 CLIENT_PLIST_FILES=	bin/${PORTNAME} libexec/${PORTNAME} \
diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile
index 0b912d83a324..d399a5e10418 100644
--- a/games/sauerbraten/Makefile
+++ b/games/sauerbraten/Makefile
@@ -36,6 +36,7 @@ SUB_FILES=	pkg-message ${PLIST_FILES:Mbin/*:T}
 OPTIONS_DEFINE=	DOCS
 
 CLIENT_DESC=	Build client
+CLIENT_USES=		gl xorg
 CLIENT_USE=		GL=gl SDL=image,mixer,sdl XORG=x11
 CLIENT_ALL_TARGET=	client
 CLIENT_PLIST_FILES=	bin/sauer_client libexec/sauer_client
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index e55b6df8aa22..c3457c09660e 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -63,7 +63,7 @@ LUA_DESC=	Bindings for LUA user scripts
 
 SDL_CONFLICTS=	${PORTNAME}-[0-9]*
 SDL_USE=	sdl=sdl2,image2,mixer2 gl=gl,glu
-SDL_USES=	gl
+SDL_USES=	gl sdl
 SDL_USES_OFF=	ncurses
 SDL_MAKE_ARGS=	TILES=y SOUND=y
 SDL_BUILD_DEPENDS=	\
diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index 6641bf496d15..239d1d1a590d 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=	CLIENT TEST
 
 CLIENT_DESC=		Build game client
 CLIENT_CMAKE_BOOL=	CLIENT
-CLIENT_USES=		gl sdl
+CLIENT_USES=		gl sdl xorg
 CLIENT_USE=		GL=gl,glu XORG=x11 SDL=sdl2
 CLIENT_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libwavpack.so:audio/wavpack \
diff --git a/games/tesseract/Makefile b/games/tesseract/Makefile
index a9870b51e398..b62d79aebccc 100644
--- a/games/tesseract/Makefile
+++ b/games/tesseract/Makefile
@@ -31,6 +31,7 @@ OPTIONS_MULTI=	FLAVOR
 OPTIONS_MULTI_FLAVOR=CLIENT DEDICATED MASTER
 
 CLIENT_DESC=		Build client
+CLIENT_USES=		gl xorg
 CLIENT_USE=		GL=gl SDL=image2,mixer2 XORG=x11
 CLIENT_ALL_TARGET=	client
 CLIENT_PLIST_FILES=	bin/tess_client libexec/tess_client
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 5954621a40dc..62827bf576a7 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -38,6 +38,7 @@ ATHENA_DESC=	Athena widget set
 MOTIF_DESC=	Motif widget set
 
 ATHENA_CONFIGURE_ON=	--disable-motif
+ATHENA_USES=	xorg
 ATHENA_USE=	xorg=xaw,xmu
 
 MOTIF_CONFIGURE_ON=	--disable-athena
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 0217531ab5aa..e1525cac2a0a 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -51,7 +51,7 @@ SOUND_USES=	openal:al,alut
 
 SDL_CONFIGURE_ENABLE=	sdl-client
 SDL_USE=	SDL=image,sdl,ttf GL=gl
-SDL_USES=	gl
+SDL_USES=	gl sdl
 .endif
 
 .include <bsd.port.options.mk>
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index 01e3998666e8..9f851bab29d5 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -36,6 +36,7 @@ TK_CONFIGURE_ON=	--with-tcltk=${TCL_INCLUDEDIR} \
 			--with-tkdir=${TK_INCLUDEDIR}
 TK_CONFIGURE_OFF=	--with-tcltk=no
 TK_LDFLAGS=		-lX11 -lXext
+X11_USES=		xorg
 X11_USE=		xorg=x11,xmu,xpm
 X11_CONFIGURE_ENV=	ac_cv_lib_Xm_main=no
 X11_CONFIGURE_OFF=	--with-x11=no
diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile
index 0aeb5aa40c10..3731aa7e8a06 100644
--- a/graphics/ImageMagick6/Makefile
+++ b/graphics/ImageMagick6/Makefile
@@ -172,6 +172,7 @@ WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 X11_CONFIGURE_WITH=	x
+X11_USES=		xorg
 X11_USE=		xorg=ice,sm,x11,xext,xt
 X11_VARS=		CONFLICTS_INSTALL+="ImageMagick-nox11-6* ImageMagick6-nox11-6*" \
 			CONFLICTS+=display-[0-9]*
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 1afc8893e890..e1446884a954 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -171,6 +171,7 @@ WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 X11_CONFIGURE_WITH=	x
+X11_USES=		xorg
 X11_USE=		xorg=ice,sm,x11,xext,xt
 X11_VARS=		CONFLICTS_INSTALL+="ImageMagick7-nox11-* \
 			CONFLICTS+=display-[0-9]*
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index b06bd19655f4..55dbfa59b70b 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -41,10 +41,11 @@ OPTIONS_DEFAULT=OPENGL XCB GLIB X11
 OPTIONS_SLAVE=	${ARCH:tu}
 OPTIONS_SUB=	yes
 
+X11_USES=	xorg
 X11_USE=	xorg=x11,xext,xrender
 X11_CONFIGURE_ENABLE=xlib
 
-OPENGL_USES=	gl
+OPENGL_USES=	gl xorg
 OPENGL_USE=	gl=gl,egl xorg=xorgproto:both
 OPENGL_CONFIGURE_ENABLE=gl egl
 OPENGL_IMPLIES=	X11
@@ -55,6 +56,7 @@ GLIB_USE=	gnome=glib20
 GLIB_CONFIGURE_ENABLE=	gobject
 
 XCB_DESC=	Enable XCB (X C-language Binding) Support
+XCB_USES=	xorg
 XCB_USE=	xorg=xcb
 XCB_CONFIGURE_ENABLE=	xcb
 
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 6f302aa7eadc..8070e1af637c 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -92,6 +92,7 @@ IRRLICHT_LIB_DEPENDS=	libIrrlicht.so:x11-toolkits/irrlicht
 IRRLICHT_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_IRRLICHT=ON
 IRRLICHT_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
 OPENGL_BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
+OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glew,glu
 OPENGL_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_OPENGL=ON
 OPENGL_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_OPENGL=OFF
diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile
index a79066778be7..38ebf775120c 100644
--- a/graphics/cloudcompare/Makefile
+++ b/graphics/cloudcompare/Makefile
@@ -48,7 +48,7 @@ PDAL_LIB_DEPENDS=	libpdal_base.so:math/pdal
 SHAPELIB_CMAKE_BOOL=	OPTION_USE_SHAPE_LIB
 SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
 
-PLUGINS_USES=		eigen:3 gl jpeg python:2.7
+PLUGINS_USES=		eigen:3 gl jpeg python:2.7 xorg
 PLUGINS_CMAKE_BOOL=	INSTALL_QANIMATION_PLUGIN INSTALL_QBLUR_PLUGIN INSTALL_QBROOM_PLUGIN INSTALL_QCOMPASS_PLUGIN \
 			INSTALL_QCSF_PLUGIN INSTALL_QCSV_MATRIX_IO_PLUGIN INSTALL_QDUMMY_PLUGIN INSTALL_QEDL_PLUGIN INSTALL_QFACETS_PLUGIN \
 			INSTALL_QHPR_PLUGIN INSTALL_QM3C2_PLUGIN \
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index a552bbb50cbb..ae4e83b91251 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -44,6 +44,7 @@ FREETYPE_CPPFLAGS=	-I${LOCALBASE}/include
 FONTCONFIG_LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_OFF=	--with-fontconfig=no
 FONTCONFIG_CPPFLAGS=		-I${LOCALBASE}/include
+XPM_USES=	xorg
 XPM_USE=	xorg=xpm,x11
 XPM_CONFIGURE_ON=	--with-x
 XPM_CONFIGURE_OFF=	--with-xpm=no
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 7b16ad5e3ad0..fe35d3863d99 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -42,6 +42,7 @@ TIFF_MESON_TRUE=	tiff
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 X11_MESON_TRUE=		x11
+X11_USES=		xorg
 X11_USE=		xorg=x11
 
 post-install:
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 912b0491fbff..8d6ee5c67bd8 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -24,6 +24,7 @@ PLIST_FILES=	bin/gifdiff bin/gifsicle \
 OPTIONS_DEFINE=		DOCS X11
 OPTIONS_DEFAULT=
 
+X11_USES=		xorg
 X11_USE=		xorg=x11
 X11_CONFIGURE_ENABLE=	gifview
 X11_CONFIGURE_WITH=	x
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index d03a08bb7c6c..d4204303f502 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -79,12 +79,16 @@ GO_DESC=	Go bindings (swig)
 TK_DESC=	TK toolkit support
 NVTHREADS_DESC=	Link with threads (needed for nvidia)
 
+XPM_USES=	xorg
 XPM_USE=	XORG=xaw,xpm,xmu,xt,sm,ice,xext,x11,xau,xdmcp
 ICONV_USES=	iconv
 NLS_USES=	gettext
+PANGOCAIRO_USES=gnome xorg
 PANGOCAIRO_USE=	GNOME=pango,cairo XORG=xrender,x11,xau,xdmcp
+GTK2_USES=	gnome xorg
 GTK2_USE=	XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
 GNOMEUI_USE=	GNOME=libgnomeui
+SMYRNA_USES=	gnome gl
 SMYRNA_USE=	GNOME=libglade2,pangox-compat,gdkpixbuf2 GL=glut,glu,gl
 GHOSTSCRIPT_USES=ghostscript
 PERL_USES=	perl5
diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile
index 0a2f48332577..c2a712b33eda 100644
--- a/graphics/megapov/Makefile
+++ b/graphics/megapov/Makefile
@@ -35,6 +35,7 @@ OPTIMIZED_CFLAGS_CFLAGS=\
 			-fexpensive-optimizations
 SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_WITH=	svga
+X11_USES=		xorg
 X11_USE=		xorg=x11,xpm
 X11_CONFIGURE_WITH=	x
 
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 549d4acb882d..86eec352816d 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -61,7 +61,7 @@ OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr \
 OPENGL_CMAKE_BOOL=	OGRE_BUILD_RENDERSYSTEM_GL3PLUS \
 			OGRE_BUILD_RENDERSYSTEM_GL \
 			OGRE_BUILD_RENDERSYSTEM_GLES2
-OPENGL_USES=		gl
+OPENGL_USES=		gl xorg
 OPENGL_USE=		XORG=sm,ice GL=gl,glu
 
 PROFILE_CMAKE_BOOL=	OGRE_PROFILING
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index d69c12d3b9dd..f6ac67c6b182 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -56,7 +56,7 @@ GIF_CMAKE_BOOL=		USE_GIF
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
-IMAGEVIEWER_USES=	qt:5
+IMAGEVIEWER_USES=	gl qt:5
 IMAGEVIEWER_IMPLIES=	TOOLS
 IMAGEVIEWER_CMAKE_BOOL=	USE_QT USE_OPENGL
 IMAGEVIEWER_USE=	GL=gl,glu,glew \