Date: Sun, 14 Oct 2012 20:42:59 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172699: [PATCH] games/zephulor: Makefile clearly, simplified, OptionsNG, take maintainership Message-ID: <20121014184312.8B801A33@hub.freebsd.org> Resent-Message-ID: <201210141850.q9EIo0Zx013166@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172699
>Category: ports
>Synopsis: [PATCH] games/zephulor: Makefile clearly, simplified, OptionsNG, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 14 18:50:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
- Take maintainership
Added file(s):
- files/zephulor.in
Removed file(s):
- pkg-plist
Makefile clearly, simplified:
Removed all Comments
+MASTER_SITES= SF/apz/apz/stable/
-COMMENT= Adventures on Planet Zephulor
+COMMENT= Side scrolling arcade game
+LICENSE= LGPL20
+RUN_DEPENDS=
+EXTRACT_DEPENDS=
+PLIST_FILES=
+DESKTOP_ENTRIES=
All moved from pkg-plist to Makefile
+PORTDATA= *
Clearly documentation
+PORTDOCS= *
+DOCSRCDIR1= ${WRKSRC}
+DOCSRCDIR2= ${WRKSRC}/maptool
Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
portlint -A
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: new ports should not set PORTREVISION.
0 fatal errors and 2 warnings found.
port test: clean
Build log
https://redports.org/buildarchive/20121014180054-36290/
>Fix:
--- zephulor-1_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/zephulor/Makefile ./Makefile
--- /usr/ports/games/zephulor/Makefile 2011-02-27 05:54:37.000000000 +0100
+++ ./Makefile 2012-10-14 20:28:18.000000000 +0200
@@ -7,85 +7,68 @@
PORTNAME= zephulor
PORTVERSION= 1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= http://www.hollowworks.com/downloads/adventuresonplanetzephulor/files/
+MASTER_SITES= SF/apz/apz/stable/
DISTNAME= ${PORTNAME}-source
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Adventures on Planet Zephulor
+MAINTAINER= nemysis@gmx.ch
+COMMENT= Side scrolling arcade game
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
- ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+LICENSE= LGPL20
+
+RUN_DEPENDS= ${PYGAME} \
+ ${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
+EXTRACT_DEPENDS=pngtopnm:${PORTSDIR}/graphics/netpbm
USE_PYTHON= yes
NO_BUILD= yes
+PLIST_FILES= bin/${PORTNAME} \
+ share/pixmaps/${PORTNAME}.png
+
+PORTDATA= *
+PORTDOCS= *
+
+DOCSRCDIR1= ${WRKSRC}
+DOC_FILES1= README.txt manual.txt readme-*.txt
+
+DOCSRCDIR2= ${WRKSRC}/maptool
+DOCSDIR2= ${DOCSDIR}/maptool
+DOC_FILES2= manual.txt
+
+DESKTOP_ENTRIES="Adventures on Planet Zephulor" "${COMMENT}" "${PORTNAME}" \
+ "${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
+SUB_FILES= ${PORTNAME}
+
+.include <bsd.port.options.mk>
+
post-patch:
-# Fix path to python interpreter
@${REINPLACE_CMD} -e 's|#!.*python|#!${PYTHON_CMD}|' \
${WRKSRC}/*.py ${WRKSRC}/maptool/*.py
+ @${FIND} ${WRKSRC} -name "*.bak" -delete
-# Make wrapper script
- @${ECHO_CMD} "#!/bin/sh" >> ${WRKSRC}/zephulor
- @${ECHO_CMD} '${PYTHON_CMD} ${DATADIR}/zephulor.py "$$@"' \
- >> ${WRKSRC}/zephulor
+post-extract:
+ @(cd ${WRKSRC}/data && ${LOCALBASE}/bin/pngtopnm zephulor.png | \
+ ${LOCALBASE}/bin/pamscale .1 | ${LOCALBASE}/bin/pnmtopng > zephulor1.png)
do-install:
-# Wrapper script
- ${INSTALL_SCRIPT} ${WRKSRC}/zephulor ${PREFIX}/bin
-
-# Data directory
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
${MKDIR} ${DATADIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/*.py ${DATADIR}
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR})
+ ${MKDIR} ${DATADIR}/maptool
+ ${INSTALL_SCRIPT} ${WRKSRC}/maptool/*.py ${DATADIR}/maptool
-# Executable scripts
-.for f in chared maploadtool scnloadtool zephulor
- ${INSTALL_SCRIPT} ${WRKSRC}/${f}.py ${DATADIR}
-.endfor
-
-# Scripts
-.for f in game_config game_entities game_hud game_map game_menu \
- game_projectiles game_sound myimg
- ${INSTALL_DATA} ${WRKSRC}/${f}.py ${DATADIR}
-.endfor
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/data/zephulor1.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-# Documentation
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
-. for f in README manual readme-chared readme-maploadtool \
- readme-scnloadtool
- ${INSTALL_DATA} ${WRKSRC}/${f}.txt ${DOCSDIR}
-. endfor
-.endif
-
-# Maptool
- ${MKDIR} ${DATADIR}/maptool
-
-# Executable scripts
-.for f in chared main
- ${INSTALL_SCRIPT} ${WRKSRC}/maptool/${f}.py ${DATADIR}/maptool
-.endfor
-
-# Scripts
-.for f in charmenu domenu game_entities game_map hud interface keymap myimg \
- tilemenu
- ${INSTALL_DATA} ${WRKSRC}/maptool/${f}.py ${DATADIR}/maptool
-.endfor
-
-# Documentation
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}/maptool
- ${INSTALL_DATA} ${WRKSRC}/maptool/manual.txt ${DOCSDIR}/maptool
+ ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+ ${MKDIR} ${DOCSDIR2}
+ ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
.endif
-# Data
- ${CP} -R ${WRKSRC}/data ${DATADIR}
-
-# Fix wrong permissions
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
- ${FIND} ${DATADIR}/data -type f -print0 | \
- ${XARGS} -0 ${CHMOD} ${SHAREMODE}
- ${FIND} ${DATADIR}/data -type d -print0 | \
- ${XARGS} -0 ${CHMOD} ${BINMODE}
-
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/zephulor/files/zephulor.in ./files/zephulor.in
--- /usr/ports/games/zephulor/files/zephulor.in 1970-01-01 01:00:00.000000000 +0100
+++ ./files/zephulor.in 2012-10-14 17:26:24.000000000 +0200
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+cd "%%DATADIR%%"
+exec /usr/bin/env python ./zephulor.py
diff -ruN --exclude=CVS /usr/ports/games/zephulor/pkg-descr ./pkg-descr
--- /usr/ports/games/zephulor/pkg-descr 2011-10-24 06:15:53.000000000 +0200
+++ ./pkg-descr 2012-10-14 17:10:59.000000000 +0200
@@ -10,4 +10,4 @@
on a level when the player dies, there will only be that remaining creature as
the player restarts.
-WWW: http://games.hollowworks.com/
+WWW: http://www.hollowworks.com/apz/
diff -ruN --exclude=CVS /usr/ports/games/zephulor/pkg-plist ./pkg-plist
--- /usr/ports/games/zephulor/pkg-plist 2005-07-20 13:03:18.000000000 +0200
+++ ./pkg-plist 1970-01-01 01:00:00.000000000 +0100
@@ -1,133 +0,0 @@
-bin/zephulor
-%%DATADIR%%/chared.py
-%%DATADIR%%/data/angry_eye-die.wav
-%%DATADIR%%/data/angry_eye-dmg.wav
-%%DATADIR%%/data/angry_eye-shoot.wav
-%%DATADIR%%/data/angry_eye.data
-%%DATADIR%%/data/angry_eye.png
-%%DATADIR%%/data/blob-die.wav
-%%DATADIR%%/data/blob-grubub.wav
-%%DATADIR%%/data/blob.bmp
-%%DATADIR%%/data/bullet1.bmp
-%%DATADIR%%/data/bullet2.bmp
-%%DATADIR%%/data/buzzbuzz-die.wav
-%%DATADIR%%/data/buzzbuzz-dmg.wav
-%%DATADIR%%/data/buzzbuzz.data
-%%DATADIR%%/data/buzzbuzz.png
-%%DATADIR%%/data/char-bang.wav
-%%DATADIR%%/data/char-die.wav
-%%DATADIR%%/data/char-ow.wav
-%%DATADIR%%/data/char1.data
-%%DATADIR%%/data/char2.data
-%%DATADIR%%/data/credits.scn
-%%DATADIR%%/data/default.charlist
-%%DATADIR%%/data/eheart.bmp
-%%DATADIR%%/data/end.scn
-%%DATADIR%%/data/entsndlist.data
-%%DATADIR%%/data/fire-powerup.bmp
-%%DATADIR%%/data/fire-powerup.data
-%%DATADIR%%/data/firstmap.data
-%%DATADIR%%/data/heart-powerup.bmp
-%%DATADIR%%/data/heart-powerup.data
-%%DATADIR%%/data/heart.bmp
-%%DATADIR%%/data/highlight.bmp
-%%DATADIR%%/data/hollowlogo-credits.png
-%%DATADIR%%/data/hollowlogo-save.png
-%%DATADIR%%/data/hollowlogo.png
-%%DATADIR%%/data/hud.bmp
-%%DATADIR%%/data/intro.scn
-%%DATADIR%%/data/invuln-powerup.bmp
-%%DATADIR%%/data/invuln-powerup.data
-%%DATADIR%%/data/jump-powerup.bmp
-%%DATADIR%%/data/jump-powerup.data
-%%DATADIR%%/data/load.scn
-%%DATADIR%%/data/logo.scn
-%%DATADIR%%/data/mushlump_lowlands-01.data
-%%DATADIR%%/data/mushlump_lowlands-02.data
-%%DATADIR%%/data/mushlump_lowlands-03.data
-%%DATADIR%%/data/mushlump_lowlands-04.data
-%%DATADIR%%/data/mushlump_lowlands-05.data
-%%DATADIR%%/data/mushlump_lowlands-06.data
-%%DATADIR%%/data/mushlump_lowlands-07.data
-%%DATADIR%%/data/mushlump_lowlands-bkg0.bmp
-%%DATADIR%%/data/mushlump_lowlands-bkg1.bmp
-%%DATADIR%%/data/mushlump_lowlands-bkg2.bmp
-%%DATADIR%%/data/mushlump_lowlands-tileset.bmp
-%%DATADIR%%/data/mushlump_lowlands.mp3
-%%DATADIR%%/data/mychar.bmp
-%%DATADIR%%/data/pause.bmp
-%%DATADIR%%/data/paxapart_flats-01.data
-%%DATADIR%%/data/paxapart_flats-02.data
-%%DATADIR%%/data/paxapart_flats-03.data
-%%DATADIR%%/data/paxapart_flats-04.data
-%%DATADIR%%/data/paxapart_flats-05.data
-%%DATADIR%%/data/paxapart_flats-06.data
-%%DATADIR%%/data/paxapart_flats-07.data
-%%DATADIR%%/data/paxapart_flats-08.data
-%%DATADIR%%/data/paxapart_flats-bkg0.bmp
-%%DATADIR%%/data/paxapart_flats-bkg1.bmp
-%%DATADIR%%/data/paxapart_flats-bkg2.bmp
-%%DATADIR%%/data/paxapart_flats-tileset.bmp
-%%DATADIR%%/data/paxapart_flats.mp3
-%%DATADIR%%/data/powerup.wav
-%%DATADIR%%/data/rock-die.wav
-%%DATADIR%%/data/rock-ow.wav
-%%DATADIR%%/data/rock_bang.wav
-%%DATADIR%%/data/rock_ow.wav
-%%DATADIR%%/data/rockmonster.bmp
-%%DATADIR%%/data/rockmonster.data
-%%DATADIR%%/data/save.scn
-%%DATADIR%%/data/scn_load.png
-%%DATADIR%%/data/scn_save.png
-%%DATADIR%%/data/sludge-stalker-die.wav
-%%DATADIR%%/data/sludge-stalker-dmg.wav
-%%DATADIR%%/data/sludge-stalker-shoot.wav
-%%DATADIR%%/data/sludge-stalker.bmp
-%%DATADIR%%/data/sludge-stalker.data
-%%DATADIR%%/data/spaceship.png
-%%DATADIR%%/data/startup.scn
-%%DATADIR%%/data/water-deep-left.bmp
-%%DATADIR%%/data/water-deep-left.data
-%%DATADIR%%/data/water-deep-right.bmp
-%%DATADIR%%/data/water-deep-right.data
-%%DATADIR%%/data/water-deep.bmp
-%%DATADIR%%/data/water-deep.data
-%%DATADIR%%/data/water.bmp
-%%DATADIR%%/data/water.data
-%%DATADIR%%/data/zephulor-any.png
-%%DATADIR%%/data/zephulor-credits.png
-%%DATADIR%%/data/zephulor-loading.png
-%%DATADIR%%/data/zephulor.png
-%%DATADIR%%/game_config.py
-%%DATADIR%%/game_entities.py
-%%DATADIR%%/game_hud.py
-%%DATADIR%%/game_map.py
-%%DATADIR%%/game_menu.py
-%%DATADIR%%/game_projectiles.py
-%%DATADIR%%/game_sound.py
-%%DATADIR%%/maploadtool.py
-%%DATADIR%%/maptool/chared.py
-%%DATADIR%%/maptool/charmenu.py
-%%DATADIR%%/maptool/domenu.py
-%%DATADIR%%/maptool/game_entities.py
-%%DATADIR%%/maptool/game_map.py
-%%DATADIR%%/maptool/hud.py
-%%DATADIR%%/maptool/interface.py
-%%DATADIR%%/maptool/keymap.py
-%%DATADIR%%/maptool/main.py
-%%DATADIR%%/maptool/myimg.py
-%%DATADIR%%/maptool/tilemenu.py
-%%DATADIR%%/myimg.py
-%%DATADIR%%/scnloadtool.py
-%%DATADIR%%/zephulor.py
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/maptool/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme-chared.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme-maploadtool.txt
-%%PORTDOCS%%%%DOCSDIR%%/readme-scnloadtool.txt
-@dirrm %%DATADIR%%/maptool
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/maptool
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- zephulor-1_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121014184312.8B801A33>