aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/csound/Makefile1
-rw-r--r--audio/mp3blaster/Makefile2
-rw-r--r--audio/ocp/Makefile4
-rw-r--r--biology/emboss/Makefile2
-rw-r--r--cad/jspice3/Makefile1
-rw-r--r--cad/spice/Makefile1
-rw-r--r--comms/gnokii/Makefile1
-rw-r--r--comms/morse/Makefile1
-rw-r--r--comms/multimon-ng/Makefile1
-rw-r--r--deskutils/cairo-dock/Makefile1
-rw-r--r--deskutils/xneur/Makefile1
-rw-r--r--devel/ace/Makefile1
-rw-r--r--devel/agar/Makefile2
-rw-r--r--devel/hwloc/Makefile1
-rw-r--r--devel/rhtvision/Makefile1
-rw-r--r--devel/sfml/Makefile2
-rw-r--r--devel/upp/Makefile3
-rw-r--r--editors/aee/Makefile1
-rw-r--r--editors/jed/Makefile1
-rw-r--r--emulators/darcnes/Makefile1
-rw-r--r--emulators/qemu30/Makefile4
-rw-r--r--emulators/qemu40/Makefile2
-rw-r--r--emulators/spim/Makefile2
-rw-r--r--emulators/wine/Makefile2
-rw-r--r--games/0verkill/Makefile1
-rw-r--r--games/angband/Makefile2
-rw-r--r--games/ezquake/Makefile3
-rw-r--r--games/heretic/Makefile2
-rw-r--r--games/stratagus/Makefile1
-rw-r--r--games/xlennart/Makefile4
-rw-r--r--games/xonotic/Makefile1
-rw-r--r--graphics/GraphicsMagick/Makefile1
-rw-r--r--graphics/aalib/Makefile1
-rw-r--r--graphics/eog-plugins/Makefile1
-rw-r--r--graphics/gmic/Makefile1
-rw-r--r--graphics/gmt/Makefile1
-rw-r--r--graphics/jasper/Makefile1
-rw-r--r--graphics/libcaca/Makefile1
-rw-r--r--graphics/libwmf/Makefile1
-rw-r--r--graphics/povray37/Makefile1
-rw-r--r--graphics/xaos/Makefile1
-rw-r--r--graphics/zbar/Makefile1
-rw-r--r--japanese/jed/Makefile1
-rw-r--r--japanese/jvim3/Makefile1
-rw-r--r--java/openjdk8/Makefile1
-rw-r--r--lang/chez-scheme/Makefile1
-rw-r--r--lang/ecl/Makefile1
-rw-r--r--lang/io/Makefile.addons6
-rw-r--r--mail/metamail/Makefile1
-rw-r--r--misc/nut/Makefile1
-rw-r--r--multimedia/ffmpeg/Makefile3
-rw-r--r--multimedia/libva-utils/Makefile1
-rw-r--r--multimedia/mpeg2codec/Makefile1
-rw-r--r--net-im/qTox/Makefile1
-rw-r--r--net/boinc-client/Makefile2
-rw-r--r--net/clusterit/Makefile1
-rw-r--r--net/freeswitch/Makefile2
-rw-r--r--net/mediastreamer/Makefile1
-rw-r--r--net/pvm/Makefile1
-rw-r--r--print/hp2xx/Makefile1
-rw-r--r--science/simbody/Makefile2
-rw-r--r--sysutils/conky/Makefile4
-rw-r--r--sysutils/gkrellm2/Makefile1
-rw-r--r--sysutils/nvclock/Makefile3
-rw-r--r--sysutils/xmbmon/Makefile1
-rw-r--r--textproc/htmldoc/Makefile1
-rw-r--r--textproc/ibus/Makefile1
-rw-r--r--www/links/Makefile1
-rw-r--r--x11-toolkits/libgdiplus/Makefile1
-rw-r--r--x11/fpc-x11/Makefile1
70 files changed, 91 insertions, 16 deletions
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index b0ca6e3242e1..a3967d266048 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -64,6 +64,7 @@ EXCITER_DESC= Build the exciter opcode
EXCITER_CMAKE_BOOL= BUILD_EXCITER_OPCODES
FLTK_DESC= Build FLTK plugin and GUI
+FLTK_USES= xorg
FLTK_USE= XORG=ice,sm,x11,xext
FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
FLTK_CMAKE_ON= -DBUILD_WINSOUND:BOOL=ON
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 5e7b62ec8d21..2eab7aff14e1 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -32,11 +32,13 @@ VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis
VORBIS_CONFIGURE_WITH= oggvorbis
SDL_CONFIGURE_WITH= sdl
+SDL_USES= sdl
SDL_USE= SDL=sdl
NAS_CONFIGURE_WITH= nas
NAS_LIB_DEPENDS= libaudio.so:audio/nas
NAS_LDFLAGS= -laudio
+NAS_USES= xorg
NAS_USE= XORG=x11,xt,ice,sm
post-patch:
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 79601561363f..4c8f9859992d 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -66,8 +66,8 @@ X11_PLIST_SUB_OFF= XORG='@comment ' DESKTOP='@comment '
X11_USE= XORG=xxf86dga,xxf86vm,xpm,xext,x11
# needed despite stage-qa's warning
-SDL_USES= desktop-file-utils
-X11_USES= desktop-file-utils
+SDL_USES= desktop-file-utils sdl
+X11_USES= desktop-file-utils xorg
LDFLAGS_i386= -Wl,-z,notext
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index f7830d8cdc94..14c6fe126600 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -39,8 +39,8 @@ DATADIR= ${PREFIX}/share/${PORTNAME:tu}
OPTIONS_DEFINE= DOCS X11
OPTIONS_DEFAULT= X11
DOCS_CONFIGURE_ON= --with-docroot=${DOCSDIR}
+X11_USES= motif xorg
X11_USE= XORG=x11
-X11_USES= motif
X11_LIB_DEPENDS= libgd.so:graphics/gd \
libpng.so:graphics/png
X11_CONFIGURE_OFF= --without-x
diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile
index 96942cc4fd92..8d10179f4b2f 100644
--- a/cad/jspice3/Makefile
+++ b/cad/jspice3/Makefile
@@ -19,6 +19,7 @@ OPTIONS_SUB= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+X11_USES= xorg
X11_USE= XORG=x11,xaw,xt
post-patch:
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index b4e35d0d22dd..f2d9e5a6c6b0 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -46,6 +46,7 @@ PORTEXAMPLES= bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \
OPTIONS_DEFINE= DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4 DEV_HISIM2
OPTIONS_DEFAULT=X11
+X11_USES= xorg
X11_USE= XORG=x11,xaw,xext,xmu,xt
X11_CONFIGURE_ENV= WITH_X11=yes
DEV_BSIM3_DESC= BSIM3v3 MOS Transistor Model Support
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index c240a6104038..b16059a0f070 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -72,6 +72,7 @@ SQLITE_CONFIGURE_OFF= --disable-sqlite
X11_CONFIGURE_WITH= x
X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
+X11_USES= gnome xorg
X11_USE= XORG=x11 XORG=xpm \
GNOME=cairo GNOME=gdkpixbuf2 GNOME=gtk20
X11_PLIST_SUB= X11=''
diff --git a/comms/morse/Makefile b/comms/morse/Makefile
index 044f8cc77589..3f7b56b88ef6 100644
--- a/comms/morse/Makefile
+++ b/comms/morse/Makefile
@@ -26,6 +26,7 @@ PULSEAUDIO_DESC= Beep using Pulse Audio
OSS_MAKE_ARGS= DEVICE=OSS
X11_MAKE_ARGS= DEVICE=X11
+X11_USES= xorg
X11_USE= XORG=x11
X11_CFLAGS= -I${LOCALBASE}/include
X11_LDFLAGS= -L${LOCALBASE}/lib
diff --git a/comms/multimon-ng/Makefile b/comms/multimon-ng/Makefile
index 9c4ccc2678ed..ab89fc800f1b 100644
--- a/comms/multimon-ng/Makefile
+++ b/comms/multimon-ng/Makefile
@@ -20,6 +20,7 @@ OPTIONS_DEFINE= PULSEAUDIO X11
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= PULSE_AUDIO_SUPPORT
+X11_USES= xorg
X11_USE= XORG=ice,sm,x11,xext
X11_CMAKE_BOOL= X11_SUPPORT
diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile
index dbd9180385f6..332593670de6 100644
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@@ -50,6 +50,7 @@ WAYLAND_USE= GL=egl
WAYLAND_CMAKE_BOOL= enable-wayland-support
WAYLAND_IMPLIES= EGL
+X11_USES= xorg
X11_USE= XORG=x11,xcomposite,xinerama,xrandr,xrender,xtst
X11_CMAKE_BOOL= enable-x11-support
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index c6a1cb063a6c..d6f474cca75e 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -44,6 +44,7 @@ OPTIONS_SUB= yes
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
+X11_USES= xorg
X11_USE= XORG=x11
X11_CONFIGURE_WITH= x
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index e3f85ed686cd..629daaea601c 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -48,6 +48,7 @@ TK_MAKE_ENV= tk=1
TRIO_DESC= Trio portable string functions
TRIO_BUILD_DEPENDS= trio>=0:devel/trio
TRIO_MAKE_ENV= trio=1
+X11_USES= xorg
X11_USE= XORG=xt
X11_MAKE_ENV= xt=1
diff --git a/devel/agar/Makefile b/devel/agar/Makefile
index f9a847e892b4..a09de0d23025 100644
--- a/devel/agar/Makefile
+++ b/devel/agar/Makefile
@@ -52,6 +52,7 @@ FONTCONFIG_CONFIGURE_WITH=fontconfig
FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
FONTCONFIG_IMPLIES= GUI
+X11_USES= gl xorg
X11_USE= GL=gl XORG=x11,xext
X11_CONFIGURE_ON= --with-x=${LOCALBASE} --with-glx
X11_CONFIGURE_OFF= --without-x --without-glx
@@ -61,6 +62,7 @@ XINERAMA_USE= XORG=xinerama
XINERAMA_CONFIGURE_WITH=xinerama
XINERAMA_IMPLIES= X11
+SDL_USES= gl sdl
SDL_USE= SDL=sdl GL=gl
SDL_CONFIGURE_WITH= sdl
SDL_IMPLIES= GUI
diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile
index 9a3fe5db1f96..8a4485e2831c 100644
--- a/devel/hwloc/Makefile
+++ b/devel/hwloc/Makefile
@@ -37,6 +37,7 @@ OPTIONS_SUB= yes
CAIRO_CONFIGURE_OFF= --disable-cairo --without-x
CAIRO_CONFIGURE_ON= --enable-cairo --with-x
CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo
+CAIRO_USES= xorg
CAIRO_USE= XORG=x11
post-install-DOCS-on:
diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index 0f6c1b2fc9b1..1aa94bb1fe61 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -36,6 +36,7 @@ PLIST_SUB= VERSION="${PORTVERSION:R}"
NLS_USES= gettext
NLS_CONFIGURE_OFF= --no-intl
+X11_USES xorg
X11_USE= XORG=x11,xmu
X11_CONFIGURE_ON= --x-include=${LOCALBASE}/include \
--x-lib=${LOCALBASE}/lib
diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index 1868f99d6ad3..2d5f394d7da2 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -36,7 +36,7 @@ MODULES_DESC= SFML modules
WINDOW_DESC= SFML Window module
WINDOW_CMAKE_BOOL= SFML_BUILD_WINDOW
-WINDOW_USES= gl
+WINDOW_USES= gl xorg
WINDOW_USE= XORG=x11,xrandr GL=gl
GRAPHICS_DESC= SFML Graphics module
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 2152d21e8669..8cfcb9ad72bd 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -48,6 +48,7 @@ IDE_LIB_DEPENDS= libexpat.so:textproc/expat2 \
libnotify.so:devel/libnotify \
libpng.so:graphics/png
IDE_PLIST_FILES= bin/theide ${MANPREFIX}/man/man1/theide.1.gz
+IDE_USES= gnome xorg
IDE_USE= XORG=x11,xau,xcb,xcursor,xdmcp,xext,xfixes,xft,xi,xinerama,xrandr,xrender \
GNOME=cairo,gdkpixbuf2,gtk20
UMK_DESC= Build/install UMK (U++ MaKe command line utility)
@@ -57,7 +58,9 @@ USEMALLOC_VARS= MACRO_FLAGS+=-DflagUSEMALLOC
SCD_DESC= Install spelling dictionaries (*.scd files)
SCD_VARS= PORTDATA+=*.scd
# SDL/OPENGL/MYSQL/PGSQL dependencies are only for run-time for use by executables built by the IDE
+SDL_USES= sdl
SDL_USE= SDL=sdl
+OPENGL_USES= gl
OPENGL_USE= GL=gl,glu
MYSQL_USES= mysql
PGSQL_USES= pgsql
diff --git a/editors/aee/Makefile b/editors/aee/Makefile
index b93cd4b65065..3b007cc456dc 100644
--- a/editors/aee/Makefile
+++ b/editors/aee/Makefile
@@ -23,6 +23,7 @@ MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= XAE
XAE_DESC= Build X11 version 'xae'
+XAE_USES= xorg
XAE_USE= XORG=x11
XAE_PLIST_FILES= bin/xae bin/rxae
XAE_ALL_TARGET= xae
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 113cd8a22fe8..682c364a38c6 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -36,6 +36,7 @@ MAKE_ENV+= DEST_DOC_DIR=${STAGEDIR}${DOCSDIR}
ALL_TARGET= all getmail
+X11_USES= xorg
X11_USE= XORG=x11 XORG=ice XORG=xt
X11_ALL_TARGET= xjed
diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
index f6a5f02d15f2..ad207fee3757 100644
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -32,6 +32,7 @@ BACKEND_DESC= GUI backend
SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib
SVGALIB_VARS= MAKE_ARGS+=TARGET=Linux_svgalib
+X11_USES= xorg
X11_USE= XORG=x11,xaw,xext,xmu,xt
.include <bsd.port.pre.mk>
diff --git a/emulators/qemu30/Makefile b/emulators/qemu30/Makefile
index e799be47579a..7925d688f1cf 100644
--- a/emulators/qemu30/Makefile
+++ b/emulators/qemu30/Makefile
@@ -54,7 +54,7 @@ GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \
libepoxy.so:graphics/libepoxy \
libpcre2-8.so:devel/pcre2
GTK3_USE= GNOME=gtk30,vte3,gdkpixbuf2 XORG=x11,xext GL=gbm
-GTK3_USES= gettext gl
+GTK3_USES= gettext gl gnome xorg
JPEG_CONFIGURE_OFF= --disable-vnc-jpeg
JPEG_USES= jpeg
NCURSES_USES= ncurses:base
@@ -80,7 +80,7 @@ VDE_CONFIGURE_OFF= --disable-vde
VDE_LIB_DEPENDS= libvdeplug.so:net/vde2
X11_CONFIGURE_ENABLE= sdl
X11_USE= SDL=sdl2 XORG=x11,xext
-X11_USES= sdl
+X11_USES= sdl xorg
.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils"
X86_TARGETS_USE_OFF= GNOME=cairo,gdkpixbuf2
.endif
diff --git a/emulators/qemu40/Makefile b/emulators/qemu40/Makefile
index d2e614aa75a8..410be5b1e87a 100644
--- a/emulators/qemu40/Makefile
+++ b/emulators/qemu40/Makefile
@@ -51,7 +51,7 @@ VDE_DESC= vde dependency (for vde networking)
OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE
OPTIONS_SUB= yes
X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2
-X11_USES= sdl
+X11_USES= gnome sdl xorg
X11_CONFIGURE_ENABLE= sdl
GTK3_LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon
GTK3_USE= GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index ff8d2315e9c9..b4c5704e33cf 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE= GUI DOCS
OPTIONS_DEFAULT=GUI
GUI_USE= XORG=x11,xaw
-GUI_USES= imake:env
+GUI_USES= imake:env xorg
GUI_PLIST_FILES=bin/xspim man/man1/xspim.1.gz
post-build-GUI-on:
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index a39ee5f52b0d..763033530644 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -111,7 +111,7 @@ VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML
X11_CONFIGURE_WITH= x cms fontconfig freetype glu jpeg opengl png xinerama xinput2 xrandr xrender
-X11_USES= gl jpeg
+X11_USES= gl jpeg xorg
X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender
X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index cbe77a3f01b8..40dfd32a1a4a 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -20,6 +20,7 @@ OPTIONS_DEFINE= X11 DOCS
OPTIONS_DEFAULT=X11
OPTIONS_SUB= yes
+X11_USES= xorg
X11_USE= XORG=xpm
X11_CONFIGURE_WITH= x
diff --git a/games/angband/Makefile b/games/angband/Makefile
index fffaf02b8874..61864a299eaa 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -23,8 +23,10 @@ OPTIONS_DEFINE= SDL X11 DOCS
OPTIONS_DEFAULT=X11
DOCS_BUILD_DEPENDS= rst2html:textproc/py-docutils
+SDL_USES= sdl
SDL_USE= SDL=image,mixer,ttf,sdl
SDL_CONFIGURE_ENABLE= sdl
+X11_USES= xorg
X11_USE= XORG=ice,sm,x11
X11_RUN_DEPENDS= xorg-fonts-miscbitmaps>=0:x11-fonts/xorg-fonts-miscbitmaps
X11_CONFIGURE_ENABLE= x11
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index 6c27e6a3fc16..44aad43d87a7 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -36,9 +36,10 @@ OPTIONS_DEFINE= OPTIMIZED_CFLAGS
OPTIONS_DEFAULT= OPENGL X11 OPTIMIZED_CFLAGS
OPTIONS_SUB= yes
-OPENGL_USES= jpeg
+OPENGL_USES= gl jpeg
OPENGL_USE= GL=yes
+X11_USES= xorg
X11_USE= XORG=xxf86dga
BROKEN_powerpc= Does not install on powerpc: signal 2
diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index 500dfd912761..eabd463685de 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -30,10 +30,12 @@ OPTIONS_SUB= yes
X11_ALL_TARGET= x11
X11_VARS= BINARY=xheretic
+X11_USES= xorg
X11_USE= XORG=x11,xext
FASTX11_ALL_TARGET= fastx11
FASTX11_VARS= BINARY=xaheretic
+FASTX11_USES= xorg
FASTX11_USE= XORG=x11,xext
SDL_ALL_TARGET= sdl
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index f78a562d0d48..fb18e554cd78 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -50,6 +50,7 @@ VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \
VORBIS_CMAKE_BOOL= WITH_OGGVORBIS
X11_DESC= X11 clipboard pasting support
+X11_USES= xorg
X11_USE= XORG=x11
X11_CMAKE_BOOL= WITH_X11
diff --git a/games/xlennart/Makefile b/games/xlennart/Makefile
index c16a1efccdaa..cc3309730e9d 100644
--- a/games/xlennart/Makefile
+++ b/games/xlennart/Makefile
@@ -40,12 +40,14 @@ GH_ACCOUNT= Xylemon
USES= pkgconfig
ATHENA_CONFIGURE_ON= --disable-gtk --disable-motif
+ATHENA_USES= xorg
ATHENA_USE= XORG=xaw,xmu,xt,x11,sm,ice
MOTIF_CONFIGURE_ON= --disable-athena --disable-gtk
MOTIF_USE= XORG=xt,x11,sm,ice,xpm
-MOTIF_USES= motif
+MOTIF_USES= motif xorg
+GTK_USES= gnome xorg
GTK_CONFIGURE_ON= --disable-athena --disable-motif
GTK_USE= GNOME=gtk20 XORG=sm,ice
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 72075a3b0c92..033ac6391582 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -42,6 +42,7 @@ CLIENT_LIB_DEPENDS= libtheora.so:multimedia/libtheora \
libvorbisenc.so:audio/libvorbis \
libvorbisfile.so:audio/libvorbis \
libogg.so:audio/libogg
+CLIENT_USES= sdl xorg
CLIENT_USE= SDL=sdl2 XORG=x11
CLIENT_ALL_TARGET= sdl-release
CLIENT_PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.ico
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 40b08ab20ee0..1889a0236fb5 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -66,6 +66,7 @@ WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
WMF_CONFIGURE_WITH= wmf
X11_CONFIGURE_OFF= ac_cv_lib_ICE_IceConnectionNumber=no
X11_CONFIGURE_WITH= x
+X11_USES= xorg
X11_USE= XORG=ice,sm,x11,xext
XML_CONFIGURE_WITH= xml
XML_USE= GNOME=libxml2
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 1062ad6585a5..b963ba3cc482 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -25,6 +25,7 @@ OPTIONS_DEFAULT= NCURSES
DRIVERS_DESC= Drives selection
+X11_USES= xorg
X11_USE= XORG=x11
X11_CONFIGURE_WITH= x11-driver=yes
NCURSES_USES= ncurses
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 28029001ffe2..de8a1cd9eed8 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -44,6 +44,7 @@ CHAMPLAIN_LIB_DEPENDS= libcogl.so:graphics/cogl \
libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libchamplain-0.12.so:graphics/libchamplain
+CHAMPLAIN_USES= gl xorg
CHAMPLAIN_USE= GL=egl XORG=x11,xcomposite,xdamage,xext,xfixes,xi,xrandr
PYTHON_CONFIGURE_ENABLE=python
diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile
index 8a2b90d0f6ee..926a7698693d 100644
--- a/graphics/gmic/Makefile
+++ b/graphics/gmic/Makefile
@@ -52,6 +52,7 @@ PLUGINS_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
PLUGINS_BROKEN= cmake files support was accidentally broken, need to convert the port to gmake use: https://github.com/dtschump/gmic/issues/135
X11_CMAKE_BOOL= ENABLE_X
+X11_USES= xorg
X11_USE= XORG=ice,sm,x11,xext
.include <bsd.port.mk>
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index ef763affd164..794225040a65 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -64,6 +64,7 @@ OCTAVE_CONFIGURE_OFF= --disable-mex
SHARED_DESC= Build shared (dynamic) libraries
SHARED_CONFIGURE_ON= --enable-shared
SHARED_USE= LDCONFIG=yes
+X11_USES= xorg
X11_USE= XORG=x11,xaw,xmu,xt
X11_CONFIGURE_OFF= --disable-xgrid
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index c6452fc6e226..307d87105dfb 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -24,6 +24,7 @@ USE_LDCONFIG= yes
USES= jpeg libtool:keepla localbase zip
OPENGL_CONFIGURE_ENABLE=opengl
+OPENGL_USES= gl xorg
OPENGL_USE= GL=glut XORG=x11,xext,xi,xmu
UUID_EXTRA_PATCHES= ${PATCHDIR}/uuid.patch
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index a3f4e33539fa..ff49fd706a13 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -32,6 +32,7 @@ OPTIONS_DEFAULT= X11 IMLIB2
X11_DESC= X11 and OpenGL support
FTGL_DESC= Freetype font rendering in OpenGL
+X11_USES= gl xorg
X11_USE= XORG=x11 GL=glut
X11_CONFIGURE_OFF= --disable-x11 --disable-gl
IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index c3e723bd5916..72f94ab43a75 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -34,6 +34,7 @@ OPTIONS_DEFINE= X11 DOCS
OPTIONS_DEFAULT=X11
OPTIONS_SUB= yes
+X11_USES= xorg
X11_USE= XORG=x11
X11_CONFIGURE_OFF=--with-x=no
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 398e6557f150..478cb7fec35e 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -40,6 +40,7 @@ IO_DESC= Without I/O restrictions (security risk)
IO_CONFIGURE_ON= --disable-io-restrictions
STATIC_CONFIGURE_ON= --enable-static
+X11_USES= xorg
X11_USE= XORG=xpm,sm,ice,x11 SDL=sdl
X11_CONFIGURE_OFF= --without-x
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 243c9b8ca6f6..f7777ea01335 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -48,6 +48,7 @@ GTK2_USE= GNOME=gtk20
GTK2_USES= pkgconfig
GTK2_CONFIGURE_WITH= gtk-driver
+X11_USES= xorg
X11_USE= XORG=x11,xext
X11_CONFIGURE_WITH= x11-driver x
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index 274f193f5db0..2f3cacb3b2c8 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -26,6 +26,7 @@ OPTIONS_RADIO_IMAGEMAGICK= V6 V7
OPTIONS_SUB= yes
V4L_DESC= Build zbarcam video scanner
+X11_USES= xorg
X11_USE= XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
X11_CONFIGURE_ON= --with-x=yes
X11_CONFIGURE_OFF= --with-x=no --without-xshm --without-xv
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index c4bc11841de4..76bb540a387b 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -40,6 +40,7 @@ CANNA_CONFIGURE_ON= --with-canna=yes
CANNA_CONFIGURE_OFF= --with-canna=no
CANNA_LIB_DEPENDS= libcanna.so:japanese/canna-lib
+X11_USES= xorg
X11_USE= XORG=x11,xext,xt
.include <bsd.port.options.mk>
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 2dff5f65df15..941056eee3c3 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -48,6 +48,7 @@ PORTDOCS= cygwin.txt differen.doc fepctrl.doc readme.doc \
CPPFLAGS+= -DBSD_UNIX -DUSE_LOCALE
LIBS+= -ltermlib -L${LOCALBASE}/lib
+X11_USES= xorg
X11_USE= XORG=x11
X11_CPPFLAGS= -DUSE_X11 -I${LOCALBASE}/include
X11_LIBS= -lX11 -L${LOCALBASE}/lib
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index b6b0589074ed..45f855da35a0 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -109,6 +109,7 @@ X11_CONFIGURE_ON= --with-giflib=system \
X11_LIB_DEPENDS= libgif.so:graphics/giflib
X11_MAKE_ENV_OFF= BUILD_HEADLESS_ONLY=1 \
MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include"
+X11_USES= xorg
X11_USE= XORG=x11,xext,xi,xrender,xt,xtst
FONTCONFIG_EXTRA_PATCHES= ${PATCHDIR}/fontconfig.patch
FONTCONFIG_IMPLIES= X11
diff --git a/lang/chez-scheme/Makefile b/lang/chez-scheme/Makefile
index b8280f8d6577..ca89c2bf78e8 100644
--- a/lang/chez-scheme/Makefile
+++ b/lang/chez-scheme/Makefile
@@ -45,6 +45,7 @@ CONFIGURE_ARGS= --installprefix=${PREFIX} \
PLIST_SUB= PORTNAME=${PORTNAME} \
CHEZ_ARCH=${CHEZ_ARCH} \
CHEZ_LIBDIR=${CHEZ_LIBDIR}
+X11_USES= xorg
X11_USE= XORG=x11
.include <bsd.port.pre.mk>
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 0bc2c02fc03b..22497def9b9f 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -41,6 +41,7 @@ PLIST_SUB= VERSION="${PORTVERSION}"
ASDF_CONFIGURE_ON= --with-asdf=yes
ASDF_CONFIGURE_OFF= --with-asdf=no
+CLX_USES= xorg
CLX_USE= XORG=x11
CLX_CONFIGURE_ON= --with-clx=yes
CLX_CONFIGURE_OFF= --with-clx=no
diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons
index 8f2a2138c8be..ec5e2eda3b3a 100644
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@@ -74,13 +74,16 @@ OPTIONS_GROUP_ADDONS=${OPTIONAL_ADDONS:tu}
BIGNUM_LIB_DEPENDS= libgmp.so:math/gmp
CFFI_LIB_DEPENDS= libffi.so:devel/libffi
+CAIRO_USES= gnome
CAIRO_USE= GNOME=cairo
CLUTTER_LIB_DEPENDS= libclutter-glx-1.0.so:graphics/clutter
DBI_LIB_DEPENDS= libdbi.so:databases/libdbi
EDITLINE_USES= libedit
FONT_LIB_DEPENDS= libfreetype.so:print/freetype2
+FONT_USES= gl xorg
FONT_USE= GL=glut XORG=xmu
GLFW_LIB_DEPENDS= libglfw.so:graphics/glfw2
+GLFW_USES= gl xorg
GLFW_USE+= GL=glu,gl XORG=sm,ice,x11,xext,xi
IMAGE_LIB_DEPENDS= libpng.so:graphics/png \
libtiff.so:graphics/tiff
@@ -88,11 +91,12 @@ IMAGE_USES= jpeg
LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
LIBSNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile
LIBXML2_USE= GNOME=libxml2
-LIBXML2_USES= iconv
+LIBXML2_USES= gnome iconv
LOUDMOUTH_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth
MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
MYSQL_USES= mysql:client
OGG_LIB_DEPENDS= libogg.so:audio/libogg
+OPENGL_USES= gl xorg
OPENGL_USE= GL=glut XORG=xmu
POSTGRESQL_USES= pgsql
PYTHON_USES= python:3.3+
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 9909910c5e44..62ae50751473 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -27,6 +27,7 @@ X11_BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
mkfontscale>=0:x11-fonts/mkfontscale
X11_RUN_DEPENDS= xloadimage:x11/xloadimage \
mkfontscale>=0:x11-fonts/mkfontscale
+X11_USES= xorg
X11_USE= XORG=x11
X11_EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile-x11
X11_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile-nox11
diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index 30baff2a08e9..22be1ca42ce1 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -28,6 +28,7 @@ FLTK_LIB_DEPENDS= libpthread-stubs.so:devel/libpthread-stubs \
libexpat.so:textproc/expat2 \
libfontconfig.so:x11-fonts/fontconfig \
libfltk_images.so:x11-toolkits/fltk
+FLTK_USES= xorg
FLTK_USE= XORG=x11,xau,xcb,xdmcp,xext,xft,xinerama,xpm,xrender
FLTK_MAKE_ENV= HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
FLTK_MAKE_ENV_OFF= HAVE_FLTK=0 FLTK_NUT=""
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 087f1092cef9..b256087e9b46 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -501,6 +501,7 @@ VAPOURSYNTH_LIB_DEPENDS= libvapoursynth-script.so:multimedia/vapoursynth
VAPOURSYNTH_CONFIGURE_ENABLE= vapoursynth
# vdpau
+VDPAU_USES= xorg
VDPAU_USE= XORG=x11
VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
VDPAU_CONFIGURE_ENABLE= vdpau
@@ -554,6 +555,7 @@ XAVS2_LIB_DEPENDS= libxavs2.so:multimedia/xavs2
XAVS2_CONFIGURE_ENABLE= libxavs2
# xcb
+XCB_USES= xorg
XCB_USE= XORG=xcb
XCB_CONFIGURE_ENABLE= libxcb
@@ -562,6 +564,7 @@ XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid
XVID_CONFIGURE_ENABLE= libxvid
# xv
+XVIDEO_USES= xorg
XVIDEO_USE= XORG=x11,xext,xv
XVIDEO_CONFIGURE_OFF= --disable-outdev=xv
diff --git a/multimedia/libva-utils/Makefile b/multimedia/libva-utils/Makefile
index 4f806fb31576..a79d8053f859 100644
--- a/multimedia/libva-utils/Makefile
+++ b/multimedia/libva-utils/Makefile
@@ -34,6 +34,7 @@ WAYLAND_CONFIGURE_ENABLE= wayland
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
X11_CONFIGURE_ENABLE= x11
+X11_USES= xorg
X11_USE= XORG=x11,xext,xfixes
.include <bsd.port.mk>
diff --git a/multimedia/mpeg2codec/Makefile b/multimedia/mpeg2codec/Makefile
index 87bee3817605..6755c3bd34b3 100644
--- a/multimedia/mpeg2codec/Makefile
+++ b/multimedia/mpeg2codec/Makefile
@@ -27,6 +27,7 @@ DATADIR= ${PREFIX}/share/mpeg2
CFLAGS+= -DVERIFY -DVERBOSE -DTRACE
+X11_USES= xorg
X11_USE= XORG=xext
X11_MAKE_ARGS= USE_DISP="-DDISPLAY" \
USE_SHMEM="-DSH_MEM" \
diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index 0a67e6e45768..f1b4d5f0304f 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -44,6 +44,7 @@ FILTERAUDIO_DESC= Enable the echo canceling backend
FILTERAUDIO_CMAKE_BOOL= USE_FILTERAUDIO
FILTERAUDIO_LIB_DEPENDS= libfilteraudio.so:audio/libfilteraudio
PLATFORM_EXTENSIONS_CMAKE_BOOL= PLATFORM_EXTENSIONS
+PLATFORM_EXTENSIONS_USES= xorg
PLATFORM_EXTENSIONS_USE= XORG=x11,xscrnsaver
SPELL_CHECK_DESC= Spell checking support
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 2d85ad8d6451..d756cef2068c 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -76,7 +76,7 @@ CLIENT_USE= RC_SUBR=boinc-client
LINUX_CONFIGURE_ON= --with-boinc-alt-platform=i686-pc-linux-gnu
LINUX_USES= linux
-X11_USES= jpeg gl
+X11_USES= jpeg gl xorg
X11_USE= GL=glut XORG=x11,xscrnsaver,xmu,xi
X11_CONFIGURE_OFF= --without-x ax_cv_check_glut_libglut=no
diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile
index 05f9fb1c3df6..8562fd2a88c9 100644
--- a/net/clusterit/Makefile
+++ b/net/clusterit/Makefile
@@ -16,6 +16,7 @@ GNU_CONFIGURE= yes
OPTIONS_DEFINE= X11
OPTIONS_SUB= yes
+X11_USES= xorg
X11_USE= XORG=x11
.include <bsd.port.options.mk>
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index b2e5fbe7a9a3..12b1ad52bade 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -91,7 +91,7 @@ ALL_MODULES_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libyaml.so:textproc/libyaml
ALL_MODULES_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa
ALL_MODULES_USE= XORG=x11 OPENLDAP=yes
-ALL_MODULES_USES= autoreconf # required by mod_unimrcp
+ALL_MODULES_USES= autoreconf xorg # required by mod_unimrcp
8K_VARS= BITRATES+=8000
16K_VARS= BITRATES+=16000
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index d5f7962ab2ec..913a966c1f93 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -53,6 +53,7 @@ G729_LIB_DEPENDS= libbcg729.so:audio/bcg729
GLX_IMPLIES= VIDEO
GLX_CMAKE_BOOL= ENABLE_GL ENABLE_GLX
+GLX_USES= gl
GLX_USE= GL=glew
GSM_CMAKE_BOOL= ENABLE_GSM
diff --git a/net/pvm/Makefile b/net/pvm/Makefile
index daa3e7252200..790706417739 100644
--- a/net/pvm/Makefile
+++ b/net/pvm/Makefile
@@ -29,6 +29,7 @@ OPTIONS_DEFINE= X11
OPTIONS_DEFAULT=X11
OPTIONS_SUB= yes
+X11_USES= xorg
X11_USE= XORG=x11,xaw,xext,xmu,xt
.include <bsd.port.options.mk>
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index ac42fa6c2206..5471c6947fd6 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -30,6 +30,7 @@ PLIST_FILES= bin/hp2xx man/man1/hp2xx.1.gz
OPTIONS_DEFINE= X11
OPTIONS_DEFAULT= X11
+X11_USES= xorg
X11_USE= XORG=x11
X11_MAKE_ENV= PREVIEWER=to_x11
X11_MAKE_ENV_OFF= PREVIEWER=no_prev
diff --git a/science/simbody/Makefile b/science/simbody/Makefile
index e02332537c09..d6f3d8f7bba3 100644
--- a/science/simbody/Makefile
+++ b/science/simbody/Makefile
@@ -34,7 +34,7 @@ DOCS_CMAKE_BOOL= INSTALL_DOCS
VISUALIZER_DESC= Build the visualizer component
VISUALIZER_CMAKE_BOOL= BUILD_VISUALIZER
-VISUALIZER_USES= gl
+VISUALIZER_USES= gl xorg
VISUALIZER_USE= GL=gl,glu,glut XORG=xi,xmu
EXAMPLE_PROGRAMS_DESC= Build and install example programs
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index d1cb3430bb47..1b04bf157f9d 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -63,6 +63,7 @@ IPV6_CMAKE_BOOL= BUILD_IPV6
LUA_CAIRO_DESC= Lua-Cairo binding
LUA_CAIRO_CMAKE_BOOL= BUILD_LUA_CAIRO
+LUA_CAIRO_USES= gnome
LUA_CAIRO_USE= gnome=cairo
LUA_CAIRO_PLIST_FILES= lib/conky/libcairo.so
LUA_CAIRO_IMPLIES= X11
@@ -74,6 +75,7 @@ LUA_IMLIB2_IMPLIES= IMLIB2 X11
LUA_RSVG_DESC= Lua-rsvg binding
LUA_RSVG_CMAKE_BOOL= BUILD_LUA_RSVG
+LUA_RSVG_USES= gnome
LUA_RSVG_USE= gnome=librsvg2
LUA_RSVG_PLIST_FILES= lib/conky/librsvg.so
LUA_RSVG_IMPLIES= X11
@@ -94,6 +96,7 @@ NCURSES_USES= ncurses:port
RSS_DESC= Display RSS feeds
RSS_CMAKE_BOOL= BUILD_RSS
+RSS_USES= gnome
RSS_USE= gnome=glib20,libxml2
RSS_IMPLIES= CURL
@@ -118,6 +121,7 @@ XMMS2_LIB_DEPENDS= libxmmsclient.so:audio/xmms2
XOAP_DESC= Display XOAP weather reports
XOAP_CMAKE_BOOL= BUILD_WEATHER_XOAP
XOAP_IMPLIES= CURL METAR
+XOAP_USES= gnome
XOAP_USE= gnome=libxml2
.include <bsd.port.options.mk>
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 042d026a536e..cca2a38ff39c 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -22,6 +22,7 @@ OPTIONS_SUB= yes
CLIENT_DESC= GKrellM Client
CLIENT_CONFLICTS= gkrellm-[^2].* gkrellm[^2]-[^2].*
+CLIENT_USES= gnome xorg
CLIENT_USE= GNOME=gtk20 XORG=sm,x11
CLIENT_USE_OFF= GNOME=glib20
CLIENT_VARS_OFF= BUILD_WRKSRC=${WRKSRC}/server \
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index 6843cd022911..6696eb840f2a 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -26,9 +26,10 @@ NVCONTROL_DESC= NV-CONTROL support (for OpenGL settings)
X11_DESC= Build GUI program (requires GTK+ 2.x)
NVCONTROL_USE= XORG=xext
-NVCONTROL_USES= pkgconfig
+NVCONTROL_USES= pkgconfig xorg
NVCONTROL_CONFIGURE_OFF= --disable-nvcontrol
+X11_USES= gnome
X11_USE= GNOME=gtk20
X11_CONFIGURE_OFF= --disable-gtk
X11_VARS= INSTALLS_ICONS=yes
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
index e038d43721ff..29d06d4216fd 100644
--- a/sysutils/xmbmon/Makefile
+++ b/sysutils/xmbmon/Makefile
@@ -29,6 +29,7 @@ OPTIONS_DEFAULT=SMB CLI
ASUS_DESC= Enable A7N8X-VM support
SMB_DESC= Enable smb(4) support
CLI_DESC= CLI support only
+X11_USES= xorg
X11_USE= XORG=x11,xt
X11_MAKE_ARGS_OFF= PROGRAM="mbmon"
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile
index fc356f6adf9b..8823e40044fe 100644
--- a/textproc/htmldoc/Makefile
+++ b/textproc/htmldoc/Makefile
@@ -31,6 +31,7 @@ HTMLDOCGUI_DESC= Build GUI front-end
HTMLDOCGUI_CONFIGURE_WITH= gui=yes
HTMLDOCGUI_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \
libfontconfig.so:x11-fonts/fontconfig
+HTMLDOCGUI_USES= xorg
HTMLDOCGUI_USE= XORG=x11,xrender,xcursor,xfixes \
xext,xft,xinerama jpeg
GNUTLS_CONFIGURE_ENABLE= gnutls
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 4c390b65efd2..a247459eb01e 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -62,6 +62,7 @@ GTK2_LIB_DEPENDS= libdbus-1.so:devel/dbus \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
+GTK3_USES= xorg
GTK3_USE= GNOME=cairo,gtk30 XORG=x11,xi
GTK3_CONFIGURE_ENABLE= gtk3 libnotify
GTK3_LIB_DEPENDS= libdbus-1.so:devel/dbus \
diff --git a/www/links/Makefile b/www/links/Makefile
index a4b8d610a319..73145e027b65 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -46,6 +46,7 @@ NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= gettext-runtime
SVG_CONFIGURE_WITH= librsvg
+SVG_USES= gnome
SVG_USE= gnome=librsvg2,glib20,gdkpixbuf2,cairo
SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index 8edfe53d3daf..454ddd28731d 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -33,6 +33,7 @@ CPE_VENDOR= mono-project
OPTIONS_DEFINE= X11
OPTIONS_DEFAULT=X11
+X11_USES= xorg
X11_USE= XORG=x11,xrender
X11_CONFIGURE_OFF= --without-x11
diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index 5151c2a376f0..35381f2d8104 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -16,6 +16,7 @@ OPTIONS_DEFINE= X11
X11_DESC= Install X libraries
OPTIONS_DEFAULT= X11
+X11_USES= xorg
X11_USE= XORG=xcursor,xfont,xxf86dga,xxf86vm,xi,xinerama,xkbfile,xrandr,xrender,xres,xv
.include "${MASTERDIR}/Makefile"