- Add staging support

- Break lines around 80 characters
- Define DOCS option
- Sort pkg-plist

2 files changed, 73 insertions, 72 deletions

diff --git a/games/pydance/Makefile b/games/pydance/Makefile
index 0c61f1492477..0b6e7d15973a 100644
--- a/games/pydance/Makefile
+++ b/games/pydance/Makefile
@@ -16,48 +16,47 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dancing simulation game similar to the kind in arcades
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+BUILD_DEPENDS=	${PYGAME}
+RUN_DEPENDS=	${PYGAME}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_NOEGGINFO=	yes
-
-PLIST_SUB=	SONGS=""
-SONGS=		forkbomb.ogg forkbomb.dance forkbomb-bg.jpg forkbomb-banner.png 6jan.ogg 6jan.dance 6jan-bg.jpg 6jan-banner.png synrg.ogg synrg.dance synrg-bg.png pydance-cdtitle.png
-
 SUB_FILES=	pkg-message
 
-MAN1=		findbpm.1
-MAN6=		pydance.6
+SONGS=		forkbomb.ogg forkbomb.dance forkbomb-bg.jpg forkbomb-banner.png \
+		6jan.ogg 6jan.dance 6jan-bg.jpg 6jan-banner.png synrg.ogg \
+		synrg.dance synrg-bg.png pydance-cdtitle.png
+
+DOCFILES=	BUGS CREDITS ChangeLog HACKING INSTALL LICENSE README TODO \
+		docs/dance-spec.txt docs/dwi-hall-of-shame.txt \
+		docs/ksf-format.txt docs/manual.html
 
-DOCFILES=	BUGS CREDITS ChangeLog HACKING INSTALL LICENSE README TODO docs/dance-spec.txt docs/dwi-hall-of-shame.txt docs/ksf-format.txt docs/manual.html
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e "s,/etc,${LOCALBASE}/etc," ${WRKSRC}/constants.py
 do-install:
