aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2019-11-07 18:36:55 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2019-11-07 18:36:55 +0000
commit4c46ca73d827ceeb91e695bf5da18e5be90e9ca4 (patch)
tree0396740faf427665ee28135c858aa42aba8d2024
parent29ac0a6ffdb0534cd5524703f46e5e061cb0ec07 (diff)
downloadports-4c46ca73d827ceeb91e695bf5da18e5be90e9ca4.tar.gz
ports-4c46ca73d827ceeb91e695bf5da18e5be90e9ca4.zip
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.
Notes
Notes: svn path=/head/; revision=517000
-rw-r--r--x11-clocks/asclock-xlib/Makefile2
-rw-r--r--x11-clocks/asclock/Makefile2
-rw-r--r--x11-clocks/astime/Makefile1
-rw-r--r--x11-clocks/astzclock/Makefile2
-rw-r--r--x11-clocks/bbdate/Makefile1
-rw-r--r--x11-clocks/bclock/Makefile2
-rw-r--r--x11-clocks/buici-clock/Makefile2
-rw-r--r--x11-clocks/dclock/Makefile2
-rw-r--r--x11-clocks/emiclock/Makefile2
-rw-r--r--x11-clocks/eyeclock/Makefile2
-rw-r--r--x11-clocks/glclock/Makefile1
-rw-r--r--x11-clocks/lmclock/Makefile2
-rw-r--r--x11-clocks/mlclock/Makefile1
-rw-r--r--x11-clocks/mouseclock/Makefile2
-rw-r--r--x11-clocks/rclock/Makefile1
-rw-r--r--x11-clocks/t3d/Makefile2
-rw-r--r--x11-clocks/tclock/Makefile2
-rw-r--r--x11-clocks/wmbinclock/Makefile2
-rw-r--r--x11-clocks/wmblueclock/Makefile2
-rw-r--r--x11-clocks/wmcalclock/Makefile1
-rw-r--r--x11-clocks/wmclock/Makefile2
-rw-r--r--x11-clocks/wmfishtime/Makefile2
-rw-r--r--x11-clocks/wmtime/Makefile2
-rw-r--r--x11-clocks/wmtimer/Makefile2
-rw-r--r--x11-clocks/xalarm/Makefile2
-rw-r--r--x11-clocks/xdaliclock/Makefile1
-rw-r--r--x11-clocks/xtimer/Makefile2
-rw-r--r--x11-drivers/xorgxrdp/Makefile2
-rw-r--r--x11-fm/caja/Makefile2
-rw-r--r--x11-fm/deforaos-browser/Makefile2
-rw-r--r--x11-fm/doublecmd/Makefile2
-rw-r--r--x11-fm/fsv2/Makefile7
-rw-r--r--x11-fm/librfm/Makefile3
-rw-r--r--x11-fm/nautilus/Makefile2
-rw-r--r--x11-fm/pcmanfm-qt/Makefile3
-rw-r--r--x11-fm/pcmanfm/Makefile2
-rw-r--r--x11-fm/rox-filer/Makefile3
-rw-r--r--x11-fm/rox-session/Makefile2
-rw-r--r--x11-fm/sushi/Makefile4
-rw-r--r--x11-fm/tdfsb/Makefile2
-rw-r--r--x11-fm/wcmcommander/Makefile2
-rw-r--r--x11-fm/worker/Makefile2
-rw-r--r--x11-fm/xcruise/Makefile2
-rw-r--r--x11-fm/xfe/Makefile2
-rw-r--r--x11-fonts/croscorefonts-fonts-ttf/Makefile4
-rw-r--r--x11-fonts/crosextrafonts-caladea-ttf/Makefile4
-rw-r--r--x11-fonts/crosextrafonts-carlito-ttf/Makefile4
-rw-r--r--x11-fonts/cyr-rfx/Makefile2
-rw-r--r--x11-fonts/datalegreya/Makefile2
-rw-r--r--x11-fonts/fira/Makefile2
-rw-r--r--x11-fonts/firacode/Makefile2
-rw-r--r--x11-fonts/firago/Makefile2
-rw-r--r--x11-fonts/geminifonts/Makefile2
-rw-r--r--x11-fonts/inconsolata-lgc-ttf/Makefile2
-rw-r--r--x11-fonts/inconsolata-ttf/Makefile2
-rw-r--r--x11-fonts/montecarlo_fonts/Makefile2
-rw-r--r--x11-fonts/nexfontsel/Makefile2
-rw-r--r--x11-fonts/proggy_fonts/Makefile2
-rw-r--r--x11-fonts/stix-fonts/Makefile2
-rw-r--r--x11-fonts/suxus/Makefile2
-rw-r--r--x11-fonts/wqy/Makefile2
-rw-r--r--x11-servers/Xfstt/Makefile2
-rw-r--r--x11-servers/x2vnc/Makefile1
-rw-r--r--x11-servers/x2x/Makefile2
-rw-r--r--x11-themes/fvwm-themes/Makefile2
-rw-r--r--x11-themes/gtk-murrine-engine/Makefile2
-rw-r--r--x11-themes/lxappearance/Makefile3
-rw-r--r--x11-themes/plasma5-kde-gtk-config/Makefile2
-rw-r--r--x11-themes/qt5-style-plugins/Makefile3
-rw-r--r--x11-themes/qtcurve/Makefile2
-rw-r--r--x11-toolkits/SoXt/Makefile2
-rw-r--r--x11-toolkits/Xaw3d/Makefile2
-rw-r--r--x11-toolkits/diorite/Makefile2
-rw-r--r--x11-toolkits/fltk/Makefile2
-rw-r--r--x11-toolkits/fox14/Makefile3
-rw-r--r--x11-toolkits/fox16/Makefile2
-rw-r--r--x11-toolkits/fox17/Makefile2
-rw-r--r--x11-toolkits/gnome-sharp20/Makefile3
-rw-r--r--x11-toolkits/gnustep-back/Makefile2
-rw-r--r--x11-toolkits/gnustep-gui/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile4
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/gtkada3/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile3
-rw-r--r--x11-toolkits/irrlicht/Makefile2
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile3
-rw-r--r--x11-toolkits/libgnomeui/Makefile3
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile4
-rw-r--r--x11-toolkits/libunique3/Makefile2
-rw-r--r--x11-toolkits/libwnck/Makefile3
-rw-r--r--x11-toolkits/libwnck3/Makefile3
-rw-r--r--x11-toolkits/libxaw3dxft/Makefile2
-rw-r--r--x11-toolkits/mowitz/Makefile2
-rw-r--r--x11-toolkits/nanogui/Makefile2
-rw-r--r--x11-toolkits/neXtaw/Makefile2
-rw-r--r--x11-toolkits/ntk/Makefile2
-rw-r--r--x11-toolkits/otk/Makefile2
-rw-r--r--x11-toolkits/p5-Prima/Makefile2
-rw-r--r--x11-toolkits/p5-Tk/Makefile2
-rw-r--r--x11-toolkits/pangox-compat/Makefile2
-rw-r--r--x11-toolkits/plib/Makefile2
-rw-r--r--x11-toolkits/py-fltk/Makefile2
-rw-r--r--x11-toolkits/py-kivy/Makefile5
-rw-r--r--x11-toolkits/py-qt5-gui/Makefile2
-rw-r--r--x11-toolkits/py-qt5-quickwidgets/Makefile2
-rw-r--r--x11-toolkits/py-qt5-widgets/Makefile2
-rw-r--r--x11-toolkits/qml-box2d/Makefile2
-rw-r--r--x11-toolkits/qt5-gtkplatform/Makefile2
-rw-r--r--x11-toolkits/qt5-widgets/Makefile3
-rw-r--r--x11-toolkits/rubygem-tk/Makefile2
-rw-r--r--x11-toolkits/rubygem-uh/Makefile2
-rw-r--r--x11-toolkits/soqt-devel/Makefile2
-rw-r--r--x11-toolkits/swt/Makefile2
-rw-r--r--x11-toolkits/termit/Makefile2
-rw-r--r--x11-toolkits/tk85/Makefile2
-rw-r--r--x11-toolkits/tk86/Makefile2
-rw-r--r--x11-toolkits/tk87/Makefile2
-rw-r--r--x11-toolkits/tkdnd/Makefile2
-rw-r--r--x11-toolkits/tkshape/Makefile2
-rw-r--r--x11-toolkits/tktray/Makefile2
-rw-r--r--x11-toolkits/v/Makefile3
-rw-r--r--x11-toolkits/wlroots/Makefile2
-rw-r--r--x11-toolkits/wmapp/Makefile2
-rw-r--r--x11-toolkits/wxgtk28/Makefile4
-rw-r--r--x11-toolkits/wxgtk30/Makefile3
-rw-r--r--x11-toolkits/wxgtk31/Makefile3
-rw-r--r--x11-toolkits/xforms/Makefile2
-rw-r--r--x11-toolkits/xmhtml/Makefile2
-rw-r--r--x11-toolkits/xview-clients/Makefile2
-rw-r--r--x11-toolkits/xview/Makefile2
-rw-r--r--x11-wm/aewm/Makefile3
-rw-r--r--x11-wm/afterstep-stable/Makefile2
-rw-r--r--x11-wm/afterstep/Makefile2
-rw-r--r--x11-wm/amiwm/Makefile2
-rw-r--r--x11-wm/antiwm/Makefile1
-rw-r--r--x11-wm/aphelia/Makefile1
-rw-r--r--x11-wm/awesome/Makefile3
-rw-r--r--x11-wm/bbkeys/Makefile2
-rw-r--r--x11-wm/bbpager/Makefile2
-rw-r--r--x11-wm/blackbox/Makefile2
-rw-r--r--x11-wm/cage/Makefile2
-rw-r--r--x11-wm/clementine-wm/Makefile2
-rw-r--r--x11-wm/compiz-fusion/Makefile2
-rw-r--r--x11-wm/compiz-plugins-extra/Makefile3
-rw-r--r--x11-wm/compiz-plugins-main/Makefile3
-rw-r--r--x11-wm/compiz-plugins-unsupported/Makefile2
-rw-r--r--x11-wm/compizconfig-backend-gconf/Makefile2
-rw-r--r--x11-wm/compizconfig-python/Makefile2
-rw-r--r--x11-wm/compton-yshui/Makefile4
-rw-r--r--x11-wm/compton/Makefile3
-rw-r--r--x11-wm/ctwm/Makefile2
-rw-r--r--x11-wm/dwm/Makefile1
-rw-r--r--x11-wm/e16-docs/Makefile2
-rw-r--r--x11-wm/e16/Makefile3
-rw-r--r--x11-wm/echinus/Makefile2
-rw-r--r--x11-wm/ede/Makefile2
-rw-r--r--x11-wm/emerald/Makefile4
-rw-r--r--x11-wm/enlightenment/Makefile2
-rw-r--r--x11-wm/epplets/Makefile2
-rw-r--r--x11-wm/euclid-wm/Makefile2
-rw-r--r--x11-wm/evilwm/Makefile2
-rw-r--r--x11-wm/fbcmd/Makefile2
-rw-r--r--x11-wm/fluxbox/Makefile2
-rw-r--r--x11-wm/fluxter/Makefile2
-rw-r--r--x11-wm/flwm/Makefile2
-rw-r--r--x11-wm/fvwm2/Makefile2
-rw-r--r--x11-wm/gcompmgr/Makefile2
-rw-r--r--x11-wm/hikari/Makefile2
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile1
-rw-r--r--x11-wm/hs-xmonad/Makefile1
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11-wm/ion/Makefile2
-rw-r--r--x11-wm/jewel/Makefile2
-rw-r--r--x11-wm/jwm/Makefile3
-rw-r--r--x11-wm/larswm/Makefile2
-rw-r--r--x11-wm/libdockapp/Makefile2
-rw-r--r--x11-wm/libwraster/Makefile2
-rw-r--r--x11-wm/lwm/Makefile2
-rw-r--r--x11-wm/lxappearance-obconf/Makefile2
-rw-r--r--x11-wm/lxqt-panel/Makefile2
-rw-r--r--x11-wm/lxqt-session/Makefile2
-rw-r--r--x11-wm/lxsession/Makefile2
-rw-r--r--x11-wm/marco/Makefile3
-rw-r--r--x11-wm/matwm2/Makefile1
-rw-r--r--x11-wm/mcwm/Makefile2
-rw-r--r--x11-wm/metacity/Makefile4
-rw-r--r--x11-wm/muffin/Makefile2
-rw-r--r--x11-wm/mutter/Makefile2
-rw-r--r--x11-wm/nickleby/Makefile1
-rw-r--r--x11-wm/obconf-qt/Makefile2
-rw-r--r--x11-wm/obpager/Makefile2
-rw-r--r--x11-wm/olvwm/Makefile2
-rw-r--r--x11-wm/openbox/Makefile2
-rw-r--r--x11-wm/oroborus/Makefile1
-rw-r--r--x11-wm/peksystray/Makefile2
-rw-r--r--x11-wm/pekwm/Makefile3
-rw-r--r--x11-wm/piewm/Makefile2
-rw-r--r--x11-wm/pwm/Makefile2
-rw-r--r--x11-wm/ratmen/Makefile2
-rw-r--r--x11-wm/ratmenu/Makefile1
-rw-r--r--x11-wm/ratpoison/Makefile2
-rw-r--r--x11-wm/sawfish/Makefile3
-rw-r--r--x11-wm/skippy-xd/Makefile2
-rw-r--r--x11-wm/spectrwm/Makefile1
-rw-r--r--x11-wm/sway/Makefile2
-rw-r--r--x11-wm/tinywm/Makefile1
-rw-r--r--x11-wm/treewm/Makefile2
-rw-r--r--x11-wm/tvtwm/Makefile2
-rw-r--r--x11-wm/vtwm/Makefile2
-rw-r--r--x11-wm/w9wm/Makefile2
-rw-r--r--x11-wm/wayfire/Makefile2
-rw-r--r--x11-wm/windowmaker/Makefile2
-rw-r--r--x11-wm/wm2/Makefile1
-rw-r--r--x11-wm/wmakerconf/Makefile2
-rw-r--r--x11-wm/wmanager/Makefile2
-rw-r--r--x11-wm/wmii-devel/Makefile2
-rw-r--r--x11-wm/wmii/Makefile1
-rw-r--r--x11-wm/wmname/Makefile1
-rw-r--r--x11-wm/wmx/Makefile2
-rw-r--r--x11/3ddesktop/Makefile2
-rw-r--r--x11/9box/Makefile2
-rw-r--r--x11/9menu/Makefile1
-rw-r--r--x11/alttab/Makefile2
-rw-r--r--x11/antimicro/Makefile2
-rw-r--r--x11/aterm/Makefile2
-rw-r--r--x11/bbappconf/Makefile1
-rw-r--r--x11/bbdock/Makefile1
-rw-r--r--x11/bbrun/Makefile2
-rw-r--r--x11/bgs/Makefile1
-rw-r--r--x11/bmpanel2/Makefile2
-rw-r--r--x11/bricons/Makefile2
-rw-r--r--x11/cinnamon-desktop/Makefile4
-rw-r--r--x11/cinnamon-session/Makefile4
-rw-r--r--x11/cinnamon/Makefile2
-rw-r--r--x11/decurs/Makefile2
-rw-r--r--x11/deforaos-keyboard/Makefile2
-rw-r--r--x11/deforaos-locker/Makefile2
-rw-r--r--x11/deforaos-panel/Makefile2
-rw-r--r--x11/deskpaint/Makefile1
-rw-r--r--x11/dmenu/Makefile1
-rw-r--r--x11/dmenu2/Makefile1
-rw-r--r--x11/docker-tray/Makefile2
-rw-r--r--x11/dsbautostart/Makefile2
-rw-r--r--x11/dxpc/Makefile2
-rw-r--r--x11/dzen2/Makefile2
-rw-r--r--x11/erun/Makefile3
-rw-r--r--x11/eterm/Makefile2
-rw-r--r--x11/fbdesk/Makefile2
-rw-r--r--x11/fbpanel/Makefile2
-rw-r--r--x11/find-cursor/Makefile2
-rw-r--r--x11/fireflies/Makefile3
-rw-r--r--x11/florence/Makefile2
-rw-r--r--x11/flruler/Makefile2
-rw-r--r--x11/gdm/Makefile2
-rw-r--r--x11/gnome-clipboard-daemon/Makefile2
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-pie/Makefile2
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-shell/Makefile3
-rw-r--r--x11/gnome-terminal/Makefile2
-rw-r--r--x11/gpctool/Makefile2
-rw-r--r--x11/grabc/Makefile1
-rw-r--r--x11/gromit/Makefile2
-rw-r--r--x11/gtk-theme-switch2/Makefile2
-rw-r--r--x11/hhpc/Makefile2
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile1
-rw-r--r--x11/hs-xmobar/Makefile2
-rw-r--r--x11/hsetroot/Makefile2
-rw-r--r--x11/i3lock/Makefile2
-rw-r--r--x11/imwheel/Makefile2
-rw-r--r--x11/kb2mb2/Makefile2
-rw-r--r--x11/keybinder-gtk3/Makefile2
-rw-r--r--x11/keybinder/Makefile2
-rw-r--r--x11/keyboardcast/Makefile2
-rw-r--r--x11/keylaunch/Makefile2
-rw-r--r--x11/lemonbar/Makefile2
-rw-r--r--x11/libXcm/Makefile2
-rw-r--r--x11/libfakekey/Makefile2
-rw-r--r--x11/libfm-qt/Makefile2
-rw-r--r--x11/libgnome/Makefile3
-rw-r--r--x11/libgnomekbd/Makefile3
-rw-r--r--x11/libgnomemm26/Makefile4
-rw-r--r--x11/libmatekbd/Makefile4
-rw-r--r--x11/libsx/Makefile2
-rw-r--r--x11/libsynaptics/Makefile2
-rw-r--r--x11/libxklavier/Makefile2
-rw-r--r--x11/lightdm-gtk-greeter/Makefile2
-rw-r--r--x11/lightdm/Makefile2
-rw-r--r--x11/lilyterm/Makefile2
-rw-r--r--x11/lsw/Makefile1
-rw-r--r--x11/lupe/Makefile1
-rw-r--r--x11/lxhotkey/Makefile2
-rw-r--r--x11/lxpanel/Makefile2
-rw-r--r--x11/lxqt-globalkeys/Makefile2
-rw-r--r--x11/lxrandr/Makefile2
-rw-r--r--x11/mate-applets/Makefile2
-rw-r--r--x11/mate-desktop/Makefile4
-rw-r--r--x11/mate-panel/Makefile4
-rw-r--r--x11/mate-screensaver/Makefile2
-rw-r--r--x11/mate-session-manager/Makefile4
-rw-r--r--x11/mate-terminal/Makefile4
-rw-r--r--x11/metalock/Makefile2
-rw-r--r--x11/metisse/Makefile6
-rw-r--r--x11/mlterm/Makefile2
-rw-r--r--x11/mrxvt-devel/Makefile2
-rw-r--r--x11/mrxvt/Makefile2
-rw-r--r--x11/multi-aterm/Makefile1
-rw-r--r--x11/mxico/Makefile2
-rw-r--r--x11/numlockx/Makefile2
-rw-r--r--x11/nvidia-settings/Makefile2
-rw-r--r--x11/nxcomp/Makefile2
-rw-r--r--x11/ooxcb/Makefile2
-rw-r--r--x11/p5-X11-GUITest/Makefile2
-rw-r--r--x11/p5-X11-IdleTime/Makefile2
-rw-r--r--x11/p5-X11-XCB/Makefile2
-rw-r--r--x11/p5-X11-Xlib/Makefile2
-rw-r--r--x11/pcdm/Makefile2
-rw-r--r--x11/perwindowlayoutd/Makefile2
-rw-r--r--x11/plasma5-plasma-desktop/Makefile2
-rw-r--r--x11/props/Makefile2
-rw-r--r--x11/py-qt5-opengl/Makefile2
-rw-r--r--x11/qterminal/Makefile2
-rw-r--r--x11/rofi/Makefile2
-rw-r--r--x11/roxterm/Makefile2
-rw-r--r--x11/rxvt-unicode/Makefile3
-rw-r--r--x11/rxvt/Makefile1
-rw-r--r--x11/sbxkb/Makefile2
-rw-r--r--x11/sddm/Makefile2
-rw-r--r--x11/setlayout/Makefile2
-rw-r--r--x11/simdock/Makefile3
-rw-r--r--x11/sisctrl/Makefile2
-rw-r--r--x11/slick-greeter/Makefile2
-rw-r--r--x11/slim/Makefile2
-rw-r--r--x11/slock/Makefile2
-rw-r--r--x11/slop/Makefile2
-rw-r--r--x11/sselp/Makefile1
-rw-r--r--x11/stalonetray/Makefile2
-rw-r--r--x11/startup-notification/Makefile2
-rw-r--r--x11/sterm/Makefile2
-rw-r--r--x11/stjerm/Makefile2
-rw-r--r--x11/swarp/Makefile1
-rw-r--r--x11/sxhkd/Makefile2
-rw-r--r--x11/sxpc/Makefile2
-rw-r--r--x11/tabbed/Makefile1
-rw-r--r--x11/temperature.app/Makefile1
-rw-r--r--x11/thinglaunch/Makefile1
-rw-r--r--x11/thingylaunch/Makefile2
-rw-r--r--x11/tilda/Makefile2
-rw-r--r--x11/tint/Makefile2
-rw-r--r--x11/trayer/Makefile2
-rw-r--r--x11/tycoon/Makefile2
-rw-r--r--x11/vdesk/Makefile2
-rw-r--r--x11/virtboard/Makefile2
-rw-r--r--x11/virtualgl/Makefile2
-rw-r--r--x11/wdm/Makefile2
-rw-r--r--x11/wmappl/Makefile1
-rw-r--r--x11/wmblob/Makefile2
-rw-r--r--x11/wmbutton/Makefile1
-rw-r--r--x11/wmcliphist/Makefile2
-rw-r--r--x11/wmctrl/Makefile2
-rw-r--r--x11/wmdrawer/Makefile2
-rw-r--r--x11/wmmatrix/Makefile2
-rw-r--r--x11/wmsystemtray/Makefile2
-rw-r--r--x11/wmutils-opt/Makefile2
-rw-r--r--x11/wmxss/Makefile2
-rw-r--r--x11/x3270/Makefile2
-rw-r--r--x11/xaniroc/Makefile2
-rw-r--r--x11/xantfarm/Makefile2
-rw-r--r--x11/xascii/Makefile2
-rw-r--r--x11/xautolock/Makefile2
-rw-r--r--x11/xautomation/Makefile1
-rw-r--r--x11/xballoon/Makefile1
-rw-r--r--x11/xbanner/Makefile1
-rw-r--r--x11/xbindkeys/Makefile1
-rw-r--r--x11/xbrightness/Makefile2
-rw-r--r--x11/xcape/Makefile2
-rw-r--r--x11/xcb/Makefile2
-rw-r--r--x11/xclip/Makefile2
-rw-r--r--x11/xcm/Makefile2
-rw-r--r--x11/xcmd/Makefile2
-rw-r--r--x11/xcoloredit/Makefile2
-rw-r--r--x11/xcolorsel/Makefile2
-rw-r--r--x11/xcut/Makefile2
-rw-r--r--x11/xdotool/Makefile2
-rw-r--r--x11/xdtm/Makefile2
-rw-r--r--x11/xfce4-dashboard/Makefile2
-rw-r--r--x11/xfishtank/Makefile2
-rw-r--r--x11/xgrab/Makefile2
-rw-r--r--x11/xidle/Makefile2
-rw-r--r--x11/xkb-switch/Makefile2
-rw-r--r--x11/xkbctrl/Makefile2
-rw-r--r--x11/xkbind/Makefile1
-rw-r--r--x11/xkbset/Makefile2
-rw-r--r--x11/xkeycaps/Makefile2
-rw-r--r--x11/xkeywrap/Makefile1
-rw-r--r--x11/xloadimage/Makefile2
-rw-r--r--x11/xmangekyou/Makefile1
-rw-r--r--x11/xmascot/Makefile2
-rw-r--r--x11/xmon/Makefile2
-rw-r--r--x11/xmotd/Makefile2
-rw-r--r--x11/xmove/Makefile2
-rw-r--r--x11/xmsg/Makefile2
-rw-r--r--x11/xmx/Makefile2
-rw-r--r--x11/xnee/Makefile2
-rw-r--r--x11/xnodecor/Makefile1
-rw-r--r--x11/xpra/Makefile2
-rw-r--r--x11/xprintidle/Makefile2
-rw-r--r--x11/xprompt/Makefile2
-rw-r--r--x11/xrestop/Makefile2
-rw-r--r--x11/xrootconsole/Makefile2
-rw-r--r--x11/xrsi/Makefile1
-rw-r--r--x11/xsel-conrad/Makefile2
-rw-r--r--x11/xsettingsd/Makefile2
-rw-r--r--x11/xskyroot/Makefile2
-rw-r--r--x11/xsnow/Makefile2
-rw-r--r--x11/xstarroll/Makefile1
-rw-r--r--x11/xtacy/Makefile2
-rw-r--r--x11/xtestpicture/Makefile2
-rw-r--r--x11/xtoolwait/Makefile2
-rw-r--r--x11/xtrlock/Makefile2
-rw-r--r--x11/xvattr/Makefile2
-rw-r--r--x11/xvkbd/Makefile2
-rw-r--r--x11/xvt/Makefile2
-rw-r--r--x11/xwatchwin/Makefile2
-rw-r--r--x11/xwinwrap/Makefile2
-rw-r--r--x11/xwit/Makefile2
-rw-r--r--x11/xxkb/Makefile2
-rw-r--r--x11/xzoom/Makefile2
-rw-r--r--x11/yeahconsole/Makefile1
-rw-r--r--x11/yelp/Makefile2
-rw-r--r--x11/zenity/Makefile2
432 files changed, 494 insertions, 400 deletions
diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index a942909ce5c3..95b2c312f0e5 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -12,8 +12,8 @@ COMMENT= New flavor of asclock
MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/asclock-xlib
+USES= imake xorg
USE_XORG= xpm x11
-USES= imake
.include <bsd.port.pre.mk>
diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile
index b73a1135eb51..b3fd0b15edfb 100644
--- a/x11-clocks/asclock/Makefile
+++ b/x11-clocks/asclock/Makefile
@@ -15,7 +15,7 @@ LICENSE= BSD2CLAUSE
CONFLICTS= asclock-gtk-[0-9]* asclock-xlib-[0-9]*
-USES= tar:tgz imake
+USES= imake tar:tgz xorg
USE_XORG= xpm xext x11
PLIST_FILES= bin/asclock man/man1/asclock.1.gz
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 54e1530357b6..af3ff7f3c93f 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -13,6 +13,7 @@ COMMENT= Time/Date applet for WindowMaker
LICENSE= GPLv2
+USES= xorg
USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xpm-includes=${LOCALBASE}/include \
diff --git a/x11-clocks/astzclock/Makefile b/x11-clocks/astzclock/Makefile
index 09eab1ada779..2efa45df4278 100644
--- a/x11-clocks/astzclock/Makefile
+++ b/x11-clocks/astzclock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.eyesbeyond.com/freebsddom/astzclock/
MAINTAINER= glewis@FreeBSD.org
COMMENT= Afterstep clock with some timezone extensions
-USES= imake
+USES= imake xorg
USE_XORG= xpm
PLIST_FILES= bin/astzclock man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/bbdate/Makefile b/x11-clocks/bbdate/Makefile
index 86ca62cfb022..8888f002de79 100644
--- a/x11-clocks/bbdate/Makefile
+++ b/x11-clocks/bbdate/Makefile
@@ -14,6 +14,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
+USES= xorg
USE_XORG= x11 xau xdmcp xext xfixes xi xrandr ice sm
PLIST_FILES= bin/bbdate share/bbtools/README.bbdate \
diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile
index e759aebf0004..d11e1fccb450 100644
--- a/x11-clocks/bclock/Makefile
+++ b/x11-clocks/bclock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SUNSITE/X11/clocks
MAINTAINER= ports@FreeBSD.org
COMMENT= Round, analog X11 clock with Bezier curve hands
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xext xmu xt
PLIST_FILES= bin/bclock \
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index 31a3a722b154..5495f94b0600 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= libcairo.so:graphics/cairo
WRKSRC= ${WRKDIR}/buici
+USES= tar:xz bison gmake pkgconfig autoreconf xorg
USE_XORG= x11 xext
-USES= tar:xz bison gmake pkgconfig autoreconf
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE=yes
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index 2ad8456ba5af..e8a80fba4b47 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES= http://opencircuitdesign.com/~tim/programs/dclock/archive/
MAINTAINER= romain@FreeBSD.org
COMMENT= 7-segment digital clock with some optional features
+USES= pkgconfig tar:tgz xorg
USE_XORG= x11 xt
-USES= pkgconfig tar:tgz
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lXt -lm
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index 8d784e0a6152..5e67afea0340 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME= Emi Clock for X11
LICENSE_FILE= ${WRKSRC}/COPYRIGHT.en
LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
-USES= iconv:build imake
+USES= iconv:build imake xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
LANGRES= resources/R6/EUC/EmiClock.ad
diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index 8c58b119384e..a9cda8ed6f45 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -13,8 +13,8 @@ COMMENT= Clock with eyes following the mouse pointer
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKE_ENV= X11BASE=${LOCALBASE}
+USES= tar:tgz xorg
USE_XORG= x11 xau xdmcp xpm xt ice
-USES= tar:tgz
DESKTOP_ENTRIES="EyeClock" "" "" "eyeclock" "" ""
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index a001d3fd3709..50d8a5fb646c 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES= http://www.daionet.gr.jp/~masa/archives/
MAINTAINER= ports@FreeBSD.org
COMMENT= OpenGL spinning pocket watch demo and benchmark utility
+USES= gl xorg
USE_XORG= xi xmu xext x11
USE_GL= gl glu glut
MAKEFILE= makefile
diff --git a/x11-clocks/lmclock/Makefile b/x11-clocks/lmclock/Makefile
index 7290cff43e7d..6b97d11afa59 100644
--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= LOCAL/ehaupt
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Xerox Lisp machine clock clone
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
PLIST_FILES= bin/lmclock
diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile
index 2d2583e29346..ef5b889433c6 100644
--- a/x11-clocks/mlclock/Makefile
+++ b/x11-clocks/mlclock/Makefile
@@ -12,6 +12,7 @@ COMMENT= Clock for mlvwm window manager
WRKSRC= ${WRKDIR}/${PORTNAME}
+USES= xorg
USE_XORG= x11 xau xdmcp
PLIST_FILES= bin/mlclock %%DATADIR%%/mlclockrc %%DATADIR%%/mlclockrc-kanji
diff --git a/x11-clocks/mouseclock/Makefile b/x11-clocks/mouseclock/Makefile
index 4849a43c3b71..c070d47dc989 100644
--- a/x11-clocks/mouseclock/Makefile
+++ b/x11-clocks/mouseclock/Makefile
@@ -13,7 +13,7 @@ COMMENT= Display the current time using the X root cursor
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= imake:notall
+USES= imake:notall xorg
USE_XORG= x11
OPTIONS_DEFINE= DOCS
diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index 48747835dd1b..2e9103f78b6c 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -13,6 +13,7 @@ COMMENT= Analog clock for X w/appointment reminder and mail notification
LICENSE= GPLv2+
+USES= xorg
USE_XORG= x11 xau xdmcp ice xpm xv
GNU_CONFIGURE= yes
ALL_TARGET= clock
diff --git a/x11-clocks/t3d/Makefile b/x11-clocks/t3d/Makefile
index b14873c635d9..51c6cf836395 100644
--- a/x11-clocks/t3d/Makefile
+++ b/x11-clocks/t3d/Makefile
@@ -19,7 +19,7 @@ EXTRACT_BEFORE_ARGS= -dc
EXTRACT_AFTER_ARGS= | ${SH}
NO_WRKSUBDIR= yes
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
PLIST_FILES= bin/t3d man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index 06c070241f2d..7309e1716f11 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -14,7 +14,7 @@ COMMENT= Transparent analog clock for x11
LICENSE= GPLv1
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= imake tar:Z
+USES= imake tar:Z xorg
USE_XORG= x11 xext
PLIST_FILES= bin/tclock man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile
index 943a18ade0d0..0033b34efea8 100644
--- a/x11-clocks/wmbinclock/Makefile
+++ b/x11-clocks/wmbinclock/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB= yes
GH_ACCOUNT= engerim42
PLIST_FILES= bin/wmBinClock
-USES= gmake
+USES= gmake xorg
USE_XORG= xpm
post-patch:
diff --git a/x11-clocks/wmblueclock/Makefile b/x11-clocks/wmblueclock/Makefile
index 58ff917aee30..d400a0dfcacb 100644
--- a/x11-clocks/wmblueclock/Makefile
+++ b/x11-clocks/wmblueclock/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple dockable clock application
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= tar:bzip2
+USES= tar:bzip2 xorg
USE_XORG= x11 xau xdmcp xext xpm
PLIST_FILES= bin/wmblueclock man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile
index 95a29b62edc0..4a9f1e0be650 100644
--- a/x11-clocks/wmcalclock/Makefile
+++ b/x11-clocks/wmcalclock/Makefile
@@ -13,6 +13,7 @@ COMMENT= Another Window Maker calendar/clock dockapp
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/../COPYING
+USES= xorg
USE_XORG= xpm
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
PLIST_FILES= bin/wmCalClock man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index 97a5af864891..f08e528389fa 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/dockapps-daaf3aa
-USES= autoreconf gmake pkgconfig
+USES= autoreconf gmake pkgconfig xorg
USE_XORG= xpm
GNU_CONFIGURE= yes
diff --git a/x11-clocks/wmfishtime/Makefile b/x11-clocks/wmfishtime/Makefile
index 9e7243f4ff02..cb37cca3fc98 100644
--- a/x11-clocks/wmfishtime/Makefile
+++ b/x11-clocks/wmfishtime/Makefile
@@ -14,7 +14,7 @@ COMMENT= Time/date applet for WindowMaker with fishes swimming around
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gnome pkgconfig
+USES= gnome pkgconfig xorg
USE_GNOME= cairo gdkpixbuf2 gtk20
USE_XORG= x11
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index 183872d6c009..0bbd5552d2d0 100644
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Time/Date applet for WindowMaker
WRKSRC= ${WRKDIR}/wmtime.app/wmtime
-USES= imake
+USES= imake xorg
USE_XORG= xpm
USE_CSTD= gnu89
diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile
index 92633ef880e4..a8bf25484830 100644
--- a/x11-clocks/wmtimer/Makefile
+++ b/x11-clocks/wmtimer/Makefile
@@ -14,7 +14,7 @@ COMMENT= Multi-Function timer dockapp for WindowMaker
WRKSRC= ${WRKDIR}/${DISTNAME}/wmtimer
PORTDOCS= README
PLIST_FILES= bin/wmtimer
-USES= gmake pkgconfig
+USES= gmake gnome pkgconfig xorg
USE_CSTD= gnu89
USE_XORG= x11 xau xcomposite xcursor xdamage xdmcp xext xfixes xi \
xinerama xpm xrandr xrender
diff --git a/x11-clocks/xalarm/Makefile b/x11-clocks/xalarm/Makefile
index 7aecd85bed17..b3c78760186d 100644
--- a/x11-clocks/xalarm/Makefile
+++ b/x11-clocks/xalarm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= XCONTRIB/utilities
MAINTAINER= cy@FreeBSD.org
COMMENT= X based alarm clock
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
pre-install:
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index b74a2829400c..a77c39bedfda 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -12,6 +12,7 @@ COMMENT= Rather neat animated clock
WRKSRC= ${WRKDIR}/${DISTNAME}/X11
GNU_CONFIGURE= yes
+USES= xorg
USE_XORG= xt sm ice xext x11
PLIST_FILES= bin/xdaliclock man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/xtimer/Makefile b/x11-clocks/xtimer/Makefile
index 189312feaa40..89a7c6742899 100644
--- a/x11-clocks/xtimer/Makefile
+++ b/x11-clocks/xtimer/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple digital timer for X11
BROKEN= unfetchable
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
PLIST_FILES= bin/xtimer man/man1/${PORTNAME}.1.gz
diff --git a/x11-drivers/xorgxrdp/Makefile b/x11-drivers/xorgxrdp/Makefile
index 8fbddb4682ac..c8688228d6e4 100644
--- a/x11-drivers/xorgxrdp/Makefile
+++ b/x11-drivers/xorgxrdp/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
RUN_DEPENDS= xauth:x11/xauth
BUILD_DEPENDS= nasm:devel/nasm
-USES= autoreconf libtool:build pkgconfig
+USES= autoreconf libtool:build pkgconfig xorg
USE_XORG= xorgproto xorg-server
USE_LDCONFIG= yes
USE_GITHUB= yes
diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile
index 5c6049ccb28e..7d19654f2c80 100644
--- a/x11-fm/caja/Makefile
+++ b/x11-fm/caja/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= libexif.so:graphics/libexif \
PORTSCOUT= limitw:1,even
USES= compiler:c11 desktop-file-utils gettext gmake gnome libtool \
- localbase mate pathfix pkgconfig shared-mime-info tar:xz
+ localbase mate pathfix pkgconfig shared-mime-info tar:xz xorg
USE_MATE= desktop icontheme:run
USE_XORG= ice sm x11
USE_GNOME= cairo gtk30 gnomeprefix intltool introspection:build libxml2
diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile
index 55281459e1ca..47b6020620b8 100644
--- a/x11-fm/deforaos-browser/Makefile
+++ b/x11-fm/deforaos-browser/Makefile
@@ -25,7 +25,7 @@ NLS_USES= gettext
DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
-USES= desktop-file-utils gnome pkgconfig
+USES= desktop-file-utils gnome pkgconfig xorg
USE_GNOME= gtk20 cairo
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index f47125a282a9..627ae2d8e16f 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
ONLY_FOR_ARCHS= amd64 i386
-USES= dos2unix desktop-file-utils fpc gnome lazarus:flavors
+USES= dos2unix desktop-file-utils fpc gnome lazarus:flavors xorg
PORTDOCS= *
diff --git a/x11-fm/fsv2/Makefile b/x11-fm/fsv2/Makefile
index 74a9318ca1a4..c6dd61686b78 100644
--- a/x11-fm/fsv2/Makefile
+++ b/x11-fm/fsv2/Makefile
@@ -17,9 +17,10 @@ LIB_DEPENDS= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \
libfreetype.so:print/freetype2 \
libftgl.so:graphics/ftgl
-USES= compiler:c++11-lang tar:bzip2 libtool gettext-runtime pkgconfig
-USE_GNOME= gtkmm24 atkmm glibmm pangomm cairomm libsigc++20 gtk20 atk cairo \
- gdkpixbuf2
+USES= compiler:c++11-lang tar:bzip2 libtool gettext-runtime gl gnome \
+ pkgconfig
+USE_GNOME= gtkmm24 atkmm glibmm pangomm cairomm libsigc++20 gtk20 atk \
+ cairo gdkpixbuf2
USE_GL= gl glu
USE_LDCONFIG= yes
diff --git a/x11-fm/librfm/Makefile b/x11-fm/librfm/Makefile
index c3182b2ff94c..c4709331e7b7 100644
--- a/x11-fm/librfm/Makefile
+++ b/x11-fm/librfm/Makefile
@@ -23,7 +23,8 @@ OPTIONS_DEFINE= NLS
CONFIGURE_ARGS+=--with-pkglibdata
INSTALLS_ICONS= yes
-USES= autoreconf gettext gnome gmake libtool:keepla pkgconfig tar:bzip2
+USES= autoreconf gettext gnome gmake libtool:keepla pkgconfig \
+ tar:bzip2 xorg
GNU_CONFIGURE= yes
USE_GNOME= gtk20 intltool cairo libxml2 librsvg2
USE_XORG+= x11
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 2159d7922e33..63d244ff54a9 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libgnome-autoar-0.so:archivers/gnome-autoar \
PORTSCOUT= limitw:1,even
USES= compiler:c11 desktop-file-utils gettext gnome \
- localbase meson pkgconfig python:3.4+,build tar:xz
+ localbase meson pkgconfig python:3.4+,build tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 gnomedesktop3
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/x11-fm/pcmanfm-qt/Makefile b/x11-fm/pcmanfm-qt/Makefile
index 9bbc1bc3b8d9..b970519941b0 100644
--- a/x11-fm/pcmanfm-qt/Makefile
+++ b/x11-fm/pcmanfm-qt/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
libexif.so:graphics/libexif
USES= cmake compiler:c++14-lang desktop-file-utils gnome\
- gettext-runtime localbase:ldflags lxqt pkgconfig kde:5 qt:5 tar:xz
+ gettext-runtime localbase:ldflags lxqt pkgconfig kde:5 qt:5 \
+ tar:xz xorg
USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
widgets x11extras
USE_KDE= oxygen-icons5
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 31a554e014d0..25e40b479832 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -26,7 +26,7 @@ gtk2_CONFLICTS_INSTALL= pcmanfm-gtk3
gtk3_CONFLICTS_INSTALL= pcmanfm
USES= desktop-file-utils gmake gnome gettext libtool localbase \
- pkgconfig tar:xz
+ pkgconfig tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 intltool
USE_XORG= x11
GNU_CONFIGURE= yes
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index 19dba3b67013..2e2cc0267e3f 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -17,7 +17,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
PLIST_SUB+= LOCALBASE=${LOCALBASE}
-USES= gettext-runtime:build gmake pkgconfig shared-mime-info tar:bzip2
+USES= gettext-runtime:build gmake gnome pkgconfig shared-mime-info \
+ tar:bzip2 xorg
USE_XORG= ice sm x11 xaw xorgproto
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 libxml2 pango
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 0780782966ed..a6be45b57bae 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \
WRKSRC= ${WRKDIR}/ROX-Session
DATADIR= ${PREFIX}/apps/ROX-Session
-USES= gettext-tools pkgconfig python:2.7 shebangfix
+USES= gettext-tools gnome pkgconfig python:2.7 shebangfix xorg
SHEBANG_FILES= AutoStart.py choose_wm.py interactive.py migrate.py
USE_GNOME= gtk20 libxml2
USE_XORG= x11 xext xtst xxf86vm
diff --git a/x11-fm/sushi/Makefile b/x11-fm/sushi/Makefile
index e37e2b4061a7..e9cd63590967 100644
--- a/x11-fm/sushi/Makefile
+++ b/x11-fm/sushi/Makefile
@@ -31,8 +31,8 @@ RUN_DEPENDS= nautilus:x11-fm/nautilus
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gmake gnome libtool localbase pathfix \
- pkgconfig tar:xz
+USES= compiler:c11 gettext gl gmake gnome libtool localbase pathfix \
+ pkgconfig tar:xz xorg
USE_CSTD= c11
INSTALLS_ICONS= yes
USE_GNOME= cairo gnomeprefix gtksourceview3 intlhack introspection
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index ea10e2ff794b..e2ec65bf72a0 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libsmpeg.so:multimedia/smpeg
+USES= gl pkgconfig sdl
USE_GL= glut
USE_SDL= image sdl
-USES= pkgconfig
PORTDOCS= README
PLIST_FILES= bin/${PORTNAME}
diff --git a/x11-fm/wcmcommander/Makefile b/x11-fm/wcmcommander/Makefile
index 6f35c890c266..9d295b22b751 100644
--- a/x11-fm/wcmcommander/Makefile
+++ b/x11-fm/wcmcommander/Makefile
@@ -19,7 +19,7 @@ GH_PROJECT= WCMCommander
CONFLICTS_INSTALL= wcm # bin/wcm
-USES= compiler:c++11-lib cmake
+USES= compiler:c++11-lib cmake xorg
CMAKE_ARGS= -DDATADIR="${DATADIR_REL}"
USE_XORG= x11
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index e041033ada91..bd37a2cfbb3f 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -35,7 +35,7 @@ HAL_LIB_DEPENDS= libhal-storage.so:sysutils/hal \
libdbus-glib-1.so:devel/dbus-glib \
libdbus-1.so:devel/dbus
HAL_USE= gnome=glib20 xorg=sm,ice
-HAL_USES= gettext-runtime
+HAL_USES= gettext-runtime gnome
INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify
diff --git a/x11-fm/xcruise/Makefile b/x11-fm/xcruise/Makefile
index 871e0a632733..88d2f85fabce 100644
--- a/x11-fm/xcruise/Makefile
+++ b/x11-fm/xcruise/Makefile
@@ -13,7 +13,7 @@ COMMENT= Navigate through a three-dimensional view of a file system
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
OPTIONS_DEFINE= DOCS
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index 34646973afe6..797d5c88cf4c 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= libFOX-1.6.so:x11-toolkits/fox16 \
libpng.so:graphics/png \
libxcb-util.so:x11/xcb-util
-USES= desktop-file-utils gmake localbase pathfix pkgconfig gnome
+USES= desktop-file-utils gmake localbase pathfix pkgconfig gnome xorg
USE_XORG= x11 xcb xft xrandr xrender
USE_GNOME= intltool
diff --git a/x11-fonts/croscorefonts-fonts-ttf/Makefile b/x11-fonts/croscorefonts-fonts-ttf/Makefile
index 100bd81e3ff2..601316c3cead 100644
--- a/x11-fonts/croscorefonts-fonts-ttf/Makefile
+++ b/x11-fonts/croscorefonts-fonts-ttf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= croscorefonts
PORTVERSION= 1.31.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= https://gsdview.appspot.com/chromeos-localmirror/distfiles/ \
LOCAL/sunpoet
@@ -13,7 +13,7 @@ COMMENT= Fonts created from by Google for ChromeOS to replace MS TTF
LICENSE= APACHE20
-USES= fonts tar:bzip2
+USES= fonts tar:bzip2 xorg
USE_XORG= x11
NO_ARCH= yes
diff --git a/x11-fonts/crosextrafonts-caladea-ttf/Makefile b/x11-fonts/crosextrafonts-caladea-ttf/Makefile
index 2ebcca3db706..e01ab9117a54 100644
--- a/x11-fonts/crosextrafonts-caladea-ttf/Makefile
+++ b/x11-fonts/crosextrafonts-caladea-ttf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crosextrafonts
PORTVERSION= 20130214
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= https://gsdview.appspot.com/chromeos-localmirror/distfiles/
PKGNAMESUFFIX= -caladea
@@ -12,7 +12,7 @@ COMMENT= Font created by Google for ChromeOS to replace MS Cambria
LICENSE= APACHE20
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
NO_ARCH= yes
diff --git a/x11-fonts/crosextrafonts-carlito-ttf/Makefile b/x11-fonts/crosextrafonts-carlito-ttf/Makefile
index 0eac7e851057..1e45f49033f3 100644
--- a/x11-fonts/crosextrafonts-carlito-ttf/Makefile
+++ b/x11-fonts/crosextrafonts-carlito-ttf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crosextrafonts-carlito
PORTVERSION= 20130920
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-fonts
MASTER_SITES= https://gsdview.appspot.com/chromeos-localmirror/distfiles/
@@ -11,7 +11,7 @@ COMMENT= Font created by Google for ChromeOS to replace MS Calibri
LICENSE= OFL11
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
NO_ARCH= yes
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile
index 91996d7034d0..e21ba4acee3e 100644
--- a/x11-fonts/cyr-rfx/Makefile
+++ b/x11-fonts/cyr-rfx/Makefile
@@ -18,7 +18,7 @@ BROKEN= unfetchable
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
mkfontscale>=0:x11-fonts/mkfontscale
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
CYR_RFX_ENCODING?= koi8-o
diff --git a/x11-fonts/datalegreya/Makefile b/x11-fonts/datalegreya/Makefile
index 07ffbd0d2857..12017243620d 100644
--- a/x11-fonts/datalegreya/Makefile
+++ b/x11-fonts/datalegreya/Makefile
@@ -16,7 +16,7 @@ USE_GITHUB= yes
GH_ACCOUNT= figs-lab
GH_TAGNAME= bb0872f
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
NO_ARCH= yes
NO_BUILD= yes
diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile
index e7f981ec6ed8..811cfe30ca41 100644
--- a/x11-fonts/fira/Makefile
+++ b/x11-fonts/fira/Makefile
@@ -11,7 +11,7 @@ COMMENT= Sans-serif, monospaced, and code typeface for small screens
LICENSE= OFL11
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
USE_GITHUB= yes
GH_ACCOUNT= bBoxType
diff --git a/x11-fonts/firacode/Makefile b/x11-fonts/firacode/Makefile
index de3e780108fb..906cb37ac640 100644
--- a/x11-fonts/firacode/Makefile
+++ b/x11-fonts/firacode/Makefile
@@ -12,7 +12,7 @@ COMMENT= Monospaced font with programming ligatures derived from Fira
LICENSE= OFL11
-USES= fonts zip
+USES= fonts xorg zip
USE_XORG= x11
NO_ARCH= yes
NO_BUILD= yes
diff --git a/x11-fonts/firago/Makefile b/x11-fonts/firago/Makefile
index cec6523c6c22..333a2a6f81c3 100644
--- a/x11-fonts/firago/Makefile
+++ b/x11-fonts/firago/Makefile
@@ -10,7 +10,7 @@ COMMENT= Expanded version of Fira Sans with support for additional languages
LICENSE= OFL11
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
USE_GITHUB= yes
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 0285e6247fb4..d1fc465d3b7b 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -16,7 +16,7 @@ COMMENT= Ukrainian KOI8 fonts for X11R6 (koi8-u)
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
mkfontscale>=0:x11-fonts/mkfontscale
-USES= fonts perl5 tar:tgz
+USES= fonts perl5 tar:tgz xorg
USE_PERL5= build
USE_XORG= x11
NO_WRKSUBDIR= yes
diff --git a/x11-fonts/inconsolata-lgc-ttf/Makefile b/x11-fonts/inconsolata-lgc-ttf/Makefile
index fbac34447e31..eb39176de700 100644
--- a/x11-fonts/inconsolata-lgc-ttf/Makefile
+++ b/x11-fonts/inconsolata-lgc-ttf/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB= yes
GH_ACCOUNT= DeLaGuardo
GH_TAGNAME= 16e2c94
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
NO_BUILD= yes
FONTNAME= TTF
diff --git a/x11-fonts/inconsolata-ttf/Makefile b/x11-fonts/inconsolata-ttf/Makefile
index 3d0d9fb5ef63..320ce9f44a9b 100644
--- a/x11-fonts/inconsolata-ttf/Makefile
+++ b/x11-fonts/inconsolata-ttf/Makefile
@@ -14,7 +14,7 @@ LICENSE= OFL11
LICENSE_FILE= ${WRKSRC}/OFL.txt
NO_ARCH= yes
-USES= fonts
+USES= fonts xorg
USE_GITHUB= yes
GH_ACCOUNT= google
GH_PROJECT= fonts
diff --git a/x11-fonts/montecarlo_fonts/Makefile b/x11-fonts/montecarlo_fonts/Makefile
index 8fd3fc9f010c..f1e787f6c1fd 100644
--- a/x11-fonts/montecarlo_fonts/Makefile
+++ b/x11-fonts/montecarlo_fonts/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Monospace font
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
NO_BUILD= yes
diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index f86a29063b01..1a67820df6ac 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -14,7 +14,7 @@ COMMENT= NeXtaw based replacement for xfontsel
LIB_DEPENDS= libneXtaw.so:x11-toolkits/neXtaw
-USES= imake
+USES= imake xorg
USE_XORG= xaw
post-patch:
diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile
index 217385289862..d35d841a88c8 100644
--- a/x11-fonts/proggy_fonts/Makefile
+++ b/x11-fonts/proggy_fonts/Makefile
@@ -28,8 +28,8 @@ COMMENT= The perfect monospaced bitmap programming fonts
ALREADY_UNZIP= ${DISTDIR}/Opti.pcf.gz ${DISTDIR}/OptiSmall.pcf.gz \
${DISTDIR}/PixelCarnageMono.pcf.gz
+USES= fonts xorg zip
USE_XORG= x11
-USES= fonts zip
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/x11-fonts/stix-fonts/Makefile b/x11-fonts/stix-fonts/Makefile
index 52317884c51f..7515158a490e 100644
--- a/x11-fonts/stix-fonts/Makefile
+++ b/x11-fonts/stix-fonts/Makefile
@@ -11,7 +11,7 @@ COMMENT= OpenType Unicode fonts for Scientific, Technical, and Math texts
LICENSE= OFL11
-USES= fonts
+USES= fonts xorg
USE_XORG= x11
USE_GITHUB= yes
GH_ACCOUNT= stipub
diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile
index 0ddc5ce80791..e76915d05ce7 100644
--- a/x11-fonts/suxus/Makefile
+++ b/x11-fonts/suxus/Makefile
@@ -15,8 +15,8 @@ COMMENT= X11 font designed to be small yet easily read
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf
SUB_FILES= pkg-message
+USES= fonts xorg
USE_XORG= x11
-USES= fonts
PLIST_FILES= ${FONTSDIR}/suxus-iso-8859-1.pcf.gz
do-extract:
diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index 4b24156ca9f7..1aa7b54725fa 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -24,8 +24,8 @@ LICENSE= GPLv2
BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf
+USES= fonts perl5 xorg
USE_XORG= x11
-USES= fonts perl5
USE_PERL5= build
NO_WRKSUBDIR= yes
NO_ARCH= yes
diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index fd3c529c56e6..04b74e2d5d3d 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -12,7 +12,7 @@ COMMENT= TrueType font server for X11
LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-USES= pkgconfig tar:xz
+USES= pkgconfig tar:xz xorg
USE_XORG= xorgproto
USE_RC_SUBR= xfstt
GNU_CONFIGURE= yes
diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile
index 5ee5858bd1ab..ee956f0bfae1 100644
--- a/x11-servers/x2vnc/Makefile
+++ b/x11-servers/x2vnc/Makefile
@@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
+USES= xorg
USE_XORG= x11 xext xrandr xxf86dga ice xinerama xrandr xrender xscrnsaver sm
PLIST_FILES= bin/x2vnc \
diff --git a/x11-servers/x2x/Makefile b/x11-servers/x2x/Makefile
index cde1d7a50068..03d11d4e0a42 100644
--- a/x11-servers/x2x/Makefile
+++ b/x11-servers/x2x/Makefile
@@ -11,7 +11,7 @@ COMMENT= Program to link multiple X servers together
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= autoreconf gmake pkgconfig
+USES= autoreconf gmake pkgconfig xorg
USE_GITHUB= yes
GH_ACCOUNT= dottedmag
GH_TAGNAME= e62a535
diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index dd7c25f9d505..c41b5c612140 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= gm4:devel/m4 \
fvwm2:x11-wm/fvwm2
RUN_DEPENDS= fvwm2:x11-wm/fvwm2
-USES= gmake perl5 shebangfix tar:bzip2
+USES= gmake perl5 shebangfix tar:bzip2 xorg
USE_XORG= xpm
SHEBANG_FILES= themes/cde/modules/create-buttonbar-config \
themes/redmondxp/modules/FvwmThemesPanelManager
diff --git a/x11-themes/gtk-murrine-engine/Makefile b/x11-themes/gtk-murrine-engine/Makefile
index 3f5daf725b2b..0f226012a647 100644
--- a/x11-themes/gtk-murrine-engine/Makefile
+++ b/x11-themes/gtk-murrine-engine/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX= -engine
MAINTAINER= pneumann@gmail.com
COMMENT= Murrine GTK+ 2.x cairo based engine
-USES= gettext gmake libtool pkgconfig tar:xz
+USES= gettext gmake gnome libtool pkgconfig tar:xz xorg
USE_XORG= pixman
USE_GNOME= gtk20 intltool intlhack
USE_LDCONFIG= yes
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index dd642ca0499a..d19c561ed4f3 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -16,7 +16,8 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
-USES= gettext-tools gmake localbase pathfix pkgconfig tar:xz
+USES= gettext-tools gmake gnome localbase pathfix pkgconfig tar:xz \
+ xorg
GNU_CONFIGURE= yes
USE_XORG= x11
USE_GNOME= cairo gdkpixbuf2 gtk20 intltool
diff --git a/x11-themes/plasma5-kde-gtk-config/Makefile b/x11-themes/plasma5-kde-gtk-config/Makefile
index 21345a3dab4a..98dcb8131337 100644
--- a/x11-themes/plasma5-kde-gtk-config/Makefile
+++ b/x11-themes/plasma5-kde-gtk-config/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
BUILD_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
-USES= cmake compiler:c++11-lib cpe gettext \
+USES= cmake compiler:c++11-lib cpe gettext gnome \
kde:5 pkgconfig qt:5 tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 gtk20 gtk30 glib20
USE_KDE= archive attica auth codecs completion config configwidgets \
diff --git a/x11-themes/qt5-style-plugins/Makefile b/x11-themes/qt5-style-plugins/Makefile
index 9c0c1aff179d..0ecc50900018 100644
--- a/x11-themes/qt5-style-plugins/Makefile
+++ b/x11-themes/qt5-style-plugins/Makefile
@@ -17,7 +17,8 @@ LICENSE= LGPL21
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= compiler:c++11-lang gettext-runtime gl pkgconfig qmake qt:5
+USES= compiler:c++11-lang gettext-runtime gl gnome pkgconfig qmake \
+ qt:5 xorg
USE_GITHUB= yes
GH_ACCOUNT= qt
GH_PROJECT= qtstyleplugins
diff --git a/x11-themes/qtcurve/Makefile b/x11-themes/qtcurve/Makefile
index 9eba665773fe..590f0b2bbf15 100644
--- a/x11-themes/qtcurve/Makefile
+++ b/x11-themes/qtcurve/Makefile
@@ -34,7 +34,7 @@ USE_GITHUB= yes
GH_ACCOUNT= KDE
GH_TAGNAME= a1ec5f8
-USES= compiler:c++11-lib cmake:insource pkgconfig
+USES= compiler:c++11-lib cmake:insource pkgconfig xorg
USE_XORG= x11 xcb
.for i in gtk2 kf5 qt5
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 39017792e6f5..aca925974d3b 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -12,7 +12,7 @@ COMMENT= GUI binding for using Open Inventor with Xt/Motif
LIB_DEPENDS= libCoin.so:graphics/Coin
-USES= libtool motif pathfix perl5 shebangfix
+USES= gl libtool motif pathfix perl5 shebangfix xorg
USE_GL= yes
USE_PERL5= build
SHEBANG_FILES= cfg/doxy4win.pl
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 68868a00fb54..88458f35b77b 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -13,7 +13,7 @@ COMMENT= 3-D Athena Widget set that looks like Motif
LICENSE= MIT
WRKSRC= ${WRKDIR}/xc/lib/Xaw3d
-USES= gettext imake
+USES= gettext imake xorg
USE_XORG= x11 xext xmu xt sm ice xpm
USE_LDCONFIG= yes
diff --git a/x11-toolkits/diorite/Makefile b/x11-toolkits/diorite/Makefile
index aa6257285840..177aad03434b 100644
--- a/x11-toolkits/diorite/Makefile
+++ b/x11-toolkits/diorite/Makefile
@@ -16,7 +16,7 @@ GH_ACCOUNT= tiliado
# USES=waf implicity does USES=python:2.7,build but that is not sufficient
# for shebangfix to know the python version
-USES= gnome pkgconfig python:2.7,build shebangfix waf
+USES= gnome pkgconfig python:2.7,build shebangfix waf xorg
USE_GITHUB= yes
USE_GNOME= gdkpixbuf2 glib20 gtk30
USE_XORG= x11
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index e08ae8223088..48cb0f74ba51 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png \
libfontconfig.so:x11-fonts/fontconfig
-USES= gl jpeg localbase pkgconfig tar:bz2
+USES= gl jpeg localbase pkgconfig tar:bz2 xorg
USE_XORG= x11 xcursor xext xfixes xft xinerama xrender
USE_GL= gl glu
USE_LDCONFIG= yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index d5dd7d1d76d2..7c187736b6a3 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -23,7 +23,7 @@ MAJORVER= ${PORTVERSION:R}
SHVER= ${PORTVERSION:S/${MAJORVER}.//}
PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
-USES= jpeg libtool
+USES= gl jpeg libtool
USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-opengl=yes \
@@ -48,6 +48,7 @@ SHM_DESC= Shared Memory support
#
.if ${PORT_OPTIONS:MXFT}
CONFIGURE_ARGS+=--with-xft=yes
+USES+= xorg
USE_XORG+= xft
CPPFLAGS+= `freetype-config --cflags`
LDFLAGS+= `freetype-config --libs`
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index faa9be578370..f0bccf4cd20f 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libpng.so:graphics/png \
libtiff.so:graphics/tiff
-USES= compiler:features jpeg libtool pathfix
+USES= compiler:features gl jpeg libtool pathfix xorg
USE_GL= gl glu
USE_XORG= x11 xext xfixes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index fc27d2d43c49..71ae34d60643 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libpng.so:graphics/png \
libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
-USES= compiler:c++11-lib libtool localbase pathfix
+USES= compiler:c++11-lib gl libtool localbase pathfix xorg
USE_GL= gl glu
USE_XORG= ice sm x11 xcursor xext xfixes xft xi xrandr xrender
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index 1e6771ad9976..91f61ff5c3af 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -16,7 +16,8 @@ LIB_DEPENDS= libpopt.so:devel/popt \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= autoreconf gmake libtool mono pathfix perl5 pkgconfig shebangfix tar:bzip2
+USES= autoreconf gmake gnome libtool mono pathfix perl5 pkgconfig \
+ shebangfix tar:bzip2 xorg
USE_LDCONFIG= yes
USE_GITHUB= yes
USE_GNOME= cairo gnomevfs2 gtksharp20 librsvg2 vte libgnomeprintui libgnomeui
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index fd12ffa3c97f..ba7b27612218 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS+= libgif.so:graphics/giflib \
libfreetype.so:print/freetype2 \
libcairo.so:graphics/cairo
-USES= gnustep jpeg pkgconfig gl
+USES= gl gnustep jpeg pkgconfig xorg
USE_GNUSTEP= base gui build
USE_XORG= xft xrender xmu xext x11 xcursor xfixes xmu
USE_GL= gl
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 69de28563dde..74a6d79c7f86 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= libsndfile.so:audio/libsndfile
LIB_DEPENDS+= libao.so:audio/libao
LIB_DEPENDS+= libflite.so:audio/flite
-USES= gnustep jpeg pkgconfig
+USES= gnustep jpeg pkgconfig xorg
USE_GNUSTEP= base build
USE_XORG= x11 xt
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index fa56b24545e5..73c0874b55eb 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -23,8 +23,8 @@ PORTSCOUT= limitw:0,even
RUN_DEPENDS+= update-mime-database:misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
-USES+= gettext gmake libtool localbase:ldflags pathfix perl5 \
- pkgconfig python:run shebangfix
+USES+= gettext gmake gnome libtool localbase:ldflags pathfix perl5 \
+ pkgconfig python:run shebangfix xorg
SHEBANG_FILES= gtk/gtk-builder-convert
GNU_CONFIGURE= yes
USE_GNOME= atk pango gdkpixbuf2 introspection:build \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index d96a95fd4406..601472d5dc70 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -35,7 +35,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango
USES= compiler:c11 gettext gmake gnome libtool localbase \
- pathfix perl5 pkgconfig tar:xz
+ pathfix perl5 pkgconfig tar:xz xorg
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
CONFIGURE_ARGS= --enable-x11-backend \
diff --git a/x11-toolkits/gtkada3/Makefile b/x11-toolkits/gtkada3/Makefile
index 401d79a141d8..20bcd64f1b60 100644
--- a/x11-toolkits/gtkada3/Makefile
+++ b/x11-toolkits/gtkada3/Makefile
@@ -27,7 +27,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
libgraphite2.so:graphics/graphite2 \
libdbus-1.so:devel/dbus
-USES= ada:run gmake iconv:wchar_t perl5 pkgconfig
+USES= ada:run gl gmake gnome iconv:wchar_t perl5 pkgconfig xorg
USE_PERL5= build
USE_GNOME= gtk30 cairo gdkpixbuf2
USE_XORG= ice sm xxf86vm xcb xdmcp xau x11 pixman xfixes xdamage \
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 7a3f0d19a229..2073177b1281 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -15,7 +15,8 @@ LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
GNU_CONFIGURE= yes
-USES= gettext gmake iconv libtool pathfix pkgconfig tar:bzip2
+USES= gettext gl gmake gnome iconv libtool pathfix pkgconfig \
+ tar:bzip2 xorg
USE_GL= glu
USE_GNOME= gtk20 pangox-compat
USE_LDCONFIG= yes
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index b3b0dbea4b4a..f870e0ad069a 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/readme.txt
LIB_DEPENDS= libpng.so:graphics/png
DOS2UNIX_GLOB= Makefile *.cpp *.h *.txt
-USES= alias dos2unix gmake jpeg zip
+USES= alias dos2unix gl gmake jpeg zip xorg
USE_GL= gl
USE_XORG= x11 xxf86vm
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index d8c132f6fb2a..d5a597d131bd 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -15,7 +15,8 @@ COMMENT= Gnome print support library
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme
-USES= bison gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES= bison gettext gmake gnome libtool:keepla pathfix pkgconfig \
+ tar:bzip2 xorg
USE_XORG= x11 xpm
USE_GNOME= gnomeprefix libgnomeprint libgnomecanvas \
intlhack
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 0f9740e3aff1..cefe62ec79bd 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS+= libgnome-keyring.so:security/libgnome-keyring \
libstartup-notification-1.so:x11/startup-notification
RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:misc/gnome-icon-theme
-USES+= bison gettext gmake localbase libtool:keepla pathfix pkgconfig
+USES+= bison gettext gmake gnome localbase libtool:keepla pathfix \
+ pkgconfig xorg
USE_GNOME= gnomeprefix intltool libbonoboui referencehack gvfs
USE_XORG= sm
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 2d365ff42517..b05b566cd465 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= libgnomemm-2.6.so:x11/libgnomemm26 \
libglademm-2.4.so:devel/libglademm24 \
libgnomevfsmm-2.6.so:devel/gnome-vfsmm
-USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
- tar:bzip2
+USES= compiler:c++11-lang gmake gnome libtool:keepla pathfix \
+ pkgconfig tar:bzip2 xorg
USE_CXXSTD= c++11
USE_XORG= x11
USE_GNOME= libgnomeui
diff --git a/x11-toolkits/libunique3/Makefile b/x11-toolkits/libunique3/Makefile
index 73f50385d823..a3591955b000 100644
--- a/x11-toolkits/libunique3/Makefile
+++ b/x11-toolkits/libunique3/Makefile
@@ -12,8 +12,8 @@ COMMENT= Library for single instance applications
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
+USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz xorg
USE_XORG= ice x11
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
USE_GNOME= gtk30 gnomeprefix introspection:build
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 1b6aa2514cc2..cd10d59e7ba4 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -21,9 +21,10 @@ PORTSCOUT= ignore:1
LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
+USES+= bison gettext gmake gnome libtool:keepla localbase:ldflags \
+ pathfix pkgconfig xorg
USE_XORG= xres x11
USE_GNOME= gtk20 referencehack intlhack introspection
-USES+= bison gettext gmake libtool:keepla localbase:ldflags pathfix pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index 921118485274..70cd96e5e6a3 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -18,7 +18,8 @@ USES= tar:xz
.if !defined(REFERENCE_PORT)
-USES+= bison gettext gmake libtool localbase pathfix pkgconfig
+USES+= bison gettext gmake gnome libtool localbase pathfix pkgconfig \
+ xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack introspection:build \
referencehack
USE_XORG= xext xrender xres x11
diff --git a/x11-toolkits/libxaw3dxft/Makefile b/x11-toolkits/libxaw3dxft/Makefile
index 3237d880734e..7fcbd5362333 100644
--- a/x11-toolkits/libxaw3dxft/Makefile
+++ b/x11-toolkits/libxaw3dxft/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:print/freetype2
-USES= libtool pathfix pkgconfig tar:bzip2
+USES= libtool pathfix pkgconfig tar:bzip2 xorg
GNU_CONFIGURE= yes
USE_XORG= x11 xext xft xmu xpm xt
USE_LDCONFIG= yes
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 94d2ccc9cdb8..8cc6b27f58ba 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -12,7 +12,7 @@ COMMENT= This is the Mowitz ("More widgets") library
LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d
-USES= libtool
+USES= libtool xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/nanogui/Makefile b/x11-toolkits/nanogui/Makefile
index a91d7c781955..a69ba3bc8827 100644
--- a/x11-toolkits/nanogui/Makefile
+++ b/x11-toolkits/nanogui/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libglfw.so:graphics/glfw
-USES= cmake compiler:c++14-lang eigen:3,build,run gl
+USES= cmake compiler:c++14-lang eigen:3,build,run gl xorg
USE_GITHUB= yes
GH_ACCOUNT= wjakob
GH_TAGNAME= 885e4fc
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 55bfeca74cee..b70e2898eb7b 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -13,7 +13,7 @@ COMMENT= Athena Widgets with N*XTSTEP appearance
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= libtool localbase
+USES= libtool localbase xorg
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_XORG= xmu x11 xext
diff --git a/x11-toolkits/ntk/Makefile b/x11-toolkits/ntk/Makefile
index 83a07ce201c9..082207a4cb0e 100644
--- a/x11-toolkits/ntk/Makefile
+++ b/x11-toolkits/ntk/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libpng.so:graphics/png
-USES= gnome jpeg localbase:ldflags pkgconfig waf
+USES= gnome jpeg localbase:ldflags pkgconfig waf xorg
USE_GITHUB= yes
GH_ACCOUNT= original-male
USE_GNOME= cairo
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 57542f9a2297..0b4541b4cc22 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -15,7 +15,7 @@ LICENSE= LGPL20+
WRKSRC= ${WRKDIR}/${PORTNAME}_lib
-USES= tar:tgz
+USES= gl tar:tgz xorg
USE_XORG= xmu xext x11
USE_GL= glut glu gl
USE_LDCONFIG= yes
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index 014425ba7f4a..4fbeb33fcee7 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libgif.so:graphics/giflib \
libtiff.so:graphics/tiff \
libwebp.so:graphics/webp
-USES= jpeg perl5 pkgconfig
+USES= jpeg perl5 pkgconfig xorg
USE_PERL5= configure
USE_XORG= x11 xcursor xext xpm xrender xrandr
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 701abb245b51..3d649615255c 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFAULT= XFT
XFT_DESC= Client-side fonts via libXft
MAKE_JOBS_UNSAFE= yes
-USES= jpeg perl5 shebangfix
+USES= jpeg perl5 shebangfix xorg
SHEBANG_FILES= pTk/Tcl-pTk \
pTk/mkVFunc
USE_PERL5= configure
diff --git a/x11-toolkits/pangox-compat/Makefile b/x11-toolkits/pangox-compat/Makefile
index bc84acbe6362..d5070e4ad40f 100644
--- a/x11-toolkits/pangox-compat/Makefile
+++ b/x11-toolkits/pangox-compat/Makefile
@@ -14,7 +14,7 @@ COMMENT= Deprecated pangoX support
BUILD_DEPENDS= pango>=1.34.0:x11-toolkits/pango
-USES= gmake libtool pathfix pkgconfig tar:xz
+USES= gmake gnome libtool pathfix pkgconfig tar:xz xorg
USE_XORG= x11 ice
USE_LDCONFIG= yes
USE_GNOME= glib20 pango
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index b3070250f18b..053febe5cef8 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -13,7 +13,7 @@ COMMENT= Portable library for joystick/sound/OpenGL GUI/3D math
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake
+USES= gl gmake xorg
USE_XORG= xt xi xmu xext x11
USE_GL= glu
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index dc1147e0ef6c..463d14ece57b 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
CFLAGS+= -DFL_LIBRARY
MAKE_ENV= FLTK_HOME=${LOCALBASE}/bin
-USES= python
+USES= python xorg
USE_PYTHON= autoplist distutils
USE_XORG= x11
diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile
index 4c51314819e1..d38b40b254ca 100644
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@@ -23,7 +23,7 @@ TEST_DEPENDS= nosetests-${PYTHON_VER}:devel/py-nose@${PY_FLAVOR}
MAKE_ENV= KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes USE_OPENGL_ES2=1 \
PYTHONPATH=${WRKSRC}
-USES= display:test python:2.7 shebangfix uniquefiles:dirs
+USES= display:test gl python:2.7 shebangfix uniquefiles:dirs
USE_GL= egl gl glesv2
USE_PYTHON= autoplist concurrent cython distutils
PYDISTUTILS_BUILD_TARGET= build_ext
@@ -71,9 +71,10 @@ SDL2_DESC= Simple Direct Media Layer v2.0 support
SDL2_MAKE_ENV= USE_SDL2=1
SDL2_MAKE_ENV_OFF= USE_SDL2=0
SDL2_USE= SDL=sdl2,mixer2,image2,ttf2
-SDL2_USES= pkgconfig
+SDL2_USES= pkgconfig sdl
X11_MAKE_ENV= USE_X11=1
X11_MAKE_ENV_OFF= USE_X11=0
+X11_USES= xorg
X11_USE= XORG=xrender,x11
.if !defined(ARCH)
diff --git a/x11-toolkits/py-qt5-gui/Makefile b/x11-toolkits/py-qt5-gui/Makefile
index c816a98daf50..820e6766cf3f 100644
--- a/x11-toolkits/py-qt5-gui/Makefile
+++ b/x11-toolkits/py-qt5-gui/Makefile
@@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtGui
PYQT_DIST= yes
-USES= python pyqt:5 qt:5
+USES= gl python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run
USE_PYTHON= concurrent flavors py3kplist
diff --git a/x11-toolkits/py-qt5-quickwidgets/Makefile b/x11-toolkits/py-qt5-quickwidgets/Makefile
index 5e6024c4d7d0..e321b26c5f9e 100644
--- a/x11-toolkits/py-qt5-quickwidgets/Makefile
+++ b/x11-toolkits/py-qt5-quickwidgets/Makefile
@@ -9,7 +9,7 @@ COMMENT= Python bindings for the Qt5 toolkit, QtQuickWidgets module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
-USES= python pyqt:5 qt:5
+USES= gl python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run
PYQT_DIST= yes
diff --git a/x11-toolkits/py-qt5-widgets/Makefile b/x11-toolkits/py-qt5-widgets/Makefile
index a0a34db501f2..2416768afac6 100644
--- a/x11-toolkits/py-qt5-widgets/Makefile
+++ b/x11-toolkits/py-qt5-widgets/Makefile
@@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtWidgets
PYQT_DIST= yes
-USES= python pyqt:5 qt:5
+USES= gl python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run
USE_PYTHON= concurrent flavors py3kplist
diff --git a/x11-toolkits/qml-box2d/Makefile b/x11-toolkits/qml-box2d/Makefile
index 01c98ff1b603..ed6a972e1547 100644
--- a/x11-toolkits/qml-box2d/Makefile
+++ b/x11-toolkits/qml-box2d/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= x11-toolkits
MAINTAINER= kde@FreeBSD.org
COMMENT= QML Box2D plugin
-USES= compiler:c++11-lang qmake:outsource qt:5
+USES= compiler:c++11-lang gl qmake:outsource qt:5
USE_GITHUB= yes
GH_TAGNAME= 21e57f
USE_GL= gl
diff --git a/x11-toolkits/qt5-gtkplatform/Makefile b/x11-toolkits/qt5-gtkplatform/Makefile
index af014fd868ba..4a7fe5af2d05 100644
--- a/x11-toolkits/qt5-gtkplatform/Makefile
+++ b/x11-toolkits/qt5-gtkplatform/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libudev.so:devel/libudev-devd \
libxkbcommon.so:x11/libxkbcommon
-USES= compiler:c++11-lang pkgconfig qmake:outsource qt:5
+USES= compiler:c++11-lang gl gnome pkgconfig qmake:outsource qt:5 xorg
USE_GNOME= gtk30 cairo gdkpixbuf2
USE_QT= buildtools_build core gui widgets dbus
USE_XORG= x11 xext xrender
diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile
index 022a2f49f4c9..a08d548c0553 100644
--- a/x11-toolkits/qt5-widgets/Makefile
+++ b/x11-toolkits/qt5-widgets/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt C++ widgets module
-USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
+USES= compiler:c++11-lang qmake:no_env qt-dist:5,base xorg
USE_QT= core gui qmake_build buildtools_build
USE_XORG= x11
HAS_CONFIGURE= yes
@@ -27,6 +27,7 @@ OPTIONS_DEFINE= GTK3
OPTIONS_SUB= YES
GTK3_DESC= GTK+-based Qt theme
+GTK3_USES= gnome
GTK3_USE= GNOME=gtk30 QT=dbus
GTK3_CONFIGURE_ON= -gtk
GTK3_CONFIGURE_OFF= -no-gtk
diff --git a/x11-toolkits/rubygem-tk/Makefile b/x11-toolkits/rubygem-tk/Makefile
index 88331581740a..142f3c3b3f19 100644
--- a/x11-toolkits/rubygem-tk/Makefile
+++ b/x11-toolkits/rubygem-tk/Makefile
@@ -14,7 +14,7 @@ CONFIGURE_ARGS=--with-tcltkversion=8.6,8.6 \
--with-tk-include=${LOCALBASE}/include/tk8.6 \
--with-tcl-include=${LOCALBASE}/include/tcl8.6
-USES= gem tk:86
+USES= gem tk:86 xorg
USE_RUBY= yes
USE_XORG= x11
diff --git a/x11-toolkits/rubygem-uh/Makefile b/x11-toolkits/rubygem-uh/Makefile
index 67e09588964f..15b884cfe274 100644
--- a/x11-toolkits/rubygem-uh/Makefile
+++ b/x11-toolkits/rubygem-uh/Makefile
@@ -10,8 +10,8 @@ COMMENT= Xlib ruby toolkit
LICENSE= BSD3CLAUSE
+USES= gem xorg
USE_RUBY= yes
-USES= gem
USE_XORG= x11 xinerama
.include <bsd.port.mk>
diff --git a/x11-toolkits/soqt-devel/Makefile b/x11-toolkits/soqt-devel/Makefile
index b551fd0750df..aa12ba1d8ad7 100644
--- a/x11-toolkits/soqt-devel/Makefile
+++ b/x11-toolkits/soqt-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libCoin.so:graphics/Coin
CONFLICTS_INSTALL= SoQt
USES= cmake compiler:c++11-lang dos2unix gl libtool \
- localbase:ldflags pathfix pkgconfig qmake:no_env qt:5
+ localbase:ldflags pathfix pkgconfig qmake:no_env qt:5 xorg
USE_QT= buildtools core gui opengl qmake widgets
USE_GL= gl
USE_XORG= ice sm x11 xext xi
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 569b1dddfd5c..003730dcc6f5 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -15,7 +15,7 @@ LICENSE= EPL
ONLY_FOR_ARCHS= amd64 i386
BROKEN_i386= missing distinfo
-USES= gl gnome pkgconfig zip:infozip
+USES= gl gnome pkgconfig zip:infozip xorg
SWT_VERSION= 4763
OUTPUT_JAR= swt.jar
diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile
index fe0c8451a6ee..939b3691075c 100644
--- a/x11-toolkits/termit/Makefile
+++ b/x11-toolkits/termit/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
USE_GITHUB= yes
GH_ACCOUNT= nonstop
-USES= cmake lua pkgconfig
+USES= cmake gnome lua pkgconfig xorg
USE_XORG= x11
USE_GNOME= cairo gdkpixbuf2 gtk30 vte3
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index ebbcd30485f2..31c4916987f0 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -19,7 +19,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
DEPRECATED= Tcl/Tk 8.5 is nearing EOL, please consider switching to Tcl/Tk 8.6
-USES+= tcl:${SHORT_TK_VER},tea
+USES+= tcl:${SHORT_TK_VER},tea xorg
USE_XORG= x11 xft xscrnsaver
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index ba28dd14f2f7..fa52e0e8f955 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -32,7 +32,7 @@ ALL_TARGET= all
INSTALL_TARGET= install-strip
TEST_TARGET= test
-USES+= tcl:${SHORT_TK_VER},tea
+USES+= tcl:${SHORT_TK_VER},tea xorg
USE_LDCONFIG= yes
USE_XORG= x11 xext xft xrender xscrnsaver
CONFIGURE_ARGS= --enable-xss \
diff --git a/x11-toolkits/tk87/Makefile b/x11-toolkits/tk87/Makefile
index 149677a549fb..e0c05ec2c117 100644
--- a/x11-toolkits/tk87/Makefile
+++ b/x11-toolkits/tk87/Makefile
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION}/unix
ALL_TARGET= all
INSTALL_TARGET= install-strip
-USES+= tcl:${SHORT_TK_VER},tea
+USES+= tcl:${SHORT_TK_VER},tea xorg
USE_LDCONFIG= yes
USE_XORG= x11 xext xft xrender xscrnsaver
CONFIGURE_ARGS= --enable-xss \
diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile
index 97e24a971492..1e4f6ef8d645 100644
--- a/x11-toolkits/tkdnd/Makefile
+++ b/x11-toolkits/tkdnd/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= tcltk@FreeBSD.org
COMMENT= Native drag and drop capabilities for Tk
-USES+= tk:tea
+USES+= tk:tea xorg
USE_XORG= x11 xext
TCL_PKG= ${PORTNAME}${PORTVERSION}
diff --git a/x11-toolkits/tkshape/Makefile b/x11-toolkits/tkshape/Makefile
index ffc2af7ebee2..41ac0fed178a 100644
--- a/x11-toolkits/tkshape/Makefile
+++ b/x11-toolkits/tkshape/Makefile
@@ -12,7 +12,7 @@ DISTNAME= shape${PORTVERSION:S/.//g}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Tk library to access to X Shaped Window Extension
-USES= gmake tk
+USES= gmake tk xorg
USE_XORG= x11 xext
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index aedf594d9f70..f05ee7a29798 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= tcltk@FreeBSD.org
COMMENT= System tray icon support
-USES+= tk:tea
+USES+= tk:tea xorg
USE_XORG= x11 xext
PLIST_FILES= lib/${TCL_PKG}/libtktray.so.1 \
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 782e82f51793..9ec6ddc3da2c 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ GUI development framework for X11 and Microsoft Windows
-USES= compiler dos2unix gmake
+USES= compiler dos2unix gmake xorg
USE_XORG= x11 xt xmu xaw
MAKE_ENV= INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
# Build ignores CXXFLAGS
@@ -24,6 +24,7 @@ WRKSRC= ${WRKDIR}/home/vgui
OPTIONS_DEFINE= OPENGL # DOCS (commented out, see below)
OPTIONS_DEFAULT= OPENGL
+OPENGL_USES= gl
OPENGL_USE= GL=glu
post-patch:
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index e04ac138ea25..694f2b4db73c 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= libudev.so:devel/libudev-devd \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
-USES= compiler:c11 gl meson pkgconfig
+USES= compiler:c11 gl meson pkgconfig xorg
USE_GITHUB= yes
USE_GL= egl gbm glesv2
USE_XORG= pixman
diff --git a/x11-toolkits/wmapp/Makefile b/x11-toolkits/wmapp/Makefile
index 0d11d4c937e4..0bc4c1b9e3a7 100644
--- a/x11-toolkits/wmapp/Makefile
+++ b/x11-toolkits/wmapp/Makefile
@@ -13,7 +13,7 @@ COMMENT= DockApp Graphics Library
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake
+USES= gmake xorg
USE_XORG= x11 xpm
CFLAGS+= -I${LOCALBASE}/include
ALL_TARGET= # empty
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 1ae62e2476f0..286b76579fdc 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS+= libpng.so:graphics/png\
libtiff.so:graphics/tiff\
libexpat.so:textproc/expat2
-USES= compiler:c++11-lang gl gmake iconv jpeg localbase pkgconfig \
- tar:bzip2
+USES= compiler:c++11-lang gl gmake gnome iconv jpeg localbase \
+ pkgconfig tar:bzip2 xorg
USE_CXXSTD= gnu++98
USE_XORG= x11 sm xxf86vm xinerama
USE_GL= glu
diff --git a/x11-toolkits/wxgtk30/Makefile b/x11-toolkits/wxgtk30/Makefile
index 0ee539645802..67b47823a973 100644
--- a/x11-toolkits/wxgtk30/Makefile
+++ b/x11-toolkits/wxgtk30/Makefile
@@ -23,7 +23,8 @@ USE_GITHUB= yes
GH_ACCOUNT= wxWidgets
GH_PROJECT= wxWidgets
-USES= compiler:c++11-lib gl gmake gnome iconv jpeg localbase pkgconfig
+USES= compiler:c++11-lib gl gmake gnome iconv jpeg localbase \
+ pkgconfig xorg
USE_XORG= x11 sm xxf86vm xinerama
USE_GL= gl glu
USE_GNOME= cairo gdkpixbuf2 gtk30
diff --git a/x11-toolkits/wxgtk31/Makefile b/x11-toolkits/wxgtk31/Makefile
index c3e6e8cb4b85..e84a12122cf8 100644
--- a/x11-toolkits/wxgtk31/Makefile
+++ b/x11-toolkits/wxgtk31/Makefile
@@ -23,7 +23,8 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libsoup-2.4.so:devel/libsoup \
libtiff.so:graphics/tiff \
-USES= compiler:c++11-lib gl gmake gnome iconv jpeg localbase pkgconfig
+USES= compiler:c++11-lib gl gmake gnome iconv jpeg localbase \
+ pkgconfig xorg
USE_GITHUB= yes
GH_ACCOUNT= wxWidgets
GH_PROJECT= wxWidgets
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index ce9113d582db..4c5a6b362b5b 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libtiff.so:graphics/tiff
-USES= jpeg libtool
+USES= gl jpeg libtool xorg
USE_XORG= xpm
USE_GL= gl
USE_LDCONFIG= yes
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index fe0f40693b6d..8e17e3eda239 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libpng.so:graphics/png
-USES= gmake jpeg libtool:build motif pkgconfig tar:tgz
+USES= gmake jpeg libtool:build motif pkgconfig tar:tgz xorg
USE_XORG= xft xmu xpm xt
USE_LDCONFIG= yes
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index 433eb538d956..6e66c150f58d 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -20,7 +20,7 @@ MAKE_JOBS_UNSAFE= yes
PATCHDIR= ${PORTSDIR}/x11-toolkits/xview/files
LIB_DEPENDS= libxview.so:x11-toolkits/xview
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
ALL_TARGET= Clients
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index ceda1d6f4459..b1f9c0aab694 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= mkfontscale:x11-fonts/mkfontscale
ONLY_FOR_ARCHS= i386
REINPLACE_ARGS= -i ""
-USES= imake
+USES= imake xorg
USE_XORG= x11
USE_LDCONFIG= yes
IMAKEINCLUDE= "-I${WRKSRC}/config -I${LOCALBASE}/lib/X11/config"
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
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index d2b3063fbfe7..15fbbd122bf7 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -12,7 +12,7 @@ COMMENT= 3D Virtual Desktop Switcher
LIB_DEPENDS= libImlib2.so:graphics/imlib2
-USES= localbase
+USES= gl localbase xorg
USE_XORG= xmu
USE_GL= glut
GNU_CONFIGURE= yes
diff --git a/x11/9box/Makefile b/x11/9box/Makefile
index 148517abda53..a1b863ee2d52 100644
--- a/x11/9box/Makefile
+++ b/x11/9box/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= 9box can "pack" windows inside itself
PLIST_FILES= bin/9box
-USES= gmake
+USES= gmake xorg
USE_XORG= xbitmaps x11 xt
BUILD_WRKSRC= ${WRKSRC}/src
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index 453756d48e00..0841cc8a94da 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -11,6 +11,7 @@ COMMENT= Simple menu patterned after Plan9
USE_GITHUB= yes
GH_ACCOUNT= arnoldrobbins
+USES= xorg
USE_XORG= x11
MAKEFILE= Makefile.noimake
ALL_TARGET= 9menu
diff --git a/x11/alttab/Makefile b/x11/alttab/Makefile
index 251b7a0c4fec..63db65ea6821 100644
--- a/x11/alttab/Makefile
+++ b/x11/alttab/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash
LIB_DEPENDS= libpng.so:graphics/png
-USES= localbase pkgconfig
+USES= localbase pkgconfig xorg
USE_GITHUB= yes
GH_ACCOUNT= sagb
diff --git a/x11/antimicro/Makefile b/x11/antimicro/Makefile
index 87caac99ea73..04426747d2ad 100644
--- a/x11/antimicro/Makefile
+++ b/x11/antimicro/Makefile
@@ -20,7 +20,7 @@ GH_ACCOUNT= antimicro #Ryochan7
LDFLAGS+= -L${LOCALBASE}/lib
USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig \
- qt:5 shared-mime-info
+ qt:5 sdl shared-mime-info xorg
USE_XORG= x11 xi xtst
USE_QT= core gui linguisttools_build qmake_build buildtools_build widgets network
USE_SDL= sdl2
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index af04a6253843..4ae7585e98ef 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -12,7 +12,7 @@ COMMENT= Color vt102 terminal emulator with transparency support
MAKE_JOBS_UNSAFE= yes
-USES= dos2unix
+USES= dos2unix xorg
DOS2UNIX_FILES= src/rxvt.h
USE_XORG= xpm
diff --git a/x11/bbappconf/Makefile b/x11/bbappconf/Makefile
index 203f00ec669d..1b423682c65a 100644
--- a/x11/bbappconf/Makefile
+++ b/x11/bbappconf/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Application configuring tool for the blackbox window manager
+USES= xorg
USE_XORG= x11
GNU_CONFIGURE= yes
diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index de4f89cba9e8..b9a742897860 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png
GNU_CONFIGURE= yes
+USES= xorg
USE_XORG= x11
PORTDOCS= README
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index 24dd6f27e351..6af7d2bef24e 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -14,9 +14,9 @@ OPTIONS_DEFINE= DOCS
WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun
+USES= gmake gnome pkgconfig xorg
USE_XORG= x11 xext xpm
USE_GNOME= gtk20
-USES= gmake pkgconfig
USE_CSTD= gnu89
PORTDOCS= README
diff --git a/x11/bgs/Makefile b/x11/bgs/Makefile
index 41b5119504e4..e2a4094e5970 100644
--- a/x11/bgs/Makefile
+++ b/x11/bgs/Makefile
@@ -13,6 +13,7 @@ COMMENT= Simple X11 BackGround Setter using Imlib2
LIB_DEPENDS= libImlib2.so:graphics/imlib2
+USES= xorg
USE_XORG= x11 xinerama
PLIST_FILES= bin/bgs \
diff --git a/x11/bmpanel2/Makefile b/x11/bmpanel2/Makefile
index 92ea0f520e44..ebd436124425 100644
--- a/x11/bmpanel2/Makefile
+++ b/x11/bmpanel2/Makefile
@@ -14,7 +14,7 @@ COMMENT= Lightweight NetWM-compliant panel (taskbar) for X11
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake pkgconfig
+USES= cmake gnome pkgconfig xorg
USE_GNOME= pango
USE_XORG= x11 xext
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index cb338b3b7053..e7fe000ff529 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -13,7 +13,7 @@ COMMENT= Quick start up utility for applications on an X display
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake perl5 tar:Z
+USES= imake perl5 tar:Z xorg
USE_PERL5= build
USE_XORG= xaw
diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 10dd72f97b7a..e3f794c6ecd2 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -16,9 +16,9 @@ BUILD_DEPENDS= gnome-autogen.sh:devel/gnome-common \
RUN_DEPENDS= xkeyboard-config>=0:x11/xkeyboard-config \
libxkbfile>=0:x11/libxkbfile
+USES= autoreconf gettext gmake gnome libtool localbase:ldflags \
+ pathfix pkgconfig python:2.7,run shebangfix tar:xz xorg
USE_XORG= x11 xrandr xext
-USES= autoreconf gettext gmake libtool localbase:ldflags pathfix \
- pkgconfig python:2.7,run shebangfix tar:xz
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
USE_GNOME= gnomeprefix gtk30 intlhack introspection:build
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index 11002fd38a74..b1603e104b30 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
RUN_DEPENDS= console-kit-daemon:sysutils/consolekit2 \
xdpyinfo:x11/xdpyinfo
-USES= autoreconf:build gettext gmake libtool \
- pathfix pkgconfig tar:xz
+USES= autoreconf:build gettext gl gmake gnome libtool \
+ pathfix pkgconfig tar:xz xorg
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
USE_GNOME= gnomeprefix gtk30 intlhack
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 6348f3ca9b78..0116f1c57e6b 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -47,7 +47,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
USES= autoreconf compiler:c11 gettext gmake gnome gl libtool \
- localbase:ldflags pathfix pkgconfig python:2.7 shebangfix
+ localbase:ldflags pathfix pkgconfig python:2.7 shebangfix xorg
USE_GITHUB= yes
USE_GL= gl egl
USE_GNOME= cairo evolutiondataserver3 gconf2 gnomedesktop3 \
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index a3261f134558..ea814aaee1a2 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -17,7 +17,7 @@ USE_GITHUB= yes
GH_ACCOUNT= danfe
GH_TAGNAME= 10c5691
-USES= compiler:c++11-lang dos2unix gnome pkgconfig
+USES= compiler:c++11-lang dos2unix gnome pkgconfig xorg
DOS2UNIX_FILES= src/cppstring.cc
GNU_CONFIGURE= yes
USE_XORG= x11
diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index f7517c1c3e3c..90e4bf015a46 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= desktop-file-utils gnome pkgconfig
+USES= desktop-file-utils gnome pkgconfig xorg
USE_GNOME= gtk20 cairo gdkpixbuf2
USE_XORG= x11 xtst
MAKE_ARGS+= PREFIX=${PREFIX}
diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index 339d6de5f905..fdcd2e7501da 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel
+USES= desktop-file-utils gnome pkgconfig xorg
USE_GNOME= gtk20 cairo gdkpixbuf2
USE_XORG= x11 xext
-USES= desktop-file-utils pkgconfig
MAKE_ARGS+= PREFIX=${PREFIX}
MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
LDFLAGS+= -lXext
diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index 6d17d609eba4..a1a3b9f588f5 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS= browser:x11-fm/deforaos-browser
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
sudo:security/sudo
-USES= gnome pkgconfig
+USES= gnome pkgconfig xorg
USE_GNOME= gtk20 cairo
USE_XORG= x11
INSTALLS_ICONS= yes
diff --git a/x11/deskpaint/Makefile b/x11/deskpaint/Makefile
index 2d89d5518f36..db422ef48990 100644
--- a/x11/deskpaint/Makefile
+++ b/x11/deskpaint/Makefile
@@ -12,6 +12,7 @@ COMMENT= Tiny interactive paint program that draws as your desktop wallpaper
BROKEN= unfetchable
+USES= xorg
USE_XORG= x11 xext
PLIST_FILES= bin/deskpaint
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index a40f8b90225f..558325eeb1d1 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
OPTIONS_DEFINE= XINERAMA
OPTIONS_DEFAULT= XINERAMA
+USES= xorg
USE_XORG= x11 xft
MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib" \
diff --git a/x11/dmenu2/Makefile b/x11/dmenu2/Makefile
index f3f3c32eac27..2a0fbdac485a 100644
--- a/x11/dmenu2/Makefile
+++ b/x11/dmenu2/Makefile
@@ -20,6 +20,7 @@ USE_GITHUB= yes
GH_ACCOUNT= mrshankly
GH_TAGNAME= a4eb44b
+USES= xorg
USE_XORG= x11 xft xrender
PLIST_FILES= bin/dmenu2 bin/dmenu2_path bin/dmenu2_run bin/stest2 \
diff --git a/x11/docker-tray/Makefile b/x11/docker-tray/Makefile
index 838a70ebb9ed..9a4730fbb5af 100644
--- a/x11/docker-tray/Makefile
+++ b/x11/docker-tray/Makefile
@@ -14,9 +14,9 @@ COMMENT= Dockapp with support for GNOME2 and KDE3 tray icons
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= gmake gnome pkgconfig xorg
USE_XORG= x11
USE_GNOME= glib20
-USES= gmake pkgconfig
PLIST_FILES= bin/docker
diff --git a/x11/dsbautostart/Makefile b/x11/dsbautostart/Makefile
index 49e6fd495de5..9b4ea055fc84 100644
--- a/x11/dsbautostart/Makefile
+++ b/x11/dsbautostart/Makefile
@@ -12,7 +12,7 @@ COMMENT= Manage commands to be executed at X session start
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c++11-lang qmake qt:5 tar:tgz
+USES= compiler:c++11-lang gl qmake qt:5 tar:tgz
USE_GL= gl
USE_QT= buildtools_build core gui linguisttools_build widgets
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index cedcbe403837..c9e93d08c938 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -13,8 +13,8 @@ LIB_DEPENDS= liblzo2.so:archivers/lzo2
LICENSE= BSD2CLAUSE
+USES= gmake tar:tgz xorg
USE_XORG= x11
-USES= gmake tar:tgz
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}
MAKE_ARGS= INSTALL="${INSTALL_PROGRAM}" \
diff --git a/x11/dzen2/Makefile b/x11/dzen2/Makefile
index 60efe61c3809..a7e712701ca6 100644
--- a/x11/dzen2/Makefile
+++ b/x11/dzen2/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB= yes
GH_ACCOUNT= robm
GH_TAGNAME= 488ab66
-USES= pkgconfig
+USES= pkgconfig xorg
USE_XORG= x11
OPTIONS_DEFINE= EXAMPLES GADGETS XPM XINERAMA XFT
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index ad617c570331..ff78bd044158 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -17,7 +17,8 @@ PLIST_FILES= bin/E-Run.epplet
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GL= gl
+USES= gl
+USE_GL= gl
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index dbf2e43c5e11..f979bf71fe74 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ENV= GDB=/usr/bin/gdb
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USES= iconv libtool shebangfix
+USES= iconv libtool shebangfix xorg
SHEBANG_FILES= ${WRKSRC}/utils/kEsetroot.in
perl_OLD_CMD= @PERL@
USE_CSTD= gnu89
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 41f0c21a8642..133c889497ed 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -16,8 +16,8 @@ LICENSE= MIT
LIB_DEPENDS= libpng.so:graphics/png \
libImlib2.so:graphics/imlib2
+USES= pkgconfig xorg
USE_XORG= xext xft xpm xrender
-USES= pkgconfig
GNU_CONFIGURE= yes
PORTDOCS= ChangeLog INSTALL README
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 28419c5fa7dd..2ac3e08cfc6b 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -13,7 +13,7 @@ COMMENT= Lightweight, NETWM compliant X11 desktop panel
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= alias gmake pkgconfig tar:tbz2
+USES= alias gmake gnome pkgconfig tar:tbz2 xorg
USE_GNOME= gtk20
USE_XORG= x11
HAS_CONFIGURE= yes
diff --git a/x11/find-cursor/Makefile b/x11/find-cursor/Makefile
index 5de24a409768..ea41e5aba71f 100644
--- a/x11/find-cursor/Makefile
+++ b/x11/find-cursor/Makefile
@@ -11,7 +11,7 @@ COMMENT= Simple XLib program to highlight the cursor position
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= localbase:ldflags
+USES= localbase:ldflags xorg
USE_GITHUB= yes
GH_ACCOUNT= Carpetsmoker
USE_XORG= x11 xdamage xext xfixes xrender
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index d4a867314cf2..cfc8616457e8 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -13,7 +13,8 @@ COMMENT= Extension of xscreensaver
LIB_DEPENDS= libgfx.so:graphics/libgfx
GNU_CONFIGURE= yes
-USE_GL= yes
+USES= gl
+USE_GL= glu
EXTRACT_AFTER_ARGS=--exclude '${DISTNAME}/libgfx*'
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/GL
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index a17d58d2a12a..4fa6614ad774 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB= multi
LIB_DEPENDS= libnotify.so:devel/libnotify
-USES= gmake iconv libtool pathfix pkgconfig tar:bzip2
+USES= gmake gnome iconv libtool pathfix pkgconfig tar:bzip2 xorg
USE_XORG= xtst xext
USE_GNOME= gtk30 cairo intlhack gnomedocutils librsvg2
USE_GSTREAMER1= yes
diff --git a/x11/flruler/Makefile b/x11/flruler/Makefile
index daf9005da4cb..5618da89a08d 100644
--- a/x11/flruler/Makefile
+++ b/x11/flruler/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/lib/libfltk.a:x11-toolkits/fltk
-USES= gmake perl5
+USES= gmake perl5 xorg
USE_PERL5= build
USE_XORG= x11 xcursor xext xfixes xft xinerama
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 816f681c1b0b..e7bc25c150a9 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -41,7 +41,7 @@ GROUPS= gdm video
PORTSCOUT= limitw:1,even
-USES= cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USES= cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz xorg
CPE_VENDOR= gnome
CPE_PRODUCT= gnome_display_manager
USE_GNOME= cairo dconf gtk30 intltool introspection
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index 1d0a3d37aac7..b14668a9c846 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -12,7 +12,7 @@ COMMENT= Program that keeps the content of your X clipboard in memory
LICENSE= GPLv2
-USES= pkgconfig tar:bzip2
+USES= gnome pkgconfig tar:bzip2 xorg
USE_GNOME= gtk20
USE_XORG= x11
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}"
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 3ed8017684e6..21c409e49e99 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
xkeyboard-config>=0:x11/xkeyboard-config
USES= bison gettext gmake gnome libtool localbase pathfix \
- pkgconfig python:3.4+ tar:xz
+ pkgconfig python:3.4+ tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile
index 4f2c014a43b7..cd1e10972504 100644
--- a/x11/gnome-pie/Makefile
+++ b/x11/gnome-pie/Makefile
@@ -42,7 +42,7 @@ REINPLACE_ARGS= -e 's,%%DATADIR%%,${DATADIR},1' \
-e 's,%%PREFIX%%,${PREFIX},1' -i.bak \
-e '/has_resize_grip/d' -i ''
-USES= cmake pkgconfig
+USES= cmake gnome pkgconfig xorg
USE_GITHUB= yes
USE_GNOME= cairo gconf2 gnomemenus3 gtk30 librsvg2 libwnck3
USE_XORG= xtst
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index e9a379a2a25c..b196e870a814 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit2 \
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gnome localbase:ldflags meson pkgconfig \
- python:3.6+,build tar:xz
+USES= compiler:c11 gettext gl gnome localbase:ldflags meson \
+ pkgconfig python:3.6+,build tar:xz xorg
USE_GNOME= gnomedesktop3 gtk30
USE_XORG= ice sm x11 xcomposite xtrans
USE_GL= egl gl glesv2
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 66efb5d40fd8..c72f77c912da 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -40,7 +40,8 @@ RUN_DEPENDS= gnome-control-center:sysutils/gnome-control-center
PORTSCOUT= limitw:1,even
USES= compiler:c11 cpe gettext gl gnome libtool localbase meson \
- pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz webplugin:native
+ pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz \
+ webplugin:native xorg
USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 introspection \
libxslt:build libxml2
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xtst
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 8587dd678c7e..257dde21da00 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
PORTSCOUT= limitw:1,even
USES= cpe gettext gmake gnome libtool localbase pathfix \
- pkgconfig tar:xz
+ pkgconfig tar:xz xorg
USE_GNOME= cairo dconf gdkpixbuf2 gtk30 intltool vte3
USE_XORG= x11
GNU_CONFIGURE= yes
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index b932da466568..9f2b4d99c27e 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -16,7 +16,7 @@ BROKEN= unfetchable
LIB_DEPENDS= libgpc.so:devel/libgpc \
libformsGL.so:x11-toolkits/xforms
-USES= zip:infozip uidfix
+USES= gl zip:infozip uidfix
USE_GL= yes
PLIST_FILES= bin/gpctool
USE_LDCONFIG= yes
diff --git a/x11/grabc/Makefile b/x11/grabc/Makefile
index c9a0e4e7b13b..1efda4f0c348 100644
--- a/x11/grabc/Makefile
+++ b/x11/grabc/Makefile
@@ -14,6 +14,7 @@ COMMENT= Grab a color from screen
LICENSE= GPLv2 # specified on the website
PLIST_FILES= bin/grabc
+USES= xorg
USE_XORG= x11
CFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lX11
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index a69b0b1e0dec..ae87d5f9c12b 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -13,7 +13,7 @@ COMMENT= GRaphics Over Miscellaneous Objects (Gromit)
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pkgconfig
+USES= gnome pkgconfig xorg
USE_GNOME= gtk20
USE_XORG= x11
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index 39ed69b18684..1671266a4e07 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.muhri.net/
MAINTAINER= oleg@bsdpower.com
COMMENT= Command line tool for switching GTK+ 2.0 themes
-USES= gmake pkgconfig
+USES= gmake gnome pkgconfig xorg
USE_XORG= x11
USE_GNOME= gtk20
diff --git a/x11/hhpc/Makefile b/x11/hhpc/Makefile
index b2db6b9beebd..35884b1d8871 100644
--- a/x11/hhpc/Makefile
+++ b/x11/hhpc/Makefile
@@ -11,7 +11,7 @@ COMMENT= Small X11 utility to hide the mouse pointer when unused
LICENSE= BSD3CLAUSE
-USES= gmake localbase pkgconfig
+USES= gmake localbase pkgconfig xorg
USE_XORG= x11
USE_GITHUB= yes
GH_ACCOUNT= aktau
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index 83c5f4f3731c..e1031f4cf8c8 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -10,7 +10,7 @@ COMMENT= Bindings to the Xft, Xrender and Freetype for Haskell programs
LICENSE= LGPL21
-USES= pkgconfig
+USES= pkgconfig xorg
USE_CABAL= utf8-string>=0.1 X11>=1.2.1
USE_XORG= xft xrender
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 3fe4a4913c2a..ceb15375e61a 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -11,6 +11,7 @@ COMMENT= Binding to the X11 graphics library
LICENSE= BSD3CLAUSE
+USES= xorg
USE_CABAL= data-default
USE_XORG= x11 xrandr xext
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 2c524b6142f2..cb39df0ba518 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -11,7 +11,7 @@ COMMENT= Minimalistic text-based status bar
LICENSE= BSD3CLAUSE
-USES= cabal pkgconfig
+USES= cabal pkgconfig xorg
OPTIONS_DEFINE= EXAMPLES XFT XPM UTF8 MPD INOTIFY DATEZONE THREADED UVMETER
OPTIONS_DEFAULT= XFT UTF8
diff --git a/x11/hsetroot/Makefile b/x11/hsetroot/Makefile
index 8c61a4c293d2..986620d231c0 100644
--- a/x11/hsetroot/Makefile
+++ b/x11/hsetroot/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= xrandr:x11/xrandr
USE_GITHUB= yes
GH_ACCOUNT= himdel
-USES= gmake pkgconfig
+USES= gmake pkgconfig xorg
USE_XORG= x11
PLIST_FILES= bin/hsetroot
diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile
index 944216f39d7d..a70adfff9d23 100644
--- a/x11/i3lock/Makefile
+++ b/x11/i3lock/Makefile
@@ -28,7 +28,7 @@ MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
PLIST_FILES= "@(,,4755) bin/i3lock" \
man/man1/i3lock.1.gz
-USES= gmake iconv localbase pkgconfig tar:bzip2
+USES= gmake iconv localbase pkgconfig tar:bzip2 xorg
LDFLAGS+= ${ICONV_LIB}
USE_XORG= x11 xcb xt xorgproto xext
USE_CSTD= c99
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index f47b2a5a1393..03b543d1e225 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -14,8 +14,8 @@ COMMENT= Utility to translate mouse wheel actions into X keyboard events
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= dos2unix gmake xorg
USE_XORG= x11 xpm xtst xext xmu
-USES= dos2unix gmake
DOS2UNIX_FILES= getopt/getopt.c
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gpm
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index 9cf174428839..fd73f8feecd1 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Redirect any key to second mouse button
PLIST_FILES= bin/kb2mb2
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext xtst
.include <bsd.port.mk>
diff --git a/x11/keybinder-gtk3/Makefile b/x11/keybinder-gtk3/Makefile
index 164e665cabc9..dc232cb2b15f 100644
--- a/x11/keybinder-gtk3/Makefile
+++ b/x11/keybinder-gtk3/Makefile
@@ -14,7 +14,7 @@ COMMENT= Library for registering keyboard shortcuts
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gettext-runtime gmake libtool pathfix pkgconfig
+USES= gettext-runtime gmake gnome libtool pathfix pkgconfig xorg
USE_GNOME= gtk30 introspection:build cairo gdkpixbuf2
USE_XORG= x11 xext xrender
GNU_CONFIGURE= yes
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 5a56205061e1..4b1fd0151a14 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_ACCOUNT= engla
-USES= autoreconf gmake libtool pathfix pkgconfig
+USES= autoreconf gmake gnome libtool pathfix pkgconfig xorg
USE_GNOME= gtk20 introspection:build
USE_XORG= x11 xext xrender
GNU_CONFIGURE= yes
diff --git a/x11/keyboardcast/Makefile b/x11/keyboardcast/Makefile
index ed8ceaa6d23c..8b37427fa0d6 100644
--- a/x11/keyboardcast/Makefile
+++ b/x11/keyboardcast/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_ACCOUNT= ekoort
+USES= gnome pkgconfig xorg
USE_XORG= xmu x11
USE_GNOME= libwnck libglade2 gtk20
-USES= pkgconfig
INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 285ae04061e1..9f3d763514bc 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -13,7 +13,7 @@ COMMENT= X utility for binding commands to a hot key
BROKEN= unfetchable
WRKSRC= ${WRKDIR}/keylaunch
-USES= perl5 gmake
+USES= perl5 gmake xorg
USE_PERL5= build
USE_XORG= x11
diff --git a/x11/lemonbar/Makefile b/x11/lemonbar/Makefile
index 88ea0a3420f3..65810e6001c6 100644
--- a/x11/lemonbar/Makefile
+++ b/x11/lemonbar/Makefile
@@ -13,7 +13,7 @@ COMMENT= Lightweight xcb based bar
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= compiler:c11 gmake localbase:ldflags perl5
+USES= compiler:c11 gmake localbase:ldflags perl5 xorg
USE_PERL5= build
USE_XORG= xcb
diff --git a/x11/libXcm/Makefile b/x11/libXcm/Makefile
index c2f94a38ef30..f9d6bdab744a 100644
--- a/x11/libXcm/Makefile
+++ b/x11/libXcm/Makefile
@@ -13,7 +13,7 @@ USE_GITHUB= yes
GH_ACCOUNT= oyranos-cms
GH_PROJECT= ${PORTNAME:tl}
-USES= libtool pathfix pkgconfig
+USES= libtool pathfix pkgconfig xorg
GNU_CONFIGURE= yes
USE_XORG= x11 xfixes xmu xt
INSTALL_TARGET= install-strip
diff --git a/x11/libfakekey/Makefile b/x11/libfakekey/Makefile
index 52202c474a67..c7b34af5c689 100644
--- a/x11/libfakekey/Makefile
+++ b/x11/libfakekey/Makefile
@@ -11,7 +11,7 @@ COMMENT= X virtual keyboard library
LICENSE= LGPL20+
-USES= libtool pathfix pkgconfig
+USES= libtool pathfix pkgconfig xorg
USE_XORG= x11 xtst
GNU_CONFIGURE= YES
INSTALL_TARGET= install-strip
diff --git a/x11/libfm-qt/Makefile b/x11/libfm-qt/Makefile
index 3b8de77e1a98..3710d336d1a0 100644
--- a/x11/libfm-qt/Makefile
+++ b/x11/libfm-qt/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
libexif.so:graphics/libexif
USES= cmake compiler:c++14-lang gettext-runtime lxqt pkgconfig \
- qt:5 gnome shared-mime-info tar:xz
+ qt:5 gnome shared-mime-info tar:xz xorg
USE_QT= buildtools_build qmake_build core gui linguisttools widgets \
x11extras
USE_GNOME= glib20
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 3331ae06e558..95bceb58b285 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -21,8 +21,9 @@ LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
RUN_DEPENDS= rarian-sk-config:textproc/rarian
INSTALL_TARGET= install-strip
+USES+= bison gettext gmake gnome localbase libtool:keepla pathfix \
+ pkgconfig xorg
USE_GNOME= gnomeprefix intlhack libbonobo gnomevfs2 referencehack
-USES+= bison gettext gmake localbase libtool:keepla pathfix pkgconfig
USE_XORG= xpm
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index b6c40211668f..4b7030425cd7 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -15,7 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libxklavier.so:x11/libxklavier
-USES= gettext gmake libtool localbase pathfix pkgconfig tar:xz
+USES= gettext gmake gnome libtool localbase pathfix pkgconfig \
+ tar:xz xorg
USE_GNOME= cairo gtk30 introspection:build
GNU_CONFIGURE= yes
USE_XORG= x11
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 0ad0a681d90d..b6de2a7dd930 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -14,8 +14,8 @@ COMMENT= C++ wrapper for libgnome library
LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24
-USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
- tar:bzip2
+USES= compiler:c++11-lang gmake gnome libtool:keepla pathfix \
+ pkgconfig tar:bzip2 xorg
USE_CXXSTD= c++11
USE_XORG= xext
USE_GNOME= libgnome
diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index 94061de8924b..d4aacab18d1c 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS= libxklavier.so:x11/libxklavier
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_GNOME= cairo gtk30 intltool introspection:build
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index 6b2bf6acf38e..6b54b4694c07 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple X11 library
LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d
-USES= tar:Z
+USES= tar:Z xorg
USE_XORG= x11 xaw xext xmu xt
ALL_TARGET= src freq
MAKE_JOBS_UNSAFE= yes
diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile
index c2aa22886f6f..5319d1c585e4 100644
--- a/x11/libsynaptics/Makefile
+++ b/x11/libsynaptics/Makefile
@@ -13,7 +13,7 @@ COMMENT= Library to access the Xorg/XFree86 Synaptics TouchPad Driver
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= libtool localbase tar:bzip2
+USES= libtool localbase tar:bzip2 xorg
GNU_CONFIGURE= yes
USE_XORG= x11
INSTALL_TARGET= install-strip
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index d28b8fae422b..d41d20b32bb9 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -15,8 +15,8 @@ BUILD_DEPENDS= iso-codes>=0:misc/iso-codes
RUN_DEPENDS= xkbcomp:x11/xkbcomp \
iso-codes>=0:misc/iso-codes
+USES= gmake gnome libtool pathfix pkgconfig tar:xz xorg
USE_XORG= x11 xkbfile
-USES= gmake libtool pathfix pkgconfig tar:xz
USE_GNOME= libxml2 glib20 introspection:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11/lightdm-gtk-greeter/Makefile b/x11/lightdm-gtk-greeter/Makefile
index d0b88fe08abe..73909e2867ab 100644
--- a/x11/lightdm-gtk-greeter/Makefile
+++ b/x11/lightdm-gtk-greeter/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= liblightdm-gobject-1.so:x11/lightdm
-USES= gettext gmake gnome localbase pkgconfig xfce
+USES= gettext gmake gnome localbase pkgconfig xfce xorg
USE_CSTD= c99
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= libexo
diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index 985a8948e7fa..8928c52e26d6 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= libaccountsservice.so:sysutils/accountsservice \
libxklavier.so:x11/libxklavier
USES= compiler:c++11-lang gettext gmake gnome libtool localbase \
- pathfix pkgconfig tar:xz
+ pathfix pkgconfig tar:xz xorg
USE_CXXSTD= c++11
USE_GNOME= glib20 intltool
USE_XORG= x11 xcb xdmcp
diff --git a/x11/lilyterm/Makefile b/x11/lilyterm/Makefile
index 4c5ae4806638..8d118e922172 100644
--- a/x11/lilyterm/Makefile
+++ b/x11/lilyterm/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext gmake pkgconfig
+USES= gettext gmake gnome pkgconfig xorg
USE_GNOME= cairo gdkpixbuf2 gtk20 vte
USE_XORG= x11 xext
GNU_CONFIGURE= yes
diff --git a/x11/lsw/Makefile b/x11/lsw/Makefile
index 2fd57ef67a64..3e96391cb294 100644
--- a/x11/lsw/Makefile
+++ b/x11/lsw/Makefile
@@ -17,6 +17,7 @@ PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+USES= xorg
USE_XORG= x11 xt xorgproto xext
post-patch:
diff --git a/x11/lupe/Makefile b/x11/lupe/Makefile
index 5a47157430af..ea4e158773a0 100644
--- a/x11/lupe/Makefile
+++ b/x11/lupe/Makefile
@@ -14,6 +14,7 @@ OPTIONS_DEFINE= DOCS
WRKSRC= ${WRKDIR}/${PORTNAME}
+USES= xorg
USE_XORG= x11 xext
GNU_CONFIGURE= yes
diff --git a/x11/lxhotkey/Makefile b/x11/lxhotkey/Makefile
index 60d4488d9f99..3fec5d93015e 100644
--- a/x11/lxhotkey/Makefile
+++ b/x11/lxhotkey/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= libfm-extra.so:x11/libfm-extra \
libfreetype.so:print/freetype2 \
libunistring.so:devel/libunistring
-USES= gettext-tools gmake pathfix pkgconfig tar:xz
+USES= gettext-tools gmake gnome pathfix pkgconfig tar:xz xorg
GNU_CONFIGURE= yes
USE_GNOME= glib20 gtk20 intltool cairo gdkpixbuf2
USE_XORG= x11
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index c796317a2ccc..2fc3ccd6d7b3 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -20,9 +20,9 @@ LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
libfreetype.so:print/freetype2
RUN_DEPENDS= ${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data
+USES= gmake gnome libtool localbase pathfix pkgconfig tar:xz xorg
USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 libwnck intltool
USE_XORG= x11
-USES= gmake libtool localbase pathfix pkgconfig tar:xz
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
--with-plugins="${LXPANEL_PLUGINS}"
diff --git a/x11/lxqt-globalkeys/Makefile b/x11/lxqt-globalkeys/Makefile
index 9bca9c7811db..cddbeefe8254 100644
--- a/x11/lxqt-globalkeys/Makefile
+++ b/x11/lxqt-globalkeys/Makefile
@@ -11,7 +11,7 @@ COMMENT= Global keyboard shortcuts registration
LICENSE= LGPL21+
-USES= cmake compiler:c++14-lang kde:5 lxqt pkgconfig qt:5 tar:xz
+USES= cmake compiler:c++14-lang kde:5 lxqt pkgconfig qt:5 tar:xz xorg
USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
svg widgets x11extras xml
USE_KDE= windowsystem
diff --git a/x11/lxrandr/Makefile b/x11/lxrandr/Makefile
index ce45cdfc25e0..b77e0abac7d0 100644
--- a/x11/lxrandr/Makefile
+++ b/x11/lxrandr/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= desktop-file-utils gmake localbase pkgconfig tar:xz
+USES= desktop-file-utils gmake gnome localbase pkgconfig tar:xz xorg
USE_GNOME= gtk20 intltool cairo
USE_XORG= xrandr
GNU_CONFIGURE= yes
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index e6a072937903..497ac2af857b 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
PORTSCOUT= limitw:1,even
USES= compiler:c11 gettext gmake gnome libtool localbase mate \
- pkgconfig python:2.7 tar:xz
+ pkgconfig python:2.7 tar:xz xorg
USE_CSTD= c11
USE_MATE= libmateweather panel
diff --git a/x11/mate-desktop/Makefile b/x11/mate-desktop/Makefile
index 11b3fbdf5840..7cd400b69d14 100644
--- a/x11/mate-desktop/Makefile
+++ b/x11/mate-desktop/Makefile
@@ -21,8 +21,8 @@ BUILD_DEPENDS= iso-codes>=0:misc/iso-codes
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool localbase pathfix \
- pkgconfig python shebangfix tar:xz
+USES= gettext gmake gnome libtool localbase pathfix \
+ pkgconfig python shebangfix tar:xz xorg
USE_XORG= x11 xrandr
USE_GNOME= cairo dconf gdkpixbuf2 gnomeprefix gtk30 \
intltool introspection:build
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index 5edb2e01b86c..8a0e0ee66e41 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
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_MATE= desktop libmateweather menus
USE_XORG= ice sm x11 xau xrandr
USE_GNOME= cairo dconf gnomeprefix gtk30 intltool \
diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index f2c602ce4095..591a00893797 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
PORTSCOUT= limitw:1,even
-USES= gettext gmake localbase pathfix pkgconfig tar:xz xorg
+USES= gettext gl gmake gnome localbase pathfix pkgconfig tar:xz xorg
USE_GL= gl
USE_MATE= desktop libmatekbd menus session:run
USE_XORG= ice sm x11 xext xscrnsaver xxf86vm
diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index 7ce670fe520e..6c38e3d3a878 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit2 \
PORTSCOUT= limitw:1,even
-USES= gettext gmake localbase libtool pathfix \
- pkgconfig tar:xz
+USES= gettext gmake gnome localbase libtool pathfix \
+ pkgconfig tar:xz xorg
USE_MATE= desktop
USE_XORG= ice sm x11 xau xext xrandr xrender xtrans xtst
USE_GNOME= cairo gtk30 intlhack librsvg2 libxslt pango
diff --git a/x11/mate-terminal/Makefile b/x11/mate-terminal/Makefile
index b43f2b27f195..c007b3f6c18b 100644
--- a/x11/mate-terminal/Makefile
+++ b/x11/mate-terminal/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= libgnutls.so:security/gnutls \
PORTSCOUT= limitw:1,even
-USES= gettext gmake localbase pathfix perl5 pkgconfig \
- shebangfix tar:xz
+USES= gettext gmake gnome localbase pathfix perl5 pkgconfig \
+ shebangfix tar:xz xorg
USE_XORG= ice sm x11
USE_GNOME= cairo dconf gdkpixbuf2 gtk30 intltool vte3
SHEBANG_FILES= mate-terminal.wrapper
diff --git a/x11/metalock/Makefile b/x11/metalock/Makefile
index 93d94d294dba..e037f9b20061 100644
--- a/x11/metalock/Makefile
+++ b/x11/metalock/Makefile
@@ -15,7 +15,7 @@ COMMENT= Enhanced X11 screen locker
LICENSE= MIT
LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE
-USES= tar:bzip2
+USES= tar:bzip2 xorg
USE_XORG= x11 xt xorgproto xext xpm
OPTIONS_DEFINE= IMLIB2 XFT ULTRAGETOPT
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index d1df4735bbd6..9f2f2f678719 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -24,7 +24,8 @@ BROKEN_armv6= Fails to build: error: GETLEFTBITS_ALIGNMENT must be 1
BROKEN_armv7= Fails to build: error: GETLEFTBITS_ALIGNMENT must be 1
BROKEN_i386= case value evaluates to -2147481600, which cannot be narrowed to type 'unsigned long'
-USES= gettext libtool localbase:ldflags pathfix pkgconfig python:2.7 shebangfix tar:bzip2
+USES= gettext libtool localbase:ldflags pathfix pkgconfig python:2.7 \
+ shebangfix tar:bzip2 xorg
SHEBANG_FILES= ${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.4.in \
${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.6.in \
${WRKSRC}/fvwm-insitu/bin/fvwm-menu-desktop.in \
@@ -69,8 +70,11 @@ GLX_X86_CONFIGURE_ENABLE= glx-x86
STROKE_LIB_DEPENDS= libstroke.so:devel/libstroke
MRPLAY_LIB_DEPENDS= librplay.so:audio/rplay
FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
+GLIB_USES= gnome
GLIB_USE= GNOME=glib20
+GTK2_USES= gnome
GTK2_USE= GNOME=gtk20
+GCONF_USES= gnome
GCONF_USE= GNOME=gconf2,libglade2
post-patch:
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 8551ed9c3fab..c2378ad15d1c 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz
-USES= gettext gnome libtool perl5 pkgconfig
+USES= gettext gnome libtool perl5 pkgconfig xorg
USE_XORG= sm x11 xft
USE_GNOME= cairo gdkpixbuf2 gtk20 vte
USE_LDCONFIG= yes
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 8f9baa94db3f..7040a026dbd6 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -14,10 +14,10 @@ COMMENT= Development version of mrxvt
LICENSE= GPLv2
CONFLICTS= mrxvt-0.4.*
+USES= shebangfix xorg
USE_XORG= x11
GNU_CONFIGURE= yes
-USES= shebangfix
SHEBANG_FILES= ${WRKSRC}/share/scripts/mrxvtset.pl
SUB_FILES+= pkg-message
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index ed6d709f464a..95735dc96735 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-lastlog --disable-wtmp
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
-USES= jpeg tar:tgz
+USES= jpeg tar:tgz xorg
USE_XORG= x11
OPTIONS_DEFINE= DOCS JAPANESE XFT
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 2618b5597ea6..da5a8f45191d 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -13,6 +13,7 @@ COMMENT= Multi terminal based on aterm
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= xorg
USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS=--with-xpm=${LOCALBASE}
diff --git a/x11/mxico/Makefile b/x11/mxico/Makefile
index b13b40ffb205..894eb048a605 100644
--- a/x11/mxico/Makefile
+++ b/x11/mxico/Makefile
@@ -15,7 +15,7 @@ COMMENT= Rotating Object on the screen (Zalgaller polyhedra)
LICENSE= MIT
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index 86d753cf7aba..53ff936ac06a 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -13,7 +13,7 @@ COMMENT= Turns on numlock in X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= localbase
+USES= localbase xorg
USE_XORG= x11 xext xtst
GNU_CONFIGURE= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index f3f4b328e3c6..4676942b322a 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libjansson.so:devel/jansson \
libvdpau.so:multimedia/libvdpau
-USES= gmake pkgconfig gettext-runtime xorg gnome
+USES= gl gmake gnome pkgconfig gettext-runtime xorg
USE_GNOME= gtk20 cairo gdkpixbuf2
USE_GL= gl
USE_XORG= x11 xext xv xxf86vm
diff --git a/x11/nxcomp/Makefile b/x11/nxcomp/Makefile
index 3c1b06608df5..28b50ca47f65 100644
--- a/x11/nxcomp/Makefile
+++ b/x11/nxcomp/Makefile
@@ -12,7 +12,7 @@ COMMENT= NX X11 protocol compression libraries
WRKSRC= ${WRKDIR}/nx-libs-${PORTVERSION}/${PORTNAME}
-USES= autoreconf gmake jpeg
+USES= autoreconf gmake jpeg xorg
USE_XORG= xorgproto
GNU_CONFIGURE= yes
LIB_DEPENDS= libpng.so:graphics/png
diff --git a/x11/ooxcb/Makefile b/x11/ooxcb/Makefile
index ab3c8707f045..44792b4ed814 100644
--- a/x11/ooxcb/Makefile
+++ b/x11/ooxcb/Makefile
@@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
-USES= python:2.7
+USES= python:2.7 xorg
USE_PYTHON= distutils autoplist
USE_XORG= xcb
diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile
index 2592c8cb93b2..55106eeda8c3 100644
--- a/x11/p5-X11-GUITest/Makefile
+++ b/x11/p5-X11-GUITest/Makefile
@@ -15,8 +15,8 @@ COMMENT= Provides GUI testing/interaction facilities
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
+USES= perl5 xorg
USE_XORG= x11 xt xext xtst
-USES= perl5
USE_PERL5= configure
post-patch:
diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile
index 537cb295ddf4..14925d8cd91f 100644
--- a/x11/p5-X11-IdleTime/Makefile
+++ b/x11/p5-X11-IdleTime/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= p5-Inline>=0.44:devel/p5-Inline \
p5-Inline-C>=0.44:devel/p5-Inline-C
MAKE_JOBS_UNSAFE= yes
-USES= perl5
+USES= perl5 xorg
USE_PERL5= configure
USE_XORG= x11 xext xscrnsaver
diff --git a/x11/p5-X11-XCB/Makefile b/x11/p5-X11-XCB/Makefile
index 96f4926ddebe..2f6d43202884 100644
--- a/x11/p5-X11-XCB/Makefile
+++ b/x11/p5-X11-XCB/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= \
p5-XML-Simple>=0:textproc/p5-XML-Simple \
p5-XS-Object-Magic>=0:devel/p5-XS-Object-Magic
-USES= localbase perl5
+USES= localbase perl5 xorg
USE_PERL5= configure
USE_XORG= x11 xcb xorgproto xinerama
MAKE_JOBS_UNSAFE= yes
diff --git a/x11/p5-X11-Xlib/Makefile b/x11/p5-X11-Xlib/Makefile
index 67fd9de911d0..3dbfc0867dc1 100644
--- a/x11/p5-X11-Xlib/Makefile
+++ b/x11/p5-X11-Xlib/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib \
p5-Try-Tiny>=0:lang/p5-Try-Tiny
-USES= perl5
+USES= perl5 xorg
USE_XORG= x11 xcomposite xext xfixes xinerama xorgproto xrender xtst
pre-configure:
diff --git a/x11/pcdm/Makefile b/x11/pcdm/Makefile
index 37da0d590246..8b0aa5668ec5 100644
--- a/x11/pcdm/Makefile
+++ b/x11/pcdm/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= xorg-minimal>=0:x11/xorg-minimal \
setxkbmap:x11/setxkbmap \
${LOCALBASE}/bin/qsudo:sysutils/qsudo
-USES= compiler:c++11-lang gl qmake qt:5
+USES= compiler:c++11-lang gl qmake qt:5 xorg
USE_QT= core gui network svg multimedia imageformats \
buildtools_build x11extras widgets concurrent linguisttools_build
USE_GL= gl
diff --git a/x11/perwindowlayoutd/Makefile b/x11/perwindowlayoutd/Makefile
index dfbfe1e600a2..e9f42e363699 100644
--- a/x11/perwindowlayoutd/Makefile
+++ b/x11/perwindowlayoutd/Makefile
@@ -11,7 +11,7 @@ COMMENT= Keeps per-window keyboard layout under X11
LICENSE= GPLv3
-USES= localbase
+USES= localbase xorg
GNU_CONFIGURE= yes
USE_XORG= x11
diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile
index 20341594a2da..ac66d64aca1b 100644
--- a/x11/plasma5-plasma-desktop/Makefile
+++ b/x11/plasma5-plasma-desktop/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS= xf86-input-evdev>0:x11-drivers/xf86-input-evdev \
xf86-input-libinput>0:x11-drivers/xf86-input-libinput
USES= cmake compiler:c++11-lib cpe desktop-file-utils \
- gettext kde:5 pkgconfig qt:5 tar:xz xorg
+ gettext gnome kde:5 pkgconfig qt:5 tar:xz xorg
USE_GNOME= glib20
USE_KDE= activities activities-stats archive attica auth baloo \
bookmarks codecs completion config configwidgets coreaddons \
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 30d7f2512bbb..cccf16d59322 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libxview.so:x11-toolkits/xview
MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/props
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
MAKE_ARGS= INFOFILES=""
diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile
index 7831cd320e0b..400f1bd66da1 100644
--- a/x11/py-qt5-opengl/Makefile
+++ b/x11/py-qt5-opengl/Makefile
@@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtOpenGL
PYQT_DIST= yes
-USES= python pyqt:5 qt:5
+USES= gl python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run widgets_run
USE_PYTHON= concurrent flavors py3kplist
diff --git a/x11/qterminal/Makefile b/x11/qterminal/Makefile
index c6d0e04a28d1..c0a2745d1a12 100644
--- a/x11/qterminal/Makefile
+++ b/x11/qterminal/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS= libqtermwidget5.so:x11-toolkits/qtermwidget
RUN_DEPENDS= liberation-fonts-ttf>=2.00:x11-fonts/liberation-fonts-ttf
USES= cmake compiler:c++11-lang gettext-runtime \
- localbase:ldflags lxqt pkgconfig qt:5 tar:xz
+ localbase:ldflags lxqt pkgconfig qt:5 tar:xz xorg
USE_QT= buildtools_build core gui qmake_build dbus linguisttools \
widgets x11extras
USE_XORG= x11
diff --git a/x11/rofi/Makefile b/x11/rofi/Makefile
index fbb800e84d34..6c4b50110ccc 100644
--- a/x11/rofi/Makefile
+++ b/x11/rofi/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libxcb-xrm.so:x11/xcb-util-xrm \
libxkbcommon-x11.so:x11/libxkbcommon
-USES= bison gmake gnome libtool pkgconfig shebangfix
+USES= bison gmake gnome libtool pkgconfig shebangfix xorg
USE_GNOME= cairo gdkpixbuf2 librsvg2 pango
USE_XORG= xcb
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 88c3f969f7e1..624eb8c12554 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libgnutls.so:security/gnutls
RUN_DEPENDS= xdg-open:devel/xdg-utils
-USES= gettext libtool:build pkgconfig python:build tar:xz
+USES= gettext gnome libtool:build pkgconfig python:build tar:xz xorg
USE_XORG= ice sm x11
USE_GNOME= cairo librsvg2:run libxslt:build vte3
USE_CSTD= c99
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 7dd4e406e361..2826191a3cb5 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig
RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig
-USES= cpe pkgconfig shebangfix tar:bzip2 terminfo
+USES= cpe pkgconfig shebangfix tar:bzip2 terminfo xorg
USE_XORG= xpm xft xrender
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -143,6 +143,7 @@ CONFIGURE_ARGS+= --enable-smart-resize
.if !${PORT_OPTIONS:MGDK_PIXBUF}
CONFIGURE_ARGS+= --disable-pixbuf
.else
+USES+= gnome
USE_GNOME+= gdkpixbuf2
CONFIGURE_ARGS+= --enable-pixbuf
.endif
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index a3d04b8e4da3..908c3c5e6986 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Low memory usage xterm replacement that supports color
+USES= xorg
USE_XORG= xpm
GNU_CONFIGURE= yes
diff --git a/x11/sbxkb/Makefile b/x11/sbxkb/Makefile
index ec001a418fcd..f4e41cb5eadb 100644
--- a/x11/sbxkb/Makefile
+++ b/x11/sbxkb/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv3
GNU_CONFIGURE= yes
LIBS+= -L${LOCALBASE}/lib -lX11
-USES= pkgconfig
+USES= gnome pkgconfig xorg
USE_GNOME= gtk20
USE_XORG= x11
diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile
index 8c5d8ad2a58b..3d6aa0c58b8f 100644
--- a/x11/sddm/Makefile
+++ b/x11/sddm/Makefile
@@ -21,7 +21,7 @@ LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0
BUILD_DEPENDS= rst2man.py-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR}
RUN_DEPENDS= dbus-run-session:devel/dbus
-USES= cmake compiler:c++11-lang kde:5 python:2.7,build qt:5
+USES= cmake compiler:c++11-lang kde:5 python:2.7,build qt:5 xorg
USE_GITHUB= yes
USE_KDE= ecm
USE_QT= core declarative dbus gui network \
diff --git a/x11/setlayout/Makefile b/x11/setlayout/Makefile
index 3adf37e5c9b4..c28823102e40 100644
--- a/x11/setlayout/Makefile
+++ b/x11/setlayout/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY= #none
MAINTAINER= oleg@bsdpower.com
COMMENT= Arrange desktops in an MxN grid layout
-USES= pkgconfig
+USES= pkgconfig xorg
USE_XORG= x11
NO_WRKSUBDIR= yes
PLIST_FILES= bin/${PORTNAME}
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 7490d446ab66..f8662e7337fc 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -15,7 +15,8 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
-USES= compiler:c++11-lang desktop-file-utils pathfix pkgconfig
+USES= compiler:c++11-lang desktop-file-utils gnome pathfix pkgconfig \
+ xorg
USE_GNOME= gnomeprefix gconf2 libwnck
USE_WX= 2.8
USE_XORG= x11
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index d325a427bdd2..100bd5fa188d 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -12,7 +12,7 @@ COMMENT= Display Control Panel for XFree86/X.org SiS driver
BROKEN= unfetchable
-USES= gmake pkgconfig
+USES= gmake gnome pkgconfig xorg
USE_XORG= x11 ice xxf86vm xinerama xv xrandr xext sm
USE_GNOME= gtk20
GNU_CONFIGURE= yes
diff --git a/x11/slick-greeter/Makefile b/x11/slick-greeter/Makefile
index 050396cd844d..59f3205c7a4e 100644
--- a/x11/slick-greeter/Makefile
+++ b/x11/slick-greeter/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= liblightdm-gobject-1.so:x11/lightdm \
libcanberra-gtk3.so:audio/libcanberra-gtk3
BUILD_DEPENDS= valac:lang/vala
-USES= autoreconf gettext gmake gnome localbase pkgconfig
+USES= autoreconf gettext gmake gnome localbase pkgconfig xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XORG= x11
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 7fbfcfdb14aa..f82eef051674 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png \
libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
-USES= cmake compiler:c++11-lang jpeg pkgconfig
+USES= cmake compiler:c++11-lang jpeg pkgconfig xorg
USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrandr \
xrender xt
USE_RC_SUBR= slim
diff --git a/x11/slock/Makefile b/x11/slock/Makefile
index 2759fd363f8c..5e7be9f0aec2 100644
--- a/x11/slock/Makefile
+++ b/x11/slock/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple X screen locker
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cpe
+USES= cpe xorg
CPE_VENDOR= suckless
USE_XORG= x11 xext xorgproto xrandr xt
MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
diff --git a/x11/slop/Makefile b/x11/slop/Makefile
index 9fe0f0270a8b..39e03a164ce7 100644
--- a/x11/slop/Makefile
+++ b/x11/slop/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv3
BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm
LIB_DEPENDS= libicuuc.so:devel/icu
-USES= cmake compiler:c++11-lang
+USES= cmake compiler:c++11-lang gl xorg
USE_GL= gl glu glew
USE_LDCONFIG= yes
USE_XORG= ice sm x11 xext xrender
diff --git a/x11/sselp/Makefile b/x11/sselp/Makefile
index ba67d0588e98..314644453dfa 100644
--- a/x11/sselp/Makefile
+++ b/x11/sselp/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES= http://dl.suckless.org/tools/ \
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= Simple SELection Printer for X11
+USES= xorg
USE_XORG= x11
PLIST_FILES= bin/sselp
diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile
index caf3ae07860e..fa533ac3b604 100644
--- a/x11/stalonetray/Makefile
+++ b/x11/stalonetray/Makefile
@@ -11,7 +11,7 @@ COMMENT= STAnd-aLONE system tray
LICENSE= GPLv2
-USES= tar:bzip2
+USES= tar:bzip2 xorg
USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-native-kde \
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index b8d08b86d9f1..364c63448700 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -16,8 +16,8 @@ LICENSE_COMB= multi
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
+USES= gmake libtool pathfix pkgconfig xorg
USE_XORG= x11
-USES= gmake libtool pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/sterm/Makefile b/x11/sterm/Makefile
index 5cc077068f34..55d2eb0dac71 100644
--- a/x11/sterm/Makefile
+++ b/x11/sterm/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= pkgconfig
+USES= pkgconfig xorg
USE_XORG= x11 xext xft
PLIST_FILES= bin/st man/man1/st.1.gz
diff --git a/x11/stjerm/Makefile b/x11/stjerm/Makefile
index 8231839a40fa..ea4b30514aec 100644
--- a/x11/stjerm/Makefile
+++ b/x11/stjerm/Makefile
@@ -16,7 +16,7 @@ USE_GITHUB= yes
GNU_CONFIGURE= yes
LIBS+= -L${LOCALBASE}/lib -lXinerama
-USES= autoreconf gmake pkgconfig
+USES= autoreconf gmake gnome pkgconfig xorg
USE_GNOME= vte gtk20
USE_XORG= xinerama
diff --git a/x11/swarp/Makefile b/x11/swarp/Makefile
index c1fddcc4d98e..d09575f1005e 100644
--- a/x11/swarp/Makefile
+++ b/x11/swarp/Makefile
@@ -13,6 +13,7 @@ COMMENT= X11 generic pointer warping utility
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+USES= xorg
USE_XORG= x11
MAKE_ARGS= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lX11" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
diff --git a/x11/sxhkd/Makefile b/x11/sxhkd/Makefile
index 3c189dc00ebf..dd5342f04954 100644
--- a/x11/sxhkd/Makefile
+++ b/x11/sxhkd/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms
-USES= gmake localbase:ldflags
+USES= gmake localbase:ldflags xorg
USE_XORG= xcb
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index 574bce6ead80..11a6a7555e04 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .shar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple X Protocol Compressor
-USES= imake
+USES= imake xorg
USE_XORG= xorgproto
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${GZIP_CMD}
diff --git a/x11/tabbed/Makefile b/x11/tabbed/Makefile
index c85b5f863b45..e31cd3ca9106 100644
--- a/x11/tabbed/Makefile
+++ b/x11/tabbed/Makefile
@@ -11,6 +11,7 @@ COMMENT= Simple generic tabbed fronted to xembed aware applications
LICENSE= MIT
+USES= xorg
USE_XORG= x11
OPTIONS_DEFINE= DOCS
diff --git a/x11/temperature.app/Makefile b/x11/temperature.app/Makefile
index 69a88d8929dc..d9b6521426d0 100644
--- a/x11/temperature.app/Makefile
+++ b/x11/temperature.app/Makefile
@@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= wget:ftp/wget
+USES= xorg
USE_XORG= x11 xpm
PORTDOCS= README
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index e24adbed6326..257a75b3428f 100644
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -12,6 +12,7 @@ COMMENT= Very fast launcher program for X
LICENSE= MIT
+USES= xorg
USE_XORG= x11 xorgproto
CPPFLAGS+= -I${LOCALBASE}/include -lX11
diff --git a/x11/thingylaunch/Makefile b/x11/thingylaunch/Makefile
index 5893430d6d7b..4ea8cd23724b 100644
--- a/x11/thingylaunch/Makefile
+++ b/x11/thingylaunch/Makefile
@@ -19,9 +19,9 @@ LIBX11_DESC= Build against libX11
LIBXCB_DESC= Build against libXCB
OPTIONS_DEFAULT= LIBX11
+USES= cmake compiler:c++11-lib xorg
USE_XORG= xorgproto
USE_CXXSTD= c++11
-USES= cmake compiler:c++11-lib
.include <bsd.port.options.mk>
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 190730582925..5ac1d9a6c2aa 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS= libconfuse.so:devel/libconfuse
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-rpath
+USES= gmake gettext gnome pkgconfig autoreconf pathfix libtool xorg
USE_XORG+= x11
USE_GNOME+= glib20 gtk30 gdkpixbuf2 pango
-USES= gmake gettext gnome pkgconfig autoreconf pathfix libtool
INSTALL_TARGET= install-strip
USE_GITHUB= yes
GH_ACCOUNT= lanoxx
diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index 2a4bba1729a4..2460b5406cfd 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libstartup-notification-1.so:x11/startup-notification
USES= alias cmake desktop-file-utils gettext-runtime gnome pkgconfig \
- shared-mime-info
+ shared-mime-info xorg
USE_GNOME= cairo glib20 gtk20 librsvg2 pango
USE_XORG= x11 xcomposite xdamage xext xfixes xinerama xrandr xrender
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index 7abb3e8b3e81..86bc2806e976 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -12,7 +12,7 @@ COMMENT= Lightweight GTK2-based systray for UNIX desktop
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= iconv gmake pkgconfig
+USES= iconv gmake gnome pkgconfig xorg
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango
USE_GITHUB= yes
USE_XORG= x11 xmu
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index 168f7ea1cc52..9cc20fd90f52 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -12,7 +12,7 @@ COMMENT= Nifty set of desktop apps, including floating buttons
LIB_DEPENDS= libforms.so:x11-toolkits/xforms
-USES= imake
+USES= imake xorg
USE_XORG= xaw
post-patch:
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index 8f683ff7a6a0..b3f589f88b3c 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -13,7 +13,7 @@ COMMENT= Command-line utility for setting up and using virtual desktops
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= autoreconf
+USES= autoreconf xorg
GNU_CONFIGURE= yes
USE_XORG= x11
diff --git a/x11/virtboard/Makefile b/x11/virtboard/Makefile
index c17ea1e64901..0ba29e73a94d 100644
--- a/x11/virtboard/Makefile
+++ b/x11/virtboard/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas
-USES= compiler:c11 gettext-tools gnome meson pkgconfig
+USES= compiler:c11 gettext-tools gnome meson pkgconfig xorg
USE_GITLAB= yes
USE_GNOME= cairo glib20
USE_XORG= pixman
diff --git a/x11/virtualgl/Makefile b/x11/virtualgl/Makefile
index 3b4832890d40..d91e747f8276 100644
--- a/x11/virtualgl/Makefile
+++ b/x11/virtualgl/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= amd64 i386
CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL
DOCSDIR= ${LOCALBASE}/VirtualGL/doc
-USES= cmake:noninja compiler:c++11-lang
+USES= cmake:noninja compiler:c++11-lang gl xorg
USE_GL= gl glu
USE_XORG= x11 xcb xext
CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include\
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 6d0101b42a9d..145feb5c1fe6 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE= PAM
OPTIONS_DEFAULT= PAM
OPTIONS_SUB= yes
-USES= gettext localbase tar:bzip2
+USES= gettext localbase tar:bzip2 xorg
USE_XORG= x11 xmu
GNU_CONFIGURE= yes
CONFIGURE_ENV= DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}"
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index e42de42fb2f2..8e1953109f83 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -13,6 +13,7 @@ COMMENT= Application launcher dockapp similar to wmbutton
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= xorg
USE_XORG= ice sm x11 xext xpm
GNU_CONFIGURE= yes
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index e0bc9cd84ae4..630804673e1f 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= https://BSDforge.com/projects/source/x11/wmblob/
MAINTAINER= portmaster@bsdforge.com
COMMENT= Shows moving blobs
+USES= pkgconfig tar:xz xorg
USE_XORG= xpm
USE_GNOME= gtk20
-USES= pkgconfig tar:xz
GNU_CONFIGURE= yes
PLIST_FILES= bin/wmblob man/man1/wmblob.1.gz
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index c6d771b7f48e..7a6f6bb30e17 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -13,6 +13,7 @@ COMMENT= Dockapp that displays 9 buttons to run apps of your choice
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= xorg
USE_XORG= xpm
SUB_FILES= pkg-message
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 74162a1e991c..06b25368ec85 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= gmake pkgconfig
+USES= gmake gnome pkgconfig xorg
USE_GNOME= gtk20
USE_XORG= x11
diff --git a/x11/wmctrl/Makefile b/x11/wmctrl/Makefile
index fdac32c6544f..9da983e9d560 100644
--- a/x11/wmctrl/Makefile
+++ b/x11/wmctrl/Makefile
@@ -12,7 +12,7 @@ COMMENT= Command line tool to interact with an EWMH/NetWM compatible X managers
LICENSE= GPLv2
-USES= pkgconfig
+USES= pkgconfig xorg
GNU_CONFIGURE= yes
USE_XORG= x11 xmu xext xt
USE_GNOME= glib20
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 56737d0f2124..874cbc317621 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -13,7 +13,7 @@ COMMENT= Dockapp which provides a drawer to launch applications
LICENSE= GPLv2+
-USES= gmake pkgconfig
+USES= gmake gnome pkgconfig xorg
USE_GNOME= gdkpixbuf2
USE_XORG= x11 xext xi
MAKE_ENV= USE_GDKPIXBUF2=1
diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile
index c55ed9d957e2..d3462ed05e0a 100644
--- a/x11/wmmatrix/Makefile
+++ b/x11/wmmatrix/Makefile
@@ -15,7 +15,7 @@ COMMENT= DockApp that runs a version of the xmatrix screenhack
MAKE_JOBS_UNSAFE= yes
PLIST_FILES= bin/wmmatrix
-USES= gmake
+USES= gmake xorg
USE_XORG= xpm
ALL_TARGET= clean all
diff --git a/x11/wmsystemtray/Makefile b/x11/wmsystemtray/Makefile
index b75a8c596164..bfabc7a302f6 100644
--- a/x11/wmsystemtray/Makefile
+++ b/x11/wmsystemtray/Makefile
@@ -11,7 +11,7 @@ COMMENT= System tray dockapp that uses freedesktop.org system tray protocol
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pkgconfig
+USES= pkgconfig xorg
USE_XORG= ice sm x11 xext xfixes xmu xpm
GNU_CONFIGURE= yes
diff --git a/x11/wmutils-opt/Makefile b/x11/wmutils-opt/Makefile
index 99b67865c82e..4f4d3c130ce8 100644
--- a/x11/wmutils-opt/Makefile
+++ b/x11/wmutils-opt/Makefile
@@ -11,7 +11,7 @@ COMMENT= Optional addons to wmutils
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= localbase:ldflags
+USES= localbase:ldflags xorg
USE_XORG= xcb
USE_GITHUB= yes
diff --git a/x11/wmxss/Makefile b/x11/wmxss/Makefile
index bc060eb8ee11..3448a74ef29b 100644
--- a/x11/wmxss/Makefile
+++ b/x11/wmxss/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= Run xscreensaver modules inside a WindowMaker dock
-USES= uidfix
+USES= uidfix xorg
USE_XORG= x11 xpm
PLIST_FILES= bin/wmxss
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/Src
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 015f1224a47b..50914780ef1f 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf \
# Conflict due to x3270if
CONFLICTS= c3270-*
-USES= cpe iconv fonts imake:env
+USES= cpe iconv fonts imake:env xorg
USE_XORG= ice sm x11 xaw xext xmu xt
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-fontdir=${FONTSDIR} \
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index d4e26f98b91a..b3e7a091d766 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -14,7 +14,7 @@ COMMENT= Animate your root-cursor
BROKEN= unfetchable
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
PLIST_FILES= bin/xaniroc man/man1/xaniroc.1.gz
diff --git a/x11/xantfarm/Makefile b/x11/xantfarm/Makefile
index ba98d9506ddf..b9d184cce725 100644
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Ant hill simulation on X11 root window
WRKSRC= ${WRKDIR}/xantfarm
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext xt
PLIST_FILES= bin/xantfarm \
man/man1/xantfarm.1.gz
diff --git a/x11/xascii/Makefile b/x11/xascii/Makefile
index bacd3c5edbff..4422b302569a 100644
--- a/x11/xascii/Makefile
+++ b/x11/xascii/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://komquats.com/distfiles/ \
MAINTAINER= cy@FreeBSD.org
COMMENT= Display an ASCII table in decimal, octal, and hexadecimal
-USES= imake
+USES= imake xorg
USE_XORG= x11 xt xaw
MAKE_ARGS= PREFIX=${PREFIX}
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 302839278f9f..0286b443672d 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SUNSITE/X11/screensavers
MAINTAINER= romain@FreeBSD.org
COMMENT= Activate xlock after a user defined time of inactivity
-USES= tar:tgz imake gmake # gmake is needed for -jX builds
+USES= tar:tgz imake gmake xorg # gmake is needed for -jX builds
USE_XORG= x11 xext xscrnsaver
OPTIONS_DEFINE= XLOCK
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index f0362d1b6713..6a59acfd8f14 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -14,6 +14,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libpng.so:graphics/png
+USES= xorg
USE_XORG= xtst
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 4fc4db286e2c..ee0e2b412eb6 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES= http://kozos.jp/myfreesoft/
MAINTAINER= ports@FreeBSD.org
COMMENT= Balloons move on root window
+USES= xorg
USE_XORG= xpm xmu xaw
ALL_TARGET= xballoon
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 32fa5d084aff..f6814e8473d6 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -11,6 +11,7 @@ DISTNAME= XBanner${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Make your XDM login screen look beautiful
+USES= xorg
USE_XORG= x11 xpm
OPTIONS_DEFINE= DOCS
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 030bef23635e..532959dd07ec 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -13,6 +13,7 @@ COMMENT= Allows you to launch shell commands under X with your keyboard
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= xorg
USE_XORG= x11 xi
GNU_CONFIGURE= yes
diff --git a/x11/xbrightness/Makefile b/x11/xbrightness/Makefile
index baf89fa58608..beef9f68c432 100644
--- a/x11/xbrightness/Makefile
+++ b/x11/xbrightness/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES= http://disjunkt.com/xbrightness/ ftp://ftp.motoom.net/files/
MAINTAINER= motoom@xs4all.nl
COMMENT= Brightness and gamma correction through the X server
+USES= imake xorg
USE_XORG= x11 xxf86vm ice xmu xt xaw
-USES= imake
PLIST_FILES= bin/xbrightness man/man1/xbrightness.1.gz
diff --git a/x11/xcape/Makefile b/x11/xcape/Makefile
index 3e95e819ef70..1983b1e2caf9 100644
--- a/x11/xcape/Makefile
+++ b/x11/xcape/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= alols
-USES= pkgconfig
+USES= pkgconfig xorg
USE_XORG= x11 xtst
MAKE_ARGS= PREFIX=${PREFIX} MANDIR=/man/man1
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index be5fe28cf6eb..eec102dba41a 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -14,7 +14,7 @@ COMMENT= Tool for managing x11 cut-buffers
LICENSE= MIT
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xt
PLIST_FILES= bin/xcb \
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index f4c5a0359efd..014d174816ea 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2
USE_GITHUB= yes
GH_ACCOUNT= astrand
-USES= autoreconf gmake iconv
+USES= autoreconf gmake iconv xorg
USE_XORG= x11 xmu
GNU_CONFIGURE= yes
diff --git a/x11/xcm/Makefile b/x11/xcm/Makefile
index 9aaeb6dc3d48..d5760e69c704 100644
--- a/x11/xcm/Makefile
+++ b/x11/xcm/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB= yes
GH_ACCOUNT= oyranos-cms
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --mandir=${PREFIX}/man
-USES= pkgconfig
+USES= pkgconfig xorg
USE_XORG= x11 xfixes xmu xt
# xcm should be added to XORG_MODULES at /usr/ports/Mk/bsd.xorg.mk
diff --git a/x11/xcmd/Makefile b/x11/xcmd/Makefile
index dc3ef93f1e4b..94d09c0af9c9 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SUNSITE/X11/xutils \
MAINTAINER= ports@FreeBSD.org
COMMENT= Xcmd is a front-end for starting programs under X11
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xext xmu xt
PLIST_FILES= bin/xcmd \
diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile
index bb2c52f31f16..66a1ec48be3b 100644
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Find colour values by graphical colour mixing
-USES= imake tar:Z
+USES= imake tar:Z xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
PLIST_FILES= bin/xcoloredit \
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 7fafdfc3bb7a..310f35358a49 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d
RUN_DEPENDS= rgb>=1.0.3:x11/rgb
WRKSRC= ${WRKDIR}/xcolorsel
-USES= imake
+USES= imake xorg
USE_XORG= xpm
post-patch:
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index e8b23814a6c8..bd0590baed0b 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
MAINTAINER= cy@FreeBSD.org
COMMENT= Manipulate X cut buffers from the commandline
-USES= imake
+USES= imake xorg
USE_XORG= x11
PLIST_FILES= bin/xcut man/man1/xcut.1.gz
diff --git a/x11/xdotool/Makefile b/x11/xdotool/Makefile
index 5f6f8b7d122a..c04ada1a0f11 100644
--- a/x11/xdotool/Makefile
+++ b/x11/xdotool/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB= yes
GH_ACCOUNT= jordansissel
USE_LDCONFIG= yes
-USES= gmake pkgconfig perl5
+USES= gmake pkgconfig perl5 xorg
USE_XORG= x11 xtst xinerama
USE_PERL5= build
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index f872f3f58ae6..e8d762f46257 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -12,8 +12,8 @@ COMMENT= Graphical shell for the X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
+USES= imake xorg
USE_XORG= xaw
-USES= imake
MAKE_JOBS_UNSAFE= yes
.include <bsd.port.mk>
diff --git a/x11/xfce4-dashboard/Makefile b/x11/xfce4-dashboard/Makefile
index 681622943d36..37d9d929adb2 100644
--- a/x11/xfce4-dashboard/Makefile
+++ b/x11/xfce4-dashboard/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libcogl.so:graphics/cogl \
libclutter-1.0.so:graphics/clutter
-USES= compiler:c11 gettext-tools gmake gnome localbase libtool \
+USES= compiler:c11 gettext-tools gl gmake gnome localbase libtool \
pathfix perl5 pkgconfig tar:bzip2 xfce xorg
USE_GNOME= cairo glib20 gtk30 intltool libwnck3
USE_XFCE= garcon xfconf
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index e920c6d3f7e8..7a6c355cf861 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -13,7 +13,7 @@ COMMENT= Make fish swim in the background of your screen
BROKEN= unfetchable
PLIST_FILES= bin/xfishtank
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
WRKSRC= ${WRKDIR}/xfishtank2.0
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 974ce938ba08..780ab93a7786 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS= xrdb:x11/xrdb
BROKEN_armv6= fails to install: xrdb: Socket is not connected: Can't open display ':0'
BROKEN_armv7= fails to install: xrdb: Socket is not connected: Can't open display ':0'
-USES= display:build imake:notall tar:Z
+USES= display:build imake:notall tar:Z xorg
USE_XORG= x11 xaw
MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile
index 3630be3aff93..ba5abdfd1fd7 100644
--- a/x11/xidle/Makefile
+++ b/x11/xidle/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= LOCAL/novel
MAINTAINER= novel@FreeBSD.org
COMMENT= Run a program on X inactivity
-USES= tar:bzip2
+USES= tar:bzip2 xorg
CFLAGS+= -I${LOCALBASE}/include -D__dead=static
MAKE_ARGS+= X11BASE="${LOCALBASE}" \
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11/xkb-switch/Makefile b/x11/xkb-switch/Makefile
index e169b026f7d5..f3a0e9b58fcd 100644
--- a/x11/xkb-switch/Makefile
+++ b/x11/xkb-switch/Makefile
@@ -14,7 +14,7 @@ COMMENT= Switch your X keyboard layouts from the command line
LICENSE= GPLv3
-USES= cmake
+USES= cmake xorg
USE_GITHUB= yes
GH_ACCOUNT= ierton
USE_XORG= x11 xkbfile
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index 42facbd4c043..e2e056eded95 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
DIST_SUBDIR= xkbctrl
PLIST_FILES= bin/xkbctrl
-USES= imake
+USES= imake xorg
USE_XORG= x11 xkbfile
NO_WRKSUBDIR= yes
diff --git a/x11/xkbind/Makefile b/x11/xkbind/Makefile
index 3420183bcea6..f83429fb1ed9 100644
--- a/x11/xkbind/Makefile
+++ b/x11/xkbind/Makefile
@@ -12,6 +12,7 @@ COMMENT= Minimal keyboard layout indicator program
LICENSE= GPLv2
GNU_CONFIGURE= yes
+USES= xorg
USE_XORG= x11
PLIST_FILES= bin/${PORTNAME} lib/${PORTNAME}/app-defaults/Xkbind \
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index cba7bc5aa8bb..9da2b1d36768 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -13,7 +13,7 @@ COMMENT= Manage various XKB features of X Window
LICENSE= BSD3CLAUSE
-USES= perl5
+USES= perl5 xorg
USE_XORG= x11
USE_PERL5= build
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index f819d1e6cb03..def29e0225e3 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -12,7 +12,7 @@ COMMENT= Graphically display and edit the keyboard mapping
LICENSE= MIT
-USES= imake tar:Z
+USES= imake tar:Z xorg
USE_XORG= ice sm x11 xaw xbitmaps xext xmu xt
PLIST_FILES= bin/xkeycaps \
diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index f32b2e274fc4..27165b8d9f71 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -11,6 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Record, repeat, and play key sequence from keyboard
MAKE_ENV= X11BASE="${LOCALBASE}"
+USES= xorg
USE_XORG= x11 xt
PORTDOCS= README
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 7fe2f0e7af63..b18c2ee239b2 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -28,7 +28,7 @@ PATCH_STRIP= -p1
VERSION= ${PORTVERSION:R}
REVISION= ${PORTVERSION:E}
-USES= jpeg
+USES= jpeg xorg
USE_XORG= x11
GNU_CONFIGURE= yes
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index cd565f53c010..4ab92e654677 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES= http://ftp.vector.co.jp/16/65/1309/
MAINTAINER= ports@FreeBSD.org
COMMENT= Kaleidoscope on X
+USES= xorg
USE_XORG= x11 xpm xaw
ALL_TARGET= xmangekyou
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index b012140b154a..65246084225a 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Moving mascot on your X11 screen
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
MAKE_ARGS= MAKE="${MAKE_CMD}"
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index e1ad47ed32af..abd561ed7feb 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Raw X11 protocol analyser
WRKSRC= ${WRKDIR}/xmon.${PORTVERSION}
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xt
.include <bsd.port.mk>
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index 9e03cf5f8bdd..750999c9fe7b 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -13,7 +13,7 @@ COMMENT= Message-of-the-day browser for X11 and dumb-terminals
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GNU
-USES= imake:noman
+USES= imake:noman xorg
USE_XORG= ice sm x11 xaw xext xmu xt
PLIST_FILES= bin/xmotd \
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 9d85a4a60b1f..33a9f2708e56 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -13,7 +13,7 @@ COMMENT= Pseudoserver to support mobile X11 clients
BROKEN= unfetchable
-USES= imake
+USES= imake xorg
USE_XORG= x11
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index 6c6150748366..10758c2d4f23 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Shows a message on the screen
PLIST_FILES= bin/xmsg man/man1/xmsg.1.gz
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext xaw xmu xt sm ice
.include <bsd.port.mk>
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index 6660a4157b69..d2bf518328dd 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/
MAINTAINER= ports@FreeBSD.org
COMMENT= X protocol multiplexor
+USES= tar:Z xorg
USE_XORG= x11
-USES= tar:Z
PLIST_FILES= bin/xmx man/man1/xmx.1.gz
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index ebbbeb34a37a..885c4367a1ed 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -13,8 +13,8 @@ COMMENT= X11 events recorder and player
LICENSE= GPLv3
GNU_CONFIGURE= yes
+USES= gmake pathfix xorg
USE_XORG= xtst
-USES= gmake pathfix
CONFIGURE_ARGS= --enable-cli --disable-doc --disable-xinput2
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 00afab766539..d5dea38f92cf 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -14,6 +14,7 @@ COMMENT= Utility to set override_redirect in XWindowAttributes to True
BROKEN= unfetchable
NO_WRKSUBDIR= yes
+USES= xorg
USE_XORG= x11
PLIST_FILES= bin/xnodecor
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index e9ec91e7889a..8efa67af783e 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -41,7 +41,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
Xvfb:x11-servers/xorg-vfbserver
USES= desktop-file-utils fortran gettext-runtime gnome pkgconfig \
- python:2.7 shared-mime-info shebangfix tar:xz
+ python:2.7 shared-mime-info shebangfix tar:xz xorg
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango
USE_PYTHON= cython distutils
diff --git a/x11/xprintidle/Makefile b/x11/xprintidle/Makefile
index 4f9252d8f713..26a17b94b8df 100644
--- a/x11/xprintidle/Makefile
+++ b/x11/xprintidle/Makefile
@@ -11,7 +11,7 @@ COMMENT= Print X idle time
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= localbase:ldflags
+USES= localbase:ldflags xorg
GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= lucianposton
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index b151a7d405c8..9a98f228c507 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= LOCAL/mph
MAINTAINER= ports@FreeBSD.org
COMMENT= Displays a dialog box and prompts user for text
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xt
PLIST_FILES= bin/xprompt \
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 254a06393803..9c5936c55fed 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -12,7 +12,7 @@ COMMENT= X11 server side resource usage statistics monitor
BROKEN= unfetchable
-USES= gmake pkgconfig ncurses
+USES= gmake pkgconfig ncurses xorg
USE_XORG= x11 xext xrender xt xres xorgproto
GNU_CONFIGURE= yes
diff --git a/x11/xrootconsole/Makefile b/x11/xrootconsole/Makefile
index 7a7c7df0a63d..3053cbca3724 100644
--- a/x11/xrootconsole/Makefile
+++ b/x11/xrootconsole/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Writes any log live onto the background
+USES= gmake xorg
USE_XORG= x11
-USES= gmake
PLIST_FILES= bin/xrootconsole man/man1/xrootconsole.1.gz
post-patch:
diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile
index 4db7f78c48d8..c03a435adf32 100644
--- a/x11/xrsi/Makefile
+++ b/x11/xrsi/Makefile
@@ -13,6 +13,7 @@ COMMENT= Minimalist break enforcer for Linux/Unix for the prevention of RSI
LICENSE= ART10
LICENSE_FILE= ${WRKSRC}/Licence
+USES= xorg
USE_XORG= x11
PLIST_FILES= bin/xrsi
PORTDOCS= Readme
diff --git a/x11/xsel-conrad/Makefile b/x11/xsel-conrad/Makefile
index 938fece2c81f..0049516a570a 100644
--- a/x11/xsel-conrad/Makefile
+++ b/x11/xsel-conrad/Makefile
@@ -19,7 +19,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
CONFLICTS_INSTALL= xsel-[0-9]*
-USES= autoreconf localbase
+USES= autoreconf localbase xorg
USE_XORG= x11 xt
GNU_CONFIGURE= yes
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
diff --git a/x11/xsettingsd/Makefile b/x11/xsettingsd/Makefile
index dbe48f368257..c39bf2600109 100644
--- a/x11/xsettingsd/Makefile
+++ b/x11/xsettingsd/Makefile
@@ -13,7 +13,7 @@ COMMENT= Daemon that implements the XSETTINGS specification
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= compiler:c++11-lang pkgconfig scons
+USES= compiler:c++11-lang pkgconfig scons xorg
USE_GITHUB= yes
GH_ACCOUNT= derat
USE_XORG= x11
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index 9f10061c3097..c84dca985aa8 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -17,7 +17,7 @@ EXTRACT_AFTER_ARGS= | ${SED} -e "/^...bin.sh/,/exit 0/!d" | ${SH}
DIST_SUBDIR= ${PORTNAME}
NO_WRKSUBDIR= yes
-USES= imake
+USES= imake xorg
USE_XORG= x11
PLIST_FILES= bin/xskyroot
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index ee3116b97bef..cf2cf1020f3e 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -12,7 +12,7 @@ COMMENT= Create a snowy and Santa-y desktop
BROKEN= unfetchable
-USES= imake
+USES= imake xorg
USE_XORG= xpm
PLIST_FILES= bin/xsnow man/man6/xsnow.6.gz
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index 816d23d30b12..2d92d69e26b0 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -13,6 +13,7 @@ COMMENT= Letters fly to far, far, far away
WRKSRC= ${WRKDIR}/${PORTNAME}-1.1
+USES= xorg
USE_XORG= xpm xt xaw
ALL_TARGET= xstarroll
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index bcde5da5d65e..23426b93a630 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}114
MAINTAINER= matt@bdd.net
COMMENT= X11 trippy color-cycling toy
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
PLIST_FILES= bin/xtacy man/man1/xtacy.1.gz
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 9daa2e870a0a..f0654673e807 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -12,7 +12,7 @@ COMMENT= Create a full-screen image to adjust your monitor
BROKEN= unfetchable
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
PLIST_FILES= bin/xtestpicture man/man1/${PORTNAME}.1.gz
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 9e1a855f79e3..befbce4a3176 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= XCONTRIB/utilities
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool startup utility for X11
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
PLIST_FILES= bin/xtoolwait man/man1/xtoolwait.1.gz
diff --git a/x11/xtrlock/Makefile b/x11/xtrlock/Makefile
index 795ff9ce73e0..9f623fc4602f 100644
--- a/x11/xtrlock/Makefile
+++ b/x11/xtrlock/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/GPL-3.txt
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= localbase
+USES= localbase xorg
USE_XORG= x11
LIBS+= -lX11 -lcrypt
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index cd7ac471f985..175d9c7cc1d0 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -13,7 +13,7 @@ COMMENT= Getting and setting Xv attributes
BROKEN= unfetchable
-USES= gnome pkgconfig
+USES= gnome pkgconfig xorg
USE_GNOME= gtk20
USE_XORG= x11 xv
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index faf3cb29db69..6d56d6be33ea 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -11,7 +11,7 @@ COMMENT= Virtual keyboard for X applications
LICENSE= GPLv2+
-USES= imake
+USES= imake xorg
USE_XORG= ice sm x11 xaw xext xmu xpm xt
DESKTOP_ENTRIES="Xvkbd" "" "" "xvkbd" "Utility;" false
diff --git a/x11/xvt/Makefile b/x11/xvt/Makefile
index 5c5b3cce7990..b30c888b1964 100644
--- a/x11/xvt/Makefile
+++ b/x11/xvt/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB= multi
PORTDOCS= xvt.1.html xvtRef.html xvtRef.txt
-USES= libtool perl5 tar:xz
+USES= libtool perl5 tar:xz xorg
USE_LDCONFIG= yes
USE_PERL5= build patch
USE_XORG= x11 xpm
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index 49838ac7ee19..9bcf9cce8f8c 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -14,7 +14,7 @@ COMMENT= Watch a window on another X server
PLIST_FILES= bin/xwatchwin \
man/man1/xwatchwin.1.gz
-USES= imake tar:Z
+USES= imake tar:Z xorg
USE_XORG= x11 xext
.include <bsd.port.mk>
diff --git a/x11/xwinwrap/Makefile b/x11/xwinwrap/Makefile
index 33664d737c24..a222072ba076 100644
--- a/x11/xwinwrap/Makefile
+++ b/x11/xwinwrap/Makefile
@@ -13,7 +13,7 @@ COMMENT= XWinWrap replace a desktop background with a movie or screensaver
WRKSRC= ${WRKDIR}/${PORTNAME}
ONLY_FOR_ARCHS= amd64 i386
-USES= tar:bzip2
+USES= tar:bzip2 xorg
USE_XORG= x11 xorgproto xrender xext
PLIST_FILES= bin/${PORTNAME}
MAKE_ARGS+= PREFIX=${PREFIX}
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index 11e048ea785b..4c83c3171811 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -12,7 +12,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:source1 \
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= X interface tool
-USES= imake
+USES= imake xorg
USE_XORG= x11 xext
PLIST_FILES= bin/xwit man/man1/xwit.1.gz
diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index 70a5a23470e9..4822ed09e18e 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -12,7 +12,7 @@ COMMENT= XKB keyboard layout indicator and switcher
LICENSE= ART10
-USES= iconv imake pkgconfig
+USES= iconv imake pkgconfig xorg
USE_XORG= xext xpm xt
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index 29d8a1dbd145..47dc83e978a1 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SUNSITE/libs/X
MAINTAINER= ports@FreeBSD.org
COMMENT= Magnify, rotate, mirror the image on the X screen
-USES= imake tar:tgz
+USES= imake tar:tgz xorg
USE_XORG= x11 xext
PLIST_FILES= bin/xzoom man/man1/xzoom.1.gz
diff --git a/x11/yeahconsole/Makefile b/x11/yeahconsole/Makefile
index a384d23322b5..dac2b07b788e 100644
--- a/x11/yeahconsole/Makefile
+++ b/x11/yeahconsole/Makefile
@@ -12,6 +12,7 @@ COMMENT= Terminal wrapper for creating drop-down consoles
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
+USES= xorg
USE_XORG= x11
ALL_TARGET= ${PORTNAME}
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 7f10aeb7ecae..5a0f768fcfbf 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= yelp-xsl>=0:textproc/yelp-xsl
PORTSCOUT= limitw:1,even
USES= compiler:c11 desktop-file-utils gettext gmake gnome \
- libtool pathfix pkgconfig sqlite tar:xz
+ libtool pathfix pkgconfig sqlite tar:xz xorg
USE_XORG= x11 ice
USE_GNOME= cairo gtk30 intlhack libxml2 libxslt
GNU_CONFIGURE= yes
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 1e81d845aa54..0f49059a9fcb 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= itstool:textproc/itstool
CONFLICTS= gtkada-1.2.* zenity-2.*
USES= gettext gmake gnome localbase pathfix pkgconfig \
- perl5 tar:xz
+ perl5 tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 gnomeprefix gtk30 intlhack
USE_XORG= x11
GNU_CONFIGURE= yes