From 82f108df3064ff3c1a1e2286a12f648d68dae4cd Mon Sep 17 00:00:00 2001
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Wed, 6 Nov 2019 18:07:22 +0000
Subject: Add USES=xorg USES=gl, ports categories m

Add USES=xorg and USES=gl to ports in categories starting with 'm'
While here, try to sprinkle other USES (mostly gnome and sdl) as needed.
---
 mail/asmail/Makefile                          | 2 +-
 mail/bbmail/Makefile                          | 2 +-
 mail/claws-mail/Makefile                      | 2 +-
 mail/coolmail/Makefile                        | 2 +-
 mail/evolution/Makefile                       | 2 +-
 mail/hbiff/Makefile                           | 1 +
 mail/wmbiff/Makefile                          | 2 +-
 mail/wmmaiload/Makefile                       | 2 +-
 mail/xbuffy/Makefile                          | 2 +-
 mail/xfaces/Makefile                          | 2 +-
 mail/xmail/Makefile                           | 2 +-
 mail/xmailbox/Makefile                        | 2 +-
 mail/xmailwatcher/Makefile                    | 2 +-
 mail/xpbiff/Makefile                          | 2 +-
 math/abs/Makefile                             | 1 +
 math/apc/Makefile                             | 1 +
 math/calctool/Makefile                        | 1 +
 math/cgal/Makefile                            | 2 +-
 math/emc2/Makefile                            | 2 +-
 math/fricas/Makefile                          | 2 +-
 math/geogram/Makefile                         | 2 +-
 math/gnuplot/Makefile                         | 2 +-
 math/hexcalc/Makefile                         | 1 +
 math/kalgebra/Makefile                        | 2 +-
 math/mathgl/Makefile                          | 3 ++-
 math/octave/Makefile                          | 2 +-
 math/openmesh/Makefile                        | 2 +-
 math/petiga/Makefile                          | 2 +-
 math/ploticus/Makefile                        | 1 +
 math/reduce/Makefile                          | 2 +-
 math/rkward-kde/Makefile                      | 2 +-
 math/slepc/Makefile                           | 2 +-
 math/snns/Makefile                            | 1 +
 math/speedcrunch/Makefile                     | 2 +-
 math/topaz/Makefile                           | 2 +-
 math/triangle/Makefile                        | 2 +-
 math/ump/Makefile                             | 2 +-
 math/vtk6/Makefile                            | 3 ++-
 math/vtk8/Makefile                            | 3 ++-
 math/xgraph/Makefile                          | 2 +-
 math/xplot/Makefile                           | 2 +-
 math/xppaut/Makefile                          | 1 +
 math/zegrapher/Makefile                       | 2 +-
 misc/actiona/Makefile                         | 3 ++-
 misc/asbutton/Makefile                        | 1 +
 misc/dartsim/Makefile                         | 3 ++-
 misc/free42/Makefile                          | 2 +-
 misc/gkrellm-gamma/Makefile                   | 2 +-
 misc/hotkeys/Makefile                         | 2 +-
 misc/magicpoint/Makefile                      | 2 +-
 misc/pspresent/Makefile                       | 2 +-
 misc/sent/Makefile                            | 1 +
 misc/unclutter-xfixes/Makefile                | 2 +-
 misc/unclutter/Makefile                       | 2 +-
 misc/visp/Makefile                            | 2 +-
 misc/wmScoreBoard/Makefile                    | 2 +-
 misc/wmcalendar/Makefile                      | 2 +-
 misc/wmjulia/Makefile                         | 2 +-
 misc/wmpal/Makefile                           | 2 +-
 misc/wmtunlo/Makefile                         | 1 +
 misc/wmweather+/Makefile                      | 2 +-
 misc/wmwork/Makefile                          | 2 +-
 misc/xgas/Makefile                            | 2 +-
 misc/xless/Makefile                           | 2 +-
 misc/xosd/Makefile                            | 3 ++-
 misc/xtypo/Makefile                           | 2 +-
 multimedia/QtAV/Makefile                      | 2 +-
 multimedia/aegisub/Makefile                   | 4 ++--
 multimedia/audacious-gtk3/Makefile            | 2 +-
 multimedia/audacious-plugins-gtk3/Makefile    | 2 +-
 multimedia/audacious-plugins/Makefile         | 2 +-
 multimedia/audacious/Makefile                 | 2 +-
 multimedia/avidemux/Makefile.common           | 4 +++-
 multimedia/butt/Makefile                      | 2 +-
 multimedia/ccextractor/Makefile               | 2 +-
 multimedia/cheese/Makefile                    | 4 ++--
 multimedia/cinelerra-gg/Makefile              | 6 ++++--
 multimedia/clutter-gst/Makefile               | 2 +-
 multimedia/dvbcut/Makefile                    | 2 +-
 multimedia/fxtv/Makefile                      | 2 +-
 multimedia/gmerlin/Makefile                   | 2 +-
 multimedia/gmtk/Makefile                      | 2 +-
 multimedia/gnome-mplayer/Makefile             | 2 +-
 multimedia/gnome-twitch/Makefile              | 2 +-
 multimedia/gstreamer-plugins-good/Makefile    | 1 +
 multimedia/gstreamer-plugins/Makefile         | 1 +
 multimedia/gstreamer1-plugins/Makefile.common | 3 +++
 multimedia/gstreamer1-vaapi/Makefile          | 2 +-
 multimedia/kaffeine/Makefile                  | 2 +-
 multimedia/kmplayer/Makefile                  | 2 +-
 multimedia/kodi/Makefile                      | 5 +++--
 multimedia/libav/Makefile                     | 4 +++-
 multimedia/libcec/Makefile                    | 1 +
 multimedia/libquicktime/Makefile              | 3 +++
 multimedia/libva-vdpau-driver/Makefile        | 2 +-
 multimedia/libvdpau-va-gl/Makefile            | 2 +-
 multimedia/libvdpau/Makefile                  | 2 +-
 multimedia/libxine/Makefile                   | 4 ++--
 multimedia/minitube/Makefile                  | 2 +-
 multimedia/mlt-qt5/Makefile                   | 2 +-
 multimedia/mlt/Makefile                       | 2 +-
 multimedia/mpc-qt/Makefile                    | 2 +-
 multimedia/mpeg_play/Makefile                 | 2 +-
 multimedia/mythtv/Makefile                    | 3 ++-
 multimedia/phonon-gstreamer/Makefile          | 2 +-
 multimedia/py-qt5-multimedia/Makefile         | 2 +-
 multimedia/py-qt5-multimediawidgets/Makefile  | 2 +-
 multimedia/qt5-multimedia/Makefile            | 2 +-
 multimedia/recordmydesktop/Makefile           | 1 +
 multimedia/simplescreenrecorder/Makefile      | 2 +-
 multimedia/smplayer/Makefile                  | 2 +-
 multimedia/totem/Makefile                     | 2 +-
 multimedia/vdr-plugin-xineliboutput/Makefile  | 2 +-
 multimedia/winff/Makefile                     | 2 +-
 multimedia/xanim/Makefile                     | 2 +-
 multimedia/xawtv/Makefile                     | 2 +-
 multimedia/xine/Makefile                      | 2 +-
 117 files changed, 140 insertions(+), 105 deletions(-)

diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index ef9d8b47ab60..e4cb563a8386 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	AFTERSTEP/apps/asmail/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Biff-type program, designed to match AfterStep
 
-USES=		ssl
+USES=		ssl xorg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shaping \
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index 2f8d0c2baf69..0d7d0e23d905 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libbt.pc:x11-wm/blackbox
 
-USES=		pkgconfig
+USES=		pkgconfig xorg
 USE_XORG=	xext
 GNU_CONFIGURE=	yes
 
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index ccec65f199c9..24d4ce668125 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 RUN_DEPENDS=	mime-support>0:misc/mime-support
 
 USES=		autoreconf gettext-tools compiler:c++11-lang cpe desktop-file-utils gettext gnome pathfix pkgconfig \
