svn commit: r338265 - in head/games/whichwayisup: . files
Rusmir Dusko
nemysis at FreeBSD.org
Tue Dec 31 09:02:13 UTC 2013
Author: nemysis
Date: Tue Dec 31 09:02:12 2013
New Revision: 338265
URL: http://svnweb.freebsd.org/changeset/ports/338265
Log:
- Change master sites
- USES dos2unix instead of USE_DOS2UNIX
- Remove dependency for desktopfileutils
- Add DOCS Option
- Change Desktop entry file
- Simplify REINPLACE_CMD
- Fix the usage of 'python' to get rid of the implicit lang/python dependency
- Break lines around 80 characters
- Recreate patches with make makepatch
- Recreate pkg-plist with make makeplist
Approved by: pawel / wg (mentors, implicit)
Added:
head/games/whichwayisup/files/patch-lib__game.py (contents, props changed)
Deleted:
head/games/whichwayisup/files/patch-lib-game.py
Modified:
head/games/whichwayisup/Makefile
head/games/whichwayisup/pkg-plist
Modified: head/games/whichwayisup/Makefile
==============================================================================
--- head/games/whichwayisup/Makefile Tue Dec 31 08:51:35 2013 (r338264)
+++ head/games/whichwayisup/Makefile Tue Dec 31 09:02:12 2013 (r338265)
@@ -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
+ ${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/
-post-install:
- @-update-desktop-database
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Added: head/games/whichwayisup/files/patch-lib__game.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/whichwayisup/files/patch-lib__game.py Tue Dec 31 09:02:12 2013 (r338265)
@@ -0,0 +1,51 @@
+--- ./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
+
+- axis0 = joystick.get_axis(0)
++# axis0 = joystick.get_axis(0)
+
+- if axis0 < -0.1:
+- inputs["LEFT"] = 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
+
+ if joystick.get_numbuttons() > 1:
+ if joystick.get_button(0):
+@@ -165,16 +165,16 @@
+ keys_released["J_B1"] = False
+ else:
+ keys_released["J_B1"] = True
+- else:
+- axis1 = joystick.get_axis(1)
++# else:
++# axis1 = joystick.get_axis(1)
+
+- if axis1 < -0.1:
+- inputs["UP"] = True
+- if keys_released["J_A1U"]:
+- inputs["JUMP"] = True
+- keys_released["J_A1U"] = False
+- else:
+- keys_released["J_A1U"] = True
++# if axis1 < -0.1:
++# inputs["UP"] = True
++# if keys_released["J_A1U"]:
++# inputs["JUMP"] = True
++# keys_released["J_A1U"] = False
++# else:
++# keys_released["J_A1U"] = True
+
+ if axis1 > 0.1:
+ if keys_released["J_A1D"]:
Modified: head/games/whichwayisup/pkg-plist
==============================================================================
--- head/games/whichwayisup/pkg-plist Tue Dec 31 08:51:35 2013 (r338264)
+++ head/games/whichwayisup/pkg-plist Tue Dec 31 09:02:12 2013 (r338265)
@@ -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
- at dirrm %%PYTHON_SITELIBDIR%%/whichwayisup
- at dirrm %%DATADIR%%/levels
- at dirrm %%DATADIR%%/misc
- at dirrm %%DATADIR%%/music
- at dirrm %%DATADIR%%/pictures
@dirrm %%DATADIR%%/sounds
+ at dirrm %%DATADIR%%/pictures
+ at dirrm %%DATADIR%%/music
+ at dirrm %%DATADIR%%/misc
+ at dirrm %%DATADIR%%/levels
@dirrm %%DATADIR%%
- at exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
+ at dirrm %%PYTHON_SITELIBDIR%%/whichwayisup
More information about the svn-ports-all
mailing list