Add USES=xorg USES=gl, ports categories e

Add USES=xorg, USES=gl and in a few cases USES=gnome to ports in categories
starting with 'e'.

54 files changed, 68 insertions, 43 deletions

diff --git a/emulators/adamem/Makefile b/emulators/adamem/Makefile
index 691f874cd0d4..8173e2ee12ee 100644
--- a/emulators/adamem/Makefile
+++ b/emulators/adamem/Makefile
@@ -16,6 +16,7 @@ BROKEN_armv6=		fails to build: regparm is not valid on this platform
 BROKEN_armv7=		fails to build: regparm is not valid on this platform
 
 NO_WRKSUBDIR=	yes
+USES=		xorg
 USE_XORG=	sm x11 xau xext xfixes xi xrandr
 
 MAKE_ARGS=	CC="${CC}" LD="${CC}"
diff --git a/emulators/almostti/Makefile b/emulators/almostti/Makefile
index 1fcf3549901f..2df7725d7426 100644
--- a/emulators/almostti/Makefile
+++ b/emulators/almostti/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	AlmostTI13-Unix-DougMelton-051409
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Texas Instruments Z80 series calculator emulator
 
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	x11 xext
 
 WRKSRC=		${WRKDIR}/AlmostTI-DougMelton-Source
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 1e123181890d..7539931af416 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -58,6 +58,7 @@ PKGNAMESUFFIX=	-sdl
 USE_SDL=	sdl
 CONFIGURE_ARGS+=	--target=sdl
 .else
+USES+=		xorg
 USE_XORG=	x11 xext
 .if ${PORT_OPTIONS:MSHM}
 CONFIGURE_ARGS+=	--target=x11-shm
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 265b313c090e..80db1745412c 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -15,7 +15,7 @@ LICENSE=	LGPL21
 
 BROKEN_i386=		does not build on i386 (../cpu.h:4513:117: error: 'regparm' parameter must be between 0 and 3 inclusive)
 
-USES=		gmake libtool:keepla pkgconfig
+USES=		gmake libtool:keepla pkgconfig xorg
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_alsa_asoundlib_h=no \
diff --git a/emulators/cingb/Makefile b/emulators/cingb/Makefile
index 1d4f0cc6fb4a..5bcac5342f47 100644
--- a/emulators/cingb/Makefile
+++ b/emulators/cingb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Yet another Nintendo Game Boy emulator
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		tar:bzip2
+USES=		tar:bzip2 xorg
 USE_XORG=	x11 xext xv
 USE_GITHUB=	yes
 GH_ACCOUNT=	nakal
diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile
index a4c342cdd8dd..39432d98f4e0 100644
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	ak@FreeBSD.org
 COMMENT=	Wonderful Sega Genesis/MegaDrive emulator
 
 USE_SDL=	sdl
-USE_GL=		yes
-USES=		gmake libarchive
+USE_GL=		glu
+USES=		gl gmake libarchive
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/dgen \
diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile
index 1b0a9a2f5d4c..dcff85847fac 100644
--- a/emulators/dtcyber/Makefile
+++ b/emulators/dtcyber/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	dtcyber20b1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop CYBER Emulator
 
-USES=		dos2unix zip
+USES=		dos2unix zip xorg
 USE_XORG=	x11
 NO_WRKSUBDIR=	yes
 INSTALL_TARGET=
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index a8b4cc0cd840..40de9e07a5e6 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	zenity:x11/zenity
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		compiler:c++0x desktop-file-utils dos2unix localbase:ldflags pkgconfig scons
+USES=		compiler:c++0x desktop-file-utils dos2unix localbase:ldflags pkgconfig scons xorg
 USE_SDL=	sdl
 USE_XORG=	x11
 
@@ -38,9 +38,11 @@ DEBUG_MAKE_ARGS_OFF=	DEBUG=0
 FRAMESKIP_DESC=		Enable frameskipping
 FRAMESKIP_MAKE_ARGS=	FRAMESKIP=1
 FRAMESKIP_MAKE_ARGS_OFF=	FRAMESKIP=0