-		python:3.6 shebangfix ssl
+		python:3.6 shebangfix ssl xorg
 USE_XORG=	ice sm
 USE_GNOME=	cairo gtk20 librsvg2
 SHEBANG_FILES=	tools/*.pl tools/*.py tools/tb2claws-mail
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index 238476525cba..72e559c5a3b4 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Xbiff like mail tool with animated 3D graphics
 PLIST_FILES=	bin/coolmail \
 		man/man1/coolmail.1.gz
 
-USES=		tar:tgz
+USES=		tar:tgz xorg
 USE_XORG=	x11 xext xmu xi
 PATCH_STRIP=	-p1
 
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9841d1406857..8e2466749b72 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -45,7 +45,7 @@ PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 desktop-file-utils cmake gettext gnome \
 		iconv:wchar_t sqlite libarchive localbase pathfix pkgconfig \
-		tar:xz
+		tar:xz xorg
 USE_GNOME=	cairo evolutiondataserver3 gnomedesktop3 intltool
 GNU_CONFIGURE=	yes
 USE_XORG=	x11
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index 79a2b7e4a25a..9b186e8fa3d9 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/misc/  \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Replacement for xbiff that handles popup window with mail headers
 
+USES=		xorg
 USE_XORG=	x11
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index c89f40d70884..f70013d5d8c5 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	GNUTLS
 
-USES=		shebangfix
+USES=		shebangfix xorg
 SHEBANG_FILES=	scripts/security.debian.rb
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile
index 57e6dd08f0f0..c7019925656d 100644
--- a/mail/wmmaiload/Makefile
+++ b/mail/wmmaiload/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Incoming mail monitor dockapp with a similar look to wmcpuload
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake localbase:ldflags pkgconfig ssl tar:bzip2
+USES=		gmake gnome localbase:ldflags pkgconfig ssl tar:bzip2 xorg
 USE_XORG=	xpm
 USE_GNOME=	gtk20
 HAS_CONFIGURE=	yes
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 824b78c7d2c3..3a26f4e15023 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-3.3.bl.3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Replacement for xbiff that handles multiple mail files
 
+USES=		cpe gmake xorg
 USE_XORG=	xext xt xaw
-USES=		cpe gmake
 CPE_VENDOR=	xbuffy_project
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/xbuffy lib/X11/app-defaults/XBuffy man/man1/xbuffy.1.gz
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index 5dfe790058a1..cfbc48f4b3fc 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libcompface.so:mail/faces
 
 # GNU make properly processes some overridden rules in the makefile that
 # imake generates.  Specifically, installing the html docs.
-USES=		imake gmake tar:Z
+USES=		imake gmake tar:Z xorg
 USE_XORG=	ice sm x11 xaw xext xmu xt xpm
 
 post-install:
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 19d5c88d20fb..bb2b0d5a7ad7 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	sjroz@verizon.net
 COMMENT=	X-based interface to the Berkeley mail program
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	xbitmaps xaw
 
 .include <bsd.port.mk>
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 4fe138392cfd..3eb0b92e0da6 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	XCONTRIB/applications
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mailbox checker with sound and animation for X Window System
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	xaw
 
 OPTIONS_DEFINE=	DOCS
diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile
index 93d792482f93..149224e1dab7 100644
--- a/mail/xmailwatcher/Makefile
+++ b/mail/xmailwatcher/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mailbox checker which displays sender and subject lines of mails
 
 PLIST_FILES=	bin/xmailwatcher man/man1/xmailwatcher.1.gz
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 post-install:
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 628b046262f5..eb84c5668a85 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	xpbiff-1.27-with-YOUBIN.tar.gz.uu
 MAINTAINER?=	sanpei@FreeBSD.org
 COMMENT?=	Replacement for xbiff that handles popup window with mail header
 
-USES=		imake:noman
+USES=		imake:noman xorg
 USE_XORG=	xpm xaw xmu
 PLIST_FILES=	bin/xpbiff
 WRKSRC=		${WRKDIR}/xpbiff
diff --git a/math/abs/Makefile b/math/abs/Makefile
index 2882b1aab28c..27d0c240772c 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -13,6 +13,7 @@ MAINTAINER=	gmarco@gufi.org
 COMMENT=	Free spreadsheet with graphical user interface
 
 PLIST_FILES=	bin/abs
+USES=		xorg
 USE_XORG=	x11 xpm xaw
 WRKSRC=		${WRKDIR}/abs-src-0.908
 
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 881251772a25..86b3f6603321 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
 
+USES=		xorg
 USE_XORG=	x11 xpm
 PLIST_FILES=	bin/apc man/man1/apc.1.gz
 
diff --git a/math/calctool/Makefile b/math/calctool/Makefile
index 1e654b4a012f..48a976722056 100644
--- a/math/calctool/Makefile
+++ b/math/calctool/Makefile
@@ -24,6 +24,7 @@ TTY_USES=	ncurses
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
+USES+=		xorg
 USE_XORG=	x11
 BINARIES+=	xcalctool
 .endif
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 7ac4dae776e3..f7b9ac4494db 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -39,7 +39,7 @@ VISUALIZATION_LIB_DEPENDS=	libgeomview.so:graphics/geomview
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT5}
-USES+=		qt:5
+USES+=		gl qt:5
 CMAKE_ARGS+=	-DWITH_CGAL_Qt5=ON
 USE_QT+=	core gui opengl widgets svg buildtools_build qmake_build xml
 USE_GL+=	gl glu
diff --git a/math/emc2/Makefile b/math/emc2/Makefile
index 6dac0e70630c..70efe77255ae 100644
--- a/math/emc2/Makefile
+++ b/math/emc2/Makefile
@@ -17,7 +17,7 @@ LICENSE_NAME=	INRIA license, perhaps specific to emc2
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	auto-accept no-dist-sell no-pkg-sell
 
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	x11 xau xcb xdmcp
 
 ALL_TARGET=	${PORTNAME}
diff --git a/math/fricas/Makefile b/math/fricas/Makefile
index 798a5162e2f8..0a5589d29704 100644
--- a/math/fricas/Makefile
+++ b/math/fricas/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/license/LICENSE.AXIOM
 
 BUILD_DEPENDS=	sbcl:lang/sbcl
 
-USES=		autoreconf gmake tar:bz2
+USES=		autoreconf gmake tar:bz2 xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lisp=sbcl
 USE_XORG=	ice sm x11 xpm
diff --git a/math/geogram/Makefile b/math/geogram/Makefile
index 657cf8f03b74..743bfd7cfa30 100644
--- a/math/geogram/Makefile
+++ b/math/geogram/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/doc/devkit/license.dox
 
 LIB_DEPENDS=	libglfw.so:graphics/glfw
 
-USES=		cmake gl localbase:ldflags
+USES=		cmake gl localbase:ldflags xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	alicevision
 USE_XORG=	x11 xcursor xi xinerama xrandr xxf86vm
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index c4b147478359..81bc189d5223 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=--disable-x11-mbfonts \
 		--without-kpsexpand
 PLIST_SUB+=	X11="@comment "
 .else
-USES+=		jpeg lua:53
+USES+=		gnome jpeg lua:53 xorg
 USE_TEX=	kpathsea
 USE_GNOME+=	atk cairo gtk20 gdkpixbuf2
 USE_WX=		2.8
diff --git a/math/hexcalc/Makefile b/math/hexcalc/Makefile
index d973e4f1ded5..a4f6e3b0e7ed 100644
--- a/math/hexcalc/Makefile
+++ b/math/hexcalc/Makefile
@@ -21,6 +21,7 @@ COMMENT=	Multi-radix calculator for x11
 #	Old distfile name in 8.2 was hexcalc..tar.Z & EXTRACT_SUFX was ..tar.Z
 #	presumably a mistake, now shortened to normality.
 
+USES=		xorg
 USE_XORG=	ice sm x11 xaw xext xmu xt
 
 PLIST_FILES=	bin/hexcalc man/man1/hexcalc.1.gz
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index 29e2c2666f4f..cec2b3bfe890 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libAnalitza.so:math/analitza
 BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
 		docbook-xml>0:textproc/docbook-xml
 
-USES=		cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
+USES=		cmake compiler:c++11-lang desktop-file-utils gettext gl kde:5 \
 		readline qt:5 tar:xz
 USE_GL=		glu
 USE_KDE=	auth codecs config configwidgets coreaddons doctools ecm i18n \
diff --git a/math/mathgl/Makefile b/math/mathgl/Makefile
index e335ee69ca1b..c198b06ccc76 100644
--- a/math/mathgl/Makefile
+++ b/math/mathgl/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libsz.so:science/szip
 
-USES=		cmake compiler:c++11-lang gettext-runtime gl jpeg python:2.7
+USES=		cmake compiler:c++11-lang gettext-runtime gl jpeg python:2.7 \
+		xorg
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
 USE_LDCONFIG=	yes
diff --git a/math/octave/Makefile b/math/octave/Makefile
index bfcf1444e38e..f677fc7480e0 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -43,7 +43,7 @@ LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick \
 
 USES=		charsetfix fortran gmake libtool perl5 pkgconfig readline \
 		tar:xz compiler:c++14-lang \
-		desktop-file-utils gl iconv
+		desktop-file-utils gl iconv xorg
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
diff --git a/math/openmesh/Makefile b/math/openmesh/Makefile
index 22326be4cdf9..8d9135c7c8e1 100644
--- a/math/openmesh/Makefile
+++ b/math/openmesh/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generic data structure for manipulating polygonal meshes
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++11-lang dos2unix gl qt:5
+USES=		cmake compiler:c++11-lang dos2unix gl qt:5 xorg
 DOS2UNIX_FILES=	src/OpenMesh/Tools/CMakeLists.txt
 USE_QT=		core concurrent gui help network opengl printsupport script scripttools sql svg x11extras xml xmlpatterns webkit widgets \
 		buildtools_build qmake_build uitools_build
diff --git a/math/petiga/Makefile b/math/petiga/Makefile
index dbcb38651682..3ab7795f2152 100644
--- a/math/petiga/Makefile
+++ b/math/petiga/Makefile
@@ -23,7 +23,7 @@ BB_COMMIT=	e2a59b1ba054
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
-USES=		cmake compiler:c++14-lang fortran
+USES=		cmake compiler:c++14-lang fortran xorg
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 
diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index a0aec46f0a7b..e86cd9f180ca 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -36,6 +36,7 @@ ALL_TARGET=	plgd18
 MAKE_ARGS+=	NOX11=-DNOX11 XLIBS= XOBJ=
 PKGNAMESUFFIX=	-nox11
 .else
+USES+=		xorg
 USE_XORG=	xpm
 .endif
 
diff --git a/math/reduce/Makefile b/math/reduce/Makefile
index 24bc036a7ef0..b22f01b0619d 100644
--- a/math/reduce/Makefile
+++ b/math/reduce/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USES=		autoreconf:build libtool gmake ncurses jpeg
+USES=		autoreconf:build libtool gmake ncurses jpeg xorg
 USE_XORG=	x11 xcursor xext xorgproto xft xrandr xrender
 
 SFSUBDIR=	snapshot_2019-04-13
diff --git a/math/rkward-kde/Makefile b/math/rkward-kde/Makefile
index 93fb76c33c23..0f3166ce5150 100644
--- a/math/rkward-kde/Makefile
+++ b/math/rkward-kde/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libR.so:math/R
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext fortran \
-		kde:5 php:cli qt:5 shared-mime-info
+		kde:5 php:cli qt:5 shared-mime-info xorg
 USE_QT=		buildtools concurrent core dbus gui network printsupport qmake script webkit	\
 		widgets xml
 USE_XORG=	x11
diff --git a/math/slepc/Makefile b/math/slepc/Makefile
index 73a46dcf140d..222bc4dead93 100644
--- a/math/slepc/Makefile
+++ b/math/slepc/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libblas.so:math/blas \
 		libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc
 
-USES=		gmake fortran python:2.7 shebangfix
+USES=		gmake fortran python:2.7 shebangfix xorg
 SHEBANG_FILES=	configure
 SHEBANG_GLOB=	*.py
 MAKEFILE=	makefile
diff --git a/math/snns/Makefile b/math/snns/Makefile
index 0ac9205e9a8d..fb31cd357f35 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Fully featured neural network simulator
 
 LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
+USES=		xorg
 USE_XORG=	x11 xext xt
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}/lib/snns --enable-global \
diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
index fe23fe73dc0f..a0c4c2768163 100644
--- a/math/speedcrunch/Makefile
+++ b/math/speedcrunch/Makefile
@@ -17,7 +17,7 @@ BB_ACCOUNT=	heldercorreia
 BB_PROJECT=	${PORTNAME}
 BB_COMMIT=	c0fc9c68d292
 
-USES=		cmake compiler:c++11-lang qt:5
+USES=		cmake compiler:c++11-lang qt:5 xorg
 USE_QT=		buildtools_build qmake_build core gui help sql widgets
 USE_XORG=	x11
 
diff --git a/math/topaz/Makefile b/math/topaz/Makefile
index c3a24353bc9d..0b988b037b49 100644
--- a/math/topaz/Makefile
+++ b/math/topaz/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		ncurses readline
+USES=		ncurses readline xorg
 USE_XORG=	x11
 MAKEFILE=	Makefile.freebsd
 
diff --git a/math/triangle/Makefile b/math/triangle/Makefile
index 7dc6890a65ae..903ecfb3ab05 100644
--- a/math/triangle/Makefile
+++ b/math/triangle/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Two-Dimensional Quality Mesh Generator and Delaunay Triangulator
 
 NO_CDROM=	No commercial use without prior arrangement with the author
 
-USES=		zip
+USES=		zip xorg
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 USE_XORG=	x11
diff --git a/math/ump/Makefile b/math/ump/Makefile
index feb3e01f9c07..5b813e622e1d 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Graphical, easy to use math program
 
 LICENSE=	GPLv2
 
-USES=		compiler:c++11-lang gmake pkgconfig tar:bzip2
+USES=		compiler:c++11-lang gl gmake gnome pkgconfig tar:bzip2
 USE_GNOME=	gtk20
 USE_GL=		glu
 
diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile
index 776dc2c87026..4b6360ae134f 100644
--- a/math/vtk6/Makefile
+++ b/math/vtk6/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libtiff.so:graphics/tiff \
 # * VTK Groups
 
 CONFLICTS=	vtk5 vtk8
-USES=		alias cmake jpeg localbase
+USES=		alias cmake jpeg localbase xorg
 USE_LDCONFIG=	${PREFIX}/lib/vtk-${VTK_SHORT_VER}
 USE_XORG=	xt sm ice x11 xext
 CXXFLAGS_powerpc64=	-mminimal-toc
@@ -103,6 +103,7 @@ CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 PLIST_SUB+=	X11="@comment " \
 		OSMESA=""
 .else
+USES+=		gl
 USE_GL=		gl glu
 PLIST_SUB+=	X11="" \
 		OSMESA="@comment "
diff --git a/math/vtk8/Makefile b/math/vtk8/Makefile
index 17bc59854ef9..22d150a5db11 100644
--- a/math/vtk8/Makefile
+++ b/math/vtk8/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libtiff.so:graphics/tiff \
 
 CONFLICTS=	vtk5 vtk6
 
-USES=		alias cmake compiler:c++11-lang gl jpeg localbase
+USES=		alias cmake compiler:c++11-lang gl jpeg localbase xorg
 USE_LDCONFIG=	${PREFIX}/lib/vtk-${VTK_SHORT_VER}
 USE_XORG=	ice x11 xt xext sm
 
@@ -116,6 +116,7 @@ CMAKE_ARGS+=	-DVTK_Group_${g}:BOOL=OFF
 .endfor
 
 .if !${PORT_OPTIONS:MOSMESA}
+USES+=		gl
 USE_GL=		gl glu
 .endif
 
diff --git a/math/xgraph/Makefile b/math/xgraph/Makefile
index 9fdd5b5999f8..6658c85c8fcc 100644
--- a/math/xgraph/Makefile
+++ b/math/xgraph/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	xgraph license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		imake tar:Z
+USES=		imake tar:Z xorg
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/math/xplot/Makefile b/math/xplot/Makefile
index 19dfa0aea48d..401a60fffa61 100644
--- a/math/xplot/Makefile
+++ b/math/xplot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.xplot.org/xplot/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 plotting package
 
-USES=		perl5
+USES=		perl5 xorg
 USE_XORG=	x11
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
diff --git a/math/xppaut/Makefile b/math/xppaut/Makefile
index 190bc6cea6fc..9696b6a8461f 100644
--- a/math/xppaut/Makefile
+++ b/math/xppaut/Makefile
@@ -16,6 +16,7 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		xorg
 USE_XORG=	x11 xbitmaps xorgproto
 CFLAGS+=	-w -Wno-return-type
 ALL_TARGET=	xppaut
diff --git a/math/zegrapher/Makefile b/math/zegrapher/Makefile
index 13bee0176402..e290a261f332 100644
--- a/math/zegrapher/Makefile
+++ b/math/zegrapher/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/math/special_functions/binomial.hpp:devel/boost-libs
 
-USES=		compiler:c++11-lang desktop-file-utils qmake qt:5
+USES=		compiler:c++11-lang desktop-file-utils gl qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	AdelKS
 USE_QT=		core gui network printsupport widgets buildtools_build
diff --git a/misc/actiona/Makefile b/misc/actiona/Makefile
index c62c7ffd58bf..eb284f964391 100644
--- a/misc/actiona/Makefile
+++ b/misc/actiona/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libopencv_core.so:graphics/opencv-core \
 		libopencv_video.so:graphics/opencv
 
-USES=		compiler:c++11-lang desktop-file-utils gl pkgconfig qmake gnome qt:5 shared-mime-info
+USES=		compiler:c++11-lang desktop-file-utils gl pkgconfig qmake \
+		gnome qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jmgr
 USE_QT=		concurrent core dbus gui multimedia network script scripttools speech sql widgets x11extras xml xmlpatterns \
diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile
index e6d2dd40be0e..46b2d5c554c9 100644
--- a/misc/asbutton/Makefile
+++ b/misc/asbutton/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Dockapp that displays 4 or 9 buttons to run apps of your choice
 
 LICENSE=	GPLv2
 
+USES=		xorg
 USE_XORG=	x11 xpm
 ALL_TARGET=	asbutton
 MAKE_ARGS=	INCLUDES="-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include" \
diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index ad9d909821f6..cba206d44ed6 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -31,7 +31,8 @@ LIB_DEPENDS=	libassimp.so:multimedia/assimp \
 		libtinyxml2.so:textproc/tinyxml2 \
 		liburdfdom_world.so:misc/urdfdom
 
-USES=		cmake compiler:c++11-lang eigen:3 gl localbase:ldflags pkgconfig
+USES=		cmake compiler:c++11-lang eigen:3 gl localbase:ldflags \
+		pkgconfig xorg
 USE_GITHUB=	yes
 GH_PROJECT=	dart
 USE_GL=		gl glu glut
diff --git a/misc/free42/Makefile b/misc/free42/Makefile
index bab175cec9d1..ad756dbd0b9a 100644
--- a/misc/free42/Makefile
+++ b/misc/free42/Makefile
@@ -20,7 +20,7 @@ BROKEN_powerpc64=	fails to link: c++: error: no such file or directory: 'gcc111l
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		compiler dos2unix gmake gnome localbase pkgconfig tar:tgz
+USES=		compiler dos2unix gmake gnome localbase pkgconfig tar:tgz xorg
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango
 USE_XORG=	x11 xmu
 DOS2UNIX_FILES=	gtk/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h gtk/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h
diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile
index 5434fce92dd0..63aac64fe32b 100644
--- a/misc/gkrellm-gamma/Makefile
+++ b/misc/gkrellm-gamma/Makefile
@@ -13,7 +13,7 @@ COMMENT=	XFree86 gamma correction plugin for GKrellM
 BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
-USES=		pkgconfig
+USES=		pkgconfig xorg
 USE_XORG=	x11 xxf86vm
 PLIST_FILES=	libexec/gkrellm2/plugins/gamma.so
 MAKE_ENV=	PLUGIN_DIR=${PLUGINDIR}
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index 4451829564ec..621de0d7664b 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -21,9 +21,9 @@ CONFIGURE_ARGS=	--with-db3-inc=${BDB_INCLUDE_DIR} \
 		--with-db3-lib=${BDB_LIB_DIR} \
 		--with-db-name=${BDB_LIB_NAME}
 
+USES=		bdb gmake xorg
 USE_XORG=	x11 xft xkbfile xmu
 GNU_CONFIGURE=	yes
-USES=		bdb gmake
 
 OPTIONS_DEFINE=	OSD
 OPTIONS_DEFAULT=	OSD
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index cc938c2ca10d..6788e8776eb3 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS+=	pnmscale:graphics/netpbm
 
 MAKE_JOBS_UNSAFE=	yes
 
-USES=		imake:env perl5 pkgconfig
+USES=		imake:env perl5 pkgconfig xorg
 USE_PERL5=	run
 USE_XORG=	x11 xext xmu xt sm ice xi xtst
 GNU_CONFIGURE=	yes
diff --git a/misc/pspresent/Makefile b/misc/pspresent/Makefile
index 73c19c675da5..0a1d95299ab9 100644
--- a/misc/pspresent/Makefile
+++ b/misc/pspresent/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Full-screen slide shows of postscript files
 
 LICENSE=	GPLv2
 
+USES=		ghostscript:x11,run xorg
 USE_XORG=	x11 xext xinerama
-USES=		ghostscript:x11,run
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDLIBS="${LDFLAGS}"
 ALL_TARGET=	pspresent
 
diff --git a/misc/sent/Makefile b/misc/sent/Makefile
index 755b99f9d828..ab35337b0f83 100644
--- a/misc/sent/Makefile
+++ b/misc/sent/Makefile
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	2ff:graphics/farbfeld
 
+USES=		xorg
 USE_XORG=	x11 xft
 
 MAKE_ARGS=	CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
diff --git a/misc/unclutter-xfixes/Makefile b/misc/unclutter-xfixes/Makefile
index a285114674c4..f2496c651a33 100644
--- a/misc/unclutter-xfixes/Makefile
+++ b/misc/unclutter-xfixes/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	a2x:textproc/asciidoc
 LIB_DEPENDS=	libev.so:devel/libev
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Airblader
diff --git a/misc/unclutter/Makefile b/misc/unclutter/Makefile
index d99cadba6ce1..78f2e53216fa 100644
--- a/misc/unclutter/Makefile
+++ b/misc/unclutter/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Remove idle cursor image from screen
 
 WRKSRC=		${WRKDIR}/unclutter
-USES=		imake tar:Z
+USES=		imake tar:Z xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/unclutter \
diff --git a/misc/visp/Makefile b/misc/visp/Makefile
index 6d2ee30aee65..9aa1740762f5 100644
--- a/misc/visp/Makefile
+++ b/misc/visp/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	libblas.so:math/blas \
 		libpng.so:graphics/png \
 		libv4l2.so:multimedia/libv4l
 
-USES=		cmake compiler:c++11-lang eigen:3 fortran gnome jpeg
+USES=		cmake compiler:c++11-lang eigen:3 fortran gnome jpeg xorg
 USE_GNOME=	libxml2
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	yes
diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index f952a15fb5b5..a48d7fd4acb2 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/../COPYING
 RUN_DEPENDS=	wget:ftp/wget
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+USES=		gmake shebangfix xorg
 USE_XORG=	xpm x11 xext
-USES=		gmake shebangfix
 SHEBANG_FILES=	GrabScores.excite
 
 OPTIONS_DEFINE=	DOCS
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index c707637fa1ff..9958639ad15a 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libical.so:devel/libical
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 
-USES=		pkgconfig
+USES=		gnome pkgconfig xorg
 USE_XORG=	xpm
 USE_GNOME=	gtk20
 MAKE_ARGS=	CC="${CC}" \
diff --git a/misc/wmjulia/Makefile b/misc/wmjulia/Makefile
index 4b2cd4e920f7..0cc4a48fb91a 100644
--- a/misc/wmjulia/Makefile
+++ b/misc/wmjulia/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 PLIST_FILES=	bin/wmjulia
 WRKSRC=	${WRKDIR}/${PORTNAME}.app/${PORTNAME}
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	xpm xext
 
 do-install:
diff --git a/misc/wmpal/Makefile b/misc/wmpal/Makefile
index 0287f90d79e6..3595da8c410a 100644
--- a/misc/wmpal/Makefile
+++ b/misc/wmpal/Makefile
@@ -12,7 +12,7 @@ COMMENT=	One of the most useless dockapps in the world
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		localbase
+USES=		localbase xorg
 USE_XORG=	x11 xpm
 GNU_CONFIGURE=	yes
 LIBS+=		-lX11
diff --git a/misc/wmtunlo/Makefile b/misc/wmtunlo/Makefile
index 2656fdee1b5d..d178eee4834e 100644
--- a/misc/wmtunlo/Makefile
+++ b/misc/wmtunlo/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Falling-down-a-tunnel dockapp
 
 LICENSE=	GPLv2
 
+USES=		xorg
 USE_XORG=	x11 xpm xorgproto
 ALL_TARGET=	wmtunlo
 
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 4b09f288cd5d..cd349f714357 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
 
-USES=		iconv jpeg
+USES=		iconv jpeg xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwraster=${LOCALBASE} \
 		--with-libpcre=${LOCALBASE} \
diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile
index f73af455f498..bb8dc6b3a473 100644
--- a/misc/wmwork/Makefile
+++ b/misc/wmwork/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Dockapp that keeps track of time you have spent on something
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
+USES=		gmake xorg
 USE_XORG=	xpm
-USES=		gmake
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/wmwork man/man1/wmwork.1.gz
diff --git a/misc/xgas/Makefile b/misc/xgas/Makefile
index e05c0d334487..2ffa4f57eda8 100644
--- a/misc/xgas/Makefile
+++ b/misc/xgas/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The animated simulation of an ideal gas
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xt
 PLIST_FILES=	bin/xgas lib/X11/app-defaults/XGas \
 		man/man1/xgas.1.gz
diff --git a/misc/xless/Makefile b/misc/xless/Makefile
index 92787a0757c5..baefc08b3747 100644
--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	XCONTRIB/applications \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11-based viewer for text files
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAKE_ARGS=	MAKE="${MAKE_CMD}"
 
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index 6191e00ab0a0..4aaefd11a758 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	X11 on-screen-display program and library
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake pkgconfig libtool
+USES=		gmake pkgconfig libtool xorg
 USE_CSTD=	gnu89
 USE_XORG=	x11 xext xt sm ice xinerama
 USE_LDCONFIG=	yes
@@ -36,6 +36,7 @@ MSEC_VARS=	DELAY_UNITS=milliseconds
 MSEC_VARS_OFF=	DELAY_UNITS=seconds
 
 XFT_EXTRA_PATCHES=	${FILESDIR}/extra-patch-xft
+XFT_USES=		gnome
 XFT_USE=		GNOME=pango XORG=xft
 
 post-patch:
diff --git a/misc/xtypo/Makefile b/misc/xtypo/Makefile
index 2d900d428b77..47925b5b552a 100644
--- a/misc/xtypo/Makefile
+++ b/misc/xtypo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	X-based keyboard trainer
 BROKEN=		unfetchable
 
 PLIST_FILES=	bin/xtypo
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 ALL_TARGET=	xtypo
 
diff --git a/multimedia/QtAV/Makefile b/multimedia/QtAV/Makefile
index ee1e5ff3045c..ba79bf5da86e 100644
--- a/multimedia/QtAV/Makefile
+++ b/multimedia/QtAV/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=		${WRKSRC}/lgpl-2.1.txt
 LIB_DEPENDS=		libass.so:multimedia/libass \
 			libavcodec.so:multimedia/ffmpeg
 
-USES=			compiler:c++11-lang qmake:outsource qt:5
+USES=			compiler:c++11-lang gl qmake:outsource qt:5 xorg
 USE_GL=			gl
 USE_QT=			core declarative gui network opengl sql widgets \
 			buildtools_build qmake_build
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 0aabda068438..5d01d41ed999 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libass.so:multimedia/libass \
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		compiler:c++11-lib desktop-file-utils gettext gmake iconv \
-		localbase pkgconfig tar:xz
+USES=		compiler:c++11-lib desktop-file-utils gettext gl gmake gnome \
+		iconv localbase pkgconfig tar:xz
 USE_GNOME=	intltool
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
diff --git a/multimedia/audacious-gtk3/Makefile b/multimedia/audacious-gtk3/Makefile
index 0b3d581a033c..dfeb2d74ff9e 100644
--- a/multimedia/audacious-gtk3/Makefile
+++ b/multimedia/audacious-gtk3/Makefile
@@ -26,7 +26,7 @@ FILESDIR=	${MASTERDIR}/files
 SUB_FILES=	pkg-message
 
 USES=		autoreconf compiler:c++11-lib desktop-file-utils \
-		gettext-tools gmake localbase pkgconfig
+		gettext-tools gmake gnome localbase pkgconfig xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	audacious-media-player
diff --git a/multimedia/audacious-plugins-gtk3/Makefile b/multimedia/audacious-plugins-gtk3/Makefile
index ced31d744389..6bbcafdd65ec 100644
--- a/multimedia/audacious-plugins-gtk3/Makefile
+++ b/multimedia/audacious-plugins-gtk3/Makefile
@@ -30,7 +30,7 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 FILESDIR=	${MASTERDIR}/files
 
 USES=		autoreconf compiler:c++11-lib gettext-tools gmake gnome \
-		iconv localbase pkgconfig
+		iconv localbase pkgconfig xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	audacious-media-player
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 52d2dec6326d..b19be814877b 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 RUN_DEPENDS=	audacious:multimedia/audacious
 
 USES=		compiler:c++11-lib gettext-tools gmake gnome iconv \
-		localbase pkgconfig tar:bzip2
+		localbase pkgconfig tar:bzip2 xorg
 USE_GNOME=	gtk20 glib20 libxml2 cairo gdkpixbuf2
 USE_XORG=	x11
 
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 24e0c96d355d..7a8749d340f9 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake \
-		gnome localbase pkgconfig tar:bzip2
+		gnome localbase pkgconfig tar:bzip2 xorg
 USE_XORG=	x11 sm
 USE_GNOME=	gtk20 glib20 cairo
 USE_LDCONFIG=	yes
diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
index 0d62ef905b69..7c3eda6992f8 100644
--- a/multimedia/avidemux/Makefile.common
+++ b/multimedia/avidemux/Makefile.common
@@ -17,7 +17,7 @@ USE_GNOME=	libxml2
 
 OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
 
-USES=		cmake:noninja pkgconfig iconv gmake compiler:features sqlite
+USES=		cmake:noninja pkgconfig iconv gmake gnome compiler:features sqlite
 USES+=		dos2unix
 DOS2UNIX_FILES=	cmake/admCheckMiscLibs.cmake \
 		avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \
@@ -137,6 +137,7 @@ CMAKE_ARGS+=	-DFONTCONFIG:BOOL=OFF
 
 .if ${PORT_OPTIONS:MXVIDEO}
 #LIB_DEPENDS+=	Xv:x11/libXv
+USES+=		xorg
 USE_XORG+=	xv
 .else
 CMAKE_ARGS+=	-DXVIDEO:BOOL=OFF
@@ -199,6 +200,7 @@ PLIST_SUB+=	XVID="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
+USES+=		sdl
 USE_SDL=	sdl
 PLIST_SUB+=	SDL=""
 .else
diff --git a/multimedia/butt/Makefile b/multimedia/butt/Makefile
index d46f9bd894ad..e2deea101c7a 100644
--- a/multimedia/butt/Makefile
+++ b/multimedia/butt/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libsamplerate.so:audio/libsamplerate \
 		libvorbis.so:audio/libvorbis
 
-USES=		autoreconf compiler:c++11-lang gmake jpeg pkgconfig
+USES=		autoreconf compiler:c++11-lang gmake jpeg pkgconfig xorg
 USE_XORG=	x11 xrender xcursor xfixes xext xft xinerama
 
 GNU_CONFIGURE=	yes
diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile
index 0018afc723a7..39c8bb9fb796 100644
--- a/multimedia/ccextractor/Makefile
+++ b/multimedia/ccextractor/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libx265.so:multimedia/x265 \
 		libxvidcore.so:multimedia/xvid
 
-USES=		cmake iconv localbase:ldflags pkgconfig
+USES=		cmake iconv localbase:ldflags pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	CCExtractor
 USE_XORG=	x11
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index bfce36baa902..306137a2c15d 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -29,8 +29,8 @@ RUN_DEPENDS=	gnome-video-effects>=0:graphics/gnome-video-effects
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake gnome libtool localbase pathfix \
-		pkgconfig tar:xz
+USES=		gettext gl gmake gnome libtool localbase pathfix \
+		pkgconfig tar:xz xorg
 USE_GNOME=	cairo intlhack evolutiondataserver3 librsvg2 \
 		gnomedesktop3 libxml2:build introspection:build
 USE_GL=		egl
diff --git a/multimedia/cinelerra-gg/Makefile b/multimedia/cinelerra-gg/Makefile
index 131797a6e736..9619204f8f39 100644
--- a/multimedia/cinelerra-gg/Makefile
+++ b/multimedia/cinelerra-gg/Makefile
@@ -51,7 +51,8 @@ EXTRA_PATCHES=	${BUILD_WRKSRC}/blds/bsd.patch:-p1
 
 REV=		502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c # git revision
 
-USES=		autoreconf gettext-runtime gettext-tools gmake iconv:wchar_t jpeg localbase makeinfo python:2.7,build shebangfix
+USES=		autoreconf gettext-runtime gettext-tools gmake iconv:wchar_t \
+		jpeg localbase makeinfo python:2.7,build shebangfix xorg
 SHEBANG_GLOB=	*.sh *.bld
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xau xdmcp xext xfixes xft xinerama xv
@@ -79,7 +80,7 @@ OPTIONS_SUB=		yes
 
 LV2_DESC=		Use LV2 plugins
 LV2_CONFIGURE_WITH=	lv2
-LV2_USES=		pkgconfig
+LV2_USES=		gnome pkgconfig
 LV2_USE=		GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
 LV2_CFLAGS=		-I${LOCALBASE}/include/lilv-0 -I${LOCALBASE}/include/suil-0
 LV2_BUILD_DEPENDS=	lv2>0:audio/lv2
@@ -90,6 +91,7 @@ LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
 			libsuil-0.so:audio/suil
 
 OPENGL_CONFIGURE_WITH=	gl
+OPENGL_USES=		gl
 OPENGL_USE=		GL=gl,glu
 
 post-patch:
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 149ca61b9e44..a54bcb01c04d 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter
 
 PORTSCOUT=	ignore:1
 
-USES=		gmake libtool localbase pathfix \
+USES=		gl gmake gnome libtool localbase pathfix \
 		pkgconfig tar:xz xorg
 USE_GNOME=	introspection gnomeprefix
 GNU_CONFIGURE=	yes
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 873c0320dc97..08da8793af5b 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	liba52.so:audio/liba52 \
 		libavutil.so:multimedia/ffmpeg
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		compiler:c++11-lang desktop-file-utils pkgconfig \
+USES=		compiler:c++11-lang desktop-file-utils gl pkgconfig \
 		qmake:outsource qt:5 shared-mime-info
 
 USE_QT=		core gui widgets xml buildtools_build linguisttools_build
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 4fd9121b587b..b4d9c68f149e 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libXaw3d.so:x11-toolkits/Xaw3d
 
-USES=		gmake jpeg tar:tgz
+USES=		gmake jpeg tar:tgz xorg
 MAKE_ENV=	X11BASE=${LOCALBASE}
 USE_XORG=	ice sm x11 xaw xext xmu xt xpm xxf86vm xxf86dga
 MAKE_FLAGS=	-e
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index fd3780da4397..534c8f332545 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libgavl.so:multimedia/gavl \
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		gettext libtool makeinfo pathfix pkgconfig sqlite
+USES=		gettext gl gnome libtool makeinfo pathfix pkgconfig sqlite xorg
 USE_GNOME=	gtk20 libxml2
 USE_XORG=	x11 xext xfixes xinerama xv
 USE_GL=		gl
diff --git a/multimedia/gmtk/Makefile b/multimedia/gmtk/Makefile
index d4c79f377767..111d78255f3a 100644
--- a/multimedia/gmtk/Makefile
+++ b/multimedia/gmtk/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-XML-Parser>0:textproc/p5-XML-Parser
 
-USES=		gettext gmake libtool pathfix perl5 pkgconfig
+USES=		gettext gmake gnome libtool pathfix perl5 pkgconfig xorg
 USE_XORG=	x11
 USE_GNOME=	glib20 intltool
 USE_PERL5=	build
diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 528da1fadcc7..a15b34700dbe 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libgmtk.so:multimedia/gmtk
 RUN_DEPENDS=	mplayer:multimedia/mplayer
 
-USES=		desktop-file-utils gettext gmake pkgconfig
+USES=		desktop-file-utils gettext gmake gnome pkgconfig xorg
 USE_XORG=	x11 xscrnsaver
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
diff --git a/multimedia/gnome-twitch/Makefile b/multimedia/gnome-twitch/Makefile
index c0c7d5a6e76e..95ab62264df6 100644
--- a/multimedia/gnome-twitch/Makefile
+++ b/multimedia/gnome-twitch/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 USES=		compiler:c11 gettext gnome meson pkgconfig python:3.5+,build \
-		tar:xz
+		tar:xz xorg
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk30
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
index 14b86d571732..f0133bfe856d 100644
--- a/multimedia/gstreamer-plugins-good/Makefile
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -15,6 +15,7 @@ MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
 RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:multimedia/gstreamer-plugins
 
+USES+=		xorg
 USE_XORG+=	xdamage
 
 gst_good_DIST=	good
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 1b7e30312f81..5f0ac196fa3f 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -72,6 +72,7 @@ PLIST_SUB+=	I386="@comment "
 gst_base_DIST=	base
 NO_GSTREAMER_COMMON=	yes
 USE_LDCONFIG=	yes
+USES+=		xorg
 USE_XORG=	x11 xv xext xorgproto
 PLIST_SUB+=	VERSION="${VERSION}" \
 		SHLIB_VERSION="${SHLIB_VERSION}"
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index acd68e209e42..ecc27d8761f0 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -328,6 +328,7 @@ gst_libmms_LIB_DEPENDS=	libmms.so:net/libmms
 gst_libmms_PLIST_FILES=	${GST_LIB_DIR}/libgstmms.so
 
 # librfb
+gst_librfb_USES=	xorg
 gst_librfb_USE_XORG=	x11
 
 # liblv2
@@ -490,6 +491,7 @@ gst_webrtcdsp_LIB_DEPENDS=	libwebrtc_audio_processing.so:audio/webrtc-audio-proc
 
 # X ximage and xvimage sinks aka output
 .if ${DIST} == base
+gst_x_USES=		xorg
 gst_x_USE_XORG=		x11 xv xext
 gst_x_CONFIGURE_ARGS=	--enable-xvideo --enable-xshm
 gst_x_GST_PLUGIN_DIR=	sys/ximage sys/xvimage
@@ -499,6 +501,7 @@ gst_x_PLIST_FILES=	${GST_LIB_DIR}/libgstximagesink.so \
 
 .if ${DIST} == good
 # Ximagesrc
+gst_x_USES=		xorg
 gst_x_USE_XORG=		x11 xfixes xdamage xext
 gst_x_CONFIGURE_ARGS=	--enable-x
 gst_x_GST_PLUGIN_DIR=	sys/ximage
diff --git a/multimedia/gstreamer1-vaapi/Makefile b/multimedia/gstreamer1-vaapi/Makefile
index 6453d6ddb248..da4de2952f29 100644
--- a/multimedia/gstreamer1-vaapi/Makefile
+++ b/multimedia/gstreamer1-vaapi/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libva.so:multimedia/libva
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		compiler:c11 gettext-runtime gmake gnome libtool \
+USES=		compiler:c11 gettext-runtime gl gmake gnome libtool \
 		pkgconfig tar:xz xorg
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index a66545cc421d..f666a797d222 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libvlc.so:multimedia/vlc \
 		libdvbv5.so:multimedia/libv4l
 
 USES=		cmake compiler:c++11-lang cpe desktop-file-utils gettext \
-		pkgconfig kde:5 qt:5 tar:xz
+		pkgconfig kde:5 qt:5 tar:xz xorg
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons i18n itemviews kio solid dbusaddons jobwidgets \
 		service widgetsaddons windowsystem xmlgui
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index b257a3faf8db..8c595d3f643f 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext-runtime \
-		kde:5 pkgconfig qt:5
+		gnome kde:5 pkgconfig qt:5 xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_QT=		concurrent core dbus gui network phonon4 printsupport \
 		svg widgets x11extras xml \
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 563171155af4..ae9bae7add25 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -61,8 +61,8 @@ LIB_DEPENDS=	libass.so:multimedia/libass \
 		libyajl.so:devel/yajl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
-USES=		autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \
-		libtool pkgconfig python:-2.7 ssl
+USES=		autoreconf:build compiler:c++11-lib gettext gmake gnome iconv \
+		jpeg libtool pkgconfig python:-2.7 ssl
 
 KODI_ARCH_i386=	x86
 KODI_ARCH_amd64=x86_64
@@ -194,6 +194,7 @@ BUILD_DEPENDS+=	gtk-update-icon-cache:x11-toolkits/gtk20
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 RUN_DEPENDS+=	glxinfo:graphics/mesa-demos \
 		xdpyinfo:x11/xdpyinfo
+USES+=		gl sdl xorg
 USE_XORG=	x11 xcb xext xmu xrandr xt xtst
 USE_GL=		egl gl glu glew
 USE_SDL=	image sdl2
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 9897ada9edae..509e59fb94bf 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
 		libvdpau.so:multimedia/libvdpau \
 		libhogweed.so:security/nettle
 
-USES=		cpe compiler:c++11-lang gmake localbase perl5 pkgconfig tar:xz
+USES=		cpe compiler:c++11-lang gmake localbase perl5 pkgconfig tar:xz \
+		xorg
 
 USE_XORG=	x11
 USE_PERL5=	build
@@ -127,6 +128,7 @@ RTMP_CONFIGURE_ENABLE=		librtmp
 SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
+SDL_USES=			sdl
 SDL_USE=			SDL=sdl
 SDL_CONFIGURE_ENABLE=		avplay
 
diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile
index 0b222554962f..5ad7a3de1b56 100644
--- a/multimedia/libcec/Makefile
+++ b/multimedia/libcec/Makefile
@@ -52,6 +52,7 @@ CMAKE_ARGS+=	-DSKIP_PYTHON_WRAPPER:BOOL=true
 .endif
 
 .if ${PORT_OPTIONS:MX11}
+USES+=		xorg
 USE_XORG=	x11 xorgproto xrandr
 .endif
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index bea8e2f06b33..8c500624364b 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -25,6 +25,7 @@ LIBS+=		-L${LOCALBASE}/lib -lintl
 INSTALL_TARGET=	install-strip
 
 .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
+USES+=		xorg
 USE_XORG=	xaw xv
 CONFIGURE_ARGS=	--with-x --enable-gpl --without-doxygen --without-lame
 
@@ -48,6 +49,7 @@ CONFIGURE_ARGS+=	--without-cpuflags
 
 .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
 .if ${PORT_OPTIONS:MGTK2}
+USES+=		gnome
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk
 .else
@@ -61,6 +63,7 @@ CONFIGURE_ARGS+=	--without-alsa
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
+USES+=		gl
 USE_GL=		yes
 CONFIGURE_ARGS+=	--with-opengl
 .else
diff --git a/multimedia/libva-vdpau-driver/Makefile b/multimedia/libva-vdpau-driver/Makefile
index b9ca35e0baa7..3d6667577963 100644
--- a/multimedia/libva-vdpau-driver/Makefile
+++ b/multimedia/libva-vdpau-driver/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libva.pc:multimedia/libva \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
-USES=		libtool gmake localbase pkgconfig tar:bzip2
+USES=		libtool gl gmake localbase pkgconfig tar:bzip2
 USE_GL=		gl
 
 GNU_CONFIGURE=	yes
diff --git a/multimedia/libvdpau-va-gl/Makefile b/multimedia/libvdpau-va-gl/Makefile
index 758f9377b067..84a0c976b878 100644
--- a/multimedia/libvdpau-va-gl/Makefile
+++ b/multimedia/libvdpau-va-gl/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libva-x11.so:multimedia/libva
 USE_GITHUB=	yes
 GH_ACCOUNT=	i-rinat
 
-USES=		cmake compiler:c++11-lang pkgconfig
+USES=		cmake compiler:c++11-lang gl pkgconfig xorg
 USE_XORG=	x11
 USE_GL=		gl
 LDFLAGS+=	-Wl,--as-needed # Xext, ICE, SM
diff --git a/multimedia/libvdpau/Makefile b/multimedia/libvdpau/Makefile
index 032deaa9300f..cc5f12489eeb 100644
--- a/multimedia/libvdpau/Makefile
+++ b/multimedia/libvdpau/Makefile
@@ -12,7 +12,7 @@ COMMENT=	VDPAU wrapper and tracing library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf libtool pkgconfig tar:xz
+USES=		autoreconf libtool pkgconfig tar:xz xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-documentation
 USE_XORG=	xorgproto xext
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 26ac95111747..406ef5497102 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -39,8 +39,8 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libogg.so:audio/libogg \
 		libdvdnav.so:multimedia/libdvdnav
 
-USES=		compiler cpe gmake gnome iconv libtool:keepla jpeg \
-		localbase pathfix perl5 pkgconfig tar:xz
+USES=		compiler cpe gl gmake gnome iconv libtool:keepla jpeg \
+		localbase pathfix perl5 pkgconfig sdl tar:xz xorg
 LLD_UNSAFE=	yes
 CPE_PRODUCT=	xine-lib
 CPE_VENDOR=	xine
diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile
index 8f2145637a0e..d3c1745fff49 100644
--- a/multimedia/minitube/Makefile
+++ b/multimedia/minitube/Makefile
@@ -11,7 +11,7 @@ COMMENT=	TV-like client for YouTube
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		compiler:c++11-lang qmake qt:5
+USES=		compiler:c++11-lang gl qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	flaviotordini
 USE_GL=		gl
diff --git a/multimedia/mlt-qt5/Makefile b/multimedia/mlt-qt5/Makefile
index f1be17e4092f..6f66a7014fe0 100644
--- a/multimedia/mlt-qt5/Makefile
+++ b/multimedia/mlt-qt5/Makefile
@@ -2,7 +2,7 @@
 
 PORTREVISION=	0
 
-USES=	qt:5
+USES=	qt:5 xorg
 USE_CXXSTD=	c++11
 USE_QT=		core gui svg widgets xml
 USE_XORG=	x11
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index b233a13763a1..c7e985312ea3 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -38,7 +38,7 @@ USE_GL=		gl
 USE_GNOME=	libxml2
 USE_SDL=	image2
 USE_XORG=	x11
-USES+=		gl iconv pathfix
+USES+=		gl iconv pathfix xorg
 PATHFIX_MAKEFILEIN=	Makefile
 CONFIGURE_ARGS+=--disable-qt --swig-languages=none
 USE_LDCONFIG=	yes
diff --git a/multimedia/mpc-qt/Makefile b/multimedia/mpc-qt/Makefile
index 5b47d616a58b..a8bdd4c0b6e3 100644
--- a/multimedia/mpc-qt/Makefile
+++ b/multimedia/mpc-qt/Makefile
@@ -19,7 +19,7 @@ GH_ACCOUNT=	wm4 # mirror
 GH_TAGNAME=	4bf2ca5
 GH_TUPLE=	Argon-:mpv-stats:1.1-28-gf42aa68:mpv_stats/external/mpv-stats
 
-USES=		compiler:c++14-lang desktop-file-utils pkgconfig qmake qt:5
+USES=		compiler:c++14-lang desktop-file-utils gl pkgconfig qmake qt:5
 USE_QT=		qmake_build buildtools_build linguisttools_build \
 		core dbus gui network svg_run widgets x11extras
 USE_GL=		gl
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index 1bc06ec4e2e9..9f2f19c9344b 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -16,7 +16,7 @@ NOT_FOR_ARCHS=		aarch64 armv6 armv7 mips mips64
 NOT_FOR_ARCHS_REASON=	fails to build: Unknown endianness of architecture
 
 WRKSRC=		${WRKDIR}/mpeg_play
-USES=		imake
+USES=		imake xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/mpeg_play \
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 85cfa28adaf8..477e0cb29b55 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -38,7 +38,8 @@ LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
 BUILD_DEPENDS=	yasm:devel/yasm \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
-USES=		gmake gl iconv libtool pkgconfig pathfix qmake:no_env qt:5 ssl
+USES=		gmake gl iconv libtool pkgconfig pathfix qmake:no_env qt:5 ssl \
+		xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 USE_GL=		gl
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index 386807d30689..ec98ff71bc5e 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GStreamer backend for Phonon
 
 LICENSE=	LGPL21
 
-USES=		cmake compiler:c++11-lang gl gnome kde:5 pkgconfig qt:5 tar:xz
+USES=		cmake compiler:c++11-lang gl gnome kde:5 pkgconfig qt:5 tar:xz xorg
 USE_GL=		gl
 USE_GNOME=	glib20 libxml2
 USE_GSTREAMER1=	yes
diff --git a/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile
index 19b9b986ca80..b1c69ea8a150 100644
--- a/multimedia/py-qt5-multimedia/Makefile
+++ b/multimedia/py-qt5-multimedia/Makefile
@@ -12,7 +12,7 @@ RUN_DEPENDS=	${PY_ENUM34}
 CONFIGURE_ARGS=	--enable QtMultimedia
 PYQT_DIST=	yes
 
-USES=		python pyqt:5 qt:5
+USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run gui_run network_run
 USE_PYTHON=	concurrent flavors py3kplist
diff --git a/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile
index c838458e3868..5dc74784001c 100644
--- a/multimedia/py-qt5-multimediawidgets/Makefile
+++ b/multimedia/py-qt5-multimediawidgets/Makefile
@@ -12,7 +12,7 @@ RUN_DEPENDS=	${PY_ENUM34}
 CONFIGURE_ARGS=	--enable QtMultimediaWidgets
 PYQT_DIST=	yes
 
-USES=		python pyqt:5 qt:5
+USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run multimedia_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile
index 5e28ad19c084..9cc7c10c6a39 100644
--- a/multimedia/qt5-multimedia/Makefile
+++ b/multimedia/qt5-multimedia/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Qt audio, video, radio and camera support module
 # LICENSE set via USES_QT5 (bsd.qt.mk)
 
 USES=		compiler:c++11-lang gl gnome pkgconfig openal qmake:norecursive \
-		qt-dist:5,multimedia
+		qt-dist:5,multimedia xorg
 USE_GL=		gl
 USE_GNOME=	glib20
 USE_QT=		core declarative gui network opengl widgets \
diff --git a/multimedia/recordmydesktop/Makefile b/multimedia/recordmydesktop/Makefile
index e392a9a9240e..e805a5001904 100644
--- a/multimedia/recordmydesktop/Makefile
+++ b/multimedia/recordmydesktop/Makefile
@@ -16,6 +16,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-oss=yes \
 			--enable-jack=yes
 
+USES=		xorg
 USE_XORG=	ice sm x11 xext xorgproto xfixes xdamage
 PLIST_FILES=	bin/recordmydesktop man/man1/recordmydesktop.1.gz
 
diff --git a/multimedia/simplescreenrecorder/Makefile b/multimedia/simplescreenrecorder/Makefile
index d1d964a32d39..bc3a00f9b1f1 100644
--- a/multimedia/simplescreenrecorder/Makefile
+++ b/multimedia/simplescreenrecorder/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libavformat.so:multimedia/ffmpeg
 
-USES=		cmake compiler:c++11-lang pkgconfig qt:5
+USES=		cmake compiler:c++11-lang pkgconfig qt:5 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	MaartenBaert
 GH_PROJECT=	ssr
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index 964b515c2520..c0922043dbe0 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Copying.txt
 
 USES=		cpe compiler:c++11-lang desktop-file-utils dos2unix gmake \
-		qmake qt:5 tar:bzip2
+		qmake qt:5 tar:bzip2 xorg
 USE_QT=		buildtools_build linguisttools_build \
 		core dbus gui network script widgets xml
 USE_XORG=	x11
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 449b13ec928e..28f65b6fc630 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -38,7 +38,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler desktop-file-utils gettext gl gnome localbase meson \
-		pkgconfig python:3.4+ tar:xz
+		pkgconfig python:3.4+ tar:xz xorg
 USE_GNOME=	cairo gtk30 intlhack introspection libxml2 nautilus3 \
 		pygobject3
 USE_XORG=	x11 xorgproto xtst ice sm
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index 6c4072d2c347..4c6ad6351e28 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libxine.so:multimedia/libxine \
 		libvdpau.so:multimedia/libvdpau
 
 PATCH_STRIP=	-p1
-USES=		compiler:c++11-lang pkgconfig tar:bzip2
+USES=		compiler:c++11-lang gl pkgconfig tar:bzip2 xorg
 USE_XORG=	xrandr xrender
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR}
diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index 3eca8e9d0af5..55271750e639 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -18,8 +18,8 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
+USES=		fpc lazarus:flavors xorg
 USE_XORG=	x11
-USES=		fpc lazarus:flavors
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11
 
 NO_WRKSUBDIR=	yes
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 4b4faa04bc86..499cd1595865 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -18,7 +18,7 @@ NO_CDROM=	Must be redistributed without fee
 
 # clang's cpp destroys whitespace, particularly hard tabs in makefiles,
 # which is fatal for imake.
-USES=		alias imake
+USES=		alias imake xorg
 USE_GCC=	any
 USE_XORG=	xext xt sm ice xext x11
 MAKE_ARGS+=	-j 2 # safe and helps even the single-CPU machines
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 285fc78509a5..0364390810be 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT=	AALIB
 ZVBI_DESC=	Enable libzvbi support
 
-USES=		gmake iconv jpeg motif ncurses perl5 tar:bzip2 pkgconfig
+USES=		gmake iconv jpeg motif ncurses perl5 tar:bzip2 pkgconfig xorg
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xaw
 CPPFLAGS+=	-I${WRKSRC}/common
diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 71f46a6b328a..11d3f37b668e 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libxine.so:multimedia/libxine
 
 USES=		desktop-file-utils gmake iconv jpeg pkgconfig readline \
-		shared-mime-info tar:xz
+		shared-mime-info tar:xz xorg
 USE_XORG=	x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vdr-keys \
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0