svn commit: r337134 - in branches/2014Q1/games/flobopuyo: . files

[Mathieu Arnold]

Author: mat
Date: Sat Dec 21 10:33:17 2013
New Revision: 337134
URL: http://svnweb.freebsd.org/changeset/ports/337134

Log:
  MFH: r337116
  
  - Support staging
  - Fix DOS2UNIX to not corrupt unrelated files
  
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/games/flobopuyo/files/patch-Makefile
     - copied unchanged from r337116, head/games/flobopuyo/files/patch-Makefile
Deleted:
  branches/2014Q1/games/flobopuyo/pkg-plist
Modified:
  branches/2014Q1/games/flobopuyo/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/flobopuyo/Makefile
==============================================================================
--- branches/2014Q1/games/flobopuyo/Makefile	Sat Dec 21 10:32:20 2013	(r337133)
+++ branches/2014Q1/games/flobopuyo/Makefile	Sat Dec 21 10:33:17 2013	(r337134)
@@ -12,10 +12,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3 at 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>

Copied: branches/2014Q1/games/flobopuyo/files/patch-Makefile (from r337116, head/games/flobopuyo/files/patch-Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/flobopuyo/files/patch-Makefile	Sat Dec 21 10:33:17 2013	(r337134, copy of r337116, head/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