54 files changed, 63 insertions, 51 deletions

diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index 0943277d3e77..7f3df0236e16 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.tigr.net/afterstep/download/ascpu/
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	CPU statistics monitor utility for XFree86
 
-USES=		jpeg
+USES=		jpeg xorg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm-includes=${LOCALBASE}/include --with-xpm-library=${LOCALBASE}/lib
diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile
index 08ad0a2f2917..d0ed808f8826 100644
--- a/sysutils/asfsm/Makefile
+++ b/sysutils/asfsm/Makefile
@@ -12,6 +12,7 @@ COMMENT=	File-system monitor for the AfterStep window manager
 
 LICENSE=	GPLv2
 
+USES=		xorg
 USE_XORG=	ice sm x11 xaw xext xpm xt
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile
index 61717fb7031f..eb804d61dadc 100644
--- a/sysutils/asmem/Makefile
+++ b/sysutils/asmem/Makefile
@@ -13,6 +13,7 @@ COMMENT=	AfterStep look-n-feel memory utilization monitor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		xorg
 USE_XORG=	x11 ice sm x11 xext xpm
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index fae7fbd11d8e..eba25a2463ad 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -19,7 +19,7 @@ BROKEN_mips64=		fails to compile: asmon.c: storage size of 'sum' isn't known
 
 BUILD_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon
 CFLAGS+=	-I${LOCALBASE}/include
-USES=		gmake
+USES=		gmake xorg
 USE_CSTD=	gnu89
 USE_XORG=	xpm x11
 ALL_TARGET=	asmon
diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile
index 3be57053ed40..74e8d060cc45 100644
--- a/sysutils/bamf/Makefile
+++ b/sysutils/bamf/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
 	libdbus-glib-1.so:devel/dbus-glib \
 	libstartup-notification-1.so:x11/startup-notification
 
-USES=		gettext-runtime gmake libtool pathfix pkgconfig python:2.7
+USES=		gettext-runtime gmake gnome libtool pathfix pkgconfig \
+		python:2.7 xorg
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2
 USE_XORG=	x11
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index cb4500be9dd8..cea905c499f1 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libnotify.so:devel/libnotify \
 RUN_DEPENDS=	growisofs:sysutils/dvd+rw-tools \
 		cdrdao:sysutils/cdrdao
 
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		shared-mime-info tar:xz
+USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
+		pkgconfig shared-mime-info tar:xz xorg
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2
 GNU_CONFIGURE=	yes
 USE_XORG=	sm ice
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 68003cd316f3..1c43d5369a19 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -38,8 +38,8 @@ RUN_DEPENDS=	py*-dbus>=0:devel/py-dbus \
 		ca_root_nss>=0:security/ca_root_nss \
 		py*-lxml>=0:devel/py-lxml
 
-USES=		autoreconf gettext gmake libtool pathfix \
-		python:2.7 pkgconfig
+USES=		autoreconf gettext gmake gnome libtool pathfix \
+		python:2.7 pkgconfig xorg
 USE_GNOME=	evolutiondataserver3 gconf2 gnomeprefix \
 		gtk30 intlhack libgnomekbd
 USE_GITHUB=	yes
diff --git a/sysutils/consolekit2/Makefile b/sysutils/consolekit2/Makefile
index 57f2a4af2d0b..95a0a3abcc82 100644
--- a/sysutils/consolekit2/Makefile
+++ b/sysutils/consolekit2/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libpolkit-gobject-1.so:sysutils/polkit
 
 WRKSRC=		${WRKDIR}/ConsoleKit2-${PORTVERSION}
-USES=		gettext gmake libtool localbase pathfix pkgconfig tar:bzip2
+USES=		gettext gmake gnome libtool localbase pathfix pkgconfig \
+		tar:bzip2 xorg
 USE_CSTD=	gnu99
 USE_XORG=	x11
 USE_GNOME=	glib20 libxslt introspection:build
