- Change Makefile header

- Change master sites
- Change maintainer email to @FreeBSD.org
- Support STAGEDIR
- Add build
- Change files/tuxfighter.in
- Change pkg-message
- Change pkg-plist, remove mtree

Approved by:	pawel / wg (mentors, implicit)

4 files changed, 30 insertions, 29 deletions

diff --git a/games/tuxfighter/Makefile b/games/tuxfighter/Makefile
index 1d75c2d73d6a..4b72b8e03868 100644
--- a/games/tuxfighter/Makefile
+++ b/games/tuxfighter/Makefile
@@ -1,4 +1,4 @@
-# Created by: nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	tuxfighter
@@ -6,12 +6,12 @@ PORTVERSION=	54
 PORTREVISION=	2
 CATEGORIES=	games python
 MASTER_SITES=	SF/pygamebook/TuxFighter/TuxFighter${PORTVERSION}_source/ \
-		SF/nemysisfreebsdp/:icons
+		SF/nemysisfreebsdp/games/:icons
 DISTFILES=	TuxFighter${DISTVERSION}.tar.gz \
 		${PORTNAME}_icons.tar.gz:icons
 DIST_SUBDIR=	python
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Little Asteroids-like Shooter game
 
 LICENSE=	GPLv2
@@ -22,7 +22,6 @@ WRKSRC=		${WRKDIR}
 
 FETCH_ARGS?=	-Fpr
 USE_PYTHON=	yes
-NO_BUILD=	yes
 
 PORTDOCS=	readme_TuxFighter54.txt
 
@@ -34,27 +33,33 @@ SUB_FILES=	${PORTNAME}
 DESKTOP_ENTRIES="TuxFighter" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+do-build:
+	@${PYTHON_CMD} -m compileall ${WRKSRC}
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.py ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR}
+	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
+		${WRKDIR}/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+
+.for d in  *.py *.pyc *.pyo
+	@(cd ${WRKSRC} ; ${INSTALL_SCRIPT} ${d} ${STAGEDIR}${DATADIR})
+.endfor
+
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR})
 
 post-install:
 .for s in ${ICON_SIZES}
-	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
-		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/tuxfighter/files/tuxfighter.in b/games/tuxfighter/files/tuxfighter.in
index 1e97cfc238eb..c12fe8ec787a 100644
--- a/games/tuxfighter/files/tuxfighter.in
+++ b/games/tuxfighter/files/tuxfighter.in
@@ -4,4 +4,4 @@
 #
 
 cd "%%DATADIR%%"
-exec ./TuxFighter54.py "${@}"
+exec %%PYTHON_CMD%% ./TuxFighter54.py "${@}"
diff --git a/games/tuxfighter/pkg-message b/games/tuxfighter/pkg-message
index be810559a420..11c42127c3dc 100644
--- a/games/tuxfighter/pkg-message
+++ b/games/tuxfighter/pkg-message
@@ -1,4 +1,5 @@
 ========================================================================
+
 Tuxfighter has been installed.
 
 Python errors will result in the first run of this game.
@@ -8,4 +9,5 @@ This issue is currently being resolved with upstream developers.
 
 All options are in the config file if you've made changes in the GUI.
     ~/.TuxFighter/TuxFighter.ini
+
 ========================================================================
diff --git a/games/tuxfighter/pkg-plist b/games/tuxfighter/pkg-plist
index d161e12de14d..78b55eed30c3 100644
--- a/games/tuxfighter/pkg-plist
+++ b/games/tuxfighter/pkg-plist
@@ -5,7 +5,11 @@ share/icons/hicolor/72x72/apps/tuxfighter.png
 share/icons/hicolor/96x96/apps/tuxfighter.png
 share/pixmaps/tuxfighter.png
 %%DATADIR%%/TuxFighter54.py
+%%DATADIR%%/TuxFighter54.pyc
+%%DATADIR%%/TuxFighter54.pyo
 %%DATADIR%%/TuxFighter_modding.py
+%%DATADIR%%/TuxFighter_modding.pyc
+%%DATADIR%%/TuxFighter_modding.pyo
 %%DATADIR%%/data/babytux1.png
 %%DATADIR%%/data/babytux2.png
 %%DATADIR%%/data/babytux3.png
@@ -56,13 +60,3 @@ share/pixmaps/tuxfighter.png
 %%DATADIR%%/data/winlogoh3.png
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/96x96/apps
-@dirrmtry share/icons/hicolor/96x96
-@dirrmtry share/icons/hicolor/72x72/apps
-@dirrmtry share/icons/hicolor/72x72
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons