- Support staging

2 files changed, 13 insertions, 83 deletions

diff --git a/games/moonlander/Makefile b/games/moonlander/Makefile
index 07c70e54e04c..b871fbbe37b6 100644
--- a/games/moonlander/Makefile
+++ b/games/moonlander/Makefile
@@ -5,47 +5,38 @@ PORTNAME=	moonlander
 PORTVERSION=	1.0
 PORTREVISION=	12
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=pool/main/m/moon-lander
-DISTNAME=	moon-lander_1.0.orig
+MASTER_SITES=	DEBIAN/pool/main/m/moon-lander
+DISTNAME=	moon-lander_${PORTVERSION}.orig
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Land a spacecraft on the moon
 
 LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/README.txt
 
 USE_SDL=	mixer image sdl
 
 WRKSRC=		${WRKDIR}/moon-lander
 
+SOUNDS=		sounds
+
+PLIST_FILES=	bin/${PORTNAME}
+PORTDATA=	*
+
 OPTIONS_DEFINE=	SOUND
+OPTIONS_DEFAULT=SOUND
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-install_dirs=	fonts images
-.if ${PORT_OPTIONS:MSOUND}
-PLIST_SUB+=	SOUND=
-install_dirs+=	sounds
-.else
+.if ! ${PORT_OPTIONS:MSOUND}
+SOUNDS=		# empty
 CFLAGS+=	-DNOSOUND
-PLIST_SUB+=	SOUND="@comment "
 .endif
 
 do-configure:
-	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/moon_lander.c
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/moon_lander.c
 
 do-install:
-	@${MKDIR} ${PREFIX}/bin; \
-	${INSTALL_PROGRAM} ${WRKSRC}/moonlander ${PREFIX}/bin; \
-	${MKDIR} ${DATADIR}
-.for i in ${install_dirs}
-	@${CP} -R ${WRKSRC}/${i} ${DATADIR}
-.endfor
-
-post-install:
-	@${FIND} ${PREFIX}/share/moonlander -type f -print0 | \
-		${XARGS} -0 ${CHMOD} 444
+	${INSTALL_PROGRAM} ${WRKSRC}/moonlander ${STAGEDIR}${PREFIX}/bin/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "fonts images ${SOUNDS}" ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/games/moonlander/pkg-plist b/games/moonlander/pkg-plist
deleted file mode 100644
index ade96e5c072f..000000000000
--- a/games/moonlander/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-bin/moonlander
-share/moonlander/fonts/ConsoleFont.bmp
-share/moonlander/fonts/LargeFont.bmp
-share/moonlander/images/backgrounds/blue_nebula.jpg
-share/moonlander/images/backgrounds/earth_moon.jpg
-share/moonlander/images/backgrounds/fingers.jpg
-share/moonlander/images/backgrounds/fire_and_planet.jpg
-share/moonlander/images/backgrounds/glowing_nebula.jpg
-share/moonlander/images/backgrounds/orange_gas.jpg
-share/moonlander/images/backgrounds/red_plain.jpg
-share/moonlander/images/backgrounds/saturn.jpg
-share/moonlander/images/blank_terrain.gif
-share/moonlander/images/kablam/exp01.png
-share/moonlander/images/kablam/exp02.png
-share/moonlander/images/kablam/exp03.png
-share/moonlander/images/kablam/exp04.png
-share/moonlander/images/kablam/exp05.png
-share/moonlander/images/kablam/exp06.png
-share/moonlander/images/kablam/exp07.png
-share/moonlander/images/kablam/exp08.png
-share/moonlander/images/kablam/exp09.png
-share/moonlander/images/kablam/exp10.png
-share/moonlander/images/kablam/exp11.png
-share/moonlander/images/kablam/exp12.png
-share/moonlander/images/kablam/exp13.png
-share/moonlander/images/kablam/exp14.png
-share/moonlander/images/kablam/exp15.png
-share/moonlander/images/kablam/exp16.png
-share/moonlander/images/kablam/exp17.png
-share/moonlander/images/kablam/exp18.png
-share/moonlander/images/kablam/exp19.png
-share/moonlander/images/kablam/exp20.png
-share/moonlander/images/kablam/exp21.png
-share/moonlander/images/kablam/exp22.png
-share/moonlander/images/kablam/exp23.png
-share/moonlander/images/kablam/exp24.png
-share/moonlander/images/kablam/exp25.png
-share/moonlander/images/logo.png
-share/moonlander/images/magigames_steel.gif
-share/moonlander/images/miniship2.bmp
-share/moonlander/images/moon-lander.ico
-share/moonlander/images/newship.png
-share/moonlander/images/thrust1.png
-share/moonlander/images/thrust2.png
-share/moonlander/images/thrust_left.bmp
-share/moonlander/images/thrust_right.bmp
-share/moonlander/images/win_icon.bmp
-%%SOUND%%share/moonlander/sounds/Blaster_1.wav
-%%SOUND%%share/moonlander/sounds/Retro_3.wav
-%%SOUND%%share/moonlander/sounds/Space_Bubbles_2.wav
-%%SOUND%%share/moonlander/sounds/beep1b.wav
-%%SOUND%%share/moonlander/sounds/eagle_has_landed.wav
-%%SOUND%%share/moonlander/sounds/explosion2.wav
-%%SOUND%%share/moonlander/sounds/honk.wav
-%%SOUND%%share/moonlander/sounds/jet_lp.wav
-%%SOUND%%@dirrm share/moonlander/sounds
-@dirrm share/moonlander/images/kablam
-@dirrm share/moonlander/images/backgrounds
-@dirrm share/moonlander/images
-@dirrm share/moonlander/fonts
-@dirrm share/moonlander