+GTK2_USES=		gnome
 GTK2_USE=		GNOME=gtk20
 GTK2_MAKE_ARGS=		GTK=1
 GTK2_MAKE_ARGS_OFF=	GTK=0
+GTK3_USES=		gnome
 GTK3_USE=		GNOME=gtk30
 GTK3_MAKE_ARGS=		GTK3=1
 GTK3_MAKE_ARGS_OFF=	GTK3=0
@@ -52,6 +54,7 @@ LOGO_IMPLIES=		CREATE_AVI
 LUA_USES=		lua:51
 LUA_MAKE_ARGS=		LUA=1 SYSTEM_LUA=1
 LUA_MAKE_ARGS_OFF=	LUA=0
+OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_MAKE_ARGS=	OPENGL=1
 OPENGL_MAKE_ARGS_OFF=	OPENGL=0
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 9ea31a940278..9285f2216082 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -23,7 +23,7 @@ LICENSE_TEXT=	This program is NOT in public domain.\
 		Legal status of distributed ROM images is unclear.
 LICENSE_PERMS=	none
 
-USES=		dos2unix gmake zip
+USES=		dos2unix gmake xorg zip
 USE_XORG=	x11 xext
 DOS2UNIX_FILES=	EMULib/Unix/LibUnix.c EMULib/Unix/NetUnix.c EMULib/Rules.gcc \
 		EMULib/Rules.Unix fMSX/fMSX.html
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 9b0bf7b36ffd..f09bf6ef515e 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	FrodoV4_1b.Src
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Emulates a Commodore 64
 
-USES=		shebangfix tk:run
+USES=		shebangfix tk:run xorg
 USE_CXXSTD=	gnu++98
 CXXFLAGS+=	-std=gnu++98
 USE_XORG=	x11 xt xext sm ice
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 8734123f7b13..8d813e28467c 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png \
 		libspectrum.so:emulators/libspectrum
 
-USES=		compiler:c++11-lang gettext gmake gnome localbase perl5 pkgconfig
+USES=		compiler:c++11-lang gettext gmake gnome localbase perl5 \
+		pkgconfiga xorg
 USE_PERL5=	build
 USE_GNOME=	cairo libxml2 glib20
 USE_XORG=	x11
diff --git a/emulators/gbe/Makefile b/emulators/gbe/Makefile
index 3e7b47ac160a..edbdf2f754ec 100644
--- a/emulators/gbe/Makefile
+++ b/emulators/gbe/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Nintendo GameBoy(tm) emulator with GNU source code
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USES=		xorg
 USE_XORG=	x11
 
 PLIST_FILES=	bin/gbe
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index 09c500f6551e..d43c4f0bcf10 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	nasm:devel/nasm
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	uses i386 assembly code
 
-USES=		gmake localbase pkgconfig
+USES=		gmake gnome gl localbase pkgconfig
 USE_GNOME=	gtk20
 USE_GL=		gl
 USE_SDL=	sdl
diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile
index 9a9368c65448..a055f393636c 100644
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 BROKEN_i386=	unknown argument: '-frerun-loop-opt'
 
-USES=		autoreconf compiler:features gmake
+USES=		autoreconf compiler:features gl gmake
 USE_SDL=	image sdl
 USE_GL=		yes
 USE_GITHUB=	yes
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 548b3a4d74f6..5ccfac391ac4 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libportaudio.so:audio/portaudio \
 		libpng.so:graphics/png
 
 USES=		cmake desktop-file-utils gnome python:3.6+ readline \
-		sdl shared-mime-info shebangfix tar:bzip2
+		sdl shared-mime-info shebangfix tar:bzip2 xorg
 USE_GNOME=	gtk30
 USE_XORG=	sm ice x11 xext
 USE_PYTHON=	concurrent
diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile
index ef4d9dc0da6d..6b8d64d620b7 100644
--- a/emulators/higan/Makefile
+++ b/emulators/higan/Makefile
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		7z:p7zip compiler:c++14-lang gettext gmake gnome pkgconfig
+USES=		7z:p7zip compiler:c++14-lang gettext gmake gnome pkgconfig xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20 gtksourceview2
 USE_XORG=	x11 xext
 USE_CSTD=	c99
