From owner-svn-ports-all@FreeBSD.ORG Sat Dec 21 01:14:10 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D7CB35F; Sat, 21 Dec 2013 01:14:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7E2DF1A40; Sat, 21 Dec 2013 01:14:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBL1EA3o047901; Sat, 21 Dec 2013 01:14:10 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBL1EAFl047899; Sat, 21 Dec 2013 01:14:10 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312210114.rBL1EAFl047899@svn.freebsd.org> From: Dmitry Marakasov Date: Sat, 21 Dec 2013 01:14:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337116 - in head/games/flobopuyo: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 01:14:10 -0000 Author: amdmi3 Date: Sat Dec 21 01:14:09 2013 New Revision: 337116 URL: http://svnweb.freebsd.org/changeset/ports/337116 Log: - Support staging - Fix DOS2UNIX to not corrupt unrelated files Added: head/games/flobopuyo/files/patch-Makefile (contents, props changed) Deleted: head/games/flobopuyo/pkg-plist Modified: head/games/flobopuyo/Makefile Modified: head/games/flobopuyo/Makefile ============================================================================== --- head/games/flobopuyo/Makefile Sat Dec 21 01:13:22 2013 (r337115) +++ head/games/flobopuyo/Makefile Sat Dec 21 01:14:09 2013 (r337116) @@ -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 Added: head/games/flobopuyo/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flobopuyo/files/patch-Makefile Sat Dec 21 01:14:09 2013 (r337116) @@ -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