diff --git a/sysutils/dunst/Makefile b/sysutils/dunst/Makefile
index b4154b104bf0..e2c9cb85610e 100644
--- a/sysutils/dunst/Makefile
+++ b/sysutils/dunst/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
-USES=		gmake gnome perl5 pkgconfig
+USES=		gmake gnome perl5 pkgconfig xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dunst-project
diff --git a/sysutils/gapcmon/Makefile b/sysutils/gapcmon/Makefile
index c5fed833905f..634c61944145 100644
--- a/sysutils/gapcmon/Makefile
+++ b/sysutils/gapcmon/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Monitor apcupsd with GTK+2 GUI
 LICENSE=	GPLv2
 
 SUB_FILES=	pkg-message
+USES=		pkgconfig gmake gnome tar:bzip2 xorg
 USE_GNOME=	gconf2
-USES=		pkgconfig gmake tar:bzip2
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib -lX11
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 62184c24965c..3270ac2f6c66 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
-USES=		gmake libtool pkgconfig
+USES=		gmake gnome libtool pkgconfig xorg
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xtst
 USE_GNOME=	gtk20
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index abc073f337c1..814740837ed6 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib gettext gnome localbase:ldflags meson \
-		pkgconfig python:3.6+,build samba:lib tar:xz
+		pkgconfig python:3.6+,build samba:lib tar:xz xorg
 USE_GNOME=	cairo gnomedesktop3 libxml2
 USE_XORG=	x11 xi
 #USE_GSTREAMER1=	yes
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 99f418f0dd32..3c4a739604e0 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -32,7 +32,7 @@ PORTSCOUT=	limitw:1,even
 USE_XORG=	x11 xext xi xtst
 USE_GNOME=	cairo gnomedesktop3 gtk30
 USES=		gettext gnome localbase:ldflags meson perl5 \
-		pkgconfig python:3.6+,build tar:xz
+		pkgconfig python:3.6+,build tar:xz xorg
 USE_PERL5=	build
 INSTALLS_ICONS=	yes
 #		-Dnssdb_dir=${LOCALBASE}/share/certs/ca-root-nss.crt
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 9639393082db..73ab4aa9b87c 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GTK2-based imond-client to control an on(e) disc fli4l router
 LICENSE=	GPLv2+
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gettext iconv
+USES=		pkgconfig gettext gnome iconv xorg
 USE_GNOME=	gtk20
 USE_XORG=	x11
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index a13209339eb1..956a219dea77 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
 RUN_DEPENDS=	xauth:x11/xauth \
 		sudo:security/sudo
 
-USES=		gettext gmake libtool pathfix pkgconfig
-USE_GNOME=	glib20 gconf2 intltool
+USES=		gettext gmake gnome libtool pathfix pkgconfig
+USE_GNOME=	glib20 gconf2 intltool xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 CONFIGURE_ARGS=	--enable-gtk-doc=no
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index 2eec0a6a6d99..560950cb61ec 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	liblineak.so:sysutils/lineakd
 
-USES=		gmake libtool
+USES=		gmake libtool xorg
 USE_XORG=	x11 xext xt xtst xfixes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	kde_cv_prog_cxx_fno_check_new=no
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index bc6dce8172c6..ef5515323757 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libxosd.so:misc/xosd \
 		liblineak.so:sysutils/lineakd
 
-USES=		gmake libtool
+USES=		gmake libtool xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xt
 GNU_CONFIGURE=	yes
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index ad2181139488..553758270b20 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	lineak
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lineakd is a daemon which enables special keys on internet keyboards
 
-USES=		gmake libtool localbase
+USES=		gmake libtool localbase xorg
 USE_CXXSTD=	c++98
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xt
diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index aebc69aa2768..a1f4ae3319ef 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libftgl.so:graphics/ftgl
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf compiler:c++0x gmake jpeg localbase:ldflags pkgconfig
+USES=		autoreconf compiler:c++0x gl gmake jpeg localbase:ldflags \
+		pkgconfig sdl
 USE_GL=		gl glu glew
 USE_SDL=	image2 sdl2
 
diff --git a/sysutils/luckybackup/Makefile b/sysutils/luckybackup/Makefile
index b335e63c1b7e..c115bdda11eb 100644
--- a/sysutils/luckybackup/Makefile
+++ b/sysutils/luckybackup/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/license/gpl.txt
 
 RUN_DEPENDS=	rsync:net/rsync
 
