aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2019-11-03 21:56:37 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2019-11-03 21:56:37 +0000
commitc32f72e68d63a930e5ea4ad5cc6e2ea4d3bb5360 (patch)
tree21deb0ada9c792042c1b4d28f91cef612f466309 /x11
parentf93fe63d74f9cd69d7f899403b10e179c4513e8a (diff)
downloadports-c32f72e68d63a930e5ea4ad5cc6e2ea4d3bb5360.tar.gz
ports-c32f72e68d63a930e5ea4ad5cc6e2ea4d3bb5360.zip
Notes
Diffstat (limited to 'x11')
-rw-r--r--x11/appres/Makefile2
-rw-r--r--x11/beforelight/Makefile2
-rw-r--r--x11/bitmap/Makefile2
-rw-r--r--x11/editres/Makefile2
-rw-r--r--x11/fstobdf/Makefile2
-rw-r--r--x11/iceauth/Makefile2
-rw-r--r--x11/ico/Makefile2
-rw-r--r--x11/libICE/Makefile2
-rw-r--r--x11/libSM/Makefile3
-rw-r--r--x11/libX11/Makefile3
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcursor/Makefile3
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXdmcp/Makefile2
-rw-r--r--x11/libXext/Makefile3
-rw-r--r--x11/libXfixes/Makefile3
-rw-r--r--x11/libXi/Makefile3
-rw-r--r--x11/libXinerama/Makefile3
-rw-r--r--x11/libXpm/Makefile2
-rw-r--r--x11/libXpresent/Makefile2
-rw-r--r--x11/libXrandr/Makefile3
-rw-r--r--x11/libXrender/Makefile2
-rw-r--r--x11/libXres/Makefile3
-rw-r--r--x11/libXtst/Makefile3
-rw-r--r--x11/libXv/Makefile3
-rw-r--r--x11/libXvMC/Makefile3
-rw-r--r--x11/libXxf86dga/Makefile3
-rw-r--r--x11/libXxf86vm/Makefile3
-rw-r--r--x11/libdmx/Makefile3
-rw-r--r--x11/libxcb/Makefile3
-rw-r--r--x11/libxkbcommon/Makefile4
-rw-r--r--x11/libxkbfile/Makefile2
-rw-r--r--x11/libxshmfence/Makefile2
-rw-r--r--x11/listres/Makefile2
-rw-r--r--x11/mkcomposecache/Makefile2
-rw-r--r--x11/pixman/Makefile3
-rw-r--r--x11/rendercheck/Makefile2
-rw-r--r--x11/rgb/Makefile2
-rw-r--r--x11/scripts/Makefile3
-rw-r--r--x11/sessreg/Makefile2
-rw-r--r--x11/setxkbmap/Makefile2
-rw-r--r--x11/smproxy/Makefile2
-rw-r--r--x11/x11perf/Makefile3
-rw-r--r--x11/xauth/Makefile3
-rw-r--r--x11/xbacklight/Makefile2
-rw-r--r--x11/xbiff/Makefile2
-rw-r--r--x11/xbitmaps/Makefile4
-rw-r--r--x11/xcalc/Makefile2
-rw-r--r--x11/xcb-proto/Makefile3
-rw-r--r--x11/xcb-util-cursor/Makefile3
-rw-r--r--x11/xcb-util-errors/Makefile2
-rw-r--r--x11/xcb-util-image/Makefile3
-rw-r--r--x11/xcb-util-keysyms/Makefile3
-rw-r--r--x11/xcb-util-renderutil/Makefile3
-rw-r--r--x11/xcb-util-wm/Makefile3
-rw-r--r--x11/xcb-util-xrm/Makefile2
-rw-r--r--x11/xcb-util/Makefile3
-rw-r--r--x11/xclipboard/Makefile2
-rw-r--r--x11/xcmsdb/Makefile2
-rw-r--r--x11/xconsole/Makefile2
-rw-r--r--x11/xcursorgen/Makefile2
-rw-r--r--x11/xditview/Makefile2
-rw-r--r--x11/xdriinfo/Makefile3
-rw-r--r--x11/xedit/Makefile3
-rw-r--r--x11/xev/Makefile2
-rw-r--r--x11/xeyes/Makefile2
-rw-r--r--x11/xf86dga/Makefile2
-rw-r--r--x11/xfd/Makefile2
-rw-r--r--x11/xfindproxy/Makefile2
-rw-r--r--x11/xfwp/Makefile2
-rw-r--r--x11/xgamma/Makefile2
-rw-r--r--x11/xgc/Makefile2
-rw-r--r--x11/xhost/Makefile2
-rw-r--r--x11/xinit/Makefile2
-rw-r--r--x11/xinput/Makefile2
-rw-r--r--x11/xkbcomp/Makefile3
-rw-r--r--x11/xkbevd/Makefile2
-rw-r--r--x11/xkbprint/Makefile2
-rw-r--r--x11/xkbutils/Makefile2
-rw-r--r--x11/xkeyboard-config/Makefile3
-rw-r--r--x11/xkill/Makefile2
-rw-r--r--x11/xload/Makefile2
-rw-r--r--x11/xlogo/Makefile2
-rw-r--r--x11/xlsatoms/Makefile2
-rw-r--r--x11/xlsclients/Makefile2
-rw-r--r--x11/xmag/Makefile2
-rw-r--r--x11/xman/Makefile2
-rw-r--r--x11/xmessage/Makefile2
-rw-r--r--x11/xmh/Makefile2
-rw-r--r--x11/xmodmap/Makefile2
-rw-r--r--x11/xmore/Makefile2
-rw-r--r--x11/xorg-cf-files/Makefile2
-rw-r--r--x11/xorg-docs/Makefile2
-rw-r--r--x11/xorgproto/Makefile2
-rw-r--r--x11/xpr/Makefile2
-rw-r--r--x11/xprop/Makefile2
-rw-r--r--x11/xrandr/Makefile3
-rw-r--r--x11/xrdb/Makefile2
-rw-r--r--x11/xrefresh/Makefile2
-rw-r--r--x11/xset/Makefile1
-rw-r--r--x11/xsetroot/Makefile2
-rw-r--r--x11/xsm/Makefile2
-rw-r--r--x11/xstdcmap/Makefile2
-rw-r--r--x11/xtrans/Makefile2
-rw-r--r--x11/xvidtune/Makefile2
-rw-r--r--x11/xvinfo/Makefile2
-rw-r--r--x11/xvmcinfo/Makefile1
-rw-r--r--x11/xwd/Makefile2
-rw-r--r--x11/xwininfo/Makefile3
-rw-r--r--x11/xwud/Makefile2
112 files changed, 111 insertions, 148 deletions
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
index e24008c96c08..0eec6322e28f 100644
--- a/x11/appres/Makefile
+++ b/x11/appres/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Program to list application's resources
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xt
PLIST_FILES= bin/appres man/man1/appres.1.gz
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index 7e20b65ca14f..0cb8fb2e3f3d 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Sample screen saver for X
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xscrnsaver xt xaw7 xt
.include <bsd.port.mk>
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 3760869466f4..3bd7a9eb81b4 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -10,7 +10,7 @@ COMMENT= Bitmap editor and converter utilities for X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xaw xbitmaps xmu xorgproto xt
.include <bsd.port.mk>
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index 102f46f55e33..4901d472e00f 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -10,7 +10,7 @@ COMMENT= Dynamic resource editor for X Toolkit Applications
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xt xmu xaw
.include <bsd.port.mk>
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
index e256cdd11151..05af0347994e 100644
--- a/x11/fstobdf/Makefile
+++ b/x11/fstobdf/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Generate BDF font from X font server
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 libfs
PLIST_FILES= bin/fstobdf man/man1/fstobdf.1.gz
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 84440cb661d2..50188446b978 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -11,7 +11,7 @@ COMMENT= ICE authority file utility for X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xorgproto ice
PLIST_FILES= bin/iceauth man/man1/iceauth.1.gz
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
index ad43d16b81bc..77ea23c89c40 100644
--- a/x11/ico/Makefile
+++ b/x11/ico/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Displays a wire-frame rotating plyhedron
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
PLIST_FILES= bin/ico man/man1/ico.1.gz
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index c83d21044c01..b8e3d5eec105 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -12,7 +12,7 @@ COMMENT= Inter Client Exchange library for X11
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= xorgproto xtrans
INSTALL_TARGET= install-strip
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 12b8ff8a1ae0..485a456b1662 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -11,8 +11,7 @@ COMMENT= Session Management library for X11
LICENSE= MIT
-USES= pathfix
-XORG_CAT= lib
+USES= pathfix xorg xorg-cat:lib
USE_XORG= ice xorgproto xtrans
CONFIGURE_ARGS+=--disable-docs --without-xmlto
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 65d9e9480983..82ce094a6675 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -11,8 +11,7 @@ COMMENT= X11 library
LICENSE= MIT
-USES= cpe perl5
-XORG_CAT= lib
+USES= cpe perl5 xorg xorg-cat:lib
USE_XORG= xau xdmcp xtrans xorgproto xcb
USE_PERL5= build
CPE_VENDOR= x
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 4fb8cbd7d42b..d23ef4448a9d 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -11,7 +11,7 @@ COMMENT= The XScrnSaver library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= x11 xext xorgproto
.include <bsd.port.mk>
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index ee9539802685..e894f5bfc59b 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -11,7 +11,7 @@ COMMENT= Authentication Protocol library for X11
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= xorgproto
INSTALL_TARGET=install-strip
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index b8a64024f793..2cd2eac5b733 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -12,7 +12,7 @@ COMMENT= X Composite extension library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= x11 xfixes xext xorgproto
INSTALL_TARGET= install-strip
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index d04cbeae9ca7..2a4e05865155 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -11,8 +11,7 @@ COMMENT= X client-side cursor loading library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cpe
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= xrender x11 xfixes xorgproto
CPE_VENDOR= x
CPE_PRODUCT= libxcursor
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index affb3c93f623..f55ca39f18fc 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -11,7 +11,7 @@ COMMENT= X Damage extension library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= x11 xfixes xorgproto
INSTALL_TARGET= install-strip
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 0b303a8d8c82..127aeb672f01 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -10,7 +10,7 @@ COMMENT= X Display Manager Control Protocol library
LICENSE= MIT
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= xorgproto:both
CONFIGURE_ARGS+=--disable-docs --without-xmlto
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index d7364981c790..eac85076ae72 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -12,8 +12,7 @@ COMMENT= X11 Extension library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cpe
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xau xorgproto
CPE_VENDOR= x
CPE_PRODUCT= libxext
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 9b961274be6e..35f63c87745e 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -11,9 +11,8 @@ COMMENT= X Fixes extension library
LICENSE= MIT
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xorgproto
-USES+= cpe
CPE_PRODUCT= libxfixes
CPE_VENDOR= x
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index d8c46d460b17..9857694cee1d 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -11,10 +11,9 @@ COMMENT= X Input extension library
LICENSE= MIT
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xfixes xorgproto
INSTALL_TARGET= install-strip
-USES+= cpe
CPE_PRODUCT= libxi
CPE_VENDOR= x
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 4cb1d9d208b8..db8329797369 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -12,9 +12,8 @@ COMMENT= X11 Xinerama library
LICENSE= MIT
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xorgproto
-USES+= cpe
CPE_PRODUCT= libxinerama
CPE_VENDOR= x
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 4a0149d0e74e..5038857ffa32 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -11,7 +11,7 @@ COMMENT= X Pixmap library
LICENSE= MIT
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= xorgproto x11 xext xt
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11/libXpresent/Makefile b/x11/libXpresent/Makefile
index 42be25f6776e..731c59bda871 100644
--- a/x11/libXpresent/Makefile
+++ b/x11/libXpresent/Makefile
@@ -10,7 +10,7 @@ COMMENT= X Present Extension library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= xorg-cat:lib
+USES= xorg xorg-cat:lib
USE_XORG= x11 xfixes xext xorgproto xrandr
INSTALL_TARGET= install-strip
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 05e1b28f1dc6..f859d99003e9 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -11,8 +11,7 @@ COMMENT= X Resize and Rotate extension library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cpe
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xrender xorgproto
CPE_VENDOR= x
CPE_PRODUCT= libxrandr
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 7389f496efa9..3cbd9f7275f4 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -11,7 +11,7 @@ COMMENT= X Render extension library
LICENSE= MIT
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= x11 xorgproto
.include <bsd.port.mk>
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 5c3c45a2dd1f..555b43f4b0fd 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -11,10 +11,9 @@ COMMENT= X Resource usage library
LICENSE= MIT
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xorgproto
INSTALL_TARGET= install-strip
-USES+= cpe
CPE_PRODUCT= libxres
CPE_VENDOR= x
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index c31728c552f6..aad6e92615e5 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -11,9 +11,8 @@ COMMENT= X Test extension
LICENSE= MIT
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xi xorgproto
-USES+= cpe
CPE_PRODUCT= libxtst
CPE_VENDOR= x
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index b1f9ae9750f7..29724d6f11a5 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -12,9 +12,8 @@ COMMENT= X Video Extension library
LICENSE= MIT
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xorgproto
-USES+= cpe
CPE_PRODUCT= libxv
CPE_VENDOR= x
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 2ca4569bff9a..32b5c140e576 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -11,8 +11,7 @@ COMMENT= X Video Extension Motion Compensation library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cpe
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xv xorgproto
CPE_VENDOR= x
CPE_PRODUCT= libxvmc
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index bb816d09c47f..c3694ece7376 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -11,8 +11,7 @@ COMMENT= X DGA Extension
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cpe
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xorgproto
CPE_VENDOR= x
CPE_PRODUCT= libxxf86dga
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 53f4fc51d3c8..fd880a3e4ce6 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -11,9 +11,8 @@ COMMENT= X Vidmode Extension
LICENSE= MIT
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= xorgproto x11 xext
-USES+= cpe
CPE_PRODUCT= libxxf86vm
CPE_VENDOR= x
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 2c86c2a1d461..570dfefdcba7 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -9,9 +9,8 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= DMX extension library
-XORG_CAT= lib
+USES= cpe xorg xorg-cat:lib
USE_XORG= x11 xext xorgproto
-USES+= cpe
CPE_VENDOR= x
.include <bsd.port.mk>
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 73d2a5eec640..c68c1b2793cc 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-st
CONFIGURE_ARGS+= --disable-build-docs --without-doxygen --enable-xinput
-XORG_CAT= lib
-USES= cpe gmake gnome python:build
+USES= cpe gmake gnome python:build xorg xorg-cat:lib
USE_GNOME= libxslt:build
USE_XORG= xau xdmcp
INSTALL_TARGET= install-strip
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 65dab783ff0a..144fc89afa47 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -13,9 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config
-XORG_CAT= lib
-USES= gmake bison tar:xz
-
+USES= gmake bison tar:xz xorg xorg-cat:lib
USE_XORG= xcb
INSTALL_TARGET= install-strip
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index c2d90fb65393..f7f60bbc80f5 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -11,7 +11,7 @@ COMMENT= XKB file library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= x11 xorgproto
INSTALL_TARGET= install-strip
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index 36a9672a672d..3aba474dfd2e 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -9,8 +9,8 @@ COMMENT= Shared memory 'SyncFence' synchronization primitive
LICENSE= MIT
+USES= xorg xorg-cat:lib
USE_XORG= xorgproto
-XORG_CAT= lib
CONFIGURE_ARGS= --with-shared-memory-dir=/tmp
INSTALL_TARGET= install-strip
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index 03f939fe6586..1128356a7ec7 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= List resources in widgets
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xaw xmu xorgproto xt
PLIST_FILES= bin/listres man/man1/listres.1.gz
diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile
index 0395cc91318d..d96bfd4ec32d 100644
--- a/x11/mkcomposecache/Makefile
+++ b/x11/mkcomposecache/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Program to create Compose cache files
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
PLIST_FILES= sbin/mkcomposecache man/man8/mkcomposecache.8.gz
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 3be28da2dac0..3a7b3a9727af 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -12,9 +12,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
PORTSCOUT= limitw:1,even
-USES= cpe perl5
+USES= cpe perl5 xorg-cat:lib
USE_PERL5= build
-XORG_CAT= lib
CONFIGURE_ARGS= --disable-gtk
INSTALL_TARGET= install-strip
diff --git a/x11/rendercheck/Makefile b/x11/rendercheck/Makefile
index 89b3a2647bd2..61fc594522c7 100644
--- a/x11/rendercheck/Makefile
+++ b/x11/rendercheck/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Small program for testing basic Render extension conformance
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xrender
PLIST_FILES= bin/rendercheck man/man1/rendercheck.1.gz
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
index 58c23c280a6a..a46898e2e5ff 100644
--- a/x11/rgb/Makefile
+++ b/x11/rgb/Makefile
@@ -10,7 +10,7 @@ COMMENT= Uncompile an rgb color-name database
CONFIGURE_ARGS= --with-rgb-db-dir=${PREFIX}/lib/X11/rgb
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xorgproto
PLIST_FILES= bin/showrgb lib/X11/rgb.txt man/man1/showrgb.1.gz
diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile
index 64df7a2faa28..1c987027874f 100644
--- a/x11/scripts/Makefile
+++ b/x11/scripts/Makefile
@@ -10,9 +10,8 @@ COMMENT= Various X related scripts
RUN_DEPENDS= ksh:shells/pdksh
-XORG_CAT= app
+USES= shebangfix xorg xorg-cat:app
USE_XORG= x11
-USES= shebangfix
post-patch:
@${REINPLACE_CMD} -e 's|XCOMM!/bin/ksh|XCOMM!${ksh_CMD}|' ${WRKSRC}/xauth_switch_to_sun-des-1.cpp
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index 56f752979f5e..d4435e10a018 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -10,7 +10,7 @@ COMMENT= Manage utmp/wtmp entries for non-init X clients
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
PLIST_FILES= bin/sessreg man/man1/sessreg.1.gz
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index f8c3272480b3..162916f1c163 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -10,7 +10,7 @@ COMMENT= Set the keyboard using the X Keyboard Extension
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xkbfile x11
CONFIGURE_ARGS= --with-xkb-config-root=${LOCALBASE}/share/X11/xkb
diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile
index bfe050c67c08..dd871c06d90b 100644
--- a/x11/smproxy/Makefile
+++ b/x11/smproxy/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Session Manager Proxy
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xt xmu
PLIST_FILES= bin/smproxy man/man1/smproxy.1.gz
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index 2a85197d591c..5e546cfa261f 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -10,9 +10,8 @@ COMMENT= X11 server performance test program
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= cpe xorg xorg-cat:app
USE_XORG= x11 xmuu xrender xft xext
-USES= cpe
CPE_VENDOR= xfree86
.include <bsd.port.mk>
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index f6f8ad81ff2e..4f5f9ae0bb05 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -12,8 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
TEST_DEPENDS= cmdtest:devel/py-cmdtest
-USES= shebangfix
-XORG_CAT= app
+USES= shebangfix xorg xorg-cat:app
USE_XORG= x11 xau xext xmuu
INSTALL_TARGET= install-strip
TEST_TARGET= check
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index 07109ca3dae1..83a048dcbbb9 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xrender xrandr xcb
PLIST_FILES= bin/xbacklight man/man1/xbacklight.1.gz
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
index 1f0c75ca384d..ffe27ee7fa2d 100644
--- a/x11/xbiff/Makefile
+++ b/x11/xbiff/Makefile
@@ -10,7 +10,7 @@ COMMENT= Mailbox flag for X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xaw xbitmaps xext xmu xt
PLIST_FILES= bin/xbiff man/man1/xbiff.1.gz
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index 595b56b5bf9d..884e6f8250e8 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -11,8 +11,6 @@ COMMENT= X.Org bitmaps data
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pathfix
-
-XORG_CAT= data
+USES= pathfix xorg-cat:data
.include <bsd.port.mk>
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index 5e28515dcc28..550b7f39e005 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= font-misc-misc>=1.1.2:x11-fonts/font-misc-misc \
font-alias>=1.0.3:x11-fonts/font-alias \
xbitmaps>=1.1.0:x11/xbitmaps
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xaw xt
.include <bsd.port.mk>
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 30b0eda04b4c..0c3ab6d324a8 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -13,9 +13,8 @@ COMMENT= The X protocol C-language Binding (XCB) protocol
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= gnome python xorg-cat:proto
USE_GNOME= libxml2:build
-XORG_CAT= proto
-USES= python
USE_PYTHON= py3kplist
NO_ARCH= yes
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 7942418e4275..564aee3986ed 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \
${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \
${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image
-XORG_CAT= lib
+USES= gmake gperf xorg xorg-cat:lib
USE_XORG= xcb
INSTALL_TARGET= install-strip
-USES= gmake gperf
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11/xcb-util-errors/Makefile b/x11/xcb-util-errors/Makefile
index 97fb276a0f0b..707b32b4b95f 100644
--- a/x11/xcb-util-errors/Makefile
+++ b/x11/xcb-util-errors/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= xcb-proto>=1.6:x11/xcb-proto
-XORG_CAT= lib
+USES= xorg xorg-cat:lib
USE_XORG= xcb
INSTALL_TARGET= install-strip
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index a947e34ae806..ed576c482a4d 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
-XORG_CAT= lib
-USES= gmake
+USES= gmake xorg xorg-cat:lib
USE_XORG= xcb
post-patch:
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index e21fafc6ee19..03610c52caf5 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
-XORG_CAT= lib
-USES= gmake
+USES= gmake xorg xorg-cat:lib
USE_XORG= xcb
post-patch:
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index 237f2bfacf4d..1a32a19bace6 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
-XORG_CAT= lib
-USES= gmake
+USES= gmake xorg xorg-cat:lib
USE_XORG= xcb
INSTALL_TARGET= install-strip
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index b4433e4f510e..b3a883ef1a39 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
-XORG_CAT= lib
-USES= gmake
+USES= gmake xorg xorg-cat:lib
USE_XORG= xcb
post-patch:
diff --git a/x11/xcb-util-xrm/Makefile b/x11/xcb-util-xrm/Makefile
index 904dcc9f602e..a82e9c4145d9 100644
--- a/x11/xcb-util-xrm/Makefile
+++ b/x11/xcb-util-xrm/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxcb-util.so:x11/xcb-util
-USES= libtool pkgconfig tar:bzip2
+USES= libtool pkgconfig tar:bzip2 xorg
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
USE_XORG= xcb
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index d6610d512a3f..87db4c07d0f8 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -14,8 +14,7 @@ COMMENT= Module with libxcb/libX11 extension/replacement libraries
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= lib
-USES= gmake tar:bzip2
+USES= gmake tar:bzip2 xorg xorg-cat:lib
USE_XORG= xau xcb xdmcp
INSTALL_TARGET= install-strip
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
index 312238191293..98541d197d0e 100644
--- a/x11/xclipboard/Makefile
+++ b/x11/xclipboard/Makefile
@@ -10,7 +10,7 @@ COMMENT= X clipboard client
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xt xaw
.include <bsd.port.mk>
diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile
index 22e80d421042..ca46643812e6 100644
--- a/x11/xcmsdb/Makefile
+++ b/x11/xcmsdb/Makefile
@@ -9,7 +9,7 @@ COMMENT= Device Color Characterization utility for X
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
PLIST_FILES= bin/xcmsdb man/man1/xcmsdb.1.gz
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index e260a8f1431b..cf25ef2ceba7 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -10,7 +10,7 @@ COMMENT= Monitor system console messages with X
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xmu xt xaw
.include <bsd.port.mk>
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index eb2d7eb26439..d962afac415d 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -11,7 +11,7 @@ LICENSE= MIT
LIB_DEPENDS= libpng.so:graphics/png
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xcursor xorgproto
INSTALL_TARGET= install-strip
diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile
index c2173a6ea546..0b1744579b81 100644
--- a/x11/xditview/Makefile
+++ b/x11/xditview/Makefile
@@ -10,7 +10,7 @@ COMMENT= Display ditroff output
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xaw xmu xt
.include <bsd.port.mk>
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
index 702757dc85b9..380d87d3b1e4 100644
--- a/x11/xdriinfo/Makefile
+++ b/x11/xdriinfo/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Query configuration information of DRI drivers
+USES= gl xorg xorg-cat:app
USE_GL= gl
-
-XORG_CAT= app
USE_XORG= x11 xorgproto
PLIST_FILES= bin/xdriinfo man/man1/xdriinfo.1.gz
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index 87b1fd681f0d..e0ebe20e0fcb 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -12,8 +12,7 @@ LICENSE= MIT BSD3CLAUSE
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= xorg-cat:app xorg
-
+USES= xorg xorg-cat:app
USE_XORG= x11 xmu xt xaw7
.include <bsd.port.mk>
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index 437e973c59b1..de4e6d2bb234 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -10,7 +10,7 @@ COMMENT= Print contents of X events
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xrandr
PLIST_FILES= bin/xev man/man1/xev.1.gz
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index 23052fa59b04..a2e649148803 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -10,7 +10,7 @@ COMMENT= Follow the mouse X demo
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xt xext xmu xrender
PLIST_FILES= bin/xeyes man/man1/xeyes.1.gz
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
index b3ac04500831..9c097b3a93bb 100644
--- a/x11/xf86dga/Makefile
+++ b/x11/xf86dga/Makefile
@@ -10,7 +10,7 @@ COMMENT= Test program for the XFree86-DGA extension
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xxf86dga xt xaw7 xmu
PLIST_FILES= bin/dga man/man1/dga.1.gz
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
index cf0b41de88e9..1eb069f844e5 100644
--- a/x11/xfd/Makefile
+++ b/x11/xfd/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2
BUILD_DEPENDS= fc-cache:x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:x11-fonts/fontconfig
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xft xkbfile xmu xrender xt xaw
.include <bsd.port.mk>
diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile
index 8204ace3802d..ba60fa5beb8c 100644
--- a/x11/xfindproxy/Makefile
+++ b/x11/xfindproxy/Makefile
@@ -13,7 +13,7 @@ EXPIRATION_DATE=2019-11-06
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 ice xt xorgproto
PLIST_FILES= bin/xfindproxy man/man1/xfindproxy.1.gz
diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile
index d44cd8c5ea18..e7a3320eb92f 100644
--- a/x11/xfwp/Makefile
+++ b/x11/xfwp/Makefile
@@ -13,7 +13,7 @@ EXPIRATION_DATE=2019-11-06
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 ice xorgproto
PLIST_FILES= bin/xfwp man/man1/xfwp.1.gz
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
index 4288bd622350..a1128ddb9c72 100644
--- a/x11/xgamma/Makefile
+++ b/x11/xgamma/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Gamma correction through the X server
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xxf86vm
PLIST_FILES= bin/xgamma man/man1/xgamma.1.gz
diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile
index 943c88b80216..c555a99140d5 100644
--- a/x11/xgc/Makefile
+++ b/x11/xgc/Makefile
@@ -9,7 +9,7 @@ COMMENT= X graphics demo
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xt xaw
.include <bsd.port.mk>
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index b7d97ca340c1..16ec1765002f 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -10,7 +10,7 @@ COMMENT= Server access control program for X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xmuu xau
PLIST_FILES= bin/xhost man/man1/xhost.1.gz
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index d3a39d8da5ab..7c587240d94d 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -11,7 +11,7 @@ COMMENT= X Window System initializer
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
post-patch:
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index a85a2e9a2356..bb335136f185 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -11,7 +11,7 @@ COMMENT= Very useful utility for configuring and testing XInput devices
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xorgproto x11 xi xext xrandr xinerama
PLIST_FILES= bin/xinput man/man1/xinput.1.gz
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 68f526bbaf4f..494fa309b1aa 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -10,8 +10,7 @@ COMMENT= Compile XKB keyboard description
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pathfix
-XORG_CAT= app
+USES= pathfix xorg xorg-cat:app
USE_XORG= x11 xkbfile
PLIST_FILES= bin/xkbcomp \
diff --git a/x11/xkbevd/Makefile b/x11/xkbevd/Makefile
index 77b15beed388..17ea0392bbbe 100644
--- a/x11/xkbevd/Makefile
+++ b/x11/xkbevd/Makefile
@@ -9,7 +9,7 @@ COMMENT= XKB event daemon
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xkbfile x11
PLIST_FILES= bin/xkbevd man/man1/xkbevd.1.gz
diff --git a/x11/xkbprint/Makefile b/x11/xkbprint/Makefile
index ef29903b51e6..63f168cf92f1 100644
--- a/x11/xkbprint/Makefile
+++ b/x11/xkbprint/Makefile
@@ -9,7 +9,7 @@ COMMENT= Utility for printing an XKB keyboard description
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xkbfile x11
PLIST_FILES= bin/xkbprint man/man1/xkbprint.1.gz
diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile
index 181c44040a97..880420de0d0f 100644
--- a/x11/xkbutils/Makefile
+++ b/x11/xkbutils/Makefile
@@ -10,7 +10,7 @@ COMMENT= XKB utility demos
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xkbfile x11 xaw xorgproto
.include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 155766e13465..cdb257d9113a 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -13,9 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= xkbcomp:x11/xkbcomp
-USES= gmake gnome localbase pathfix perl5
+USES= gmake gnome localbase pathfix perl5 xorg-cat:data
-XORG_CAT= data
NO_ARCH= yes
USE_GNOME= libxslt:build
USE_PERL5= build
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
index dc90791a3010..e8b78237e42e 100644
--- a/x11/xkill/Makefile
+++ b/x11/xkill/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Utility for killing a client by its X resource
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xmuu
PLIST_FILES= bin/xkill man/man1/xkill.1.gz
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
index 59c01ff7bea6..97ac79922ef1 100644
--- a/x11/xload/Makefile
+++ b/x11/xload/Makefile
@@ -10,7 +10,7 @@ COMMENT= System load average display for X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xaw xmu xt
.include <bsd.port.mk>
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index d9b62ab3c692..3271bc073ec7 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -10,7 +10,7 @@ COMMENT= Displays the X Window System logo
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= sm x11 xaw xext xft xmu xrender xt
.include <bsd.port.mk>
diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile
index 4a4eeeb83acb..cf18fd76ff10 100644
--- a/x11/xlsatoms/Makefile
+++ b/x11/xlsatoms/Makefile
@@ -9,7 +9,7 @@ COMMENT= List interned atoms defined on a server
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xcb
PLIST_FILES= bin/xlsatoms man/man1/xlsatoms.1.gz
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
index d9056519c876..5e100f3de3f7 100644
--- a/x11/xlsclients/Makefile
+++ b/x11/xlsclients/Makefile
@@ -10,7 +10,7 @@ COMMENT= List client applications running on a display
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xcb xmuu
PLIST_FILES= bin/xlsclients man/man1/xlsclients.1.gz
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index c79717aa6876..a79c1cc47b9a 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -9,7 +9,7 @@ COMMENT= X application for screen magnifying
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xt xaw
.include <bsd.port.mk>
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index 1a625a173cfb..1b0c35f4823a 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -10,7 +10,7 @@ COMMENT= Manual page display program for X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xt xaw
.include <bsd.port.mk>
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
index d5721a2dbac0..3559b45b2346 100644
--- a/x11/xmessage/Makefile
+++ b/x11/xmessage/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Display message or query in a X window
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xt xaw
.include <bsd.port.mk>
diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile
index 5a51948caac5..459bf06dd779 100644
--- a/x11/xmh/Makefile
+++ b/x11/xmh/Makefile
@@ -9,7 +9,7 @@ COMMENT= Send and read mail with an X interface to MH
RUN_DEPENDS+= repl:mail/nmh
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xaw xmu xt xbitmaps
.include <bsd.port.mk>
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
index 9442fdaef3bb..ac8580926ca0 100644
--- a/x11/xmodmap/Makefile
+++ b/x11/xmodmap/Makefile
@@ -10,7 +10,7 @@ COMMENT= Utility for modifying keymaps and pointer button mappings in X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
PLIST_FILES= bin/xmodmap man/man1/xmodmap.1.gz
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
index 36e45e111b36..d8196dd8cdfe 100644
--- a/x11/xmore/Makefile
+++ b/x11/xmore/Makefile
@@ -9,7 +9,7 @@ COMMENT= Plain text display program for X
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xaw xt
.include <bsd.port.mk>
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 01e11bdf9bc9..2d56801be8f9 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -10,7 +10,7 @@ COMMENT= X.org cf files for use with imake builds
LICENSE= MIT
-XORG_CAT= util
+USES= xorg-cat:util
post-patch:
@${REINPLACE_CMD} 's|\(define ExtraXaw[^ ]*\) [$$].*|\1 /**/|' \
diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile
index 89c29d9f7f74..fb5ef6f92252 100644
--- a/x11/xorg-docs/Makefile
+++ b/x11/xorg-docs/Makefile
@@ -10,6 +10,6 @@ COMMENT= X.org documentation files
CONFIGURE_ARGS+= --without-xmlto --without-fop --disable-specs
-XORG_CAT= doc
+USES= xorg-cat:doc
.include <bsd.port.mk>
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
index d58e0ca6906e..dba4da7a39f0 100644
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= xorg protocol headers
-XORG_CAT= proto
+USES= xorg-cat:proto
CONFIGURE_ARGS= --without-fop \
--without-xmlto \
diff --git a/x11/xpr/Makefile b/x11/xpr/Makefile
index 7f7935b92dcb..b355a8341d32 100644
--- a/x11/xpr/Makefile
+++ b/x11/xpr/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Utility for printing an X window dump
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xmuu x11
PLIST_FILES= bin/xdpr bin/xpr man/man1/xdpr.1.gz man/man1/xpr.1.gz
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
index 32021a4b1bbd..a907c356ed71 100644
--- a/x11/xprop/Makefile
+++ b/x11/xprop/Makefile
@@ -10,7 +10,7 @@ COMMENT= Property displayer for X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
PLIST_FILES= bin/xprop man/man1/xprop.1.gz
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 590c9df3eae6..2334c6774f6f 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -10,8 +10,7 @@ COMMENT= Primitive command line interface to the RandR extension
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= tar:xz
-XORG_CAT= app
+USES= tar:xz xorg xorg-cat:app
USE_XORG= xrandr xrender x11
PLIST_FILES= bin/xrandr \
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index bd3c11509ea0..d002c58def0f 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -10,7 +10,7 @@ COMMENT= X server resource database utility
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xmuu x11
PLIST_FILES= bin/xrdb man/man1/xrdb.1.gz
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
index 0175ebc5f0b9..3c975c7d123f 100644
--- a/x11/xrefresh/Makefile
+++ b/x11/xrefresh/Makefile
@@ -9,7 +9,7 @@ COMMENT= Refresh all or part of an X screen
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
PLIST_FILES= bin/xrefresh man/man1/xrefresh.1.gz
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index 3e9fdf85778d..662ab572e984 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -12,7 +12,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
USES= xorg xorg-cat:app
-
USE_XORG= xmuu x11 xext
CONFIGURE_ARGS= --without-xf86misc \
--without-fontcache
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
index 34a8613feadd..ee89424a3db5 100644
--- a/x11/xsetroot/Makefile
+++ b/x11/xsetroot/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Root window parameter setting utility for X
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xmuu x11 xbitmaps xcursor
PLIST_FILES= bin/xsetroot man/man1/xsetroot.1.gz
diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile
index 43f16b456bd5..14727dbd0ff3 100644
--- a/x11/xsm/Makefile
+++ b/x11/xsm/Makefile
@@ -7,6 +7,6 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Session Manager
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= ice sm x11 xaw xt
.include <bsd.port.mk>
diff --git a/x11/xstdcmap/Makefile b/x11/xstdcmap/Makefile
index 04ddf5c9a32d..56c38f9905a4 100644
--- a/x11/xstdcmap/Makefile
+++ b/x11/xstdcmap/Makefile
@@ -9,7 +9,7 @@ COMMENT= X standard colormap utility
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xmu xt
PLIST_FILES= bin/xstdcmap man/man1/xstdcmap.1.gz
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index d954407eb036..49f205bdc983 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -10,7 +10,7 @@ COMMENT= Abstract network code for X
LICENSE= MIT
-XORG_CAT= lib
+USES= xorg-cat:lib
CONFIGURE_ARGS+=--disable-docs --without-xmlto
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
index 6e905ce2f845..5822dda5e703 100644
--- a/x11/xvidtune/Makefile
+++ b/x11/xvidtune/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Video mode tuner for X
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xxf86vm xt xaw
.include <bsd.port.mk>
diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile
index c6fbf52ffa14..df5a10d27ede 100644
--- a/x11/xvinfo/Makefile
+++ b/x11/xvinfo/Makefile
@@ -10,7 +10,7 @@ COMMENT= Print out X-Video extension adaptor information
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= xv x11
PLIST_FILES= bin/xvinfo man/man1/xvinfo.1.gz
diff --git a/x11/xvmcinfo/Makefile b/x11/xvmcinfo/Makefile
index a85d9cf19818..3efecdab9e23 100644
--- a/x11/xvmcinfo/Makefile
+++ b/x11/xvmcinfo/Makefile
@@ -9,6 +9,7 @@ DISTFILES=
MAINTAINER= x11@FreeBSD.org
COMMENT= Print out XvMC extension adaptor information
+USES= xorg
USE_XORG= xvmc xv x11
LDFLAGS+= -lXvMC -lXv -lX11
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
index a64d006f0b0f..d6f39e923ee4 100644
--- a/x11/xwd/Makefile
+++ b/x11/xwd/Makefile
@@ -9,7 +9,7 @@ COMMENT= Dump an image of an X window
LICENSE= MIT
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11 xkbfile
PLIST_FILES= bin/xwd man/man1/xwd.1.gz
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index cdf2579729a8..f5310a6b5946 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -10,8 +10,7 @@ COMMENT= Window information utility for X
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-XORG_CAT= app
-USES= iconv
+USES= iconv xorg xorg-cat:app
USE_XORG= x11 xcb xorgproto
LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm
diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile
index f2ef19c39022..d3a6f64193cc 100644
--- a/x11/xwud/Makefile
+++ b/x11/xwud/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Image displayer for X
-XORG_CAT= app
+USES= xorg xorg-cat:app
USE_XORG= x11
PLIST_FILES= bin/xwud man/man1/xwud.1.gz