@@ -41,6 +41,7 @@ INPUT_SDL_DESC=		Build SDL input driver
 INPUT_X_DESC=		Build X input driver
 
 
+GLX_USES=	gl
 GLX_USE=	GL=gl
 GLX_VARS=	VIDEO_DRIVER+=video.glx
 
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index 9453fc18ea29..447af0135a11 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -18,6 +18,7 @@ ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	is an i386 binary
 
 NO_WRKSUBDIR=	yes
+USES=		xorg
 USE_XORG=	x11 xext
 NO_BUILD=	yes
 STRIP=
diff --git a/emulators/joytran/Makefile b/emulators/joytran/Makefile
index faac20460646..7999e6a9f02b 100644
--- a/emulators/joytran/Makefile
+++ b/emulators/joytran/Makefile
@@ -14,7 +14,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USE_SDL=	sdl2
-USES=		tar:bzip2 cmake:insource pkgconfig
+USES=		tar:bzip2 cmake:insource pkgconfig xorg
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" -DPREFIX="${PREFIX}"
 USE_XORG=	x11 xtst
 
diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile
index f8a5fe4b07ec..a3ce93dc5570 100644
--- a/emulators/kcemu/Makefile
+++ b/emulators/kcemu/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile \
 		libxvidcore.so:multimedia/xvid \
 		libz80ex.so:devel/z80ex
 
-USES=		compiler:c++11-lang gettext ncurses pkgconfig
+USES=		compiler:c++11-lang gettext gnome ncurses pkgconfig xorg
 USE_CXXSTD=	gnu++98
 USE_GNOME=	gtk20
 USE_XORG=	xmu
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 4c2e7929f4d1..57ef2d193d40 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 RUN_DEPENDS=	liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf
 
 USES=		compiler:c++14-lang gl gmake jpeg pkgconfig \
-		python:2.7,build qt:5 sdl shebangfix
+		python:2.7,build qt:5 sdl shebangfix xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mamedev
diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile
index c13f46fd7139..5dedb0a51dd3 100644
--- a/emulators/mastergear/Makefile
+++ b/emulators/mastergear/Makefile
@@ -18,6 +18,7 @@ NO_WRKSUBDIR=	yes
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	is an i386 binary
 
+USES=		xorg
 USE_XORG=	x11 xext
 
 NO_BUILD=	yes
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index a16f24d6c284..653ae4f10f00 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -30,7 +30,7 @@ SUB_FILES=	pkg-message
 CONFIGURE_ARGS+=--disable-alsa --disable-alsatest \
 		--with-sdl-prefix=${LOCALBASE}
 
-USES=		compiler:c++11-lib cpe iconv pkgconfig:build tar:xz
+USES=		compiler:c++11-lib cpe gl iconv pkgconfig:build tar:xz
 CPE_VENDOR=	david_shadoff
 
 OPTIONS_DEFINE=	NLS DOCS JACK
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index e8fa20d482e8..cd3a30cf668b 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -37,6 +37,7 @@ CONFIGURE_ENV+=	ac_cv_header_iconv_h=no
 .endif
 
 .if ${PORT_OPTIONS:MX11}
+USES+=		xorg
 USE_XORG=	x11 sm ice xau
 PLIST_SUB+=	X11=""
 .else
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index 56d699c74231..bc075d9eca0f 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	Fork of Mupen64 Nintendo 64 emulator
 
-USES+=		gmake pkgconfig
+USES+=		gl gmake pkgconfig
 USE_GL?=	yes
 USE_SDL?=	sdl2
 USE_LDCONFIG?=	yes
diff --git a/emulators/mupen64plus-qt/Makefile b/emulators/mupen64plus-qt/Makefile
index 9ba603a99bba..d5a75be2e0f7 100644
--- a/emulators/mupen64plus-qt/Makefile
+++ b/emulators/mupen64plus-qt/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core \
 		${LOCALBASE}/lib/mupen64plus/mupen64plus-video-rice.so:emulators/mupen64plus-video-rice \
 		mupen64plus:emulators/mupen64plus-ui-console
 