-USES=		compiler:c++11-lang qmake qt:5
+USES=		compiler:c++11-lang gl qmake qt:5
 
 USE_GL=		gl
 USE_QT=		core gui network widgets buildtools_build
diff --git a/sysutils/lxinput/Makefile b/sysutils/lxinput/Makefile
index 09b67e10057d..b859e69a2996 100644
--- a/sysutils/lxinput/Makefile
+++ b/sysutils/lxinput/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gmake localbase pkgconfig tar:xz
+USES=		gmake gnome localbase pkgconfig tar:xz xorg
 USE_GNOME=	gtk20 cairo gdkpixbuf2 intltool
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
diff --git a/sysutils/lxqt-config/Makefile b/sysutils/lxqt-config/Makefile
index 743bba8cf3af..d01eff451df5 100644
--- a/sysutils/lxqt-config/Makefile
+++ b/sysutils/lxqt-config/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/xorg/modules/input/libinput_drv.so:x11-drivers/x
 LIB_DEPENDS=	libudev.so:devel/libudev-devd
 
 USES=	cmake compiler:c++14-lang kde:5 localbase:ldflags lxqt qt:5 \
-	pkgconfig tar:xz
+	pkgconfig tar:xz xorg
 USE_QT=	buildtools_build qmake_build concurrent core dbus \
 	gui linguisttools svg widgets x11extras xml
 USE_KDE=	libkscreen windowsystem
diff --git a/sysutils/lxqt-qtplugin/Makefile b/sysutils/lxqt-qtplugin/Makefile
index 40b2eef62c03..98e2ef8ed047 100644
--- a/sysutils/lxqt-qtplugin/Makefile
+++ b/sysutils/lxqt-qtplugin/Makefile
@@ -15,7 +15,8 @@ LICENSE=	LGPL21+
 LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt \
 		libexif.so:graphics/libexif
 
-USES=	cmake compiler:c++14-lang kde:5 lxqt pkgconfig tar:xz qt:5 gnome gettext-runtime
+USES=	cmake compiler:c++14-lang gnome kde:5 lxqt pkgconfig tar:xz qt:5 \
+	gettext-runtime xorg
 
 USE_XORG=xcb
 USE_GNOME=glib20
diff --git a/sysutils/lxterminal/Makefile b/sysutils/lxterminal/Makefile
index 780af1a97432..d6cc35e4ddac 100644
--- a/sysutils/lxterminal/Makefile
+++ b/sysutils/lxterminal/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gmake gnome localbase pkgconfig tar:xz
+USES=		gmake gnome localbase pkgconfig tar:xz xorg
 USE_GNOME=	gtk20 glib20 cairo vte intltool
 USE_XORG=	x11 xext
 
diff --git a/sysutils/mate-power-manager/Makefile b/sysutils/mate-power-manager/Makefile
index 5684846c3407..2d15209acb79 100644
--- a/sysutils/mate-power-manager/Makefile
+++ b/sysutils/mate-power-manager/Makefile
@@ -27,8 +27,8 @@ RUN_DEPENDS=	pkexec:sysutils/polkit \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool localbase \
-		pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome libtool localbase mate \
+		pathfix pkgconfig tar:xz xorg
 USE_MATE=	panel
 USE_XORG=	x11 xext xorgproto xrandr xrender
 USE_GNOME=	cairo glib20 gtk30 intlhack
diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile
index ac421b5c01be..5ed1a3f20394 100644
--- a/sysutils/mate-settings-daemon/Makefile
+++ b/sysutils/mate-settings-daemon/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	xrdb:x11/xrdb
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool localbase pathfix \
+USES=		gettext gmake gnome libtool localbase mate pathfix \
 		pkgconfig tar:xz xorg
 USE_MATE=	desktop libmatekbd mixer
 USE_XORG=	ice sm x11 xext xi
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index bddf9116ca81..9bd155b347d1 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 RUN_DEPENDS=	gnome-icon-theme>0:misc/gnome-icon-theme \
 		hicolor-icon-theme>0:misc/hicolor-icon-theme
 
