Add USES=xorg USES=gl, ports categories x

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

89 files changed, 103 insertions, 77 deletions

diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index 873b2813ecea..af1aecee5cea 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	DOCS GTK2 XFT
 
-USES=		gmake
+USES=		gmake xorg
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${LOCALBASE}"
 USE_XORG=	x11 xext xt xaw
 
@@ -26,6 +26,7 @@ PORTDOCS=	DESIGN LICENSE NEWS README TODO
 GTKCLIENTS=	aemenu-gtk aepanel-gtk
 XAWCLIENTS=	aemenu-xaw aepanel-xaw aesession set-gnome-pda
 
+GTK2_USES=	gnome
 GTK2_USE=	GNOME=gtk20
 GTK2_PLIST_FILES=	bin/aemenu-gtk bin/aepanel-gtk
 
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index aeceab702c5d..4e98a024050c 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS=	xli:graphics/xli
 
-USES=		gmake jpeg pkgconfig shebangfix tar:bzip2
+USES=		gmake gnome jpeg pkgconfig shebangfix tar:bzip2 xorg
 USE_CSTD=	gnu89
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 librsvg2 pango
 USE_XORG+=	ice sm x11 xcomposite xcursor xdamage xext xfixes xi xinerama \
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index f1f1bafd3ae7..82167e9dc8f0 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	asclock:x11-clocks/asclock
 CONFLICTS?=	afterstep-2*
 PORTSCOUT=	limit:^1\.[0-9.]*$$
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	xpm xext x11
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install install.man
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index 0d2af65cdfc6..fc94ecdb5878 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}0.21pl2
 MAINTAINER=	dcarmich@dcarmichael.net
 COMMENT=	Window manager that makes your desktop look like an Amiga(TM)
 
-USES=		shebangfix
+USES=		shebangfix xorg
 SHEBANG_FILES=	Xinitrc.in \
 		Xsession.in \
 		Xsession2.in
diff --git a/x11-wm/antiwm/Makefile b/x11-wm/antiwm/Makefile
index 4308890eaef4..af1957c45965 100644
--- a/x11-wm/antiwm/Makefile
+++ b/x11-wm/antiwm/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Minimalist window manager inspired by Ratpoison
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		xorg
 USE_XORG=	x11
 
 PLIST_FILES=	bin/antiwm
diff --git a/x11-wm/aphelia/Makefile b/x11-wm/aphelia/Makefile
index 1058e1c06c39..16c255598c71 100644
--- a/x11-wm/aphelia/Makefile
+++ b/x11-wm/aphelia/Makefile
@@ -16,6 +16,7 @@ RUN_DEPENDS=	dmenu_run:x11/dmenu \
 USE_GITHUB=	yes
 GH_ACCOUNT=	vardy
 GH_TAGNAME=	54c2d6fb18f3121ebaf836fad53ca48a2f3aa812
+USES=		xorg
 USE_XORG=	x11
 
 PLIST_FILES=	bin/aphelia
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 9cfe13be0024..6cd740ee1cbc 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -30,7 +30,8 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo \
 
 CONFLICTS_INSTALL=	awesome3-[0-9]*
 
-USES=		cmake compiler:c11 gettext iconv pkgconfig lua shebangfix
+USES=		cmake compiler:c11 gettext gnome iconv pkgconfig lua \
+		shebangfix xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	awesomewm
 SHEBANG_FILES=	utils/awesome-client
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 64bdd1551a35..37d0398afc7f 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -14,7 +14,7 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	blackbox:x11-wm/blackbox
 
-USES=		perl5 pkgconfig
+USES=		perl5 pkgconfig xorg
 USE_PERL5=	build
 USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index 18920a42f187..d31b23a22a2a 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -15,7 +15,7 @@ OPTIONS_SUB=	yes
 
 BUILD_DEPENDS=	blackbox:x11-wm/blackbox
 
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig xorg
 USE_XORG=	xext sm x11 xau xcursor xi
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	`pkg-config --cflags xft`
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index 1151b4c4c404..c823dcaf7724 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Small and fast window manager for X11R6
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		pathfix pkgconfig iconv
+USES=		pathfix pkgconfig iconv xorg
 USE_XORG=	x11 xft
 
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 70603f790fe6..cd5d6459e6fc 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 
-USES=		compiler:c11 meson pkgconfig
+USES=		compiler:c11 meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 GH_ACCOUNT=	Hjdskes
diff --git a/x11-wm/clementine-wm/Makefile b/x11-wm/clementine-wm/Makefile
index 8cdbcef1a1d8..786549cbfb80 100644
--- a/x11-wm/clementine-wm/Makefile
+++ b/x11-wm/clementine-wm/Makefile
@@ -17,7 +17,7 @@ LICENSE_COMB=	multi
 RUN_DEPENDS=	xv:graphics/xv \
 		rxvt:x11/rxvt
 
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	x11
 
 PORTDOCS=	HISTORY LICENSE
