2 files changed, 15 insertions, 280 deletions

diff --git a/games/magicor/Makefile b/games/magicor/Makefile
index 62eec2fac0b3..3065f3551396 100644
--- a/games/magicor/Makefile
+++ b/games/magicor/Makefile
@@ -22,29 +22,25 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
-PORTDOCS=	README
+PORTDOCS=	*
+PORTDATA=	*
 
 DESKTOP_ENTRIES="Magicor" \
 		"Old-school, puzzle game similar to Solomon's Key" \
 		"" \
-		"magicor" \
+		"${PORTNAME}" \
 		"Game;LogicGame;" \
 		false
 
 OPTIONS_DEFINE=	EDITOR DOCS
 OPTIONS_DEFAULT=EDITOR
+OPTIONS_SUB=	yes
+
 EDITOR_DESC=	Enable editor
+EDITOR_RUN_DEPEND=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MEDITOR}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
-PLIST_SUB+=	EDITOR=""
-.else
-PLIST_SUB+=	EDITOR="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|###CONFIG_PATH###|${PREFIX}/etc/magicor/magicor.conf|' \
 		${WRKSRC}/Magicor.py
@@ -56,31 +52,18 @@ post-patch:
 	@${FIND} ${WRKSRC}/magicor -name "*.pyc" -delete
 
 do-install:
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR}
-	mkdir ${PYTHON_SITELIBDIR}/magicor
-	cd ${WRKSRC}/magicor && ${COPYTREE_SHARE} . ${PYTHON_SITELIBDIR}/magicor
-	${MKDIR} ${PREFIX}/etc/magicor
-	${INSTALL_SCRIPT} ${WRKSRC}/Magicor.py ${PREFIX}/bin/magicor
+	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
+	cd ${WRKSRC}/magicor && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/magicor/
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/magicor
+	${INSTALL_SCRIPT} ${WRKSRC}/Magicor.py ${STAGEDIR}${PREFIX}/bin/magicor
 	${INSTALL_DATA} ${WRKSRC}/etc/magicor.conf \