-USES=		compiler:c++11-lang gettext gmake gnome iconv localbase pkgconfig
+USES=		compiler:c++11-lang gettext gmake gnome iconv localbase \
+		pkgconfig xorg
 USE_CXXSTD=	c++11
 USE_GNOME=	gtkmm24
 INSTALLS_ICONS=	yes
diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile
index 8d0b53f50e96..fb55d859da25 100644
--- a/sysutils/passwordsafe/Makefile
+++ b/sysutils/passwordsafe/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	zip:archivers/zip
 
 CONFLICTS=	pwsafe-[0-9]*
 
-USES=		compiler:c++11-lang gmake
+USES=		compiler:c++11-lang gmake xorg
 USE_GITHUB=	yes
 USE_WX=		3.0+
 USE_XORG=	x11 xtst
diff --git a/sysutils/pc-networkmanager/Makefile b/sysutils/pc-networkmanager/Makefile
index aaba0d815ff3..0d5a27966853 100644
--- a/sysutils/pc-networkmanager/Makefile
+++ b/sysutils/pc-networkmanager/Makefile
@@ -18,7 +18,7 @@ MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
 MAKE_JOBS_UNSAFE=	yes
 
-USES=		qmake qt:5 shebangfix tar:xz
+USES=		gl qmake qt:5 shebangfix tar:xz
 SHEBANG_FILES=	src/NetworkManager/resources/umts_stick
 USE_LDCONFIG=	yes
 USE_QT=		core gui network svg linguist \
diff --git a/sysutils/plasma5-kinfocenter/Makefile b/sysutils/plasma5-kinfocenter/Makefile
index 20958c554f0f..ee5166832058 100644
--- a/sysutils/plasma5-kinfocenter/Makefile
+++ b/sysutils/plasma5-kinfocenter/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Plasma5 utility providing system information
 
 LIB_DEPENDS=	libpci.so:devel/libpci
 
-USES=		cmake compiler:c++11-lib cpe gettext kde:5 pkgconfig \
+USES=		cmake compiler:c++11-lib cpe gettext gl kde:5 pkgconfig \
 		qt:5 tar:xz xorg
 USE_GL=		egl gl glu
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
diff --git a/sysutils/pwsafe/Makefile b/sysutils/pwsafe/Makefile
index e8f801a6ce5e..674f24fe765f 100644
--- a/sysutils/pwsafe/Makefile
+++ b/sysutils/pwsafe/Makefile
@@ -27,6 +27,7 @@ PLIST_FILES=	bin/pwsafe man/man1/pwsafe.1.gz
 
 .if ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS=	--with-x
+USES+=		xorg
 USE_XORG=	ice sm x11 xmu
 .else
 CONFIGURE_ARGS=	ac_cv_have_x="have_x=no" \
diff --git a/sysutils/radeontop/Makefile b/sysutils/radeontop/Makefile
index 8e74e5e73d0f..73ab0877f559 100644
--- a/sysutils/radeontop/Makefile
+++ b/sysutils/radeontop/Makefile
@@ -20,7 +20,7 @@ NOT_FOR_ARCHS_REASON=	fails to compile: fatal error: amdgpu_drm.h file not found
 USE_GITHUB=	yes
 GH_ACCOUNT=	clbr
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig xorg
 USE_XORG=	xcb
 MAKE_ARGS=	amdgpu=1
 
diff --git a/sysutils/roottail/Makefile b/sysutils/roottail/Makefile
index 5e5f7eb467a7..1d334840d0c6 100644
--- a/sysutils/roottail/Makefile
+++ b/sysutils/roottail/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Print text directly to X11 root window
 
 BROKEN=		unfetchable
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	x11 xext
 MAKE_ARGS=	CC="${CC}"
 
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 1465cea3cb3e..98016d897279 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		cmake compiler:c++14-lang cpe ssl
+USES=		cmake compiler:c++14-lang cpe ssl xorg
 CPE_VENDOR=	synergy-foss
 USE_GITHUB=	yes
 GH_ACCOUNT=	symless
diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile
index df656127140f..85b6a7a0df60 100644
--- a/sysutils/tarsnap-gui/Makefile
+++ b/sysutils/tarsnap-gui/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Cross platform GUI for the Tarsnap command line client
 USE_GITHUB=	yes
 GH_ACCOUNT=	Tarsnap
 
-USES=		compiler:c++11-lib qmake qt:5
+USES=		compiler:c++11-lib gl qmake qt:5
 USE_QT=		buildtools_build core gui network qmake_build sql sql-sqlite3 widgets
 USE_GL=		gl
 
diff --git a/sysutils/wmapmload/Makefile b/sysutils/wmapmload/Makefile
index 910e838ae97b..aa974a3bfda5 100644
--- a/sysutils/wmapmload/Makefile
+++ b/sysutils/wmapmload/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	i386
+USES=		xorg
 USE_XORG=	x11 xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=""
diff --git a/sysutils/wmbluecpu/Makefile b/sysutils/wmbluecpu/Makefile
index 868bef78c6b8..82d25bd43e21 100644
--- a/sysutils/wmbluecpu/Makefile
+++ b/sysutils/wmbluecpu/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/X11/xutils
 MAINTAINER=	benjsc@FreeBSD.org
 COMMENT=	CPU monitoring dockapp
 
-USES=		tar:bzip2
+USES=		tar:bzip2 xorg
 USE_XORG=	xpm
 
 post-patch:
diff --git a/sysutils/wmbsdbatt/Makefile b/sysutils/wmbsdbatt/Makefile
index 97db88cb2c27..faf91ad47c91 100644
--- a/sysutils/wmbsdbatt/Makefile
+++ b/sysutils/wmbsdbatt/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Dockapp for battery & temperature monitoring through ACPI
 
 BROKEN=		unfetchable
 
+USES=		xorg
 USE_XORG=	x11 xpm
 
 PLIST_FILES=	bin/wmbsdbatt
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index 3f42a68c5ceb..cb2509a72761 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -12,7 +12,7 @@ COMMENT=	"lcd" dockapp for windowmaker, which displays the current cpuload
 
 BROKEN=		unfetchable
 
-USES=		tar:bzip2
+USES=		tar:bzip2 xorg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index 226a29cd5104..f15b0ea9d2f3 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -19,6 +19,7 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/${PORTNAME}
+USES=		xorg
 USE_XORG=	xpm
 MAKEFILE=	Makefile.FREEBSD
 PORTDOCS=	CHANGES README TODO
diff --git a/sysutils/wmdiskmon/Makefile b/sysutils/wmdiskmon/Makefile
index 83aa022b2079..cc6afe34e79e 100644
--- a/sysutils/wmdiskmon/Makefile
+++ b/sysutils/wmdiskmon/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 MAINTAINER=	mbeis@xs4all.nl
 COMMENT=	Disk usage monitor dockapp
 
+USES=		xorg
 USE_XORG=	x11 xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=""
diff --git a/sysutils/wmflame/Makefile b/sysutils/wmflame/Makefile
index a4dfe3816f83..79eb23b39fd9 100644
--- a/sysutils/wmflame/Makefile
+++ b/sysutils/wmflame/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Dockapp that shows the load average as a flame
 
 LICENSE=	GPLv2
 
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	x11 xpm
 
 PLIST_FILES=	bin/wmflame
diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile
index 0febebc76ae5..fbd1e7e427ae 100644
--- a/sysutils/wmmemfree/Makefile
+++ b/sysutils/wmmemfree/Makefile
@@ -15,7 +15,7 @@ BROKEN_FreeBSD_13=	fails to compile: read_mem.c: invalid use of undefined type '
 BROKEN_mips=		fails to compile: mem_freebsd.c: storage size of 'vm' isn't known
 BROKEN_mips64=		fails to compile: mem_freebsd.c: storage size of 'vm' isn't known
 
-USES=		tar:bzip2
+USES=		tar:bzip2 xorg
 USE_XORG=	xpm
 
 PLIST_FILES=	"@(,kmem,2555) bin/wmmemfree" man/man1/${PORTNAME}.1.gz
