Minimize diffs with ports.

git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1180 058c260c-8361-11dd-a0ac-aa2bafec7d09

84 files changed, 67 insertions, 100 deletions

diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index 81bcc4c..70befad 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -13,6 +13,6 @@ RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 CONFIGURE_ARGS+=	--with-pciids-path=${LOCALBASE}/share/pciids
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile
index 9213cdc..aa54b1b 100644
--- a/devel/xorg-macros/Makefile
+++ b/devel/xorg-macros/Makefile
@@ -10,7 +10,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org development aclocal macros
 
 XORG_CAT=	util
-NO_STAGE=	yes
 
 MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 738d3d4..c3b67b9 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -14,7 +14,6 @@ LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm \
 
 USES=		pkgconfig
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
-NO_STAGE=	yes
 
 .include <bsd.port.options.mk>
 
@@ -42,6 +41,7 @@ ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
 ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME
 .endif
 
+NO_STAGE=	yes
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
 PLIST_SUB+=	VERSION=${MESADISTVERSION}
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index ae2d01a..6001d55 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 
 CONFLICTS=	libglut-[0-9].*
 
-NO_STAGE=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -29,6 +28,7 @@ DOCS=	download.html freeglut.html freeglut_logo.png		\
 	progress.html structure.html
 BINS=	CallbackMaker Fractals Fractals_random Lorenz One shapes
 
+NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 pre-configure:
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index 2fc5d45..3d91cdd 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -15,8 +15,8 @@ USES=		pkgconfig
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
 
 SUB_FILES=	pkg-install pkg-deinstall
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 11b69e1..4dd8c91 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL utility library
 
 USE_BZIP2=	yes
-USES=		pathfix
+USES=		pathfix pkgconfig
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 USE_LDCONFIG=	yes
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index d009cb5..95b5dcf 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -12,15 +12,14 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL widgets library
 
 USE_BZIP2=	yes
-USES=		pathfix pkgconfig
+USES=		motif pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GL=		gl
-USE_MOTIF=	yes
 USE_XORG=	x11 xt xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --enable-motif
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index f9aebf2..d9aa3c6 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -17,9 +17,9 @@ USES=		pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+NO_STAGE=	yes
 
 OPTIONS_DEFINE=	MANPAGES
-NO_STAGE=	yes
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	MANPAGES
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 78b9520..607fb12 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -10,6 +10,6 @@ COMMENT=	X.Org keyboard input driver
 XORG_CAT=	driver
 USE_XORG=	kbproto
 MAN4=		kbd.4x
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 5c87c3c..3bbe02f 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -10,6 +10,6 @@ COMMENT=	X.Org mouse input driver
 XORG_CAT=	driver
 USES=		pathfix
 MAN4=		mousedrv.4x
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 3fe72e5..d5e3195 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -11,8 +11,8 @@ USE_GL=		gl
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
 MAN4=		ati.4x radeon.4x
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000051
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index b86b902..3cc799f 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -10,6 +10,6 @@ COMMENT=	X.Org fbdev display driver
 
 XORG_CAT=	driver
 MAN4=		fbdev.4x
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index c78a16b..f34c93f 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -24,9 +24,8 @@ USE_XORG=	glproto \
 		xvmc
 
 MAN4=		intel.4x
-NO_STAGE=	yes
-
 
+NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
@@ -43,7 +42,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-src__sna__sna_threads.c \
 LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
-INTEL_REVISION=	4
+INTEL_REVISION=	5
 PLIST_SUB+=	OLD=""
 
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_ch7017_ch7017.c \
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 5f09aee..3b80a5c 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -9,7 +9,6 @@ COMMENT=	X.Org vesa display driver
 
 XORG_CAT=	driver
 MAN4=		vesa.4x
-NO_STAGE=	yes
-
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index a57b706..a8f0921 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -16,8 +16,6 @@ VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
 
 NO_BUILD=	yes
-NO_STAGE=	yes
-
 
 INPUT_DRIVERS=		mouse \
 			keyboard \