-	${MKDIR} ${PREFIX}/share/games/pydance
-	${MKDIR} ${PREFIX}/share/games/pydance/songs
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} utils/findbpm.py ${PREFIX}/bin/findbpm
-	cd ${WRKSRC} && for MODULE in *.py; do test "$$MODULE" = "setup.py" -o "$$MODULE" = "pydance.py" || ${INSTALL_DATA} $$MODULE ${PREFIX}/share/games/pydance/$$MODULE || exit 1; done
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} pydance.py ${PREFIX}/share/games/pydance/pydance.py
-	cd ${WRKSRC} && ${FIND} themes/ images/ sound/ -type d -exec ${MKDIR} ${PREFIX}/share/games/pydance/{} \;
-	cd ${WRKSRC} && ${FIND} themes/ images/ sound/ -type f -exec ${INSTALL_DATA} {} ${PREFIX}/share/games/pydance/{} \;
-	cd ${WRKSRC} && ${INSTALL_MAN} docs/man/findbpm.1 ${MANPREFIX}/man/man1/
-	cd ${WRKSRC} && ${INSTALL_MAN} docs/man/pydance.6 ${MANPREFIX}/man/man6/
-	${LN} -sf ${PREFIX}/share/games/pydance/pydance.py ${PREFIX}/bin/pydance
-	cd ${WRKSRC} && ${INSTALL_DATA} pydance.posix.cfg ${PREFIX}/etc/pydance.cfg.sample
-	for SONG in ${SONGS}; do ${INSTALL_DATA} ${_DISTDIR}/$$SONG ${PREFIX}/share/games/pydance/songs; done
-	${MV} ${PREFIX}/share/games/pydance/songs/pydance-cdtitle.png ${PREFIX}/share/games/pydance/songs/pydance.png
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${MKDIR} ${DOCSDIR}/images
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} docs/images/* ${DOCSDIR}/images
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/pydance/songs
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/findbpm.py ${STAGEDIR}${PREFIX}/bin/findbpm
+	(cd ${WRKSRC} && for MODULE in *.py; do test "$$MODULE" = "setup.py" -o \
+		"$$MODULE" = "pydance.py" || ${INSTALL_DATA} $$MODULE \
+		${STAGEDIR}${PREFIX}/share/games/pydance/$$MODULE || exit 1; done)
+	${INSTALL_SCRIPT} ${WRKSRC}/pydance.py ${STAGEDIR}${PREFIX}/share/games/pydance
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "themes images sound" \
+		${STAGEDIR}${PREFIX}/share/games/pydance)
+	${INSTALL_MAN} ${WRKSRC}/docs/man/findbpm.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/pydance.6 ${STAGEDIR}${MANPREFIX}/man/man6
+	${LN} -sf ${PREFIX}/share/games/pydance/pydance.py \
+		${STAGEDIR}${PREFIX}/bin/pydance
+	${INSTALL_DATA} ${WRKSRC}/pydance.posix.cfg \
+		${STAGEDIR}${PREFIX}/etc/pydance.cfg.sample
+	(cd ${_DISTDIR} && ${INSTALL_DATA} ${SONGS} \
+		${STAGEDIR}${PREFIX}/share/games/pydance/songs)
+	(cd ${STAGEDIR}${PREFIX}/share/games/pydance/songs && ${MV} \
+		pydance-cdtitle.png pydance.png)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/games/pydance/pkg-plist b/games/pydance/pkg-plist
index 39f84f4544c8..2306480b3d3b 100644
--- a/games/pydance/pkg-plist
+++ b/games/pydance/pkg-plist
@@ -1,19 +1,33 @@
-@unexec rm -f %D/share/games/pydance/*.py[co]
-%%SONGS%%share/games/pydance/songs/6jan-banner.png
-%%SONGS%%share/games/pydance/songs/6jan-bg.jpg
-%%SONGS%%share/games/pydance/songs/6jan.dance
-%%SONGS%%share/games/pydance/songs/6jan.ogg
-%%SONGS%%share/games/pydance/songs/forkbomb-banner.png
-%%SONGS%%share/games/pydance/songs/forkbomb-bg.jpg
-%%SONGS%%share/games/pydance/songs/forkbomb.dance
-%%SONGS%%share/games/pydance/songs/forkbomb.ogg
-%%SONGS%%share/games/pydance/songs/pydance.png
-%%SONGS%%share/games/pydance/songs/synrg-bg.png
-%%SONGS%%share/games/pydance/songs/synrg.dance
-%%SONGS%%share/games/pydance/songs/synrg.ogg
 bin/findbpm
 bin/pydance
 etc/pydance.cfg.sample
+man/man1/findbpm.1.gz
+man/man6/pydance.6.gz
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/dance-spec.txt
+%%PORTDOCS%%%%DOCSDIR%%/dwi-hall-of-shame.txt
+%%PORTDOCS%%%%DOCSDIR%%/images/cheappad.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/diff-indicator.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/emsusb2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/endless.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/gameselect.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/joe-sis.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/keymap.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/menu.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/nonstop-picks.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/nonstop.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/options.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/ss-folder.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/ss-song.jpg
+%%PORTDOCS%%%%DOCSDIR%%/ksf-format.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
 share/games/pydance/announcer.py
 share/games/pydance/arrows.py
 share/games/pydance/colors.py
@@ -86,6 +100,18 @@ share/games/pydance/player.py
 share/games/pydance/pydance.py
 share/games/pydance/records.py
 share/games/pydance/scores.py
+share/games/pydance/songs/6jan-banner.png
+share/games/pydance/songs/6jan-bg.jpg
+share/games/pydance/songs/6jan.dance
+share/games/pydance/songs/6jan.ogg
+share/games/pydance/songs/forkbomb-banner.png
+share/games/pydance/songs/forkbomb-bg.jpg
+share/games/pydance/songs/forkbomb.dance
+share/games/pydance/songs/forkbomb.ogg
+share/games/pydance/songs/pydance.png
+share/games/pydance/songs/synrg-bg.png
+share/games/pydance/songs/synrg.dance
+share/games/pydance/songs/synrg.ogg
 share/games/pydance/songselect.py
 share/games/pydance/sound/assist-d.ogg
 share/games/pydance/sound/assist-l.ogg
@@ -132,9 +158,9 @@ share/games/pydance/themes/dj/djenzay/rankings/secondchances.ogg
 share/games/pydance/themes/dj/djenzay/rankings/sure.ogg
 share/games/pydance/themes/dj/djenzay/rankings/tobe.ogg
 share/games/pydance/themes/dj/none/djtheme.cfg
-share/games/pydance/themes/font/default.cfg
-share/games/pydance/themes/font/VL-PGothic-Regular.ttf
 share/games/pydance/themes/font/VL PGothic.cfg
+share/games/pydance/themes/font/VL-PGothic-Regular.ttf
+share/games/pydance/themes/font/default.cfg
 share/games/pydance/themes/gfx/32x32/ddresque.zip
 share/games/pydance/themes/gfx/32x32/default/arr_c_c_0.png
 share/games/pydance/themes/gfx/32x32/default/arr_c_c_1.png
@@ -385,30 +411,6 @@ share/games/pydance/util.py
 @dirrm share/games/pydance/images
 @dirrm share/games/pydance
 @dirrmtry share/games
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/dance-spec.txt
-%%PORTDOCS%%%%DOCSDIR%%/dwi-hall-of-shame.txt
-%%PORTDOCS%%%%DOCSDIR%%/images/cheappad.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/diff-indicator.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/emsusb2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/endless.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/gameselect.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/joe-sis.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/keymap.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/menu.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/nonstop-picks.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/nonstop.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/options.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/ss-folder.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/ss-song.jpg
-%%PORTDOCS%%%%DOCSDIR%%/ksf-format.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rm -f %D/share/games/pydance/*.py[co]