6 files changed, 13 insertions, 16 deletions

diff --git a/x11-clocks/lmclock/Makefile b/x11-clocks/lmclock/Makefile
index 7649c2a3243e..3b36972a3a70 100644
--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@@ -15,11 +15,10 @@ USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/lmclock
 
-NO_STAGE=	yes
 post-extract:
 	@${TOUCH} ${WRKSRC}/lmclock.man
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11-themes/audacious-skins/Makefile b/x11-themes/audacious-skins/Makefile
index a6832be5bbb6..e5263a3ee641 100644
--- a/x11-themes/audacious-skins/Makefile
+++ b/x11-themes/audacious-skins/Makefile
@@ -16,9 +16,8 @@ NO_BUILD=	yes
 
 DATADIR=	${PREFIX}/share/audacious
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/Skins
-	${INSTALL_DATA} ${WRKSRC}/Skins/*/*.wsz ${DATADIR}/Skins
+	${MKDIR} ${STAGEDIR}${DATADIR}/Skins
+	${INSTALL_DATA} ${WRKSRC}/Skins/*/*.wsz ${STAGEDIR}${DATADIR}/Skins
 
 .include <bsd.port.mk>
diff --git a/x11/gtk-launch/Makefile b/x11/gtk-launch/Makefile
index 45d519e8cb10..43d7d33d1bde 100644
--- a/x11/gtk-launch/Makefile
+++ b/x11/gtk-launch/Makefile
@@ -20,7 +20,6 @@ PORTSCOUT=	skipv:1.1
 
 OPTIONS_DEFINE=DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -31,11 +30,11 @@ do-build:
 		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/launch.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-install:
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index eb4f12225f08..c6b496563b22 100644
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -16,12 +16,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/thinglaunch
 
-NO_STAGE=	yes
 do-build:
 	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c \
 		-o ${WRKSRC}/${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 130a4d422de3..46cd81b88b40 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -37,7 +37,6 @@ WCHAR_DESC=	Enable wide-character support
 
 OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:M256COLOR}
@@ -77,8 +76,6 @@ PLIST_SUB+=	GNOME=""
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-MAN1=		resize.1 koi8rxterm.1 uxterm.1 xterm.1
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 900004
@@ -91,9 +88,9 @@ post-extract:
 
 post-install:
 .for f in koi8rxterm resize uxterm xterm
-	@${CHMOD} ${BINMODE} ${PREFIX}/bin/${f}
+	@${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${STAGEDIR}${PREFIX}/share/applications/
 .if ${PORT_OPTIONS:MGNOME}
 	@-update-desktop-database
 .endif
diff --git a/x11/xterm/pkg-plist b/x11/xterm/pkg-plist
index bc9539d7dc0a..ff3f902a084c 100644
--- a/x11/xterm/pkg-plist
+++ b/x11/xterm/pkg-plist
@@ -8,6 +8,10 @@ lib/X11/app-defaults/UXTerm
 lib/X11/app-defaults/UXTerm-color
 lib/X11/app-defaults/XTerm
 lib/X11/app-defaults/XTerm-color
+man/man1/resize.1.gz
+man/man1/koi8rxterm.1.gz
+man/man1/uxterm.1.gz
+man/man1/xterm.1.gz
 share/applications/xterm.desktop
 share/pixmaps/filled-xterm_32x32.xpm
 share/pixmaps/filled-xterm_48x48.xpm