@@ -99,6 +97,7 @@ SUNFFB_DESC=		Install sunffb video driver
 # these drivers have a different module name compared to the plugin they install
 QUIRKS=		keyboard:kbd
 
+NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # Manual add arch specific drivers so they be added to depend lines.
diff --git a/x11-fonts/fontsproto/Makefile b/x11-fonts/fontsproto/Makefile
index cda0fb2..878eaad 100644
--- a/x11-fonts/fontsproto/Makefile
+++ b/x11-fonts/fontsproto/Makefile
@@ -9,7 +9,5 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Fonts extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
-
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 4b4d5c2..dd8b61c 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -10,7 +10,5 @@ COMMENT=	The FS library
 XORG_CAT=	lib
 USE_XORG=	fontsproto:both xproto:both xtrans
 USE_AUTOTOOLS=	libtool
-NO_STAGE=	yes
-
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index bdbeb31..1741768 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -13,9 +13,8 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
 XORG_CAT=	lib
 USE_XORG=	xproto:both xtrans fontsproto:both fontenc
-NO_STAGE=	yes
-
 
 CONFIGURE_ARGS=--without-xmlto --disable-devel-docs
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index a9ca31e..163fd21 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -10,7 +10,5 @@ COMMENT=	The fontenc Library
 
 XORG_CAT=	lib
 USE_XORG=	xproto
-NO_STAGE=	yes
-
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index b031e11..be18e10 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -15,9 +15,8 @@ USE_RC_SUBR=	xfs
 CONFIGURE_ARGS=	--without-xmlto --without-fop
 
 MAN1=		xfs.1
-NO_STAGE=	yes
-
 
+NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in
 .if defined(WITHOUT_XFS_CACHE)
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index bbd9925..c3a6520 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_STAGE=	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 c5b6605..496f98f 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -22,8 +22,8 @@ CONFLICTS=	XFree86-font75dpi-*
 
 NO_BUILD=	# none
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
-NO_STAGE=	yes
 
 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 fd25bca..b78adb9 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -21,8 +21,8 @@ CONFLICTS=	XFree86-fontCyrillic-*
 
 NO_BUILD=	# none
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
-NO_STAGE=	yes
 
 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 a9f91f7..dffea8b 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -28,8 +28,8 @@ CONFLICTS=	XFree86-fontDefaultBitmaps-*
 
 NO_BUILD=	# none
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
-NO_STAGE=	yes
 
 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 afe65e6..a70282f 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -22,6 +22,6 @@ do-install:	# empty
 
 NO_BUILD=	# none
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index 1e53ee2..a6c2739 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -24,6 +24,6 @@ do-install:	# empty
 
 NO_BUILD=	# none
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index bd70060..f3ef39b 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -22,8 +22,8 @@ RUN_DEPENDS=	xorg-fonts-100dpi>=0:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
 		${FONTSDIR}/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
 
 NO_BUILD=	yes
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 do-install:
 		${MKDIR} ${PREFIX}/libdata/xorg
 		${TOUCH} ${PREFIX}/libdata/xorg/fonts
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index 2dea236..bab652e 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	xephyr
-PORTREVISION=	0
 
 COMMENT=	X server from X.Org based on kdrive
 
@@ -21,8 +20,8 @@ CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
 
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xephyr
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${PREFIX}/bin/
 
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 28983c6..1dcd916 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	xorg-dmx
-PORTREVISION=	0
 
 COMMENT=	Distributed Multihead X from X.Org
 
@@ -21,11 +20,11 @@ CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
 		--without-xmlto	--disable-docs --disable-devel-docs \
 		--enable-dmx --localstatedir=/var --without-dtrace
 
-NO_STAGE=	yes
 MAN1=		Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1
 
 SLAVE_PORT=	yes
 
+NO_STAGE=	yes
 do-install:
 	cd ${WRKSRC}/hw/dmx; ${MAKE} install
 
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 24085ae..e8a4815 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -20,10 +20,10 @@ CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
 		--localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes
-NO_STAGE=	yes
 PLIST_FILES=	bin/Xnest
 MAN1=		Xnest.1
 
+NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 5b4a7fd..6f11ae9 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -22,8 +22,8 @@ CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xvfb
 MAN1=		Xvfb.1
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 do-install:
 	cd ${WRKSRC}/hw/vfb; ${MAKE} install
 
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 3bf1a47..da11eaa 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -15,6 +15,6 @@ USES=		gmake
 CONFIGURE_ARGS+=--without-xmlto
 
 MAN3=		Xaw.3
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index af7bf9b..f5eab9c 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -11,6 +11,6 @@ COMMENT=	X Miscellaneous Utilities libraries
 
 XORG_CAT=	lib
 USE_XORG=	xproto:both x11 xt xext
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 3261590..6cc4439 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -12,7 +12,6 @@ COMMENT=	X Toolkit library
 XORG_CAT=	lib
 USE_XORG=	x11 sm xproto:both kbproto
 CONFIGURE_ARGS=	--disable-specs
-NO_STAGE=	yes
 
 MAN3=	MenuPopdown.3 \
 	MenuPopup.3 \
@@ -283,6 +282,7 @@ MAN3=	MenuPopdown.3 \
 	XtWindowOfObject.3 \
 	XtWindowToWidget.3
 
+NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 		${WRKSRC}/configure
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
index 0f2206e..299229c 100644
--- a/x11/bigreqsproto/Makefile
+++ b/x11/bigreqsproto/Makefile
@@ -9,6 +9,5 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	BigReqs extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
index 5db7e06..dbefded 100644
--- a/x11/dri2proto/Makefile
+++ b/x11/dri2proto/Makefile
@@ -8,6 +8,5 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	DRI2 prototype headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
index 06912fc..78c0703 100644
--- a/x11/fstobdf/Makefile
+++ b/x11/fstobdf/Makefile
@@ -8,11 +8,11 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Generate BDF font from X font server
 
 XORG_CAT=	app
-NO_STAGE=	yes
 USE_XORG=	x11 libfs
 
 PLIST_FILES=	bin/fstobdf
 
 MAN1=		fstobdf.1
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index 2064f0b..5ae9713 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -9,6 +9,5 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	GLX extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index 9a6df4c..a3a6b06 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -9,7 +9,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Input extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 CONFIGURE_ARGS=	--without-asciidoc
 
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
index 1ac30a0..284c182 100644
--- a/x11/kbproto/Makefile
+++ b/x11/kbproto/Makefile
@@ -9,6 +9,5 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	KB extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index fd5705c..4c0e454 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -10,7 +10,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Inter Client Exchange library for X11
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xproto:both xtrans
 
 .include <bsd.port.mk>
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 2cc7345..e832ad1 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Session Management library for X11
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	ice xproto:both xtrans
 
 CONFIGURE_ARGS+=--disable-docs --without-xmlto
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index d24c60a..83c0f97 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 
 USES=		perl5
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
 		kbproto:both inputproto xf86bigfontproto xproto:both \
 		xcb
@@ -24,6 +23,7 @@ CONFIGURE_ARGS+=	--datadir=${PREFIX}/lib \
 			--disable-specs
 CONFIGURE_ENV+=	ac_cv_path_PS2PDF=""
 
+NO_STAGE=	yes
 .include "${.CURDIR}/manpages"
 
 post-patch:
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 50bc312..e83a276 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -8,7 +8,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The XScrnSaver library
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 xext xextproto scrnsaverproto:both
 
 MAN3=		Xss.3 \
@@ -24,4 +23,5 @@ MAN3=		Xss.3 \
 		XScreenSaverUnregister.3 \
 		XScreenSaverUnsetAttributes.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index d822af7..a228177 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -8,8 +8,8 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The XTrap library
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	trapproto:both x11 xext xextproto xt
 USE_AUTOTOOLS=	libtool
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 4e188a1..4ee84d1 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -9,13 +9,13 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Authentication Protocol library for X11
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xproto:both
 
 MAN3=		Xau.3 XauDisposeAuth.3 XauFileName.3 XauGetAuthByAddr.3 \
 		XauGetBestAuthByAddr.3 XauLockAuth.3 XauReadAuth.3 \
 		XauUnlockAuth.3 XauWriteAuth.3
 
