61 files changed, 28 insertions, 97 deletions

diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile
index 5cde862ed570..814a969baa01 100644
--- a/x11-fonts/bdftopcf/Makefile
+++ b/x11-fonts/bdftopcf/Makefile
@@ -11,8 +11,6 @@ COMMENT=	Convert X font from BDF to PCF
 XORG_CAT=	app
 USE_XORG=	xfont
 
-PLIST_FILES=	bin/bdftopcf
-MAN1=		bdftopcf.1
+PLIST_FILES=	bin/bdftopcf man/man1/bdftopcf.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile
index 7c8913b2b8c8..4840274f3c38 100644
--- a/x11-fonts/encodings/Makefile
+++ b/x11-fonts/encodings/Makefile
@@ -12,5 +12,4 @@ XORG_CAT=	font
 USE_XORG=	fontutil
 FONTDIR=	encodings/large encodings
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile
index fa01ab83420a..0f634fac98ad 100644
--- a/x11-fonts/font-adobe-100dpi/Makefile
+++ b/x11-fonts/font-adobe-100dpi/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Adobe 100dpi font
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile
index 1a5b6a15e742..ecdd02c74118 100644
--- a/x11-fonts/font-adobe-75dpi/Makefile
+++ b/x11-fonts/font-adobe-75dpi/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Adobe 75dpi font
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile
index 92fcf6d93364..9abf4ae020a1 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Adobe Utopia 100dpi font
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile
index 9ba0dcb318c9..6fcafcc10485 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Adobe Utopia 75dpi font
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile
index bf97828611e5..a19133eee9c9 100644
--- a/x11-fonts/font-adobe-utopia-type1/Makefile
+++ b/x11-fonts/font-adobe-utopia-type1/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Adobe Utopia Type1 font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile
index c7182ea856ad..e745bae96ee0 100644
--- a/x11-fonts/font-alias/Makefile
+++ b/x11-fonts/font-alias/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Font aliases
 XORG_CAT=	font
 FONTDIR=	100dpi 75dpi misc cyrillic
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile
index 6437d72a5756..3c3987487db5 100644
--- a/x11-fonts/font-arabic-misc/Makefile
+++ b/x11-fonts/font-arabic-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Arabic fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile
index 9f309ccfca56..2411a3755b50 100644
--- a/x11-fonts/font-bh-100dpi/Makefile
+++ b/x11-fonts/font-bh-100dpi/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Bigelow Holmes 100dpi font
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile
index 36a411b844a7..921a01d55dea 100644
--- a/x11-fonts/font-bh-75dpi/Makefile
+++ b/x11-fonts/font-bh-75dpi/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Bigelow Holmes 75dpi font
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
index 46411e8da81a..a23ca06f6f95 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Bigelow Holmes Lucida TypeWriter 100dpi font
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
index af971c1f927e..335df69d056d 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org Bigelow Holmes Lucida TypeWriter 75dpi font
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile
index 4e7ad12535ee..ae81fe96ad78 100644
--- a/x11-fonts/font-bh-ttf/Makefile
+++ b/x11-fonts/font-bh-ttf/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Bigelow & Holmes TTF font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile
index b7f94e49226e..65d892853606 100644
--- a/x11-fonts/font-bh-type1/Makefile
+++ b/x11-fonts/font-bh-type1/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Bigelow Holmes Type1 font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile
index 47007c85008d..a38a56e46efd 100644
--- a/x11-fonts/font-bitstream-100dpi/Makefile
+++ b/x11-fonts/font-bitstream-100dpi/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Bitstream Vera 100dpi font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile
index bb1e2506ac7f..4ef122e674da 100644
--- a/x11-fonts/font-bitstream-75dpi/Makefile
+++ b/x11-fonts/font-bitstream-75dpi/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Bitstream Vera 75dpi font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile
index c5d5fd0d1056..d2a81599f3e6 100644
--- a/x11-fonts/font-bitstream-speedo/Makefile
+++ b/x11-fonts/font-bitstream-speedo/Makefile
@@ -9,5 +9,4 @@ COMMENT=	X.Org Bitstream Vera Speedo font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile
index ba706b737050..00a6e5f6ea59 100644
--- a/x11-fonts/font-bitstream-type1/Makefile
+++ b/x11-fonts/font-bitstream-type1/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Bitstream Vera Type1 font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile
index 03f2cba90082..3bca6ecb3393 100644
--- a/x11-fonts/font-cronyx-cyrillic/Makefile
+++ b/x11-fonts/font-cronyx-cyrillic/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Cronyx Cyrillic font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile
index 7de94daa7a0c..09920f54db8d 100644
--- a/x11-fonts/font-cursor-misc/Makefile
+++ b/x11-fonts/font-cursor-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Cursor fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile
index eeee4671de0b..952dd3368ec4 100644
--- a/x11-fonts/font-daewoo-misc/Makefile
+++ b/x11-fonts/font-daewoo-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Daewoo fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile
index 064f33f244e9..a6bf1edc1613 100644
--- a/x11-fonts/font-dec-misc/Makefile
+++ b/x11-fonts/font-dec-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Dec fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile
index 9dca516a0aae..ae4dd6e902ad 100644
--- a/x11-fonts/font-ibm-type1/Makefile
+++ b/x11-fonts/font-ibm-type1/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org IBM Type1 font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile
index 95c1b93e9907..0e038369fad8 100644
--- a/x11-fonts/font-isas-misc/Makefile
+++ b/x11-fonts/font-isas-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous ISAS fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile
index ad975de1c59a..43968fb8cf68 100644
--- a/x11-fonts/font-jis-misc/Makefile
+++ b/x11-fonts/font-jis-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous JIS fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile
index f3509477b8f9..b443a44ad6ba 100644
--- a/x11-fonts/font-micro-misc/Makefile
+++ b/x11-fonts/font-micro-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Micro fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile
index 37208ef2083b..d06da8356f8f 100644
--- a/x11-fonts/font-misc-cyrillic/Makefile
+++ b/x11-fonts/font-misc-cyrillic/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Cyrillic font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile
index 95e6c7d45dfe..81cdcf829b0b 100644
--- a/x11-fonts/font-misc-ethiopic/Makefile
+++ b/x11-fonts/font-misc-ethiopic/Makefile
@@ -11,5 +11,4 @@ XORG_CAT=	font
 INSTALLS_TTF=	yes
 FONTDIR=	TTF OTF
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile
index 9d7d1c2220eb..00116af8ef12 100644
--- a/x11-fonts/font-misc-meltho/Makefile
+++ b/x11-fonts/font-misc-meltho/Makefile
@@ -11,5 +11,4 @@ XORG_CAT=	font
 INSTALLS_TTF=	yes
 FONTDIR=	OTF
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile
index 21ad7f9083e9..99e9eb502854 100644
--- a/x11-fonts/font-misc-misc/Makefile
+++ b/x11-fonts/font-misc-misc/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org miscellaneous Misc fonts
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile
index bee5afdfc75d..28ff192bad5f 100644
--- a/x11-fonts/font-mutt-misc/Makefile
+++ b/x11-fonts/font-mutt-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Mutt fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile
index 8cbadb659208..06b1f426bf94 100644
--- a/x11-fonts/font-schumacher-misc/Makefile
+++ b/x11-fonts/font-schumacher-misc/Makefile
@@ -11,5 +11,4 @@ COMMENT=	X.Org miscellaneous Schumacher fonts
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile
index 76a480861d9b..bd2a49c0efa7 100644
--- a/x11-fonts/font-screen-cyrillic/Makefile
+++ b/x11-fonts/font-screen-cyrillic/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Screen Cyrillic font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile
index f3a38fb449e9..0ffd90e41426 100644
--- a/x11-fonts/font-sony-misc/Makefile
+++ b/x11-fonts/font-sony-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Sony fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile
index 0d75e895de49..0eeee719e87f 100644
--- a/x11-fonts/font-sun-misc/Makefile
+++ b/x11-fonts/font-sun-misc/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org miscellaneous Sun fonts
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile
index a902817260c4..9807bb091dc1 100644
--- a/x11-fonts/font-util/Makefile
+++ b/x11-fonts/font-util/Makefile
@@ -10,7 +10,4 @@ COMMENT=	Create an index of X font files in a directory
 
 XORG_CAT=	font
 
