3 files changed, 47 insertions, 97 deletions

diff --git a/games/flobopuyo/Makefile b/games/flobopuyo/Makefile
index 07442d91e7fc..896b55dd0fc6 100644
--- a/games/flobopuyo/Makefile
+++ b/games/flobopuyo/Makefile
@@ -12,10 +12,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Clone of the famous PuyoPuyo
 
-USES=		bison
-USE_GMAKE=	yes
+USES=		bison gmake dos2unix
+DOS2UNIX_FILES=	IosVector.cpp PuyoGame.cpp
 USE_SDL=	sdl mixer image
-USE_DOS2UNIX=	yes
+
+PLIST_FILES=	bin/${PORTNAME}
+PORTDATA=	*
 
 DESKTOP_ENTRIES="FloboPuyo" \
 		"Clone of the famous PuyoPuyo" \
@@ -24,16 +26,7 @@ DESKTOP_ENTRIES="FloboPuyo" \
 		"Game;BlocksGame;" \
 		false
 
-NO_STAGE=	yes
 post-extract:
 	@${FIND} ${WRKSRC} -name '._*' -delete
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|^DATADIR=.*$$|DATADIR=${DATADIR}|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|^INSTALL_DATADIR=.*$$|INSTALL_DATADIR=${DATADIR}|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|^INSTALL_BINDIR=.*$$|INSTALL_BINDIR=${PREFIX}/bin|' ${WRKSRC}/Makefile
-
 .include <bsd.port.mk>