+NO_STAGE=	yes
 post-install:
 	${LN} -sf ${PREFIX}/lib/libXau.so.6 ${PREFIX}/lib/libXau.so.0
 
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index e3ab615..04477a5 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -10,7 +10,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Composite extension library
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	compositeproto:both x11 xfixes xext fixesproto xproto:both
 MAN3=		Xcomposite.3 \
 		XCompositeQueryExtension.3 \
@@ -25,4 +24,5 @@ MAN3=		Xcomposite.3 \
 		XCompositeGetOverlayWindow.3 \
 		XCompositeReleaseOverlayWindow.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 2e03ab0..f4ef75c 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -11,7 +11,6 @@ COMMENT=	X client-side cursor loading library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xrender x11 xfixes fixesproto xproto:both \
 		xextproto
 
@@ -50,4 +49,5 @@ MAN3=		Xcursor.3 \
 		XcursorSetTheme.3 \
 		XcursorGetTheme.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 94f6107..0e0842b 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Damage extension library
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 damageproto:both xfixes fixesproto xextproto xproto:both
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 9940c61..3e3c7d2 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -11,7 +11,6 @@ COMMENT=	X Display Manager Control Protocol library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xproto:both
 
 CONFIGURE_ARGS+=--disable-docs --without-xmlto
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index bd90c96..8a7b8cb 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -12,7 +12,6 @@ COMMENT=	X11 Extension library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xproto x11 xextproto:both xau
 CONFIGURE_ARGS+=--disable-specs --without-xmlto
 
@@ -78,4 +77,5 @@ MAN3=		DBE.3 \
 		XShmQueryExtension.3 \
 		XShmQueryVersion.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 74f8430..04eaad0 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -11,9 +11,9 @@ COMMENT=	X Fixes extension library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 fixesproto:both xproto:both xextproto
 
 MAN3=		Xfixes.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index eec923d..ecbfd00 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -12,7 +12,6 @@ COMMENT=	X Input extension library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xproto x11 xext xextproto xfixes inputproto:both
 
 CONFIGURE_ARGS+=--disable-docs \
@@ -96,4 +95,5 @@ MAN3=		XAllowDeviceEvents.3 \
 		XUngrabDeviceButton.3 \
 		XUngrabDeviceKey.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 69b1bbc..2acc3be 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -12,7 +12,6 @@ COMMENT=	X11 Xinerama library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 xext xextproto xineramaproto:both
 USE_AUTOTOOLS=	libtool
 
@@ -22,4 +21,5 @@ MAN3=		Xinerama.3 \
 		XineramaIsActive.3 \
 		XineramaQueryScreens.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 72aa076..8c2a6f8 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -12,7 +12,6 @@ COMMENT=	X print library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 xext xextproto xau printproto:both
 USE_AUTOTOOLS=	libtool
 
@@ -51,4 +50,5 @@ MAN3=	XpCancelDoc.3 \
 	XpStartPage.3 \
 	libXp.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index b6bcb64..28e9d78 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -11,9 +11,9 @@ COMMENT=	X Pixmap library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xproto x11 xext xextproto xt
 
 MAN1=		cxpm.1 sxpm.1
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 0d6a17e..715bf5f 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -11,7 +11,6 @@ COMMENT=	X Resize and Rotate extension library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 randrproto:both xext xextproto xrender renderproto xproto:both
 
 MAN3=		Xrandr.3 \
@@ -30,4 +29,5 @@ MAN3=		Xrandr.3 \
 		XRRSetScreenConfig.3 \
 		XRRSetScreenConfigAndRate.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index b7ac416..ae0698b 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -11,7 +11,7 @@ COMMENT=	X Render extension library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 renderproto:both xproto:both
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 806c91f..38420c5 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -11,7 +11,6 @@ COMMENT=	X Resource usage library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 xext xextproto resourceproto xproto:both
 
 MAN3=		XRes.3 \
@@ -21,4 +20,5 @@ MAN3=		XRes.3 \
 		XResQueryExtension.3 \
 		XResQueryVersion.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index f3ee925..7ed7bf9 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -11,7 +11,6 @@ COMMENT=	X Test extension
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 xext recordproto:both xextproto inputproto:both \
 		xi
 USE_AUTOTOOLS=	libtool