-USES=		qmake qt:5
+USES=		gl qmake qt:5
 USE_GL=		gl
 USE_QT=		core gui network sql widgets xml \
 		buildtools_build \
diff --git a/emulators/mupen64plus-video-arachnoid/Makefile b/emulators/mupen64plus-video-arachnoid/Makefile
index e55acef25c8b..b15bda4970c1 100644
--- a/emulators/mupen64plus-video-arachnoid/Makefile
+++ b/emulators/mupen64plus-video-arachnoid/Makefile
@@ -9,6 +9,7 @@ COMMENT=	The arachnoid video plugin for Mupen64plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
+USES+=		gl
 USE_GL=		gl glu
 USE_SDL=	#
 
diff --git a/emulators/mupen64plus-video-glide64/Makefile b/emulators/mupen64plus-video-glide64/Makefile
index dd4fa6eab45c..d14728608d2d 100644
--- a/emulators/mupen64plus-video-glide64/Makefile
+++ b/emulators/mupen64plus-video-glide64/Makefile
@@ -9,6 +9,7 @@ COMMENT=	Glide64 video plugin for Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
+USES+=		gl
 USE_GL=		gl
 USE_SDL=	sdl2
 
diff --git a/emulators/mupen64plus-video-glide64mk2/Makefile b/emulators/mupen64plus-video-glide64mk2/Makefile
index 1769598aa3a3..1b9edd3eb2b6 100644
--- a/emulators/mupen64plus-video-glide64mk2/Makefile
+++ b/emulators/mupen64plus-video-glide64mk2/Makefile
@@ -9,6 +9,7 @@ COMMENT=	Glide64mk2 video plugin for Mupen64Plus
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core \
 		libboost_thread.so:devel/boost-libs
 
+USES+=		gl
 USE_GL=		gl
 USE_SDL=	sdl2
 
diff --git a/emulators/mupen64plus-video-rice/Makefile b/emulators/mupen64plus-video-rice/Makefile
index 271c759fc8a6..1bab97e74303 100644
--- a/emulators/mupen64plus-video-rice/Makefile
+++ b/emulators/mupen64plus-video-rice/Makefile
@@ -6,6 +6,7 @@ PKGNAMESUFFIX=	-video-rice
 
 COMMENT=	The rice graphics plugin for Mupen64plus
 
+USES=		gl
 USE_GL=		yes
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
diff --git a/emulators/mupen64plus-video-z64/Makefile b/emulators/mupen64plus-video-z64/Makefile
index 4663f6147b28..b408acc3122b 100644
--- a/emulators/mupen64plus-video-z64/Makefile
+++ b/emulators/mupen64plus-video-z64/Makefile
@@ -9,6 +9,7 @@ COMMENT=	Low-level RDP plugin for the Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
+USES=		gl
 USE_GL=		gl glu glew
 USE_SDL=	sdl2
 
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 29fa6cdf9435..09a19fa5e4f5 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -14,8 +14,8 @@ COMMENT=	8086 PC emulator, by David Hedley
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 RUN_DEPENDS=	mkfontscale:x11-fonts/mkfontscale
 
+USES=		dos2unix xorg
 USE_XORG=	x11 xext
-USES=		dos2unix
 DOS2UNIX_FILES=	programs/config.sys
 MAKE_ENV=	FILESDIR=${FILESDIR} STAGEDIR=${STAGEDIR}
 MAKE_ARGS=	CC="${CC}"
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index 3fd9898fb2ab..56f4680941eb 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -34,7 +34,7 @@ GH_TUPLE?=	hrydgard:glslang:7.11.3214-63-gf9d08a25:glslang/ext/glslang \
 
 CONFLICTS_INSTALL=	${PORTNAME}-*
 
