Date: Fri, 15 Feb 2013 14:00:01 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/172934: [PATCH] games/whichwayisup: Makefile changed, OptionsNG, take maintainership Message-ID: <201302151400.r1FE018t011871@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/172934; it has been noted by GNATS.
From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/172934: [PATCH] games/whichwayisup: Makefile changed,
OptionsNG, take maintainership
Date: Fri, 15 Feb 2013 14:55:16 +0100
--MP_/5a_byW=RxSAIyfHfkVYtaAe
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Removed
BUILD_DEPENDS= winicontoppm:${PORTSDIR}/graphics/netpbm
Added in Makefile
SF/nemysisfreebsdp/:icons
${PORTNAME}.png:icons
USE_GNOME= desktopfileutils
INSTALLS_ICONS= yes
@-update-desktop-database
in pkg-plist
@exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
--MP_/5a_byW=RxSAIyfHfkVYtaAe
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=whichwayisup.diff
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/games/whichwayisup/Makefile ./Makefile
--- /usr/ports/games/whichwayisup/Makefile 2013-01-14 17:55:23.000000000 +0100
+++ ./Makefile 2013-02-15 14:44:26.000000000 +0100
@@ -7,42 +7,62 @@
PORTNAME= whichwayisup
PORTVERSION= 0.7.9
-PORTREVISION= 3
-DISTVERSION= ${PORTVERSION:S/.//g}
-CATEGORIES= games
-MASTER_SITES= http://www.hectigo.net/games/whichwayisup/
-DISTNAME= ${PORTNAME}_b${DISTVERSION}
+PORTREVISION= 4
+CATEGORIES= games python
+MASTER_SITES= http://www.oletus.fi/static/whichwayisup/ \
+ SF/nemysisfreebsdp/:icons
+DISTFILES= ${PORTNAME}_b${DISTVERSION:S/.//g}${EXTRACT_SUFX} \
+ ${PORTNAME}.png:icons
+DIST_SUBDIR= python
+EXTRACT_ONLY= ${PORTNAME}_b${DISTVERSION:S/.//g}${EXTRACT_SUFX}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= nemysis@gmx.ch
COMMENT= Platformer game with rotational twist
-RUN_DEPENDS= py*-game>=1.7.1:${PORTSDIR}/devel/py-game
+LICENSE= GPLv2
+
+RUN_DEPENDS= ${PYGAME}
+
+WRKSRC= ${WRKDIR}/${PORTNAME}
USE_PYTHON= yes
USE_ZIP= yes
+USE_GNOME= desktopfileutils
+INSTALLS_ICONS= yes
+USE_DOS2UNIX= *.py *.txt
+
PORTDOCS= README.txt changelog.txt
-WRKSRC= ${WRKDIR}/${PORTNAME}
+DESKTOP_ENTRIES="Which Way Is Up" "${COMMENT}" \
+ "${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+ "${PORTNAME}" "Game;ArcadeGame;" false
+
+.include <bsd.port.options.mk>
post-patch:
@${REINPLACE_CMD} -e '/libdir =/s|=.*|= "${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}"|'\
${WRKSRC}/run_game.py
@${REINPLACE_CMD} -e '/data_dir =/s|data_py.*data.|"${DATADIR}"|'\
${WRKSRC}/lib/data.py
- @${RM} ${WRKSRC}/lib/data.py.bak
+ @${FIND} ${WRKSRC} -name "*.bak" -delete -or -name "*.orig" -delete
do-build:
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/lib/
- @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/lib/
+ @${PYTHON_CMD} -m compileall ${WRKSRC}
+ @${PYTHON_CMD} -O -m compileall ${WRKSRC}
@${TOUCH} ${WRKSRC}/data/music/.keep_me
do-install:
- @cd ${WRKSRC}/data/&&${COPYTREE_SHARE} . ${DATADIR}/
- @cd ${WRKSRC}/lib/&&${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/
- @${INSTALL_SCRIPT} ${WRKSRC}/run_game.py ${PREFIX}/bin/${PORTNAME}
-.ifndef NOPORTDOCS
- @${INSTALL} -d ${DOCSDIR}/
- @cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+ ${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
+
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/whichwayisup/distinfo ./distinfo
--- /usr/ports/games/whichwayisup/distinfo 2013-01-14 17:55:23.000000000 +0100
+++ ./distinfo 2013-02-15 14:44:11.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (whichwayisup_b079.zip) = bcc2b7fc8719a8e055969c8eac099b7c40b9d68f36ba1f83d690216bdcdd51f6
-SIZE (whichwayisup_b079.zip) = 1001890
+SHA256 (python/whichwayisup_b079.zip) = bcc2b7fc8719a8e055969c8eac099b7c40b9d68f36ba1f83d690216bdcdd51f6
+SIZE (python/whichwayisup_b079.zip) = 1001890
+SHA256 (python/whichwayisup.png) = 1e4853723f76ed6cbbb8726508d64322b8887b7211bf98de03fc0ff589f73161
+SIZE (python/whichwayisup.png) = 984
diff -ruN --exclude=CVS /usr/ports/games/whichwayisup/files/patch-lib-game.py ./files/patch-lib-game.py
--- /usr/ports/games/whichwayisup/files/patch-lib-game.py 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-lib-game.py 2012-10-21 14:21:24.000000000 +0200
@@ -0,0 +1,52 @@
+--- lib/game.py.orig 2012-10-21 13:48:24.000000000 +0200
++++ lib/game.py 2012-10-21 14:20:03.000000000 +0200
+@@ -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["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 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"]:
diff -ruN --exclude=CVS /usr/ports/games/whichwayisup/pkg-descr ./pkg-descr
--- /usr/ports/games/whichwayisup/pkg-descr 2013-01-14 17:55:23.000000000 +0100
+++ ./pkg-descr 2012-10-21 02:14:07.000000000 +0200
@@ -3,4 +3,4 @@
named Guy find his keys in a labyrinth of dangers and bad dialogue.
Author: Olli "Hectigo" Etuaho <admin[at]hectigo.net>
-WWW: http://www.hectigo.net/games/whichwayisup/
+WWW: http://www.oletus.fi/static/whichwayisup/
diff -ruN --exclude=CVS /usr/ports/games/whichwayisup/pkg-plist ./pkg-plist
--- /usr/ports/games/whichwayisup/pkg-plist 2013-01-14 17:55:23.000000000 +0100
+++ ./pkg-plist 2013-02-15 14:42:33.000000000 +0100
@@ -196,6 +196,7 @@
%%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
@@ -203,3 +204,5 @@
@dirrm %%DATADIR%%/pictures
@dirrm %%DATADIR%%/sounds
@dirrm %%DATADIR%%
+@exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
===> Done
--MP_/5a_byW=RxSAIyfHfkVYtaAe--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302151400.r1FE018t011871>