@@ -30,6 +29,7 @@ MAN3=	XTestCompareCurrentCursorWithWindow.3 \
 	XTestSetGContextOfGC.3 \
 	XTestSetVisualIDOfVisual.3
 
+NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ \
 		s/specs//' ${WRKSRC}/Makefile.in
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 82fee21..f1784fd 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -12,7 +12,6 @@ COMMENT=	X Video Extension library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 xext xextproto videoproto:both xproto:both
 
 MAN3=	Xv.3 \
@@ -42,4 +41,5 @@ MAN3=	Xv.3 \
 	XvUngrabPort.3 \
 	XvVideoNotify.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 46f63d6..1c3c51d 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Video Extension Motion Compensation library
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 xext xv xextproto videoproto:both xproto:both
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index 515fe16..4005033 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -11,7 +11,6 @@ COMMENT=	X DGA Extension
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xproto x11 xextproto xext xf86dgaproto:both
 
 MAN3=		XDGA.3 \
@@ -36,4 +35,5 @@ MAN3=		XDGA.3 \
 		XF86DGA.3 \
 		XFree86-DGA.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index a1ecbd9..aec047e 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -11,7 +11,6 @@ COMMENT=	X Vidmode Extension
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	xproto x11 xextproto xext xf86vidmodeproto:both
 
 MAN3=		XF86VM.3 \
@@ -37,4 +36,5 @@ MAN3=		XF86VM.3 \
 		XF86VidModeGetViewPort.3 \
 		XF86VidModeValidateModeLine.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 098ac09..5ffb20b 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -9,7 +9,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	DMX extension library
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 xext xextproto dmxproto:both
 
 MAN3=		DMX.3 \
@@ -30,4 +29,5 @@ MAN3=		DMX.3 \
 		DMXRemoveScreen.3 \
 		DMXSync.3
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index f0261ab..cc0789e 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -25,7 +25,6 @@ USE_GNOME=	libxslt:build
 USE_LDCONFIG=	yes
 USE_XORG=	xau xdmcp
 USE_PYTHON_BUILD=	2.5+
-NO_STAGE=	yes
 
 GNU_CONFIGURE=	yes
 .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
@@ -42,6 +41,7 @@ XDMCP_LIBS=	-L${LOCALBASE}/lib -lXdmcp
 XPROTO_CFLAGS=	-I${LOCALBASE}/include
 XPROTO_LIBS=	-L${LOCALBASE}/lib
 
+NO_STAGE=	yes
 .include "${.CURDIR}/manpages"
 
 .include <bsd.port.options.mk>
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index 8ee907e..d730243 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -11,7 +11,7 @@ COMMENT=	XKB file library
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 USE_XORG=	x11 kbproto:both
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
index ab5ba10..e1d3b5f 100644
--- a/x11/randrproto/Makefile
+++ b/x11/randrproto/Makefile
@@ -9,6 +9,5 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Randr extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile
index 131a2e6..9985790 100644
--- a/x11/recordproto/Makefile
+++ b/x11/recordproto/Makefile
@@ -9,7 +9,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	RECORD extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 CONFIGURE_ARGS+=--disable-specs --without-xmlto
 
diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile
index 17c459b..7427974 100644
--- a/x11/scrnsaverproto/Makefile
+++ b/x11/scrnsaverproto/Makefile
@@ -8,7 +8,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	ScrnSaver extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 CONFIGURE_ARGS+=--disable-specs --without-xmlto
 
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 8d65b07..f35c8b0 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -15,8 +15,8 @@ USE_BZIP2=	yes
 USES=		pathfix
 USE_PYTHON=	2.5+
 GNU_CONFIGURE=	yes