-USES=		cmake compiler:c++11-lib localbase:ldflags pkgconfig
+USES=		cmake compiler:c++11-lib gl localbase:ldflags pkgconfig
 EXCLUDE=	libzip zlib
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		gl glew glu
diff --git a/emulators/qemu-powernv/Makefile b/emulators/qemu-powernv/Makefile
index 150238f7c295..4d3032e1a2a7 100644
--- a/emulators/qemu-powernv/Makefile
+++ b/emulators/qemu-powernv/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=		${LOCALBASE}/lib/libfdt.so:sysutils/dtc
 
 USES=		bison:build compiler:c11 gmake gnome libtool makeinfo \
-		pkgconfig python:2.7,build tar:bz2
+		pkgconfig python:2.7,build tar:bz2 xorg
 USE_XORG=	pixman
 USE_GNOME=	glib20
 
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index f5adf9c1e661..1bb124b33ae6 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -50,6 +50,7 @@ CONFIGURE_ARGS+=	--disable-tools
 .endif
 .else
 # qemu-system-* targets require pixman to build, add an explicit dependency.
+USES+=		xorg
 USE_XORG=	pixman
 .endif
 
@@ -58,6 +59,7 @@ USE_XORG=	pixman
 .if defined(QEMU_USER_STATIC)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libglib-2.0.a:devel/glib20
 .else
+USES+=		gnome
 USE_GNOME+=	glib20
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libfdt.so:sysutils/dtc
 .endif
@@ -151,7 +153,7 @@ CONFIGURE_ARGS+=	--disable-gtk --disable-vte
 PLIST_SUB+=	GTK2="@comment "
 .else
 USE_GNOME+=	gtk20 vte
-USES+=		gettext
+USES+=		gettext gnome
 PLIST_SUB+=	GTK2=""
 .endif
 
@@ -189,7 +191,8 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl
 .if empty(PORT_OPTIONS:MOPENGL)
 CONFIGURE_ARGS+=	--disable-opengl
 .else
-USE_GL=		yes
+USES+=		gl
+USE_GL=		glu
 .endif
 
 .if empty(PORT_OPTIONS:MUSBREDIR)
diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index 8e83d1e51d59..e2d067f7b36b 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	DOCS
 
 NO_WRKSUBDIR=	yes
 
-USES=		compiler:c++11-lang gmake qt:5 tar:bzip2
+USES=		compiler:c++11-lang gl gmake qt:5 tar:bzip2 xorg
 USE_XORG=	x11 xmu
 USE_GL=		gl glu
 USE_QT=		buildtools_build core declarative gui multimedia \
diff --git a/emulators/quasi88/Makefile b/emulators/quasi88/Makefile
index 6174b20b4041..39e326f9f427 100644
--- a/emulators/quasi88/Makefile
+++ b/emulators/quasi88/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.eonet.ne.jp/~showtime/quasi88/release/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PC-8801 emulator for X
 
+USES=		gmake tar:tgz xorg
 USE_XORG=	x11 xext
-USES=		gmake tar:tgz
 MAKE_ENV=	DATADIR="${DATADIR}" _CC="${CC}" _CFLAGS="${CFLAGS}" \
 		_CXX="${CXX}" LD="${CXX}" PROGRAM="${PORTNAME}"
 MAKE_ARGS=	ARCH="freebsd"
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index f83c9422ece0..59c581ecb4e1 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -34,8 +34,8 @@ GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-27-g9220f5e:hidapi/3rdparty/hidapi \
 		USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \
 		zeux:pugixml:v1.9-51-g8bf806c:pugixml/3rdparty/pugixml
 
-USES=		cmake compiler:c++17-lang iconv:wchar_t localbase:ldflags \
-		openal:soft pkgconfig qt:5
+USES=		cmake compiler:c++17-lang gl iconv:wchar_t localbase:ldflags \
+		openal:soft pkgconfig qt:5 xorg
 USE_GL=		gl glew
 USE_QT=		qmake_build buildtools_build core concurrent dbus declarative gui network widgets
 USE_XORG=	x11
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 8c66fa840bd1..bdcc1a27d14e 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -21,7 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	snes9xgit
 
 USES=		autoreconf compiler:c11 desktop-file-utils gettext gmake \
-		localbase perl5 pkgconfig tar:bzip2
+		gnome localbase perl5 pkgconfig tar:bzip2 xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20 intltool libxml2
 USE_SDL=	sdl2
 USE_XORG=	x11 xext
