3 files changed, 36 insertions, 41 deletions

diff --git a/games/whichwayisup/Makefile b/games/whichwayisup/Makefile
index 8e4bf63fd8b5..36368d107c63 100644
--- a/games/whichwayisup/Makefile
+++ b/games/whichwayisup/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.7.9
 PORTREVISION=	5
 CATEGORIES=	games python
 MASTER_SITES=	http://www.oletus.fi/static/whichwayisup/ \
-		SF/nemysisfreebsdp/:icons
+		SF/nemysisfreebsdp/games/${PORTNAME}/:icons
 DISTFILES=	${PORTNAME}_b${DISTVERSION:S/.//g}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	python
@@ -21,25 +21,25 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_PYTHON=	yes
 USE_ZIP=	yes
-USE_GNOME=	desktopfileutils
+USES=		dos2unix
+DOS2UNIX_REGEX=	.*.[^pt][^nt][^gf]
+USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
-USE_DOS2UNIX=	*.py *.txt
 
 PORTDOCS=	README.txt changelog.txt
 
-DESKTOP_ENTRIES="Which Way Is Up" "${COMMENT}" \
-		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-		"${PORTNAME}" "Game;ArcadeGame;" false
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+DESKTOP_ENTRIES="Which Way Is Up" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 post-patch:
-	@${REINPLACE_CMD} -e '/libdir =/s|=.*|= "${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}"|'\
+	@${REINPLACE_CMD} \
+		-e 's|libdir =.*|libdir = "${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}"| ; \
+		s|/usr/bin/env python|${PYTHON_CMD}|' \
 		${WRKSRC}/run_game.py
-	@${REINPLACE_CMD} -e '/data_dir =/s|data_py.*data.|"${DATADIR}"|'\
+	@${REINPLACE_CMD} -e 's|(data_py.*|("${DATADIR}"))|' \
 		${WRKSRC}/lib/data.py
 	@${FIND} ${WRKSRC} -name "*.bak" -delete -or -name "*.orig" -delete
 
@@ -49,17 +49,15 @@ do-build:
 	@${TOUCH} ${WRKSRC}/data/music/.keep_me
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/run_game.py ${PREFIX}/bin/${PORTNAME}
-	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${DATADIR})
-	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME})
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
-
-post-install:
-	@-update-desktop-database
+	${INSTALL_SCRIPT} ${WRKSRC}/run_game.py \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME})
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/whichwayisup/files/patch-lib-game.py b/games/whichwayisup/files/patch-lib__game.py
index 908c341e8b6a..193471c2f081 100644
--- a/games/whichwayisup/files/patch-lib-game.py
+++ b/games/whichwayisup/files/patch-lib__game.py
@@ -1,5 +1,5 @@
---- lib/game.py.orig	2012-10-21 13:48:24.000000000 +0200
-+++ lib/game.py	2012-10-21 14:20:03.000000000 +0200
+--- ./lib/game.py.orig	2013-12-30 21:44:21.000000000 +0100
++++ ./lib/game.py	2013-12-30 21:44:21.000000000 +0100
 @@ -140,15 +140,15 @@
  
    if joystick != None:   # Parse joystick input
@@ -10,14 +10,13 @@
 -    if axis0 < -0.1:
 -      inputs["LEFT"] = True
 -      inputs["ANALOG"] = -axis0
--
--    if axis0 > 0.1:
--      inputs["RIGHT"] = True
--      inputs["ANALOG"] = axis0
 +#    if axis0 < -0.1:
 +#      inputs["LEFT"] = True
 +#      inputs["ANALOG"] = -axis0
-+
+ 
+-    if axis0 > 0.1:
+-      inputs["RIGHT"] = True
+-      inputs["ANALOG"] = axis0
 +#    if axis0 > 0.1:
 +#      inputs["RIGHT"] = True
 +#      inputs["ANALOG"] = axis0
diff --git a/games/whichwayisup/pkg-plist b/games/whichwayisup/pkg-plist
index 3214f4a8a4cf..56f57c19fc25 100644
--- a/games/whichwayisup/pkg-plist
+++ b/games/whichwayisup/pkg-plist
@@ -66,12 +66,12 @@ bin/whichwayisup
 %%PYTHON_SITELIBDIR%%/whichwayisup/spikes.py
 %%PYTHON_SITELIBDIR%%/whichwayisup/spikes.pyc
 %%PYTHON_SITELIBDIR%%/whichwayisup/spikes.pyo
-%%PYTHON_SITELIBDIR%%/whichwayisup/trigger.py
-%%PYTHON_SITELIBDIR%%/whichwayisup/trigger.pyc
-%%PYTHON_SITELIBDIR%%/whichwayisup/trigger.pyo
 %%PYTHON_SITELIBDIR%%/whichwayisup/tile.py
 %%PYTHON_SITELIBDIR%%/whichwayisup/tile.pyc
 %%PYTHON_SITELIBDIR%%/whichwayisup/tile.pyo
+%%PYTHON_SITELIBDIR%%/whichwayisup/trigger.py
+%%PYTHON_SITELIBDIR%%/whichwayisup/trigger.pyc
+%%PYTHON_SITELIBDIR%%/whichwayisup/trigger.pyo
 %%PYTHON_SITELIBDIR%%/whichwayisup/util.py
 %%PYTHON_SITELIBDIR%%/whichwayisup/util.pyc
 %%PYTHON_SITELIBDIR%%/whichwayisup/util.pyo
@@ -85,6 +85,7 @@ bin/whichwayisup
 %%PYTHON_SITELIBDIR%%/whichwayisup/world.py
 %%PYTHON_SITELIBDIR%%/whichwayisup/world.pyc
 %%PYTHON_SITELIBDIR%%/whichwayisup/world.pyo
+share/pixmaps/whichwayisup.png
 %%DATADIR%%/levels/A Piece of Cake.txt
 %%DATADIR%%/levels/Quest For The Keys.txt
 %%DATADIR%%/levels/The Other Side.txt
@@ -196,13 +197,10 @@ bin/whichwayisup
 %%DATADIR%%/sounds/kling.ogg
 %%DATADIR%%/sounds/nextlevel.ogg
 %%DATADIR%%/sounds/woosh.ogg
-share/pixmaps/whichwayisup.png
-@dirrm %%PYTHON_SITELIBDIR%%/whichwayisup
-@dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%/misc
-@dirrm %%DATADIR%%/music
-@dirrm %%DATADIR%%/pictures
 @dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/pictures
+@dirrm %%DATADIR%%/music
+@dirrm %%DATADIR%%/misc
+@dirrm %%DATADIR%%/levels
 @dirrm %%DATADIR%%
-@exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
+@dirrm %%PYTHON_SITELIBDIR%%/whichwayisup