-MAN1=		bdftruncate.1 ucs2any.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-util/pkg-plist b/x11-fonts/font-util/pkg-plist
index a89511bdd609..4d8ebc4ab861 100644
--- a/x11-fonts/font-util/pkg-plist
+++ b/x11-fonts/font-util/pkg-plist
@@ -18,4 +18,6 @@ lib/X11/fonts/util/map-ISO8859-9
 lib/X11/fonts/util/map-JISX0201.1976-0
 lib/X11/fonts/util/map-KOI8-R
 libdata/pkgconfig/fontutil.pc
+man/man1/bdftruncate.1.gz
+man/man1/ucs2any.1.gz
 share/aclocal/fontutil.m4
diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile
index 91d0dc0cdf32..9b8b09b01f6b 100644
--- a/x11-fonts/font-winitzki-cyrillic/Makefile
+++ b/x11-fonts/font-winitzki-cyrillic/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org Winitzki Cyrillic font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
index b9ec5f12e333..3095a1df874d 100644
--- a/x11-fonts/font-xfree86-type1/Makefile
+++ b/x11-fonts/font-xfree86-type1/Makefile
@@ -10,5 +10,4 @@ COMMENT=	X.Org XFree86 Type1 font
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile
index 0d65bc7268ee..541832855a77 100644
--- a/x11-fonts/fonttosfnt/Makefile
+++ b/x11-fonts/fonttosfnt/Makefile
@@ -12,9 +12,6 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 XORG_CAT=	app
 USE_XORG=	xproto fontenc
 
-PLIST_FILES=	bin/fonttosfnt
+PLIST_FILES=	bin/fonttosfnt man/man1/fonttosfnt.1.gz
 
-MAN1=		fonttosfnt.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile
index 39cba878e234..d6860cb2cd79 100644
--- a/x11-fonts/fslsfonts/Makefile
+++ b/x11-fonts/fslsfonts/Makefile
@@ -10,9 +10,6 @@ COMMENT=	List fonts served by the X font server
 XORG_CAT=	app
 USE_XORG=	x11 libfs
 
-PLIST_FILES=	bin/fslsfonts
+PLIST_FILES=	bin/fslsfonts man/man1/fslsfonts.1.gz
 
-MAN1=		fslsfonts.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index 17417680811c..dba8dc61ae79 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -16,5 +16,4 @@ USE_XORG=	xproto:both xtrans fontsproto:both fontenc
 
 CONFIGURE_ARGS=--without-xmlto --disable-devel-docs
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
index d488614475ef..1cf063cf297c 100644
--- a/x11-fonts/libXfontcache/Makefile
+++ b/x11-fonts/libXfontcache/Makefile
@@ -10,12 +10,4 @@ COMMENT=	The Xfontcache library
 XORG_CAT=	lib
 USE_XORG=	fontcacheproto:both x11 xext xextproto
 
-MAN3=		FontCacheChangeCacheSettings.3 \
-		FontCacheQueryExtension.3 \
-		FontCacheQueryVersion.3 \
-		FontCacheGetCacheSettings.3 \
-		FontCacheGetCacheStatistics.3 \
-		Xfontcache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXfontcache/pkg-plist b/x11-fonts/libXfontcache/pkg-plist
index 53b501253a0d..cb25d17c1d80 100644
--- a/x11-fonts/libXfontcache/pkg-plist
+++ b/x11-fonts/libXfontcache/pkg-plist
@@ -3,3 +3,9 @@ lib/libXfontcache.la
 lib/libXfontcache.so
 lib/libXfontcache.so.1
 libdata/pkgconfig/xfontcache.pc
+man/man3/FontCacheChangeCacheSettings.3.gz
+man/man3/FontCacheQueryExtension.3.gz
+man/man3/FontCacheQueryVersion.3.gz
+man/man3/FontCacheGetCacheSettings.3.gz
+man/man3/FontCacheGetCacheStatistics.3.gz
+man/man3/Xfontcache.3.gz
diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile
index 72dee53c89d5..f7ea3a3da032 100644
--- a/x11-fonts/mkfontdir/Makefile
+++ b/x11-fonts/mkfontdir/Makefile
@@ -12,8 +12,6 @@ RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 XORG_CAT=	app
 
-PLIST_FILES=	bin/mkfontdir
-MAN1=		mkfontdir.1
+PLIST_FILES=	bin/mkfontdir man/man1/mkfontdir.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index 0b94126da85f..c2005428d82d 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -15,8 +15,6 @@ USE_XORG=	xproto fontenc
 
 CONFIGURE_ARGS+=--disable-maintainer-mode
 
-PLIST_FILES=	bin/mkfontscale
-MAN1=		mkfontscale.1
+PLIST_FILES=	bin/mkfontscale man/man1/mkfontscale.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile
index ea8a95b93aba..42fc82c0535c 100644
--- a/x11-fonts/showfont/Makefile
+++ b/x11-fonts/showfont/Makefile
@@ -10,9 +10,6 @@ COMMENT=	Font dumper for the X font server
 XORG_CAT=	app
 USE_XORG=	libfs
 
-PLIST_FILES=	bin/showfont
+PLIST_FILES=	bin/showfont man/man1/showfont.1.gz
 
-MAN1=		showfont.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile
index 04bdfab70f79..bffb80a6c0a1 100644
--- a/x11-fonts/xfontsel/Makefile
+++ b/x11-fonts/xfontsel/Makefile
@@ -10,7 +10,4 @@ COMMENT=	Point and click selection of X11 font names
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xfontsel.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfontsel/pkg-plist b/x11-fonts/xfontsel/pkg-plist
index b2a288e570ce..4365dff9480d 100644
--- a/x11-fonts/xfontsel/pkg-plist
+++ b/x11-fonts/xfontsel/pkg-plist
@@ -1,4 +1,5 @@
 bin/xfontsel
+man/man1/xfontsel.1.gz
 share/X11/app-defaults/XFontSel
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index be18e10df1bb..0fa5429a5b2f 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -14,9 +14,6 @@ USE_XORG=	libfs xfont xtrans
 USE_RC_SUBR=	xfs
 CONFIGURE_ARGS=	--without-xmlto --without-fop
 
-MAN1=		xfs.1
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in
 .if defined(WITHOUT_XFS_CACHE)
@@ -27,9 +24,7 @@ post-build:
 	@cd ${WRKSRC}/config/ && ${GMAKE} config
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config.default
-	@if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \
-		${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config; \
-	fi
+	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config.default
+	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config; \
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist
index e2378ab6db01..e175b97fd85c 100644
--- a/x11-fonts/xfs/pkg-plist
+++ b/x11-fonts/xfs/pkg-plist
@@ -1,4 +1,5 @@
 bin/xfs
+man/man1/xfs.1.gz
 @unexec if cmp -s %D/etc/X11/fs/config.default %D/etc/X11/fs/config; then rm -f %D/etc/X11/fs/config; fi
 etc/X11/fs/config.default
 @exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile
index 5d8f9eedc47d..e052dcde5150 100644
--- a/x11-fonts/xfsinfo/Makefile
+++ b/x11-fonts/xfsinfo/Makefile
@@ -10,9 +10,6 @@ COMMENT=	X font server information utility
 XORG_CAT=	app
 USE_XORG=	x11 libfs
 
-PLIST_FILES=	bin/xfsinfo
+PLIST_FILES=	bin/xfsinfo man/man1/xfsinfo.1.gz
 
-MAN1=		xfsinfo.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xlsfonts/Makefile b/x11-fonts/xlsfonts/Makefile
index 38a8d29dc613..c965a197355f 100644
--- a/x11-fonts/xlsfonts/Makefile
+++ b/x11-fonts/xlsfonts/Makefile
@@ -10,9 +10,6 @@ COMMENT=	Server font list displayer for X
 XORG_CAT=	app
 USE_XORG=	x11
 
-PLIST_FILES=	bin/xlsfonts
+PLIST_FILES=	bin/xlsfonts man/man1/xlsfonts.1.gz
 
-MAN1=		xlsfonts.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index c3a65206b5dd..7517c7737f25 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${FONTDIR}/100dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-1
 CONFLICTS=	XFree86-font100dpi-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index 496f98f5a0b2..f8632676fd10 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${FONTDIR}/75dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75
 CONFLICTS=	XFree86-font75dpi-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index b78adb9a04b1..d2242bccc1eb 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -20,9 +20,9 @@ RUN_DEPENDS=	${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx
 CONFLICTS=	XFree86-fontCyrillic-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index dffea8bcec16..193725ed0589 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -27,9 +27,9 @@ RUN_DEPENDS=	${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-m
 CONFLICTS=	XFree86-fontDefaultBitmaps-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index 09d1df2402e3..76d230c911ea 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \
 do-install:	# empty
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index a6c273942a49..f254b37620be 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	XFree86-fontScalable-*
 do-install:	# empty
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index f3ef39b662e1..33a70418a992 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -23,9 +23,8 @@ RUN_DEPENDS=	xorg-fonts-100dpi>=0:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 do-install:
-		${MKDIR} ${PREFIX}/libdata/xorg
-		${TOUCH} ${PREFIX}/libdata/xorg/fonts
+		${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg
+		${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/fonts
 
 .include <bsd.port.mk>