Date: Tue, 30 May 2006 12:20:22 GMT From: Dmitry Marakasov <amdmi3@mail.ru> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/97979: [PATCH] games/fishsupper: update to 0.1.2 Message-ID: <200605301220.k4UCKMGc041714@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/97979; it has been noted by GNATS.
From: Dmitry Marakasov <amdmi3@mail.ru>
To: bug-followup@FreeBSD.org
Cc: freebsd@unixfreunde.de
Subject: Re: ports/97979: [PATCH] games/fishsupper: update to 0.1.2
Date: Tue, 30 May 2006 16:19:35 +0400
* Edwin Groothuis (edwin@FreeBSD.org) wrote:
> State-Changed-From-To: open->feedback
> State-Changed-By: edwin
> State-Changed-When: Fri May 26 19:20:47 UTC 2006
> State-Changed-Why:
> Awaiting maintainers feedback
Sorry I've just noticed the PR on the portsmon page, unfortunately it
didn't get any emails.
I've modified the patch a little so it does handle highscore table and
config file (game won't start if table.txt and config.txt are not in the
current dir). For now these are installed into datadir, so the game
cathes an exception on exit (but it handles it pretty clean :)) tryint
to write to these files, but that's only temporary measure, as the
author promised to implement proper dotfile/dotdir handling in 0.1.13.
Here's modified patch (thanks Martin):
--- fishsupper.patch begins here ---
diff -ruN fishsupper.orig/Makefile fishsupper/Makefile
--- fishsupper.orig/Makefile Sat May 27 03:55:10 2006
+++ fishsupper/Makefile Sat May 27 05:15:17 2006
@@ -6,7 +6,7 @@
#
PORTNAME= fishsupper
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,7 @@
USE_SDL= sdl image mixer
ALL_TARGET= fishsupper
-WRKSRC= ${WRKDIR}/FishSupper
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
BUILD_WRKSRC= ${WRKSRC}/src
PORTDOCS= README
@@ -28,9 +28,12 @@
@${REINPLACE_CMD} -e 's|g++|${CXX} ${CXXFLAGS}|' ${WRKSRC}/src/Makefile
@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/src/getreadydisplay.cc \
${WRKSRC}/src/playdisplay.cc ${WRKSRC}/src/playmodel.cc \
- ${WRKSRC}/src/soundengine.cc ${WRKSRC}/src/titlescreendisplay.cc
+ ${WRKSRC}/src/soundengine.cc ${WRKSRC}/src/titlescreendisplay.cc \
+ ${WRKSRC}/src/highscoresdisplay.cc
@${REINPLACE_CMD} -e '/filename/ s|\[[0-9][0-9]*\]|[1024]|' ${WRKSRC}/src/playdisplay.cc \
${WRKSRC}/src/playmodel.cc
+ @${REINPLACE_CMD} -e 's|table.txt|${DATADIR}/table.txt|' ${WRKSRC}/src/highscoresdisplay.cc
+ @${REINPLACE_CMD} -e 's|config.txt|${DATADIR}/config.txt|' ${WRKSRC}/src/settings.cc
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/fishsupper ${PREFIX}/bin
@@ -39,6 +42,7 @@
${MKDIR} ${DATADIR}/${d}
${INSTALL_DATA} ${WRKSRC}/data/${d}/* ${DATADIR}/${d}/
.endfor
+ ${INSTALL_DATA} ${WRKSRC}/config.txt ${WRKSRC}/table.txt ${DATADIR}/
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff -ruN fishsupper.orig/distinfo fishsupper/distinfo
--- fishsupper.orig/distinfo Sat May 27 03:55:10 2006
+++ fishsupper/distinfo Sat May 27 03:55:16 2006
@@ -1,3 +1,3 @@
-MD5 (fishsupper-0.1.1.tar.gz) = 15ede656a11612c261e4e67a669ae21e
-SHA256 (fishsupper-0.1.1.tar.gz) = 8d8ebd84d70bf4546b181f378489ee821f16ecc864fe961881025f89f9bcb653
-SIZE (fishsupper-0.1.1.tar.gz) = 785300
+MD5 (fishsupper-0.1.2.tar.gz) = a7ebb1d68ffe3f93d461dde374d85fd5
+SHA256 (fishsupper-0.1.2.tar.gz) = c9e5777397b66b1b900412425b8e43a99bfa9ef6597021fdecde8b71f20d8aea
+SIZE (fishsupper-0.1.2.tar.gz) = 982262
diff -ruN fishsupper.orig/pkg-plist fishsupper/pkg-plist
--- fishsupper.orig/pkg-plist Sat May 27 03:55:10 2006
+++ fishsupper/pkg-plist Sat May 27 04:07:38 2006
@@ -1,4 +1,7 @@
bin/fishsupper
+%%DATADIR%%/config.txt
+%%DATADIR%%/table.txt
+%%DATADIR%%/images/cats_whiskers.png
%%DATADIR%%/images/font1.png
%%DATADIR%%/images/font2.png
%%DATADIR%%/images/fs_image_00.png
@@ -28,7 +31,10 @@
%%DATADIR%%/images/fs_image_24.png
%%DATADIR%%/images/fs_image_25.png
%%DATADIR%%/images/fs_image_26.png
+%%DATADIR%%/images/fs_image_27.png
%%DATADIR%%/images/get_ready_bg.png
+%%DATADIR%%/images/high_scores_font.png
+%%DATADIR%%/images/high_scores_font_faint.png
%%DATADIR%%/images/hiscores.png
%%DATADIR%%/images/hiscores_h.png
%%DATADIR%%/images/intro_screen.png
@@ -42,11 +48,13 @@
%%DATADIR%%/levels/level_02.fsl
%%DATADIR%%/levels/level_03.fsl
%%DATADIR%%/levels/level_04.fsl
+%%DATADIR%%/levels/level_05.fsl
+%%DATADIR%%/levels/level_06.fsl
%%DATADIR%%/sounds/miaow.wav
%%DATADIR%%/sounds/ping.wav
%%DATADIR%%/sounds/river.wav
%%DATADIR%%/sounds/splash.wav
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/levels
@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%
--- fishsupper.patch ends here ---
--
Best regards,
Dmitry mailto:amdmi3@mail.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605301220.k4UCKMGc041714>