Update games/stonesoup to latest version (0.6.0). From the announcement: The Crawl devteam announces the release of Dungeon Crawl Stone Soup 0.6 Heizölrückstoßabdämpfung Here are the highlights of the new version: * Removed Divinations spell school. * New branch: the Shoals, sometimes replacing Swamp or Snake Pit. * Three new gods: Jiyva (slime), Fedhas (plants), Cheibriados (slow). * Altars for dungeon gods may now appear on levels 2 to 9 instead of the Temple. * Many cool new monsters, uniques, portal vaults and ammunition brands. For a full list of changes, please see http://crawl.develz.org/main/0.6.0.txt Fix: Files deleted from the port: games/stonesoup/files/patch-makefile.unix games/stonesoup/files/patch-makefile_tiles.unix games/stonesoup/files/patch-tilesdl.cc games/stonesoup/files/patch-util__lua__src__Makefile games/stonesoup/files/patch-util__sqlite__Makefile
A small correction to the Makefile: Use the defined SAVEDIR variable.
Responsible Changed From-To: freebsd-ports-bugs->amdmi3 I'll take it.
* Tobias Rehbein (tobias.rehbein@web.de) wrote: > +BUILD_DEPENDS= git:${PORTSDIR}/devel/git > +LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 > +RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar Why does it need git and gtar? > +MAKE_ARGS= FREEBSD_PORT=yes I'd simplify the port by just patching stuff to what it should look like on FreeBSD. Conditionals should be submitted upstream instead. > +MAKE_ARGS+= wizard You should use ALL_TARGET here most likely. > + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/${MAKEFILE} Just using ${LOCALBASE} and other vars in patched Makefile will make this port much more cleaner. > +- #define SAVE_PACKAGE_CMD "tar" > +- #define LOAD_UNPACKAGE_CMD "tar -zxf %s"PACKAGE_SUFFIX" -C %s" > ++ #define SAVE_PACKAGE_CMD "gtar" > ++ #define LOAD_UNPACKAGE_CMD "gtar -zxf %s"PACKAGE_SUFFIX" -C %s" > ++ INCLUDES_L += -I%%LOCALBASE%%/include/ > ++ INCLUDES_L += -I%%LOCALBASE%%/include/lua51 > ++ LIBS += -L%%LOCALBASE%%/lib/ > ++ LIBS += -L%%LOCALBASE%%/lib/lua51 > ++ LIBS += -llua-5.1 > ++ LIBS += -lsqlite3 > + endif > +@exec chown -R root:games %D/%%DATADIR%% Why is this needed? Datadir should be world-readable and shouldn'e need nondefault group. > +@exec install -d -o root -g games -m 775 %%SAVEDIR%% > +@unexec rmdir %%SAVEDIR%% >/dev/null 2>&1 || echo 'stonesoup save-game directory (%%SAVEDIR%%) not removed due to existing save games. If you are permanently removing this port, you should do a ``rm -rf %%SAVEDIR%%``.' | fmt I'd suggest to changing the game to store savegames in dotdir instead, if that's possible. -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
State Changed From-To: open->feedback Ask for submitter fix.
Am Thu, Apr 15, 2010 at 07:29:05PM +0400 schrieb Dmitry Marakasov: > Why does it need git and gtar? There was a small bug in the upstream makefile which required git to be present at build time. I sorted this out with one of the developers. Git is no longer a dependency. gtar is needed because stonesoup uses tar with gnuisms to create the save files. I avoided this in former versions by disabling the taring of save files. But this really clutter the savedir as every save consists of several files. > > +MAKE_ARGS= FREEBSD_PORT=yes > > I'd simplify the port by just patching stuff to what it should look like > on FreeBSD. Conditionals should be submitted upstream instead. I've done this with the first versions of the port, but I figured I can handle updates better this way. I guess it's a matter of taste. I hope it's ok. > > > +MAKE_ARGS+= wizard > > You should use ALL_TARGET here most likely. No, surprisingly not. The upstream makefile states that these arguments have to be provided at install time too. > Just using ${LOCALBASE} and other vars in patched Makefile will make > this port much more cleaner. This is a nice one, never thought of it. Done it. > > +@exec chown -R root:games %D/%%DATADIR%% > > Why is this needed? Datadir should be world-readable and shouldn'e need > nondefault group. This is right, I changed it. > I'd suggest to changing the game to store savegames in dotdir instead, > if that's possible. This an argument we had when I submitted games/stonesoup the first time. A roguelike without hi-scores and player ghosts isn't a roguelike. The savedir is used for saves, ghosts and scores. So it's not possible to change this.
* Tobias Rehbein (tobias.rehbein@web.de) wrote: Ok, now it's fine. Just one more question: why are FETCH_ARGS needed? Also, just to be sure: % ls files README.FreeBSD.in patch-AppHdr.h patch-makefile is this correct? -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
Am Fri, Apr 16, 2010 at 06:51:06AM +0400 schrieb Dmitry Marakasov: > Just one more question: why are FETCH_ARGS needed? To be honest I don't know. It was introduced when Sourceforge changed their distribution scheme. As it works I opted on the safe side to leave it in. > Also, just to be sure: > > % ls files > README.FreeBSD.in patch-AppHdr.h patch-makefile > > is this correct? Yes, this is right. Find attached another fix to the port. I noticed some permission problems in the savedir which I worked out with the upstream devs. It's fixed in this port and upstream. This should be the last revision of this patch. I'd rather play this game now ;)
Just to be sure: Are you wating for additional feedback on my behalf? Or is this PR in your queue? Regards Tobias
amdmi3 2010-05-14 14:12:48 UTC FreeBSD ports repository Modified files: games/stonesoup Makefile distinfo pkg-plist games/stonesoup/files patch-AppHdr.h Added files: games/stonesoup/files patch-makefile Removed files: games/stonesoup/files patch-makefile.unix patch-makefile_tiles.unix patch-tilesdl.cc patch-util__lua__src__Makefile patch-util__sqlite__Makefile Log: - Update to 0.6.0 PR: 145525 Submitted by: Tobias Rehbein <tobias.rehbein@web.de> (maintainer) Revision Changes Path 1.13 +37 -36 ports/games/stonesoup/Makefile 1.9 +3 -3 ports/games/stonesoup/distinfo 1.5 +14 -3 ports/games/stonesoup/files/patch-AppHdr.h 1.1 +169 -0 ports/games/stonesoup/files/patch-makefile (new) 1.5 +0 -136 ports/games/stonesoup/files/patch-makefile.unix (dead) 1.3 +0 -170 ports/games/stonesoup/files/patch-makefile_tiles.unix (dead) 1.4 +0 -11 ports/games/stonesoup/files/patch-tilesdl.cc (dead) 1.3 +0 -13 ports/games/stonesoup/files/patch-util__lua__src__Makefile (dead) 1.3 +0 -18 ports/games/stonesoup/files/patch-util__sqlite__Makefile (dead) 1.6 +131 -89 ports/games/stonesoup/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed, with minor changes. Thanks!