3 files changed, 58 insertions, 72 deletions

diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile
index a1eafa68806a..786045faba17 100644
--- a/games/fishsupper/Makefile
+++ b/games/fishsupper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fishsupper
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,35 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	amdmi3@mail.ru
 COMMENT=	Guide a cat across a series of rivers, jumping from log to log
 
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl image mixer
 USE_GCC=	3.4+
 
-ALL_TARGET=	fishsupper
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC=	${WRKSRC}/src
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 PORTDOCS=	README
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/src/Makefile
-	@${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/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}/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)
+post-install:
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/games/fishsupper/distinfo b/games/fishsupper/distinfo
index a03c41c8d9de..4f99ee19cb8b 100644
--- a/games/fishsupper/distinfo
+++ b/games/fishsupper/distinfo
@@ -1,3 +1,3 @@
-MD5 (fishsupper-0.1.3.tar.gz) = cf178785a9460c13c5011316bbec9997
-SHA256 (fishsupper-0.1.3.tar.gz) = fae394edbaa9999a4fcf70802d0b76da4cb81e6cb3785d068368ed0bbc795d72
-SIZE (fishsupper-0.1.3.tar.gz) = 1171658
+MD5 (fishsupper-0.1.4.tar.gz) = a23ed94c94cf2edd1bd6bb3f5b714f70
+SHA256 (fishsupper-0.1.4.tar.gz) = e00990b6b174cea3f44741fd247d220aa3bbad6384c3a03f4f7dce433f1cac93
+SIZE (fishsupper-0.1.4.tar.gz) = 1240599
diff --git a/games/fishsupper/pkg-plist b/games/fishsupper/pkg-plist
index 3ff873270ccd..436e4d911001 100644
--- a/games/fishsupper/pkg-plist
+++ b/games/fishsupper/pkg-plist
@@ -1,48 +1,45 @@
 bin/fishsupper
-%%DATADIR%%/images/cats_whiskers.png
-%%DATADIR%%/images/font1.png
-%%DATADIR%%/images/font2.png
-%%DATADIR%%/images/fs_image_00.png
-%%DATADIR%%/images/fs_image_01.png
-%%DATADIR%%/images/fs_image_02.png
-%%DATADIR%%/images/fs_image_03.png
-%%DATADIR%%/images/fs_image_04.png
-%%DATADIR%%/images/fs_image_05.png
-%%DATADIR%%/images/fs_image_06.png
-%%DATADIR%%/images/fs_image_07.png
-%%DATADIR%%/images/fs_image_08.png
-%%DATADIR%%/images/fs_image_09.png
-%%DATADIR%%/images/fs_image_10.png
-%%DATADIR%%/images/fs_image_11.png
-%%DATADIR%%/images/fs_image_12.png
-%%DATADIR%%/images/fs_image_13.png
-%%DATADIR%%/images/fs_image_14.png
-%%DATADIR%%/images/fs_image_15.png
-%%DATADIR%%/images/fs_image_16.png
-%%DATADIR%%/images/fs_image_17.png
-%%DATADIR%%/images/fs_image_18.png
-%%DATADIR%%/images/fs_image_19.png
-%%DATADIR%%/images/fs_image_20.png
-%%DATADIR%%/images/fs_image_21.png
-%%DATADIR%%/images/fs_image_22.png
-%%DATADIR%%/images/fs_image_23.png
-%%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
-%%DATADIR%%/images/play.png
-%%DATADIR%%/images/play_h.png
-%%DATADIR%%/images/quit.png
-%%DATADIR%%/images/quit_h.png
-%%DATADIR%%/images/settings.png
+%%DATADIR%%/images/fonts/font2.png
+%%DATADIR%%/images/fonts/high_scores_font.png
+%%DATADIR%%/images/fonts/high_scores_font_faint.png
+%%DATADIR%%/images/fonts/small_font.png
+%%DATADIR%%/images/fonts/small_font_faint.png
+%%DATADIR%%/images/getready/get_ready_bg.png
+%%DATADIR%%/images/highscores/cats_whiskers.png
+%%DATADIR%%/images/play/fs_image_00.png
+%%DATADIR%%/images/play/fs_image_01.png
+%%DATADIR%%/images/play/fs_image_02.png
+%%DATADIR%%/images/play/fs_image_03.png
+%%DATADIR%%/images/play/fs_image_04.png
+%%DATADIR%%/images/play/fs_image_05.png
+%%DATADIR%%/images/play/fs_image_06.png
+%%DATADIR%%/images/play/fs_image_07.png
+%%DATADIR%%/images/play/fs_image_08.png
+%%DATADIR%%/images/play/fs_image_09.png
+%%DATADIR%%/images/play/fs_image_10.png
+%%DATADIR%%/images/play/fs_image_11.png
+%%DATADIR%%/images/play/fs_image_12.png
+%%DATADIR%%/images/play/fs_image_13.png
+%%DATADIR%%/images/play/fs_image_14.png
+%%DATADIR%%/images/play/fs_image_15.png
+%%DATADIR%%/images/play/fs_image_16.png
+%%DATADIR%%/images/play/fs_image_17.png
+%%DATADIR%%/images/play/fs_image_18.png
+%%DATADIR%%/images/play/fs_image_19.png
+%%DATADIR%%/images/play/fs_image_20.png
+%%DATADIR%%/images/play/fs_image_21.png
+%%DATADIR%%/images/play/fs_image_22.png
+%%DATADIR%%/images/play/fs_image_23.png
+%%DATADIR%%/images/play/fs_image_24.png
+%%DATADIR%%/images/play/fs_image_25.png
+%%DATADIR%%/images/play/fs_image_26.png
+%%DATADIR%%/images/play/fs_image_27.png
+%%DATADIR%%/images/play/fs_image_28.png
+%%DATADIR%%/images/play/fs_image_29.png
+%%DATADIR%%/images/play/fs_image_30.png
+%%DATADIR%%/images/play/fs_image_31.png
+%%DATADIR%%/images/play/fs_image_32.png
+%%DATADIR%%/images/play/fs_image_33.png
 %%DATADIR%%/images/settings/background.png
 %%DATADIR%%/images/settings/image_00.png
 %%DATADIR%%/images/settings/image_01.png
@@ -56,9 +53,11 @@ bin/fishsupper
 %%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%%/images/titlescreen/hiscores_h.png
+%%DATADIR%%/images/titlescreen/intro_screen.png
+%%DATADIR%%/images/titlescreen/play_h.png
+%%DATADIR%%/images/titlescreen/quit_h.png
+%%DATADIR%%/images/titlescreen/settings_h.png
 %%DATADIR%%/levels/level_01.fsl
 %%DATADIR%%/levels/level_02.fsl
 %%DATADIR%%/levels/level_03.fsl
@@ -75,6 +74,11 @@ bin/fishsupper
 %%DATADIR%%/sounds/splash.wav
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/images/titlescreen
 @dirrm %%DATADIR%%/images/settings
+@dirrm %%DATADIR%%/images/play
+@dirrm %%DATADIR%%/images/highscores
+@dirrm %%DATADIR%%/images/getready
+@dirrm %%DATADIR%%/images/fonts
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%