diff --git a/x11-wm/compiz-fusion/Makefile b/x11-wm/compiz-fusion/Makefile
index 7e115442749a..f1df982f622c 100644
--- a/x11-wm/compiz-fusion/Makefile
+++ b/x11-wm/compiz-fusion/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
 		${LOCALBASE}/lib/compiz/libanimation.so:x11-wm/compiz-plugins-main \
 		${LOCALBASE}/bin/ccsm:x11-wm/ccsm
 
-USES=		metaport
+USES=		gnome metaport xorg
 USE_GNOME=	libxslt
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama xrandr
 
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index a4e411f7f9ee..6e4b900e31ad 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -23,7 +23,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
 		${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:x11-wm/compiz-plugins-main
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gettext-runtime gettext-tools gmake gl gnome libtool:keepla pathfix pkgconfig tar:bzip2
+USES=		gettext-runtime gettext-tools gmake gl gnome libtool:keepla \
+		pathfix pkgconfig tar:bzip2 xorg
 USE_GL=		glu
 USE_CSTD=	gnu89
 USE_GNOME=	gconf2 gdkpixbuf2 intltool libxslt
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 53345a6ca998..53ed5710caac 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -22,7 +22,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake jpeg libtool:keepla pathfix pkgconfig tar:bzip2
+USES=		gl gmake gnome jpeg libtool:keepla pathfix pkgconfig tar:bzip2 \
+		xorg
 USE_CSTD=	gnu89
 USE_GL=		yes
 USE_GNOME=	gconf2 intltool libxslt
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 36181ecc0821..fe0ea968946c 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES=		gl gmake gnome libtool:keepla pathfix pkgconfig tar:bzip2 xorg
 USE_GL=		yes
 USE_GNOME=	gconf2 intltool libxslt
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama xorgproto xrandr
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index f572c8043075..ddfc77a0ded4 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libcompizconfig.so:x11-wm/libcompizconfig \
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES=		gmake gnome libtool:keepla pathfix pkgconfig tar:bzip2 xorg
 USE_GNOME=	gconf2 glib20 libxslt
 USE_LDCONFIG=	yes
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama xrandr
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 1feecab1514b..4dbeea65654f 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
+USES=		gmake gnome libtool pathfix pkgconfig python:2.7 tar:bzip2 xorg
 USE_GNOME=	glib20 libxml2 libxslt
 USE_PYTHON=	flavors
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama xrandr
diff --git a/x11-wm/compton-yshui/Makefile b/x11-wm/compton-yshui/Makefile
index 8a6460ab2e19..2cb34a0eb1ce 100644
--- a/x11-wm/compton-yshui/Makefile
+++ b/x11-wm/compton-yshui/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS=	xprop:x11/xprop \
 
 CONFLICTS_INSTALL=	compton # bin/compton
 
-USES=		compiler:c11 meson localbase pkgconfig python:3.4+,run shebangfix
+USES=		compiler:c11 meson localbase pkgconfig python:3.4+,run \
+		shebangfix xorg
 USE_GITHUB=	yes
 USE_XORG=	x11 xcb xext pixman
 GH_ACCOUNT=	yshui
@@ -49,6 +50,7 @@ DRM_DESC=		DRM VSync fallback (deprecated)
 DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 DRM_MESON_TRUE=		vsync_drm
 
+OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_MESON_TRUE=	opengl
 
diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile
index bf891d7c1e07..6795c35e220d 100644
--- a/x11-wm/compton/Makefile
+++ b/x11-wm/compton/Makefile
@@ -20,7 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	chjj
 GH_TAGNAME=	b7f43ee
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig xorg
 USE_XORG=	x11 xcomposite xdamage xext xfixes xrandr xrender
 
 MAKE_ARGS=	COMPTON_VERSION=git-${PORTVERSION}-${GH_TAGNAME} \
@@ -45,6 +45,7 @@ PCRE_MAKE_ARGS_OFF=	NO_REGEX_PCRE=yes
 DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 DRM_MAKE_ARGS_OFF=	NO_VSYNC_DRM=yes
 
+OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_MAKE_ARGS_OFF=	NO_VSYNC_OPENGL=yes
 
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 6f1f3546f8c7..20e45012ba87 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extension to twm, with support for multiple virtual screens
 
 LICENSE=	MIT
 
-USES=		cmake jpeg tar:xz
+USES=		cmake jpeg tar:xz xorg
 USE_XORG=	x11 xext xt ice sm xpm xmu
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index e8869fb715da..c60a1fd39008 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 # do-test target.
 TEST_DEPENDS=	${LOCALBASE}/libexec/atf-check:devel/kyua
 
+USES=		xorg
 USE_XORG=	x11 xft
 
 MAKE_ARGS=	CC="${CC}" \
diff --git a/x11-wm/e16-docs/Makefile b/x11-wm/e16-docs/Makefile
index 5041786b4ace..076003116b52 100644
--- a/x11-wm/e16-docs/Makefile
+++ b/x11-wm/e16-docs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Data files of enlightenment DOX
 
 RUN_DEPENDS=	${LOCALBASE}/bin/e16:x11-wm/e16
 
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index ffdf2a17d9c6..bbb10821ed84 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -34,7 +34,8 @@ PANGO_CONFIGURE_ENABLE=	pango
 DOCS_CONFIGURE_ON=	--enable-docs=yes
 DOCS_CONFIGURE_OFF=	--enable-docs=no
 
-USES=		autoreconf gmake iconv libtool gnome perl5 pkgconfig shebangfix
+USES=		autoreconf gmake iconv libtool gnome perl5 pkgconfig \
+		shebangfix xorg
 
 USE_XORG=	ice sm xorgproto x11 xbitmaps \
 		xcomposite xdamage xext xfixes xft xinerama xrandr xrender \
diff --git a/x11-wm/echinus/Makefile b/x11-wm/echinus/Makefile
index 57989d372d93..811690ab98c7 100644
--- a/x11-wm/echinus/Makefile
+++ b/x11-wm/echinus/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		pkgconfig
+USES=		pkgconfig xorg
 USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
 
 FILES=		echinusrc close.xbm iconify.xbm max.xbm
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index db93fd6ade83..ee2c3a874cfc 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libfltk.so:x11-toolkits/fltk
 
 USES=		fam gettext iconv:translit localbase:ldflags pathfix \
-		pkgconfig python:2.7 shared-mime-info shebangfix
+		pkgconfig python:2.7 shared-mime-info shebangfix xorg
 
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 SHEBANG_FILES=	doc/asciidoc/asciidoc.py
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index bd7b5853251b..02a1f3e88f4c 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gmake libtool pathfix \
-		pkgconfig shared-mime-info tar:bzip2
+USES=		desktop-file-utils gl gmake gnome libtool pathfix \
+		pkgconfig shared-mime-info tar:bzip2 xorg
 USE_GL=		gl
 USE_GNOME=	cairo gtk20 intltool libwnck pango
 USE_XORG=	x11 xrender
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 9e9e893bee9a..aad12e960730 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -21,7 +21,7 @@ BROKEN_sparc64=		Does not install on sparc64: signal 10
 
 GNU_CONFIGURE=	yes
 USES=		alias autoreconf compiler:c11 desktop-file-utils gettext-tools \
-		gmake iconv libtool pathfix pkgconfig tar:xz
+		gmake iconv libtool pathfix pkgconfig tar:xz xorg
 USE_XORG=	xcb
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 891df2ebaacc..0d473f9d1007 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libcdaudio.so:audio/libcdaudio
 RUN_DEPENDS=	e16:x11-wm/e16 \
 		import:graphics/ImageMagick6
 
-USES=		gmake libtool pkgconfig
+USES=		gl gmake libtool pkgconfig xorg
 USE_XORG=	xext
 USE_GL=		glut
 USE_LDCONFIG=	yes
diff --git a/x11-wm/euclid-wm/Makefile b/x11-wm/euclid-wm/Makefile
index 55607b1e414d..73236c8009ad 100644
--- a/x11-wm/euclid-wm/Makefile
+++ b/x11-wm/euclid-wm/Makefile
@@ -26,7 +26,7 @@ XINERAMA_ALL_TARGET=	euclid-wm
 EUCLID_MENU_ALL_TARGET=	euclid-menu
 XINERAMA_USE=		XORG=xinerama
 
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	x11
 
 PLIST_FILES=	bin/euclid-wm \
diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 5e090823f005..e5fa960e51dc 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.6809.org.uk/evilwm/
 MAINTAINER=	lasg@lasg.dk
 COMMENT=	Minimalist window manager based on 9wm
 
-USES=		gmake localbase:ldflags
+USES=		gmake localbase:ldflags xorg
 USE_XORG=	x11 xpm xext xrandr xrender
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" prefix="${PREFIX}" \
 		mandir="${MANPREFIX}/man"
diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile
index 7719f3534493..f2e4ce8a9ad8 100644
--- a/x11-wm/fbcmd/Makefile
+++ b/x11-wm/fbcmd/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	fluxbox:x11-wm/fluxbox
 
-USES=		gmake localbase:ldflags tar:bzip2
+USES=		gmake localbase:ldflags tar:bzip2 xorg
 ALL_TARGET=	first
 MAKE_ARGS=	CXX="${CXX}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 50d6304061b2..a2a5145cb957 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libfribidi.so:converters/fribidi \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig xorg
 
 USE_XORG=	x11 xext xorgproto xft xpm xrandr
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile
index 69e8395aca74..38adbd1e488d 100644
--- a/x11-wm/fluxter/Makefile
+++ b/x11-wm/fluxter/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Desktop pager for the Fluxbox Slit
 
 LICENSE=	GPLv2
 
-USES=		gmake
+USES=		gmake xorg
 
 USE_XORG=	x11 ice xorgproto xt xaw xext sm
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 2768217c311f..f889cdabd622 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
-USES=		autoreconf gmake
+USES=		autoreconf gmake xorg
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xt
 
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 601e2e54e039..67211cb3b6ab 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -25,7 +25,7 @@ CONFLICTS?=	fvwm1-1.* fvwm-2.[457].*
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mandoc --without-gnome --disable-gtk \
 		ac_cv_path_PYTHON=${PYTHON_CMD}
-USES=		gmake perl5 pkgconfig python:3.4+ gettext readline
+USES=		gmake gnome perl5 pkgconfig python:3.4+ gettext readline xorg
 USE_XORG=	xcursor xft xinerama xpm xrender x11 ice xext
 USE_GNOME=	cairo
 
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index dd911bd442f7..1c9875308e57 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	xcompmgr:x11-wm/xcompmgr
 
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib -lX11
-USES=		compiler:c++11-lang autoreconf libtool pkgconfig
+USES=		compiler:c++11-lang autoreconf gnome libtool pkgconfig xorg
 USE_CXXSTD=	c++11
 USE_GNOME=	gtkmm24
 USE_XORG=	x11
diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index c4165fea8cd8..7b6f57664b65 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libxcb-ewmh.so:x11/xcb-util-wm \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-keysyms.so:x11/xcb-util-keysyms
 
-USES=		compiler:c11 localbase:ldflags
+USES=		compiler:c11 localbase:ldflags xorg
 USE_XORG=	x11 xcb
 
 OPTIONS_DEFINE=	DOCS
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 2169f1fda286..f7c26345c672 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Third-party extensions for xmonad
 
 LICENSE=	BSD3CLAUSE
 
+USES=		xorg
 USE_CABAL=	extensible-exceptions mtl>=1 old-time random utf8-string \
 		X11>=1.6.1 X11-xft>=0.2 xmonad
 USE_XORG=	x11
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index e8caca419a5b..d8c1886c3ec7 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Tiling window manager
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		xorg
 USE_CABAL=	extensible-exceptions mtl semigroups setlocale utf8-string X11
 USE_XORG=	x11
 
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 419d7a741a76..0faf7be3434a 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gmake iconv:translit localbase pkgconfig
+USES=		gmake gnome iconv:translit localbase pkgconfig xorg
 USE_CXXSTD=	c++98
 USE_GNOME=	gdkpixbuf2
 USE_XORG=	ice sm x11 xext xrender
diff --git a/x11-wm/ion/Makefile b/x11-wm/ion/Makefile
index e589a78f7daf..d43f5bd0c185 100644
--- a/x11-wm/ion/Makefile
+++ b/x11-wm/ion/Makefile
@@ -15,7 +15,7 @@ BROKEN=		unfetchable
 CONFLICTS=	ion-2-*
 CONFLICTS_INSTALL=	ion-shell
 
+USES=		gmake xorg
 USE_XORG=	x11
-USES=		gmake
 
 .include <bsd.port.mk>
diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile
index a6613116887c..21f3e7195632 100644
--- a/x11-wm/jewel/Makefile
+++ b/x11-wm/jewel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Window manager based on aewm++
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler gmake
+USES=		compiler gmake xorg
 USE_XORG=	x11 xext xpm
 ALL_TARGET=	all
 PORTDOCS=	Changelog Changelog.DLR Changelog.jewel INSTALL README
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 381e0f1f0893..886639b29cc2 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Joe's Window Manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		iconv localbase pkgconfig tar:xz
+USES=		iconv localbase pkgconfig tar:xz xorg
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
@@ -21,6 +21,7 @@ OPTIONS_DEFINE=		CAIRO DEBUG FRIBIDI JPEG NLS PNG SVG XEXT XFT \
 OPTIONS_DEFAULT=	FRIBIDI JPEG PNG XEXT XFT XINERAMA XMU XPM XRENDER
 OPTIONS_SUB=		yes
 
+CAIRO_USES=		gnome
 CAIRO_USE=		GNOME=cairo
 CAIRO_CONFIGURE_ENABLE=	cairo
 DEBUG_CONFIGURE_ENABLE=	debug
diff --git a/x11-wm/larswm/Makefile b/x11-wm/larswm/Makefile
index b3109c7f5fae..28f4410a830b 100644
--- a/x11-wm/larswm/Makefile
+++ b/x11-wm/larswm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tiling Window Manager for X
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xext xmu xt
 
 PORTDOCS=	ChangeLog README README.9menu README.9wm \
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 64d04513ddff..a6bfaf52ac7a 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	mkfontdir:x11-fonts/mkfontscale
 
-USES=		autoreconf fonts libtool pkgconfig
+USES=		autoreconf fonts libtool pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	fontutil x11 xext xpm
 
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index 15576e39ad50..39acf5998dd3 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libwebp.so:graphics/webp \
 		libMagickWand-6.so:graphics/ImageMagick6
 
-USES=		jpeg libtool localbase pathfix pkgconfig
+USES=		jpeg libtool localbase pathfix pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xft xinerama xmu xpm
 BUILD_WRKSRC=	${WRKSRC}/wrlib
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index 4d391c6a20ae..a7a0ca131283 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight window manager
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig
+USES=		pkgconfig xorg
 USE_XORG=	sm x11 xext
 MAKEFILE=	no_xmkmf_makefile
 MAKE_ARGS=	LDFLAGS="${LDFLAGS}"
diff --git a/x11-wm/lxappearance-obconf/Makefile b/x11-wm/lxappearance-obconf/Makefile
index 92583ffabfa7..1faee2fdaba2 100644
--- a/x11-wm/lxappearance-obconf/Makefile
+++ b/x11-wm/lxappearance-obconf/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	openbox:x11-wm/openbox \
 	lxappearance:x11-themes/lxappearance
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USES=	gettext-tools gmake libtool pkgconfig tar:xz
+USES=	gettext-tools gmake gnome libtool pkgconfig tar:xz xorg
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack atk cairo pango gdkpixbuf2 \
 	librsvg2 libxml2
diff --git a/x11-wm/lxqt-panel/Makefile b/x11-wm/lxqt-panel/Makefile
index c9dd41fd829f..2a0a62e90e4f 100644
--- a/x11-wm/lxqt-panel/Makefile
+++ b/x11-wm/lxqt-panel/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt \
 RUN_DEPENDS=	lxmenu-data>=0.1.2:x11/lxmenu-data
 
 USES=	cmake compiler:c++14-lang gettext-runtime kde:5 qt:5 gnome \
-	localbase:ldflags lxqt pkgconfig tar:xz
+	localbase:ldflags lxqt pkgconfig tar:xz xorg
 USE_QT=	buildtools_build qmake_build core dbus gui svg widgets \
 	x11extras xml
 USE_KDE=	windowsystem
diff --git a/x11-wm/lxqt-session/Makefile b/x11-wm/lxqt-session/Makefile
index a77b71ecaa13..817fa630601d 100644
--- a/x11-wm/lxqt-session/Makefile
+++ b/x11-wm/lxqt-session/Makefile
@@ -15,7 +15,7 @@ LICENSE=	LGPL21+
 BUILD_DEPENDS=	xdg-user-dirs-update:devel/xdg-user-dirs
 
 USES=	cmake compiler:c++14-lang kde:5 lxqt qt:5 \
-	pkgconfig tar:xz
+	pkgconfig tar:xz xorg
 USE_QT=	buildtools_build qmake_build core dbus gui linguisttools \
 	svg widgets x11extras xml
 USE_KDE=	windowsystem
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index bdc24c04ab20..361ab7daf41d 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libpolkit-agent-1.so:sysutils/polkit \
 		libck-connector.so:sysutils/consolekit2
 
-USES=		autoreconf gmake gnome localbase pkgconfig tar:xz
+USES=		autoreconf gmake gnome localbase pkgconfig tar:xz xorg
 USE_GNOME=	glib20 gtk20 intltool cairo gdkpixbuf2 libxslt
 USE_XORG=	x11
 
diff --git a/x11-wm/marco/Makefile b/x11-wm/marco/Makefile
index d8665846f789..4088163fab7a 100644
--- a/x11-wm/marco/Makefile
+++ b/x11-wm/marco/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS=	zenity>=3.0.0:x11/zenity
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool localbase pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome libtool localbase pathfix pkgconfig \
+		tar:xz xorg
 USE_XORG=	ice sm x11 xcomposite xcursor xdamage xext xfixes \
 		xinerama xrandr xrender
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
diff --git a/x11-wm/matwm2/Makefile b/x11-wm/matwm2/Makefile
index 1382420c96e5..9d01a696cc73 100644
--- a/x11-wm/matwm2/Makefile
+++ b/x11-wm/matwm2/Makefile
@@ -15,6 +15,7 @@ LICENSE=	MIT
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cc=${CC} --prefix=${PREFIX} --mandir=${MANPREFIX}/man
+USES=		xorg
 USE_XORG=	x11 xext xinerama xft
 
 PLIST_FILES=	bin/matwm2 man/man1/${PORTNAME}.1.gz
diff --git a/x11-wm/mcwm/Makefile b/x11-wm/mcwm/Makefile
index 5c6686becd53..078e27474483 100644
--- a/x11-wm/mcwm/Makefile
+++ b/x11-wm/mcwm/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-icccm.so:x11/xcb-util-wm
 
+USES=		tar:bzip2 xorg
 USE_XORG=	x11 xrandr
-USES=		tar:bzip2
 
 PLIST_FILES=	bin/mcwm bin/hidden man/man1/mcwm.1.gz man/man1/hidden.1.gz
 PORTDOCS=	README NEWS
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 80cf618ff07d..b17f13205b1c 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -22,10 +22,10 @@ RUN_DEPENDS=	zenity>=3.0.0:x11/zenity \
 
 PORTSCOUT=	limitw:1,even
 
-USE_XORG=	x11 xcomposite xdamage xrender xcursor xinerama xext xrandr
 USES=		compiler:c11 gettext gmake gnome libtool \
-		localbase pathfix pkgconfig tar:xz
+		localbase pathfix pkgconfig tar:xz xorg
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xcomposite xdamage xrender xcursor xinerama xext xrandr
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2:build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index a4369d5243c5..0678e22cb827 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
 RUN_DEPENDS=	zenity>=3.0.0:x11/zenity
 
 USES=		autoreconf:build gettext libtool gmake \
-		pathfix pkgconfig python:2.7
+		pathfix pkgconfig python:2.7 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_GNOME=	gconf2 gnomedocutils gnomeprefix gtk30 \
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index a7071fff7f4e..4d7be61c7ee3 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -35,7 +35,7 @@ RUN_DEPENDS=	zenity>=3.0.0:x11/zenity \
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++0x gettext gl gmake gnome libtool localbase pathfix \
-		pkgconfig tar:xz
+		pkgconfig tar:xz xorg
 USE_GL=		egl
 USE_GNOME=	cairo gdkpixbuf2 gnomedesktop3 introspection
 USE_XORG=	ice sm x11 xcb xcomposite xcursor xdamage xext xfixes \
diff --git a/x11-wm/nickleby/Makefile b/x11-wm/nickleby/Makefile
index da4879ab173c..81fdfd2d0b10 100644
--- a/x11-wm/nickleby/Makefile
+++ b/x11-wm/nickleby/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Simple window manager
 
 BROKEN=		unfetchable
 
+USES=		xorg
 USE_XORG=	x11
 DESTDIRNAME=	STAGEDIR
 
diff --git a/x11-wm/obconf-qt/Makefile b/x11-wm/obconf-qt/Makefile
index 0909344ed95f..c7717bc4e890 100644
--- a/x11-wm/obconf-qt/Makefile
+++ b/x11-wm/obconf-qt/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libobt.so:x11-wm/openbox \
 		libImlib2.so:graphics/imlib2
 
 USES=		cmake compiler:c++11-lang gettext-runtime localbase qt:5 \
-		gnome lxqt pkgconfig tar:xz
+		gnome lxqt pkgconfig tar:xz xorg
 
 USE_QT=		buildtools_build qmake_build core gui linguisttools \
 		widgets x11extras
diff --git a/x11-wm/obpager/Makefile b/x11-wm/obpager/Makefile
index 5d113ebd6d2f..594fbbd4d628 100644
--- a/x11-wm/obpager/Makefile
+++ b/x11-wm/obpager/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 
-USES=		compiler gmake
+USES=		compiler gmake xorg
 USE_XORG=	x11 xext
 
 CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 085ef347c6bf..13f9591ce15c 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 REINPLACE_ARGS= -i ""
 NO_WRKSUBDIR=	yes
-USES=		imake tar:Z
+USES=		imake tar:Z xorg
 USE_XORG=	xpm
 
 IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 59e7fde63649..f1116a9ce7ab 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix python:run pkgconfig shebangfix
+USES=		gmake gnome libtool pathfix python:run pkgconfig shebangfix xorg
 USE_GNOME=	cairo glib20 libxml2 pango
 USE_XORG=	ice sm x11 xcursor xext xft xinerama xrandr \
 		xrender xau
diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index 06c1028ce6c0..17f6a9f9e8bb 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Small and simple GNOME-compatible window manager
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
+USES=		xorg
 USE_XORG=	xpm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/peksystray/Makefile b/x11-wm/peksystray/Makefile
index c45b0146b10a..e9daafde355c 100644
--- a/x11-wm/peksystray/Makefile
+++ b/x11-wm/peksystray/Makefile
@@ -12,7 +12,7 @@ COMMENT=	System tray dockapp similar to the GNOME notification area applet
 
 LICENSE=	GPLv2
 
-USES=		tar:bzip2
+USES=		tar:bzip2 xorg
 USE_XORG=	x11 ice sm
 GNU_CONFIGURE=	yes
 
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 64cc75983555..50991e6660e6 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -18,7 +18,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		compiler gmake iconv:wchar_t jpeg localbase pkgconfig tar:bzip2
+USES=		compiler gmake iconv:wchar_t jpeg localbase pkgconfig \
+		tar:bzip2 xorg
 USE_XORG=	xft xpm x11 sm ice xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shape --enable-xinerama --enable-xrandr \
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 82392d9a20f5..1cf954115f5d 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	tvtwm with pie (circular) menus
 
 BROKEN=		unfetchable
 
-USES=		imake
+USES=		imake xorg
 DISABLE_SIZE=	yes
 USE_XORG=	xbitmaps xpm xmu
 
diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index c3d7555d8d8b..ab30115c21b9 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 MAINTAINER=	schot@a-eskwadraat.nl
 COMMENT=	lightweight window manager with emphasis on usability
 
+USES=		gmake xorg
 USE_XORG=	x11
-USES=		gmake
 MAKE_ENV=	X11_PREFIX="${LOCALBASE}" HAS_SYSTEM_ASPRINTF=1
 
 OPTIONS_DEFINE=	DOCS
diff --git a/x11-wm/ratmen/Makefile b/x11-wm/ratmen/Makefile
index c7814c904235..dc21fc0f93e8 100644
--- a/x11-wm/ratmen/Makefile
+++ b/x11-wm/ratmen/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.update.uu.se/~zrajm/programs/ratmen/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple program for displaying a menu in a window
 
-USES=		perl5
+USES=		perl5 xorg
 USE_XORG=	x11
 USE_PERL5=	build
 PLIST_FILES=	bin/ratmen man/man1/ratmen.1.gz
diff --git a/x11-wm/ratmenu/Makefile b/x11-wm/ratmenu/Makefile
index 6c1bb17dee6c..ff7e187bbc15 100644
--- a/x11-wm/ratmenu/Makefile
+++ b/x11-wm/ratmenu/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Simple menu patterened for use with ratpoison
 
 BROKEN=		unfetchable
 
+USES=		xorg
 USE_XORG=	x11
 ALL_TARGET=	ratmenu
 PLIST_FILES=	bin/ratmenu \
diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile
index 696efdd9f22b..8495c21acafc 100644
--- a/x11-wm/ratpoison/Makefile
+++ b/x11-wm/ratpoison/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple window manager with no fat library dependencies
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig
+USES=		pkgconfig xorg
 USE_XORG=	ice x11 xext xrandr xtst
 GNU_CONFIGURE=	yes
 
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 2f6ec98fd465..150286d3f19a 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	librep.so:lang/librep \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	rep-gtk2>=0.90:x11-toolkits/rep-gtk2
 
-USES=		autoreconf gmake gnome libtool localbase makeinfo pathfix pkgconfig tar:xz
+USES=		autoreconf gmake gnome libtool localbase makeinfo pathfix \
+		pkgconfig tar:xz xorg
 USE_XORG=	ice sm x11 xft xinerama xrandr xtst xrender xext
 USE_GNOME=	cairo gtk20
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/skippy-xd/Makefile b/x11-wm/skippy-xd/Makefile
index 5c84eb574f07..f6ab33ec32a6 100644
--- a/x11-wm/skippy-xd/Makefile
+++ b/x11-wm/skippy-xd/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png
 
-USES=		gmake jpeg pkgconfig
+USES=		gmake jpeg pkgconfig xorg
 USE_XORG=	x11 xcomposite xdamage xext xfixes xft xinerama xrender
 
 USE_GITHUB=	yes
diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index 860b22d382bb..6ac1c6e4c351 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -23,6 +23,7 @@ OPTIONS_DEFINE= EXAMPLES
 
 .include	<bsd.port.options.mk>
 
+USES=		xorg
 USE_XORG=	x11 xcb xcursor xft xrandr xt
 
 USE_LDCONFIG=	yes
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index fbb4c2682905..2ee04ba62a50 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	swaybg:x11/swaybg
 
-USES=		compiler:c11 gnome meson pkgconfig
+USES=		compiler:c11 gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
diff --git a/x11-wm/tinywm/Makefile b/x11-wm/tinywm/Makefile
index a182f54392c5..5d273fc838cc 100644
--- a/x11-wm/tinywm/Makefile
+++ b/x11-wm/tinywm/Makefile
@@ -14,6 +14,7 @@ COMMENT=	Ridiculously tiny window manager
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/tinywm
+USES=		xorg
 USE_XORG=	x11
 PORTDOCS=	README
 
diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile
index d60911f6a8e6..8a010292dda2 100644
--- a/x11-wm/treewm/Makefile
+++ b/x11-wm/treewm/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	constant expression evaluates to -2147483648 which cannot be narrowed to type 'unsigned long'
 
-USES=		gmake imake:env tar:bzip2
+USES=		gmake imake:env tar:bzip2 xorg
 USE_XORG=	x11 ice sm xext xmu xpm xt xxf86vm
 
 PORTDOCS=	AUTHORS ChangeLog PROBLEMS README README.tiling TODO
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index d09b8f853da6..b48a8735db53 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Twm with a virtual desktop
 LICENSE=	MIT
 
 WRKSRC=		${WRKDIR}/tvtwm
-USES=		imake
+USES=		imake xorg
 USE_XORG=	xbitmaps xpm xmu
 PLIST_FILES=	bin/tvtwm \
 		man/man1/tvtwm.1.gz
diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index 478f531690e3..8cb45af6a4a1 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=	pkgconfig
+USES=	pkgconfig xorg
 
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xft xinerama xpm xmu xrandr
diff --git a/x11-wm/w9wm/Makefile b/x11-wm/w9wm/Makefile
index 2bc8820fff32..8cba7544d296 100644
--- a/x11-wm/w9wm/Makefile
+++ b/x11-wm/w9wm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Hack of 9wm to give virtual screens
 
 WRKSRC=		${WRKDIR}/${DISTNAME}.orig
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/w9wm \
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index d845fcea0933..3a7d8fd47bc5 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
-USES=		compiler:c++11-lib gl jpeg meson pkgconfig
+USES=		compiler:c++11-lib gl gnome jpeg meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		egl glesv2
 USE_GNOME=	cairo
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index c150a3813fb3..4184a3cd3ee0 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libexif.so:graphics/libexif
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:graphics/wmicons
 
-USES=		jpeg libtool shebangfix pathfix perl5 pkgconfig
+USES=		jpeg libtool shebangfix pathfix perl5 pkgconfig xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xft xinerama xmu xpm
 SHEBANG_FILES=	util/wkdemenu.pl
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index b67fc24a2f31..c12cc91bdc76 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Simple window manager for X
 
 BUILD_DEPENDS=	makedepend:devel/makedepend
 
+USES=		xorg
 USE_XORG=	x11 xext xmu
 ALL_TARGET=	depend wm2
 
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 99388f465049..3aeb1d226c58 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -20,8 +20,8 @@ RUN_DEPENDS=	rpm:archivers/rpm4
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USES=		gettext pkgconfig perl5 gmake gnome shebangfix xorg
 USE_GNOME=	gtk20
-USES=		gettext pkgconfig perl5 gmake shebangfix
 SHEBANG_FILES=	scripts/getfile.pl.in scripts/upgrade.pl.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wmakerdataprefix="${LOCALBASE}/share" \
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 7b3ea07b560e..71318d95a8df 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		gmake
+USES=		gl gmake xorg
 USE_XORG=	x11 xext
 USE_GL=		gl
 
diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile
index e541aa48523d..678779679c03 100644
--- a/x11-wm/wmii-devel/Makefile
+++ b/x11-wm/wmii-devel/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libixp.so:devel/libixp
 
 CONFLICTS=	wmii-[0-9]*
 
-USES=		pkgconfig python:run shebangfix tar:tbz
+USES=		pkgconfig python:run shebangfix tar:tbz xorg
 SHEBANG_FILES=	alternative_wmiircs/python/wmiirc
 USE_XORG=	x11 xext xrandr xrender xinerama xft
 
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index 3c205dc66e3f..3ba763570b34 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -18,6 +18,7 @@ RUN_DEPENDS=	dmenu:x11/dmenu
 
 CONFLICTS=	wmii-devel-[0-9]*
 
+USES=		xorg
 USE_XORG=	x11 xorgproto xt xext
 
 MAKE_ARGS=	PREFIX="${PREFIX}" MAN="${MANPREFIX}/man" \
diff --git a/x11-wm/wmname/Makefile b/x11-wm/wmname/Makefile
index 1f8b02bb1056..35dc5ad62078 100644
--- a/x11-wm/wmname/Makefile
+++ b/x11-wm/wmname/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES=	http://dl.suckless.org/tools/
 MAINTAINER=	nuncupatio@gmail.com
 COMMENT=	Prints/sets the window manager name property of the root window
 
+USES=		xorg
 USE_XORG=	x11 xorgproto
 
 PLIST_FILES=	bin/wmname
diff --git a/x11-wm/wmx/Makefile b/x11-wm/wmx/Makefile
index d806c2b0ca4f..daf39f46a043 100644
--- a/x11-wm/wmx/Makefile
+++ b/x11-wm/wmx/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.all-day-breakfast.com/wmx/
 MAINTAINER=	kwhite@site.uottawa.ca
 COMMENT=	Simple window manager based on wm2
 
-USES=		pkgconfig
+USES=		pkgconfig xorg
 GNU_CONFIGURE=	yes
 USE_XORG=	ice sm x11 xcomposite xext xft xpm