-NO_STAGE=	yes
 
 DATADIR=	${PREFIX}/share/xcb
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile
index 9ab54ef..73b3e5e 100644
--- a/x11/xcmiscproto/Makefile
+++ b/x11/xcmiscproto/Makefile
@@ -9,7 +9,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XCMisc extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 CONFIGURE_ARGS+=--disable-specs --without-xmlto
 
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
index 62feec7..2777cf8 100644
--- a/x11/xextproto/Makefile
+++ b/x11/xextproto/Makefile
@@ -9,7 +9,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XExt extension headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 CONFIGURE_ARGS+=--disable-specs
 
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 52483d2..76b5ab8 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -9,11 +9,11 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Very useful utility for configuring and testing XInput devices
 
 XORG_CAT=	app
-NO_STAGE=	yes
 USE_XORG=	inputproto x11 xi xext xrandr xinerama
 
 PLIST_FILES=	bin/xinput
 
 MAN1=		xinput.1
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index fa41eda..69aab9a 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -12,7 +12,6 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 XORG_CAT=	data
-NO_STAGE=	yes
 
 USE_BZIP2=	yes
 USE_GNOME=	intlhack libxslt:build
@@ -28,6 +27,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN7=		xkeyboard-config.7
 
+NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # !nls case doesn't work correctly, comment it out.
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index 1e0ed96..52121bb 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -26,8 +26,8 @@ COMPONENTS=	appres bitmap xf86dga:dga iceauth luit \
 COMPONENTS+=	x11-wm/twm:twm x11-clocks/xclock:xclock xinit xterm
 
 NO_BUILD=	yes
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 do-install:
 		${MKDIR} ${PREFIX}/libdata/xorg
 		${TOUCH} ${PREFIX}/libdata/xorg/apps
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 44cc42c..8b10bad 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -12,7 +12,6 @@ COMMENT=	X.org cf files for use with imake builds
 LICENSE=	MIT
 
 XORG_CAT=	util
-NO_STAGE=	yes
 
 post-patch:
 		@${REINPLACE_CMD} 's|\(define ExtraXaw[^ ]*\) [$$].*|\1 /**/|' \
diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile
index f349d40..6642225 100644
--- a/x11/xorg-docs/Makefile
+++ b/x11/xorg-docs/Makefile
@@ -13,6 +13,6 @@ MAN7=	X.7 Standards.7 XProjectTeam.7 Consortium.7 Xsecurity.7 XOrgFoundation.7
 CONFIGURE_ARGS+=	--without-xmlto --without-fop --disable-specs
 
 XORG_CAT=	doc
-NO_STAGE=	yes
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index bba838c..d3d1e00 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org libraries meta-port
 
 NO_BUILD=	yes
-NO_STAGE=	yes
 
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
 		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \
@@ -55,6 +54,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
 		${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
 		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
 
+NO_STAGE=	yes
 do-install:
 		${MKDIR} ${PREFIX}/libdata/xorg
 		${TOUCH} ${PREFIX}/libdata/xorg/libraries
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 87adc57..58d5942 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
 		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
 
+NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # doc
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index b37603d..3fbb50b 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -9,7 +9,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 protocol headers
 
 XORG_CAT=	proto
-NO_STAGE=	yes
 
 CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc
 
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 8668aa1..6a268d8 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Abstract network code for X
 LICENSE=	MIT
 
 XORG_CAT=	lib
-NO_STAGE=	yes
 
 CONFIGURE_ARGS+=--disable-docs --without-xmlto
 
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
index 7560f52..bd396e5 100644
--- a/x11/xvidtune/Makefile
+++ b/x11/xvidtune/Makefile
@@ -8,9 +8,9 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Video mode tuner for X
 
 XORG_CAT=	app
-NO_STAGE=	yes
 USE_XORG=	xxf86vm xt xaw
 
 MAN1=		xvidtune.1
 
+NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index 0e308bb..4feb999 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -8,12 +8,9 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Window information utility for X
 
 XORG_CAT=	app
-NO_STAGE=	yes
 USES=		iconv
 USE_XORG=	x11 xcb xproto xorg-macros
 
-PLIST_FILES=	bin/xwininfo
-
-MAN1=		xwininfo.1
+PLIST_FILES=	bin/xwininfo man/man1/xwininfo.1.gz
 
 .include <bsd.port.mk>