- use STAGEDIR

5 files changed, 12 insertions, 22 deletions

diff --git a/games/xinfocom/Makefile b/games/xinfocom/Makefile
index 186901bd04ae..cf0abcbad2c5 100644
--- a/games/xinfocom/Makefile
+++ b/games/xinfocom/Makefile
@@ -14,8 +14,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An Infocom game interpreter for X11
 
-NO_STAGE=	yes
-
 USES=		imake
 USE_XORG=	xt sm ice xext x11
 WRKSRC=		${WRKDIR}/xinfocom
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index ffbfb79ad9b3..7bd4e77b90c7 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -13,12 +13,9 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	The classic cat-and-mouse
 
-NO_STAGE=	yes
-
 NO_WRKSUBDIR=	yes
 USES=		imake
 USE_XORG=	x11
-MAN6=		xneko.6
-PLIST_FILES=	bin/xneko
+PLIST_FILES=	bin/xneko man/man6/xneko.6.gz
 
 .include <bsd.port.mk>
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index 6b544c859cf0..108e69c1e4cb 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -11,18 +11,14 @@ MASTER_SITE_SUBDIR=	games/xpuzzles
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	X-based rubik's cube(tm)
 
-NO_STAGE=	yes
-
 WRKSRC=		${WRKDIR}/xrubik
 USES=		imake
 USE_XORG=	xt sm ice xext x11
 XFREE86_HTML_MAN=	no
-NO_INSTALL_MANPAGES=	yes
-MAN1=		xrubik.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xrubik ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/Rubik.ad ${PREFIX}/lib/X11/app-defaults/Rubik
-	${INSTALL_MAN} ${WRKSRC}/xrubik.man ${PREFIX}/man/man1/xrubik.1
+	${INSTALL_PROGRAM} ${WRKSRC}/xrubik ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/Rubik.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Rubik
+	${INSTALL_MAN} ${WRKSRC}/xrubik.man ${STAGEDIR}${PREFIX}/man/man1/xrubik.1
 
 .include <bsd.port.mk>
diff --git a/games/xrubik/pkg-plist b/games/xrubik/pkg-plist
index ed7744c7589e..818ea9c61a19 100644
--- a/games/xrubik/pkg-plist
+++ b/games/xrubik/pkg-plist
@@ -1,2 +1,3 @@
 bin/xrubik
 lib/X11/app-defaults/Rubik
+man/man1/xrubik.1.gz
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 769a22d883d4..a4fc23766118 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -11,12 +11,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}_en${EXTRACT_SUFX}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	X version of the popular board game
 
-NO_STAGE=	yes
-
 USES=		imake
 USE_BZIP2=	yes
 USE_XORG=	xaw
-NO_INSTALL_MANPAGES=	yes
 
 XSCRABBLEDIR=	${PREFIX}/lib/X11/xscrabble
 
@@ -32,15 +29,16 @@ post-patch:
 	@${SED} -e 's|/usr/share/games/scrabble/en|${XSCRABBLEDIR}|g' \
 		${WRKSRC}/../xscrabble_en/app-defaults/XScrabble_en \
 		> ${WRKSRC}/XScrabble
-	@${REINPLACE_CMD} -e 's|= -O|=$$(CDEBUGFLAGS)|g' ${WRKSRC}/Imakefile
+	${REINPLACE_CMD} -e 's|= -O|=$$(CDEBUGFLAGS)|g' ${WRKSRC}/Imakefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrab ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrabble ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/XScrabble ${PREFIX}/lib/X11/app-defaults
-	@${MKDIR} ${XSCRABBLEDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrab ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xscrabble ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/XScrabble ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/
+	${MKDIR} ${STAGEDIR}${XSCRABBLEDIR}
 .for file in OSPD3.gz duplicate scrabble_rules scrabble_scores
-	${INSTALL_DATA} ${WRKSRC}/../xscrabble_en/lib/${file} ${XSCRABBLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/../xscrabble_en/lib/${file} \
+		${STAGEDIR}${XSCRABBLEDIR}/
 .endfor
 
 .include <bsd.port.mk>