diff --git a/sysutils/wmmemload/Makefile b/sysutils/wmmemload/Makefile
index dd40d7fa55a5..9184d9a44ec3 100644
--- a/sysutils/wmmemload/Makefile
+++ b/sysutils/wmmemload/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Dockapp for monitoring memory and swap usage
 LICENSE=	GPLv2+
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf
+USES=		autoreconf xorg
 USE_XORG=	xpm
 WRKSRC=		${WRKDIR}/dockapps
 
diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile
index eaf44f5180d5..57654e2881cd 100644
--- a/sysutils/wmtop/Makefile
+++ b/sysutils/wmtop/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Dockapp to display top three CPU consuming processes
 
 LICENSE=	GPLv2
 
-USES=		gmake			# gmake is needed for -jX builds
+USES=		gmake xorg		# gmake is needed for -jX builds
 USE_XORG=	xpm x11
 USE_CSTD=	gnu89
 ALL_TARGET=	freebsd
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index c65d2b0e78c5..140117b66d52 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	Uptime showing dockapp with a similar look to wmcpuload
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf tar:bzip2
+USES=		autoreconf tar:bzip2 xorg
 USE_XORG=	xpm
 CONFIGURE_ARGS=	--program-prefix=""
 
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 6462b1684f57..80e7aa24edf6 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Laptop battery status display for X11
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		imake:noman
+USES=		imake:noman xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 PLIST_FILES=	"@(,operator,2755) bin/xbatt"
 
diff --git a/sysutils/xcpustate/Makefile b/sysutils/xcpustate/Makefile
index 36e03e058e55..70c2962fd336 100644
--- a/sysutils/xcpustate/Makefile
+++ b/sysutils/xcpustate/Makefile
@@ -17,7 +17,7 @@ EXTRACT_AFTER_ARGS=	# none
 
 NO_WRKSUBDIR=	yes
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xt
 
 PLIST_FILES=	"@(,kmem,2555) bin/${PORTNAME}" man/man1/${PORTNAME}.1.gz
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index 8d5b326d2a59..2fa925ba3370 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -13,7 +13,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	vlasovskikh
 GH_PROJECT=	xdu
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 PLIST_FILES=	bin/xdu lib/X11/app-defaults/XDu man/man1/xdu.1.gz
 
diff --git a/sysutils/xfce4-kbdleds-plugin/Makefile b/sysutils/xfce4-kbdleds-plugin/Makefile
index 8c4592d0e219..c8500cb4640a 100644
--- a/sysutils/xfce4-kbdleds-plugin/Makefile
+++ b/sysutils/xfce4-kbdleds-plugin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
-		tar:bzip2 xfce
+		tar:bzip2 xfce xorg
 GNU_CONFIGURE=	yes
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 intltool pango
 USE_XORG=	ice sm x11
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index bc747df7e88b..75ccd811342c 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/system/status/xstatus
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X File System Monitor
 
-USES=		imake tar:tgz
+USES=		imake tar:tgz xorg
 USE_XORG=	xbitmaps x11 xext
 MAKE_ARGS=	CC="${CC}" CCOPTIONS="-DFreeBSD"
 PLIST_FILES=	bin/xfsm man/man1/${PORTNAME}.1.gz
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index bd888f3ae109..927ff4336425 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -14,7 +14,7 @@ LICENSE_COMB=	multi
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	uses x86-specific hardware resources
 
-USES=		gmake
+USES=		gmake xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	hills
 
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index 199983e6cdb7..6e57193ad041 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System information display tool
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	x11
 
 ALL_TARGET=	xsysstats
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 8caac3a8e892..823d081bb944 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=		libdbus-1.so:devel/dbus			\
 RUN_DEPENDS=		animate:graphics/ImageMagick6	\
 			gimp:graphics/gimp-app
 
-USES=			gettext gmake gnome localbase pkgconfig
+USES=			gettext gmake gnome localbase pkgconfig xorg
 
 USE_GNOME=		cairo gdkpixbuf2 glib20 libglade2 intltool
 USE_XORG=		x11 xext xmu ice xfixes xdamage