3 files changed, 43 insertions, 13 deletions

diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile
index 91e57e5c20ed..a1eafa68806a 100644
--- a/games/fishsupper/Makefile
+++ b/games/fishsupper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fishsupper
-PORTVERSION=	0.1.1
+PORTVERSION=	0.1.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,9 +16,10 @@ COMMENT=	Guide a cat across a series of rivers, jumping from log to log
 
 USE_GMAKE=	yes
 USE_SDL=	sdl image mixer
+USE_GCC=	3.4+
 
 ALL_TARGET=	fishsupper
-WRKSRC=		${WRKDIR}/FishSupper
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
 
 PORTDOCS=	README
@@ -28,17 +29,18 @@ post-patch:
 	@${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 ${WRKSRC}/src/settingsdisplay.cc
 	@${REINPLACE_CMD} -e '/filename/ s|\[[0-9][0-9]*\]|[1024]|' ${WRKSRC}/src/playdisplay.cc \
 		${WRKSRC}/src/playmodel.cc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fishsupper ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-.for d in images levels sounds
-	${MKDIR} ${DATADIR}/${d}
-	${INSTALL_DATA} ${WRKSRC}/data/${d}/* ${DATADIR}/${d}/
-.endfor
+	${MKDIR} ${DATADIR}/images/settings ${DATADIR}/levels ${DATADIR}/sounds
+	${INSTALL_DATA} ${WRKSRC}/data/images/*.png ${DATADIR}/images/
+	${INSTALL_DATA} ${WRKSRC}/data/images/settings/* ${DATADIR}/images/settings/
+	${INSTALL_DATA} ${WRKSRC}/data/levels/* ${DATADIR}/levels/
+	${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${DATADIR}/sounds/
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/games/fishsupper/distinfo b/games/fishsupper/distinfo
index 6e015f2719a8..a03c41c8d9de 100644
--- a/games/fishsupper/distinfo
+++ b/games/fishsupper/distinfo
@@ -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.3.tar.gz) = cf178785a9460c13c5011316bbec9997
+SHA256 (fishsupper-0.1.3.tar.gz) = fae394edbaa9999a4fcf70802d0b76da4cb81e6cb3785d068368ed0bbc795d72
+SIZE (fishsupper-0.1.3.tar.gz) = 1171658
diff --git a/games/fishsupper/pkg-plist b/games/fishsupper/pkg-plist
index e34666849cdc..3ff873270ccd 100644
--- a/games/fishsupper/pkg-plist
+++ b/games/fishsupper/pkg-plist
@@ -1,4 +1,5 @@
 bin/fishsupper
+%%DATADIR%%/images/cats_whiskers.png
 %%DATADIR%%/images/font1.png
 %%DATADIR%%/images/font2.png
 %%DATADIR%%/images/fs_image_00.png
@@ -28,7 +29,12 @@ bin/fishsupper
 %%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/fs_image_28.png
+%%DATADIR%%/images/fs_image_29.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
@@ -37,16 +43,38 @@ bin/fishsupper
 %%DATADIR%%/images/quit.png
 %%DATADIR%%/images/quit_h.png
 %%DATADIR%%/images/settings.png
+%%DATADIR%%/images/settings/background.png
+%%DATADIR%%/images/settings/image_00.png
+%%DATADIR%%/images/settings/image_01.png
+%%DATADIR%%/images/settings/image_02.png
+%%DATADIR%%/images/settings/image_03.png
+%%DATADIR%%/images/settings/image_04.png
+%%DATADIR%%/images/settings/image_05.png
+%%DATADIR%%/images/settings/image_06.png
+%%DATADIR%%/images/settings/image_07.png
+%%DATADIR%%/images/settings/image_08.png
+%%DATADIR%%/images/settings/image_09.png
+%%DATADIR%%/images/settings/image_10.png
+%%DATADIR%%/images/settings/image_11.png
 %%DATADIR%%/images/settings_h.png
+%%DATADIR%%/images/small_font.png
+%%DATADIR%%/images/small_font_faint.png
 %%DATADIR%%/levels/level_01.fsl
 %%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%%/levels/level_07.fsl
+%%DATADIR%%/levels/level_08.fsl
+%%DATADIR%%/levels/level_09.fsl
+%%DATADIR%%/levels/level_10.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/settings
+@dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%