@@ -47,6 +47,7 @@ NETPLAY_DESC=			Network support
 NETPLAY_CONFIGURE_WITH=		netplay
 
 OPENGL_CONFIGURE_WITH=		opengl
+OPENGL_USES=			gl
 OPENGL_USE=			GL=gl,glu
 
 XRANDR_CONFIGURE_WITH=		xrandr
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index 5509d64761bb..14a8c400e1fb 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
 RESTRICTED=	Contains ROM (C) by Atari
 
 TOSIMG?=	tos.img
-USES=		fonts
+USES=		fonts xorg
 FONTNAME=	misc
 USE_XORG=	x11 sm ice xext xorgproto
 HAS_CONFIGURE=	yes
diff --git a/emulators/teo/Makefile b/emulators/teo/Makefile
index 654742534720..f571cbc5ab63 100644
--- a/emulators/teo/Makefile
+++ b/emulators/teo/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/licence-en.txt
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libpng.so:graphics/png
 
-USES=		gmake gnome pkgconfig
+USES=		gmake gnome pkgconfig xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	x11 xext
 
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index bb2754c2100d..0d7215b38d6f 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	uses i386 assembly code
 
-USES=		compiler gmake
+USES=		compiler gmake xorg
 USE_XORG=	x11 ice sm xext xpm
 USE_BINUTILS=	yes
 GNU_CONFIGURE=	yes
diff --git a/emulators/vgb-bin/Makefile b/emulators/vgb-bin/Makefile
index f689702b6b6e..4df539394b2f 100644
--- a/emulators/vgb-bin/Makefile
+++ b/emulators/vgb-bin/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libc.so.5:misc/compat5x
 IA32_BINARY_PORT=	yes
 NO_BUILD=	no
 NO_WRKSUBDIR=	no
+USES=		xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/vgb
diff --git a/emulators/vgba-bin/Makefile b/emulators/vgba-bin/Makefile
index 0b0082663285..3d05f7d576d3 100644
--- a/emulators/vgba-bin/Makefile
+++ b/emulators/vgba-bin/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libc.so.5:misc/compat5x \
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	no
 NO_WRKSUBDIR=	no
+USES=		xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/vgba
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 2828fe8a5443..6bb60e562f14 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 USES=		compiler:c++11-lang pkgconfig makeinfo localbase:ldflags \
-		gmake iconv:wchar_t jpeg readline gettext
+		gmake iconv:wchar_t jpeg readline gettext xorg
 USE_XORG=	xpm ice sm xext xv xt x11 xmu xxf86vm
 USE_XORG+=	xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
 HAS_CONFIGURE=	yes
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 9dd5f575b813..1f7e50a1fb3f 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -150,7 +150,7 @@ USES+=		python:2.7,build
 .if ${PORT_OPTIONS:MQT5}
 CONFIGURE_ARGS+=	--enable-qt5
 PLIST_SUB+=	QT=""
-USES+=		gl qmake:no_env qt:5
+USES+=		gl qmake:no_env qt:5 xorg
 USE_GL=		gl glu
 USE_QT=		buildtools_build core dbus gui linguisttools_build opengl
 USE_QT+=	printsupport widgets x11extras
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index 81b71e104ed6..b8808ac23418 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -40,7 +40,8 @@ DOS2UNIX_REGEX=	.*\.(c|cpp|h|ypp)
 USE_XORG=	x11 xext
 USE_GL=		gl glu
 USE_SDL=	sdl
-USES=		compiler:c++11-lang cmake:insource,noninja dos2unix gnome gl pkgconfig
+USES=		compiler:c++11-lang cmake:insource,noninja dos2unix gnome gl \
+		pkgconfig xorg
 INSTALLS_ICONS=	yes
 CMAKE_ARGS=	-DVERSION:STRING="${PORTVERSION}" \
 		-DSYSCONFDIR:STRING="${PREFIX}/etc"  \
diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile
index aadfdf07d5f3..bc73254a85cb 100644
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core \
 
 WRKSRC=		${WRKDIR}/auria-${PORTNAME}-0564db396383
 
