51 files changed, 51 insertions, 56 deletions

diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile
index 46653e26a79f..cd2275798417 100644
--- a/x11-fonts/bdftopcf/Makefile
+++ b/x11-fonts/bdftopcf/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Convert X font from BDF to PCF
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		localbase
+USES=		localbase xorg xorg-cat:app
 
-XORG_CAT=	app
 USE_XORG=	xorgproto
 
 PLIST_FILES=	bin/bdftopcf man/man1/bdftopcf.1.gz
diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile
index a0833c46319c..e651a5c0d3f7 100644
--- a/x11-fonts/encodings/Makefile
+++ b/x11-fonts/encodings/Makefile
@@ -13,7 +13,7 @@ LICENSE=	PD
 
 BUILD_DEPENDS=	mkfontscale:x11-fonts/mkfontscale
 
-USES=		tar:bzip2
+USES=		tar:bzip2 xorg
 USE_XORG=	fontutil
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fontrootdir=${PREFIX}/share/fonts
diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile
index c4a2140dfaa2..c4ceb7bbfe92 100644
--- a/x11-fonts/font-adobe-100dpi/Makefile
+++ b/x11-fonts/font-adobe-100dpi/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Adobe 100dpi font
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile
index 014964053dce..ae0c37beacdf 100644
--- a/x11-fonts/font-adobe-75dpi/Makefile
+++ b/x11-fonts/font-adobe-75dpi/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Adobe 75dpi font
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile
index c4bc7847fda5..e2612e1ea16a 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Adobe Utopia 100dpi font
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile
index d8500c3da153..ba5829c584d5 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Adobe Utopia 75dpi font
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile
index ce1b7855be11..12bc6421757a 100644
--- a/x11-fonts/font-adobe-utopia-type1/Makefile
+++ b/x11-fonts/font-adobe-utopia-type1/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Adobe Utopia Type1 font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile
index 5bd7488cb5df..294e73026444 100644
--- a/x11-fonts/font-alias/Makefile
+++ b/x11-fonts/font-alias/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Font aliases
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 NOFONT=		yes
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile
index 267af53054e7..648b74154180 100644
--- a/x11-fonts/font-arabic-misc/Makefile
+++ b/x11-fonts/font-arabic-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Arabic fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile
index df7cf89e3974..f516fa706c6b 100644
--- a/x11-fonts/font-bh-100dpi/Makefile
+++ b/x11-fonts/font-bh-100dpi/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bigelow Holmes 100dpi font
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile
index 443b37c60ee9..c9b18538486d 100644
--- a/x11-fonts/font-bh-75dpi/Makefile
+++ b/x11-fonts/font-bh-75dpi/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bigelow Holmes 75dpi font
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
index c7ed0e08e380..0d354eacda68 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bigelow Holmes Lucida TypeWriter 100dpi font
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
index 809bd612753f..1491d1a20d8a 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bigelow Holmes Lucida TypeWriter 75dpi font
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile
index 1df0904ce1cd..b029424ab807 100644
--- a/x11-fonts/font-bh-ttf/Makefile
+++ b/x11-fonts/font-bh-ttf/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bigelow & Holmes TTF font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile
index 2249a87bca7b..5ac81da8e4f6 100644
--- a/x11-fonts/font-bh-type1/Makefile
+++ b/x11-fonts/font-bh-type1/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bigelow Holmes Type1 font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile
index c873207d514a..c23591e18e92 100644
--- a/x11-fonts/font-bitstream-100dpi/Makefile
+++ b/x11-fonts/font-bitstream-100dpi/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bitstream Vera 100dpi font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile
index c538b3e90bd9..6ced08340c71 100644
--- a/x11-fonts/font-bitstream-75dpi/Makefile
+++ b/x11-fonts/font-bitstream-75dpi/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bitstream Vera 75dpi font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile
index af6f905e354b..1902960b457d 100644
--- a/x11-fonts/font-bitstream-type1/Makefile
+++ b/x11-fonts/font-bitstream-type1/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Bitstream Vera Type1 font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile
index be1119b3ebb6..5fd096b90a4d 100644
--- a/x11-fonts/font-cronyx-cyrillic/Makefile
+++ b/x11-fonts/font-cronyx-cyrillic/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Cronyx Cyrillic font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile
index 3816b9a32f21..7616c4f91adb 100644
--- a/x11-fonts/font-cursor-misc/Makefile
+++ b/x11-fonts/font-cursor-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Cursor fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile
index caf025f58529..8981ee983a06 100644
--- a/x11-fonts/font-daewoo-misc/Makefile
+++ b/x11-fonts/font-daewoo-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Daewoo fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile
index ed2a83bfb27f..05c9c0a234b8 100644
--- a/x11-fonts/font-dec-misc/Makefile
+++ b/x11-fonts/font-dec-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Dec fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile
index 66a11287fdfd..d87a357c589f 100644
--- a/x11-fonts/font-ibm-type1/Makefile
+++ b/x11-fonts/font-ibm-type1/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org IBM Type1 font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile
index 57beee7a0f1b..7190ebea615d 100644
--- a/x11-fonts/font-isas-misc/Makefile
+++ b/x11-fonts/font-isas-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous ISAS fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile
index 9b74fd84364d..fe1221db60bb 100644
--- a/x11-fonts/font-jis-misc/Makefile
+++ b/x11-fonts/font-jis-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous JIS fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile
index a5dbfa9d1cf0..b0a370fa518f 100644
--- a/x11-fonts/font-micro-misc/Makefile
+++ b/x11-fonts/font-micro-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Micro fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile
index 2f9535262f13..11c86adc1101 100644
--- a/x11-fonts/font-misc-cyrillic/Makefile
+++ b/x11-fonts/font-misc-cyrillic/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Cyrillic font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile
index 17fa85949ba0..055191c6099b 100644
--- a/x11-fonts/font-misc-ethiopic/Makefile
+++ b/x11-fonts/font-misc-ethiopic/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Ethiopic font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 FONTNAME=	TTF
 PLIST_FILES=	"@fcfontsdir ${PREFIX}/share/fonts/OTF" \
 		"@comment ${PREFIX}/share/fonts/OTF/fonts.dir" \
diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile
index ae59f3b7f6b5..48c37279f6e6 100644
--- a/x11-fonts/font-misc-meltho/Makefile
+++ b/x11-fonts/font-misc-meltho/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Meltho font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 FONTNAME=	OTF
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile
index 59fee2f7ea33..c2de460af9b7 100644
--- a/x11-fonts/font-misc-misc/Makefile
+++ b/x11-fonts/font-misc-misc/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Misc fonts
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile
index ba2c7f455d61..37e7b313ed1c 100644
--- a/x11-fonts/font-mutt-misc/Makefile
+++ b/x11-fonts/font-mutt-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Mutt fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile
index 5a06b9b3c494..79486b54a1f7 100644
--- a/x11-fonts/font-schumacher-misc/Makefile
+++ b/x11-fonts/font-schumacher-misc/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Schumacher fonts
 
-XORG_CAT=	font
+USES=		xorg xorg-cat:font
 USE_XORG=	fontutil
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile
index 03791c81728a..8f7906459e19 100644
--- a/x11-fonts/font-screen-cyrillic/Makefile
+++ b/x11-fonts/font-screen-cyrillic/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Screen Cyrillic font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile
index 3c6219581f3f..4ccaca5be549 100644
--- a/x11-fonts/font-sony-misc/Makefile
+++ b/x11-fonts/font-sony-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Sony fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile
index cd7178d3ea9f..0901d4e75d83 100644
--- a/x11-fonts/font-sun-misc/Makefile
+++ b/x11-fonts/font-sun-misc/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous Sun fonts
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile
index 6273a1b10061..19295e0daa63 100644
--- a/x11-fonts/font-winitzki-cyrillic/Makefile
+++ b/x11-fonts/font-winitzki-cyrillic/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Winitzki Cyrillic font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
index 4dda901d7301..874007d8a9f9 100644
--- a/x11-fonts/font-xfree86-type1/Makefile
+++ b/x11-fonts/font-xfree86-type1/Makefile
@@ -9,6 +9,6 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org XFree86 Type1 font
 
-XORG_CAT=	font
+USES=		xorg-cat:font
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile
index 24829fd9d7e7..10e0442e0e1f 100644
--- a/x11-fonts/fonttosfnt/Makefile
+++ b/x11-fonts/fonttosfnt/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Wrap a bitmap font in a sftn wrapper
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-XORG_CAT=	app
+USES=		xorg xorg-cat:app
 USE_XORG=	xorgproto fontenc
 
 PLIST_FILES=	bin/fonttosfnt man/man1/fonttosfnt.1.gz
diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile
index 339b1b53d54b..7b69c8e8e34e 100644
--- a/x11-fonts/fslsfonts/Makefile
+++ b/x11-fonts/fslsfonts/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	List fonts served by the X font server
 
-XORG_CAT=	app
+USES=		xorg xorg-cat:app
 USE_XORG=	x11 libfs
 
 PLIST_FILES=	bin/fslsfonts man/man1/fslsfonts.1.gz
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 12f8adb0f588..c935b1867f21 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -10,9 +10,7 @@ COMMENT=	The FS library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe
-
-XORG_CAT=	lib
+USES=		cpe xorg xorg-cat:lib
 USE_XORG=	xorgproto xtrans
 CPE_VENDOR=	x
 CPE_PRODUCT=	libfs
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index c3f7f1351713..6161ef677aa9 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -16,8 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-USES=		cpe
-XORG_CAT=	lib
+USES=		cpe xorg xorg-cat:lib
 USE_XORG=	xorgproto xtrans fontenc
 INSTALL_TARGET=	install-strip
 CPE_PRODUCT=	libxfont
diff --git a/x11-fonts/libXfont2/Makefile b/x11-fonts/libXfont2/Makefile
index 499b1b4eb6c2..f9e87b19936c 100644
--- a/x11-fonts/libXfont2/Makefile
+++ b/x11-fonts/libXfont2/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-USES=		xorg-cat:lib xorg
+USES=		xorg xorg-cat:lib
 USE_XORG=	xorgproto xtrans fontenc
 INSTALL_TARGET=	install-strip
 #USES+=	cpe
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index a2b0f9d5e762..c7b5ef937797 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
-XORG_CAT=	lib
+USES=		xorg xorg-cat:lib
 USE_XORG=	xorgproto xrender
 INSTALL_TARGET=	install-strip
 
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index 529a38d0f0cd..4af886ea0195 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -11,7 +11,7 @@ COMMENT=	The fontenc Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-XORG_CAT=	lib
+USES=		xorg xorg-cat:lib
 USE_XORG=	xorgproto
 
 CONFIGURE_ARGS=	--with-encodingsdir=${LOCALBASE}/share/fonts/encodings
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index 97cad4ff2538..e9c45fa43ba4 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-XORG_CAT=	app
+USES=		xorg xorg-cat:app
 USE_XORG=	xorgproto fontenc
 
 PLIST_FILES=	bin/mkfontdir \
diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile
index d8eff2c5ba4f..a92a2d73cc85 100644
--- a/x11-fonts/showfont/Makefile
+++ b/x11-fonts/showfont/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Font dumper for the X font server
 
-XORG_CAT=	app
+USES=		xorg xorg-cat:app
 USE_XORG=	libfs xorgproto
 
 PLIST_FILES=	bin/showfont man/man1/showfont.1.gz
diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile
index 9103f1561f9a..b4c76270bc08 100644
--- a/x11-fonts/xfontsel/Makefile
+++ b/x11-fonts/xfontsel/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Point and click selection of X11 font names
 
-XORG_CAT=	app
+USES=		xorg xorg-cat:app
 USE_XORG=	x11 xaw xmu xt
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 9cced71c7759..7d0e73f6679f 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -8,8 +8,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org font server
 
-XORG_CAT=	app
-USES=		cpe gmake
+USES=		cpe gmake xorg xorg-cat:app
 CPE_VENDOR=	x
 CPE_PRODUCT=	x_font_server
 USE_XORG=	libfs xfont2 xorgproto xtrans
diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile
index 4b05f62b3de7..f4fc29cd6c9d 100644
--- a/x11-fonts/xfsinfo/Makefile
+++ b/x11-fonts/xfsinfo/Makefile
@@ -10,7 +10,7 @@ COMMENT=	X font server information utility
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-XORG_CAT=	app
+USES=		xorg xorg-cat:app
 USE_XORG=	x11 libfs
 
 PLIST_FILES=	bin/xfsinfo man/man1/xfsinfo.1.gz
diff --git a/x11-fonts/xlsfonts/Makefile b/x11-fonts/xlsfonts/Makefile
index a26e8efd0ab8..db00ce5040c7 100644
--- a/x11-fonts/xlsfonts/Makefile
+++ b/x11-fonts/xlsfonts/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Server font list displayer for X
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-XORG_CAT=	app
+USES=		xorg xorg-cat:app
 USE_XORG=	x11
 
 PLIST_FILES=	bin/xlsfonts man/man1/xlsfonts.1.gz
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index 506070f80e9b..18362cb4d029 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org fonts meta-port
 
-USES=		metaport
+USES=		metaport xorg
 USE_XORG=	fontutil
 
 RUN_DEPENDS=	xorg-fonts-100dpi>0:x11-fonts/xorg-fonts-100dpi \