2 files changed, 5 insertions, 150 deletions

diff --git a/games/gondola/Makefile b/games/gondola/Makefile
index e96956a05f43..d404606b5d29 100644
--- a/games/gondola/Makefile
+++ b/games/gondola/Makefile
@@ -25,6 +25,8 @@ SUB_LIST=	PROGRAM_DIR="${PREFIX}/lib/${PORTNAME}"
 
 WRKSRC=		${WRKDIR}/Gondola-${PORTVERSION}
 
+PORTDATA=	*
+
 DESKTOP_ENTRIES="Gondola" \
 		"Create and optimize a distribution network of gondolas" \
 		"" \
@@ -32,7 +34,6 @@ DESKTOP_ENTRIES="Gondola" \
 		"Game;StrategyGame;" \
 		false
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|g' ${WRKSRC}/gamelib/*.py
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
@@ -40,11 +41,9 @@ post-patch:
 	@${RM} -f ${WRKSRC}/gamelib/*.{bak,orig}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "snowui gamelib simplejson run_game.py" \
-		${PREFIX}/lib/${PORTNAME}
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/data && ${COPYTREE_SHARE} '*' ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
+	cd ${WRKSRC}/data && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DATADIR}/
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/games/gondola/pkg-plist b/games/gondola/pkg-plist
index 0061fb304993..dd3fc83c0c32 100644
--- a/games/gondola/pkg-plist
+++ b/games/gondola/pkg-plist
@@ -60,150 +60,6 @@ lib/gondola/snowui/scrollbox.py
 lib/gondola/snowui/scrollbox.pyc
 lib/gondola/snowui/widget.py
 lib/gondola/snowui/widget.pyc
-%%DATADIR%%/all.png
-%%DATADIR%%/arcticpaint_logo.png
-%%DATADIR%%/arrow.png
-%%DATADIR%%/arrow_bg.png
-%%DATADIR%%/b_build.png
-%%DATADIR%%/b_fast.png
-%%DATADIR%%/b_menu.png
-%%DATADIR%%/b_pause.png
-%%DATADIR%%/b_play.png
-%%DATADIR%%/ball.png
-%%DATADIR%%/barge.png
-%%DATADIR%%/barge_wake_left.png
-%%DATADIR%%/barge_wake_right.png
-%%DATADIR%%/bird_flying.png
-%%DATADIR%%/bronze.png
-%%DATADIR%%/button.png
-%%DATADIR%%/button_long.png
-%%DATADIR%%/cable.png
-%%DATADIR%%/connection_selection.png
-%%DATADIR%%/consumer.png
-%%DATADIR%%/consumer_bg.png
-%%DATADIR%%/cube.png
-%%DATADIR%%/cursors/build.png
-%%DATADIR%%/cursors/connect.png
-%%DATADIR%%/cursors/default.png
-%%DATADIR%%/decors/bird0.png
-%%DATADIR%%/decors/bird1.png
-%%DATADIR%%/decors/buoy0.png
-%%DATADIR%%/decors/dock0.png
-%%DATADIR%%/decors/hut0.png
-%%DATADIR%%/decors/plant0.png
-%%DATADIR%%/decors/plant1.png
-%%DATADIR%%/decors/rock0.png
-%%DATADIR%%/decors/rock1.png
-%%DATADIR%%/dificulty.png
-%%DATADIR%%/fs_down.png
-%%DATADIR%%/fs_up.png
-%%DATADIR%%/gear.png
-%%DATADIR%%/gold.png
-%%DATADIR%%/gondola.png
-%%DATADIR%%/help_bubble.png
-%%DATADIR%%/hsinput.png
-%%DATADIR%%/hssubmit.png
-%%DATADIR%%/hud.png
-%%DATADIR%%/hud2.png
-%%DATADIR%%/hud_popup.png
-%%DATADIR%%/icon_build.png
-%%DATADIR%%/icon_clear.png
-%%DATADIR%%/icon_connect.png
-%%DATADIR%%/icon_continue.png
-%%DATADIR%%/icon_decors.png
-%%DATADIR%%/icon_exit.png
-%%DATADIR%%/icon_islands.png
-%%DATADIR%%/icon_save.png
-%%DATADIR%%/icon_sp.png
-%%DATADIR%%/ingame_menu.png
-%%DATADIR%%/island1.png
-%%DATADIR%%/island1_border.png
-%%DATADIR%%/island2.png
-%%DATADIR%%/island2_border.png
-%%DATADIR%%/island3.png
-%%DATADIR%%/island3_border.png
-%%DATADIR%%/island4.png
-%%DATADIR%%/island4_border.png
-%%DATADIR%%/island5.png
-%%DATADIR%%/island5_border.png
-%%DATADIR%%/islands.svg
-%%DATADIR%%/map_bg.png
-%%DATADIR%%/map_select.png
-%%DATADIR%%/maps/Barges.json
-%%DATADIR%%/maps/Big Map.json
-%%DATADIR%%/maps/The Transformer.json
-%%DATADIR%%/maps/Tutorial.json
-%%DATADIR%%/maps/Volcanos.json
-%%DATADIR%%/maps/_tpl.json
-%%DATADIR%%/menu/man1.png
-%%DATADIR%%/menu/map_detail.png
-%%DATADIR%%/menu/maps_bar.png
-%%DATADIR%%/menu/moc_map.png
-%%DATADIR%%/menu/play.png
-%%DATADIR%%/menu/selection.png
-%%DATADIR%%/menu/selection_blank.png
-%%DATADIR%%/menu_bg.png
-%%DATADIR%%/menu_button.png
-%%DATADIR%%/menu_buttons_bg.png
-%%DATADIR%%/minimap/border.png
-%%DATADIR%%/minimap/i1.png
-%%DATADIR%%/minimap/i2.png
-%%DATADIR%%/minimap/i3.png
-%%DATADIR%%/minimap/i4.png
-%%DATADIR%%/minimap/i5.png
-%%DATADIR%%/minimap/overlay.png
-%%DATADIR%%/minimap/zoom.png
-%%DATADIR%%/movie/cables.png
-%%DATADIR%%/movie/claw.png
-%%DATADIR%%/movie/drawing.svg
-%%DATADIR%%/movie/gondola1.png
-%%DATADIR%%/movie/island_bg.png
-%%DATADIR%%/movie/loading.png
-%%DATADIR%%/movie/loading_bg.png
-%%DATADIR%%/movie/sky1.png
-%%DATADIR%%/movie/tree1.png
-%%DATADIR%%/movie/wheel.png
-%%DATADIR%%/music/Laid Back Swing.mp3
-%%DATADIR%%/music/One For Luck.mp3
-%%DATADIR%%/mute.png
-%%DATADIR%%/mute_onn.png
-%%DATADIR%%/play.png
-%%DATADIR%%/producer.png
-%%DATADIR%%/quit.png
-%%DATADIR%%/r_arrow.png
-%%DATADIR%%/selection.png
-%%DATADIR%%/silver.png
-%%DATADIR%%/smoke.png
-%%DATADIR%%/sorter_arm.png
-%%DATADIR%%/sorter_base.png
-%%DATADIR%%/sorter_claw_close.png
-%%DATADIR%%/sorter_claw_open.png
-%%DATADIR%%/sounds/beach-waves.mp3
-%%DATADIR%%/sounds/connection.wav
-%%DATADIR%%/sounds/splash.mp3
-%%DATADIR%%/sounds/squeak1.wav
-%%DATADIR%%/sounds/squeak2.wav
-%%DATADIR%%/sounds/squeak3.wav
-%%DATADIR%%/sounds/squeak4.wav
-%%DATADIR%%/sounds/tug-boat-horn.mp3
-%%DATADIR%%/station.png
-%%DATADIR%%/station_icon_consumer.png
-%%DATADIR%%/station_icon_gear.png
-%%DATADIR%%/station_placeholder.png
-%%DATADIR%%/stats_popup.png
-%%DATADIR%%/transformer.png
-%%DATADIR%%/transformer_bg.png
-%%DATADIR%%/triangle.png
-%%DATADIR%%/wake.png
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/music
-@dirrm %%DATADIR%%/movie
-@dirrm %%DATADIR%%/minimap
-@dirrm %%DATADIR%%/menu
-@dirrm %%DATADIR%%/maps
-@dirrm %%DATADIR%%/decors
-@dirrm %%DATADIR%%/cursors
-@dirrm %%DATADIR%%
 @dirrm lib/gondola/snowui
 @dirrm lib/gondola/simplejson
 @dirrm lib/gondola/gamelib