-USES=		compiler:c++11-lib gl python:2.7 sdl
+USES=		compiler:c++11-lib gl python:2.7 sdl xorg
 USE_CXXSTD=	c++11
 USE_SDL=	sdl
 USE_GL=		gl
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 0031a165655c..75f595b3c694 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/fonts/misc/7x14B-ISO8859-1.pcf.gz:x11-fonts/font
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-lutil
-USES=		autoreconf gmake pkgconfig tar:bzip2
+USES=		autoreconf gmake pkgconfig tar:bzip2 xorg
 USE_XORG=	x11 xext xt
 NO_WRKSUBDIR=	yes
 
diff --git a/emulators/x49gp/Makefile b/emulators/x49gp/Makefile
index fb64fb65953c..1d460a0dfae9 100644
--- a/emulators/x49gp/Makefile
+++ b/emulators/x49gp/Makefile
@@ -21,11 +21,11 @@ NOT_FOR_ARCHS_REASON=	unsupported CPU = unknown
 
 WRKSRC=		${WRKDIR}/x49gp/x49gp-code
 
+USES=		gmake gnome pkgconfig xorg
 USE_GCC=	any
 USE_XORG=	x11
 USE_GNOME=	gtk20
 
-USES=		gmake pkgconfig
 
 OPTIONS_SINGLE=	FIRMWARE
 OPTIONS_SINGLE_FIRMWARE=FIRMWARE_215 FIRMWARE_209
diff --git a/emulators/xbraitenberg/Makefile b/emulators/xbraitenberg/Makefile
index 2002a1a3ca85..43181845d9f3 100644
--- a/emulators/xbraitenberg/Makefile
+++ b/emulators/xbraitenberg/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES=	http://www.lcdf.org/~eddietwo/xbraitenberg/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Braitenberg vehicle simulator with pseudo-physics
 
+USES=		xorg
 USE_CXXSTD=	c++98
 USE_XORG=	x11 ice sm xext
 GNU_CONFIGURE=	yes
diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile
index 5aaf2994ba8e..e6463818374b 100644
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}
 
 USE_XORG=	ice
 USE_GNOME=	glib20
-USES=		gettext iconv pkgconfig
+USES=		gettext gnome iconv pkgconfig xorg
 
 LIB_DEPENDS+=	libpcre.so:devel/pcre \
 		libdsk.so:emulators/libdsk
diff --git a/emulators/xhomer/Makefile b/emulators/xhomer/Makefile
index bc97ea9674af..691a39f3d71f 100644
--- a/emulators/xhomer/Makefile
+++ b/emulators/xhomer/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://xhomer.isani.org/xhomer/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emulator for the DEC Pro 350 computer
 
-USES=		gmake tar:tgz
+USES=		gmake tar:tgz xorg
 USE_XORG=	xt sm ice xext x11
 ALL_TARGET=	clean xhomer
 INSTALL_TARGET=	# empty
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index b248091f9c9f..911f6d90e3d7 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -25,7 +25,8 @@ MMX_BUILD_DEPENDS=nasm:devel/nasm
 MMX_CONFIGURE_ENABLE=mmx
 
 EXTRACT_AFTER_ARGS=--exclude libltdl
-USES=		gettext gmake gnome jpeg libtool localbase pkgconfig shebangfix
+USES=		gettext gmake gnome jpeg libtool localbase pkgconfig \
+		shebangfix xorg
 USE_GNOME=	gtk20
 SHEBANG_FILES=	contrib/instgame
 USE_XORG=	x11 xext xxf86vm
diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile
index 04fc83c95655..dfb68b9fb0c2 100644
--- a/emulators/xzx/Makefile
+++ b/emulators/xzx/Makefile
@@ -14,7 +14,7 @@ COMMENT=	ZX Spectrum (48K/128K/+3) Emulator for X11
 
 RESTRICTED=	Redistribution forbidden by license
 
-USES=		imake:env motif
+USES=		imake:env motif xorg
 USE_XORG=	x11 ice sm xext xpm xt xxf86vm
 
 GNU_CONFIGURE=	yes