-		${PREFIX}/etc/magicor/magicor.conf.dist
-	if [ ! -f ${PREFIX}/etc/magicor/magicor.conf ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/magicor/magicor.conf.dist \
-			${PREFIX}/etc/magicor/magicor.conf; \
-	fi
+		${STAGEDIR}${PREFIX}/etc/magicor/magicor.conf.dist
 .if ${PORT_OPTIONS:MEDITOR}
-	${INSTALL_SCRIPT} ${WRKSRC}/Magicor-LevelEditor.py ${PREFIX}/bin/magicor-editor
+	${INSTALL_SCRIPT} ${WRKSRC}/Magicor-LevelEditor.py ${STAGEDIR}${PREFIX}/bin/magicor-editor
 	${INSTALL_DATA} ${WRKSRC}/etc/magicor-editor.conf \
-		${PREFIX}/etc/magicor/magicor-editor.conf.dist
-	if [ ! -f ${PREFIX}/etc/magicor/magicor-editor.conf ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/magicor/magicor-editor.conf.dist \
-			${PREFIX}/etc/magicor/magicor-editor.conf; \
-	fi
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+		${STAGEDIR}${PREFIX}/etc/magicor/magicor-editor.conf.dist
 .endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/magicor/pkg-plist b/games/magicor/pkg-plist
index cfab92950404..9b8c120e3c75 100644
--- a/games/magicor/pkg-plist
+++ b/games/magicor/pkg-plist
@@ -6,237 +6,6 @@ etc/magicor/magicor.conf.dist
 %%EDITOR%%@unexec if cmp -s %D/etc/magicor/magicor-editor.conf.dist %D/etc/magicor/magicor-editor.conf; then rm -f %D/etc/magicor/magicor-editor.conf; fi
 %%EDITOR%%etc/magicor/magicor-editor.conf.dist
 %%EDITOR%%@exec if [ ! -f %B/magicor-editor.conf ]; then cp -p %D/%F %B/magicor-editor.conf; fi
-%%DATADIR%%/backgrounds/maroon.png
-%%DATADIR%%/backgrounds/stone.png
-%%DATADIR%%/brushes
-%%DATADIR%%/editor/magicor-editor.glade
-%%DATADIR%%/editor/magicor-editor.gladep
-%%DATADIR%%/fonts/info-inactive.png
-%%DATADIR%%/fonts/info.png
-%%DATADIR%%/images/footstep.png
-%%DATADIR%%/images/gnu-logo.png
-%%DATADIR%%/images/linux-logo.png
-%%DATADIR%%/images/magicor-tmp.png
-%%DATADIR%%/images/magicor.png
-%%DATADIR%%/images/menu/continue_game-active.png
-%%DATADIR%%/images/menu/continue_game-inactive.png
-%%DATADIR%%/images/menu/new_game-active.png
-%%DATADIR%%/images/menu/new_game-inactive.png
-%%DATADIR%%/images/menu/options-active.png
-%%DATADIR%%/images/menu/options-inactive.png
-%%DATADIR%%/images/menu/quit-active.png
-%%DATADIR%%/images/menu/quit-inactive.png
-%%DATADIR%%/images/pygame-logo.png
-%%DATADIR%%/images/python-logo.png
-%%DATADIR%%/images/sdl-logo.png
-%%DATADIR%%/images/title-clouds.png
-%%DATADIR%%/images/title-ice.png
-%%DATADIR%%/images/title-sky.jpg
-%%DATADIR%%/levels/_test/blob-die.wav
-%%DATADIR%%/levels/_test/brushes
-%%DATADIR%%/levels/_test/level-05.lvl
-%%DATADIR%%/levels/_test/level-07a.lvl
-%%DATADIR%%/levels/_test/level-07d.lvl
-%%DATADIR%%/levels/_test/level-07e.lvl
-%%DATADIR%%/levels/_test/level-07f.lvl
-%%DATADIR%%/levels/_test/level-07g.lvl
-%%DATADIR%%/levels/_test/level-08.lvl
-%%DATADIR%%/levels/_test/level-09.lvl
-%%DATADIR%%/levels/_test/level-10a.lvl
-%%DATADIR%%/levels/_test/level-11a.lvl
-%%DATADIR%%/levels/_test/walking_blob.png
-%%DATADIR%%/levels/egypt/_bg-bricks.png
-%%DATADIR%%/levels/egypt/_bg-hieroglyphs.png
-%%DATADIR%%/levels/egypt/_bg-wall.png
-%%DATADIR%%/levels/egypt/bricks.png
-%%DATADIR%%/levels/egypt/brushes
-%%DATADIR%%/levels/egypt/climbing-scarab.png
-%%DATADIR%%/levels/egypt/egypt-01.lvl
-%%DATADIR%%/levels/egypt/egypt-02.lvl
-%%DATADIR%%/levels/egypt/egypt-03.lvl
-%%DATADIR%%/levels/egypt/egypt-04.lvl
-%%DATADIR%%/levels/egypt/egypt-05.lvl
-%%DATADIR%%/levels/egypt/egypt-06.lvl
-%%DATADIR%%/levels/egypt/egypt-07.lvl
-%%DATADIR%%/levels/egypt/egypt-08.lvl
-%%DATADIR%%/levels/egypt/egypt-09.lvl
-%%DATADIR%%/levels/egypt/egypt-10.lvl
-%%DATADIR%%/levels/egypt/egypt-11.lvl
-%%DATADIR%%/levels/egypt/egypt-12.lvl
-%%DATADIR%%/levels/egypt/egypt-13.lvl
-%%DATADIR%%/levels/egypt/egypt-14.lvl
-%%DATADIR%%/levels/egypt/egypt-15.lvl
-%%DATADIR%%/levels/egypt/egyptian-akward.xm
-%%DATADIR%%/levels/egypt/egyptian-sadness.xm
-%%DATADIR%%/levels/egypt/egyptian-trance.xm
-%%DATADIR%%/levels/egypt/h1.png
-%%DATADIR%%/levels/egypt/scarab-die.wav
-%%DATADIR%%/levels/egypt/spider.png
-%%DATADIR%%/levels/egypt/walking-scarab.png
-%%DATADIR%%/levels/forest/_bg-green.png
-%%DATADIR%%/levels/forest/_bg-wines.png
-%%DATADIR%%/levels/forest/blippy.xm
-%%DATADIR%%/levels/forest/brushes
-%%DATADIR%%/levels/forest/decor-drop-left.png
-%%DATADIR%%/levels/forest/decor-drop-right.png
-%%DATADIR%%/levels/forest/decor-drops.png
-%%DATADIR%%/levels/forest/decor-flower.png
-%%DATADIR%%/levels/forest/decor-moist.png
-%%DATADIR%%/levels/forest/decor-water.png
-%%DATADIR%%/levels/forest/f2.png
-%%DATADIR%%/levels/forest/f3.png
-%%DATADIR%%/levels/forest/forest-01.lvl
-%%DATADIR%%/levels/forest/forest-02.lvl
-%%DATADIR%%/levels/forest/forest-03.lvl
-%%DATADIR%%/levels/forest/forest-04.lvl
-%%DATADIR%%/levels/forest/forest-05.lvl
-%%DATADIR%%/levels/forest/forest-06.lvl
-%%DATADIR%%/levels/forest/forest-07.lvl
-%%DATADIR%%/levels/forest/forest-08.lvl
-%%DATADIR%%/levels/forest/forest-09.lvl
-%%DATADIR%%/levels/forest/forest-10.lvl
-%%DATADIR%%/levels/forest/forest-11.lvl
-%%DATADIR%%/levels/forest/forest-12.lvl
-%%DATADIR%%/levels/forest/forest-13.lvl
-%%DATADIR%%/levels/forest/forest-14.lvl
-%%DATADIR%%/levels/forest/forest-15.lvl
-%%DATADIR%%/levels/forest/rainforest.xm
-%%DATADIR%%/levels/forest/tile-wood.png
-%%DATADIR%%/levels/level-01.lvl
-%%DATADIR%%/levels/level-02.lvl
-%%DATADIR%%/levels/level-03.lvl
-%%DATADIR%%/levels/pompei/B100M801.png
-%%DATADIR%%/levels/pompei/box_3_lindo_fog_halo1.png
-%%DATADIR%%/levels/pompei/box_3_lindo_fog_sinnormal.png
-%%DATADIR%%/levels/pompei/brushes
-%%DATADIR%%/levels/pompei/decor-hcenter.png
-%%DATADIR%%/levels/pompei/decor-left.png
-%%DATADIR%%/levels/pompei/decor-right.png
-%%DATADIR%%/levels/pompei/huevospline_3_lindo_fog_b.png
-%%DATADIR%%/levels/pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow.png
-%%DATADIR%%/levels/pompei/pompei-01.lvl
-%%DATADIR%%/levels/pompei/pompei-02.lvl
-%%DATADIR%%/levels/pompei/pompei-03.lvl
-%%DATADIR%%/levels/pompei/pompei-04.lvl
-%%DATADIR%%/levels/pompei/pompei-05.lvl
-%%DATADIR%%/levels/pompei/pompei-06.lvl
-%%DATADIR%%/levels/pompei/pompei-07.lvl
-%%DATADIR%%/levels/pompei/pompei-08.lvl
-%%DATADIR%%/levels/pompei/pompei-09.lvl
-%%DATADIR%%/levels/pompei/pompei-10.lvl
-%%DATADIR%%/levels/pompei/pompei-11.lvl
-%%DATADIR%%/levels/pompei/pompei-12.lvl
-%%DATADIR%%/levels/pompei/pompei-13.lvl
-%%DATADIR%%/levels/pompei/pompei-14.lvl
-%%DATADIR%%/levels/pompei/pompei-15.lvl
-%%DATADIR%%/levels/pompei/pompei1.xm
-%%DATADIR%%/levels/pompei/pompei2.xm
-%%DATADIR%%/levels/pompei/rect_cz_touched_2c3.png
-%%DATADIR%%/levels/pompei/tile-hmosaic.png
-%%DATADIR%%/levels/snow/brushes
-%%DATADIR%%/levels/snow/i1.png
-%%DATADIR%%/levels/snow/ice.xm
-%%DATADIR%%/levels/snow/ice1.png
-%%DATADIR%%/levels/snow/ice2.png
-%%DATADIR%%/levels/snow/ice2.xm
-%%DATADIR%%/levels/snow/ice3.png
-%%DATADIR%%/levels/snow/snow-01.lvl
-%%DATADIR%%/levels/snow/snow-02.lvl
-%%DATADIR%%/levels/snow/snow-03.lvl
-%%DATADIR%%/levels/snow/snow-04.lvl
-%%DATADIR%%/levels/snow/snow-05.lvl
-%%DATADIR%%/levels/snow/snow-06.lvl
-%%DATADIR%%/levels/snow/snow-07.lvl
-%%DATADIR%%/levels/snow/snow-08.lvl
-%%DATADIR%%/levels/snow/snow-09.lvl
-%%DATADIR%%/levels/snow/snow-10.lvl
-%%DATADIR%%/levels/snow/snow-11.lvl
-%%DATADIR%%/levels/snow/snow-12.lvl
-%%DATADIR%%/levels/snow/snow-13.lvl
-%%DATADIR%%/levels/snow/snow-14.lvl
-%%DATADIR%%/levels/snow/snow-15.lvl
-%%DATADIR%%/levels/snow/snow.png
-%%DATADIR%%/levels/snow/snowman.png
-%%DATADIR%%/levels/snow/snowtop.png
-%%DATADIR%%/levels/space/_bg-landscape.png
-%%DATADIR%%/levels/space/_bg-nebula.png
-%%DATADIR%%/levels/space/_bg-nova.png
-%%DATADIR%%/levels/space/blob-die.wav
-%%DATADIR%%/levels/space/brushes
-%%DATADIR%%/levels/space/decor-small-star.png
-%%DATADIR%%/levels/space/decor-star.png
-%%DATADIR%%/levels/space/space-01.lvl
-%%DATADIR%%/levels/space/space-02.lvl
-%%DATADIR%%/levels/space/space-03.lvl
-%%DATADIR%%/levels/space/space-04.lvl
-%%DATADIR%%/levels/space/space-05.lvl
-%%DATADIR%%/levels/space/space-06.lvl
-%%DATADIR%%/levels/space/space-07.lvl
-%%DATADIR%%/levels/space/space-08.lvl
-%%DATADIR%%/levels/space/space-09.lvl
-%%DATADIR%%/levels/space/space-10.lvl
-%%DATADIR%%/levels/space/space-11.lvl
-%%DATADIR%%/levels/space/space-12.lvl
-%%DATADIR%%/levels/space/space-13.lvl
-%%DATADIR%%/levels/space/space-14.lvl
-%%DATADIR%%/levels/space/space-15.lvl
-%%DATADIR%%/levels/space/strange.xm
-%%DATADIR%%/levels/space/tile-01.png
-%%DATADIR%%/levels/space/walking-blob.png
-%%DATADIR%%/music/menu.xm
-%%DATADIR%%/music/playing.xm
-%%DATADIR%%/music/soft-trance.xm
-%%DATADIR%%/music/title.xm
-%%DATADIR%%/samples/blockhit.wav
-%%DATADIR%%/samples/blockland.wav
-%%DATADIR%%/samples/bonus.wav
-%%DATADIR%%/samples/createice.wav
-%%DATADIR%%/samples/done.wav
-%%DATADIR%%/samples/erupt.wav
-%%DATADIR%%/samples/fall.wav
-%%DATADIR%%/samples/icebreak.wav
-%%DATADIR%%/samples/jump.wav
-%%DATADIR%%/samples/menu.wav
-%%DATADIR%%/samples/playerdie.wav
-%%DATADIR%%/samples/playerland.wav
-%%DATADIR%%/samples/push.wav
-%%DATADIR%%/samples/spikes.wav
-%%DATADIR%%/samples/start.wav
-%%DATADIR%%/samples/walk.wav
-%%DATADIR%%/sprites/arrow.png
-%%DATADIR%%/sprites/ball_b.png
-%%DATADIR%%/sprites/burning.png
-%%DATADIR%%/sprites/cloud.png
-%%DATADIR%%/sprites/dust.png
-%%DATADIR%%/sprites/fire-normal.png
-%%DATADIR%%/sprites/frost.png
-%%DATADIR%%/sprites/ice-hard.png
-%%DATADIR%%/sprites/ice-normal.png
-%%DATADIR%%/sprites/lava.png
-%%DATADIR%%/sprites/light-white.png
-%%DATADIR%%/sprites/light-yellow.png
-%%DATADIR%%/sprites/player-penguin.png
-%%DATADIR%%/sprites/player-test.png
-%%DATADIR%%/sprites/seeker3x18.png
-%%DATADIR%%/sprites/sparkle-star.png
-%%DATADIR%%/sprites/sparkle-yellow.png
-%%DATADIR%%/sprites/spikes.png
-%%DATADIR%%/sprites/spiting_lava.png
-%%DATADIR%%/sprites/sun.png
-%%DATADIR%%/sprites/sunlight.png
-%%DATADIR%%/sprites/trapola.png
-%%DATADIR%%/sprites/trapola2_q.png
-%%DATADIR%%/sprites/trapola2b_exp.png
-%%DATADIR%%/sprites/tube-endings.png
-%%DATADIR%%/tiles/shadow.png
-%%DATADIR%%/tiles/squares.png
-%%DATADIR%%/tiles/stone.png
-%%DATADIR%%/tiles/tube-horizontal.png
-%%DATADIR%%/tiles/tube-left-down.png
-%%DATADIR%%/tiles/tube-left-up.png
-%%DATADIR%%/tiles/tube-right-down.png
-%%DATADIR%%/tiles/tube-right-up.png
-%%DATADIR%%/tiles/tube-vertical.png
 %%PYTHON_SITELIBDIR%%/magicor/__init__.py
 %%PYTHON_SITELIBDIR%%/magicor/editor/__init__.py
 %%PYTHON_SITELIBDIR%%/magicor/editor/brushes.py
@@ -263,21 +32,4 @@ etc/magicor/magicor.conf.dist
 @dirrm %%PYTHON_SITELIBDIR%%/magicor/sprites
 @dirrm %%PYTHON_SITELIBDIR%%/magicor/editor
 @dirrm %%PYTHON_SITELIBDIR%%/magicor
-@dirrm %%DATADIR%%/tiles
-@dirrm %%DATADIR%%/sprites
-@dirrm %%DATADIR%%/samples
-@dirrm %%DATADIR%%/music
-@dirrm %%DATADIR%%/levels/space
-@dirrm %%DATADIR%%/levels/snow
-@dirrm %%DATADIR%%/levels/pompei
-@dirrm %%DATADIR%%/levels/forest
-@dirrm %%DATADIR%%/levels/egypt
-@dirrm %%DATADIR%%/levels/_test
-@dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%/images/menu
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/editor
-@dirrm %%DATADIR%%/backgrounds
-@dirrm %%DATADIR%%
 @dirrmtry etc/magicor