diff --git a/games/flobopuyo/files/patch-Makefile b/games/flobopuyo/files/patch-Makefile
new file mode 100644
index 000000000000..2b56b59e0194
--- /dev/null
+++ b/games/flobopuyo/files/patch-Makefile
@@ -0,0 +1,42 @@
+--- Makefile.orig	2013-09-30 06:31:44.043518968 +0400
++++ Makefile	2013-09-30 06:31:58.306519003 +0400
+@@ -12,9 +12,8 @@
+ DEBUG_MODE=false
+ 
+ # Unix/Linux settings
+-PREFIX=/usr/local
+-DATADIR=$(PREFIX)/share/games/flobopuyo
+-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games
++DATADIR=$(PREFIX)/share/flobopuyo
++INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin
+ INSTALL_DATADIR=$(DESTDIR)/$(DATADIR)
+ 
+ # Mac settings
+@@ -40,15 +39,12 @@
+ #
+ ##############
+ 
+-SDL_CONFIG=sdl-config
+-CC=g++
+-CXX=g++
++CC=${CXX}
+ 
+-CFLAGS= -DDATADIR=\"${DATADIR}\"
+-LDFLAGS=
++CFLAGS+= -DDATADIR=\"${DATADIR}\"
+ 
+ ifneq ($(PLATFORM), $(CYGWIN_VERSION))
+-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
++CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags`
+ LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
+ endif
+ 
+@@ -110,7 +106,7 @@
+ all: prelude flobopuyo
+ 
+ flobopuyo: ${OBJFILES}
+-	@echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
++	@echo "[flobopuyo]" && ${CXX} $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
+ 	@echo "--------------------------------------"
+ 	@echo " Compilation finished"
+ 	@[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true
diff --git a/games/flobopuyo/pkg-plist b/games/flobopuyo/pkg-plist
deleted file mode 100644
index 3773c083cfc6..000000000000
--- a/games/flobopuyo/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-bin/flobopuyo
-%%DATADIR%%/gfx/0live.png
-%%DATADIR%%/gfx/1live.png
-%%DATADIR%%/gfx/2live.png
-%%DATADIR%%/gfx/3live.png
-%%DATADIR%%/gfx/Background.jpg
-%%DATADIR%%/gfx/BackgroundDark.jpg
-%%DATADIR%%/gfx/BigNeutral.png
-%%DATADIR%%/gfx/Explode1.png
-%%DATADIR%%/gfx/Explode2.png
-%%DATADIR%%/gfx/Explode3.png
-%%DATADIR%%/gfx/Explode4.png
-%%DATADIR%%/gfx/MenuBackground.jpg
-%%DATADIR%%/gfx/Neutral.png
-%%DATADIR%%/gfx/Shadow.png
-%%DATADIR%%/gfx/Shrink1.png
-%%DATADIR%%/gfx/Shrink2.png
-%%DATADIR%%/gfx/Shrink3.png
-%%DATADIR%%/gfx/Shrink4.png
-%%DATADIR%%/gfx/circle.png
-%%DATADIR%%/gfx/crosseye.png
-%%DATADIR%%/gfx/eye0.png
-%%DATADIR%%/gfx/eye1.png
-%%DATADIR%%/gfx/eye2.png
-%%DATADIR%%/gfx/font3b.png
-%%DATADIR%%/gfx/font4b.png
-%%DATADIR%%/gfx/fontdark.png
-%%DATADIR%%/gfx/grid.png
-%%DATADIR%%/gfx/menusel.png
-%%DATADIR%%/gfx/perso1_1.png
-%%DATADIR%%/gfx/perso1_2.png
-%%DATADIR%%/gfx/speed.png
-%%DATADIR%%/gfx/speed_black.png
-%%DATADIR%%/gfx/twirleye0.png
-%%DATADIR%%/gfx/twirleye1.png
-%%DATADIR%%/gfx/twirleye2.png
-%%DATADIR%%/gfx/twirleye3.png
-%%DATADIR%%/gfx/v0.png
-%%DATADIR%%/gfx/v1a.png
-%%DATADIR%%/gfx/v1b.png
-%%DATADIR%%/gfx/v1c.png
-%%DATADIR%%/gfx/v1d.png
-%%DATADIR%%/gfx/v2ab.png
-%%DATADIR%%/gfx/v2ac.png
-%%DATADIR%%/gfx/v2ad.png
-%%DATADIR%%/gfx/v2bc.png
-%%DATADIR%%/gfx/v2bd.png
-%%DATADIR%%/gfx/v2cd.png
-%%DATADIR%%/gfx/v3abc.png
-%%DATADIR%%/gfx/v3abd.png
-%%DATADIR%%/gfx/v3acd.png
-%%DATADIR%%/gfx/v3bcd.png
-%%DATADIR%%/gfx/v4abcd.png
-%%DATADIR%%/sfx/applose.wav
-%%DATADIR%%/sfx/bam1.wav
-%%DATADIR%%/sfx/bim1.wav
-%%DATADIR%%/sfx/bim2.wav
-%%DATADIR%%/sfx/fff.wav
-%%DATADIR%%/sfx/flobopuyo_game1.xm
-%%DATADIR%%/sfx/flobopuyo_game2.xm
-%%DATADIR%%/sfx/flobopuyo_gameover.xm
-%%DATADIR%%/sfx/flobopuyo_menu.xm
-%%DATADIR%%/sfx/pastaga.wav
-%%DATADIR%%/sfx/pop.wav
-%%DATADIR%%/sfx/remove.wav
-%%DATADIR%%/sfx/slide.wav
-%%DATADIR%%/sfx/splash1.wav
-%%DATADIR%%/sfx/splash2.wav
-%%DATADIR%%/sfx/splash3.wav
-%%DATADIR%%/sfx/splash4.wav
-%%DATADIR%%/sfx/splash5.wav
-%%DATADIR%%/sfx/splash6.wav
-%%DATADIR%%/sfx/splash7.wav
-%%DATADIR%%/sfx/splash8.wav
-%%DATADIR%%/sfx/strange_fear.xm
-%%DATADIR%%/sfx/strange_fear2.xm
-%%DATADIR%%/sfx/strange_gameover.xm
-%%DATADIR%%/sfx/woho.wav
-%%DATADIR%%/sfx/woo.wav
-%%DATADIR%%/sfx/yahoohoo.wav
-%%DATADIR%%/story/intro.txt
-@dirrm %%DATADIR%%/story
-@dirrm %%DATADIR%%/sfx
-@dirrm %%DATADIR%%/gfx
-@dirrm %%DATADIR%%