From owner-svn-ports-head@FreeBSD.ORG Mon Dec 9 23:48:17 2013 Return-Path: Delivered-To: svn-ports-head@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 6BF6C55C; Mon, 9 Dec 2013 23:48:17 +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 559CF1B7B; Mon, 9 Dec 2013 23:48:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9NmGRb047217; Mon, 9 Dec 2013 23:48:16 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9NmFTw047209; Mon, 9 Dec 2013 23:48:15 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312092348.rB9NmFTw047209@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 9 Dec 2013 23:48:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336034 - in head: . games/flare games/flare-engine games/flare-engine/files games/flare-game games/flare-game/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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 23:48:17 -0000 Author: amdmi3 Date: Mon Dec 9 23:48:14 2013 New Revision: 336034 URL: http://svnweb.freebsd.org/changeset/ports/336034 Log: - Update flare to 0.19 - Split flare port to engine and game counterparts just as upstream did - Add patch from upstream git to display useful message when enigne in ran without game specified Added: head/games/flare-engine/ - copied from r335675, head/games/flare/ head/games/flare-engine/files/patch-no-game-specified (contents, props changed) head/games/flare-game/ - copied from r335675, head/games/flare/ Deleted: head/games/flare/ head/games/flare-engine/files/patch-src-Hazard.cpp head/games/flare-engine/files/patch-src-MapCollision.cpp head/games/flare-engine/files/patch-src-Utils.cpp head/games/flare-engine/files/patch-src-Utils.h head/games/flare-engine/pkg-plist head/games/flare-game/files/ Modified: head/MOVED head/games/flare-engine/Makefile head/games/flare-engine/distinfo head/games/flare-game/Makefile head/games/flare-game/distinfo head/games/flare-game/pkg-descr head/games/flare-game/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Mon Dec 9 23:27:44 2013 (r336033) +++ head/MOVED Mon Dec 9 23:48:14 2013 (r336034) @@ -5298,3 +5298,4 @@ www/clickheat||2013-12-07|Has expired: N security/pdfcrack||2013-12-08|Has expired: Not active since several years security/rarcrack||2013-12-08|Has expired: Not active since several years java/subversion-java|java/java-subversion|2013-12-08|Rename to reflect subversion child port naming scheme +games/flare|games/flare-game|2013-12-10|Flare port was split into engine and game counterparts, as upstream did Modified: head/games/flare-engine/Makefile ============================================================================== --- head/games/flare/Makefile Thu Dec 5 17:18:40 2013 (r335675) +++ head/games/flare-engine/Makefile Mon Dec 9 23:48:14 2013 (r336034) @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= flare -PORTVERSION= 0.18 -PORTEPOCH= 1 +PORTVERSION= 0.19 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}-game/ +MASTER_SITES= SF/${PORTNAME}-game/Linux/ +DISTNAME= ${PORTNAME}-engine.${PORTVERSION} +PKGNAMESUFFIX= -engine MAINTAINER= amdmi3@FreeBSD.org COMMENT= Free Libre Action Roleplaying Engine @@ -15,21 +16,17 @@ LICENSE= GPLv3 USES= cmake USE_SDL= sdl mixer image ttf CMAKE_BUILD_TYPE= #empty -INSTALLS_ICONS= yes -CMAKE_ARGS= -DBINDIR="bin" -DDATADIR="share/flare" - -LATEST_LINK= flare-rpg +CMAKE_ARGS= -DBINDIR="bin" -DDATADIR="share/flare" -DMANDIR="man" PORTDOCS= * PORTDATA= * -.include +PLIST_FILES= bin/${PORTNAME} \ + man/man1/flare.1.gz -.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ -.endif + ${INSTALL_DATA} ${WRKSRC}/README.engine ${STAGEDIR}${DOCSDIR}/ .include Modified: head/games/flare-engine/distinfo ============================================================================== --- head/games/flare/distinfo Thu Dec 5 17:18:40 2013 (r335675) +++ head/games/flare-engine/distinfo Mon Dec 9 23:48:14 2013 (r336034) @@ -1,2 +1,2 @@ -SHA256 (flare-0.18.tar.gz) = 9d99aa010d92c24db72d3c0cb4e7bfcf4b121370bcad92851694d62f1bb599b9 -SIZE (flare-0.18.tar.gz) = 177594730 +SHA256 (flare-engine.0.19.tar.gz) = 69811133b22c2c95ca7f35f0db6e63b693e646a433843c0f1c50a2d7f4d581e1 +SIZE (flare-engine.0.19.tar.gz) = 545167 Added: head/games/flare-engine/files/patch-no-game-specified ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flare-engine/files/patch-no-game-specified Mon Dec 9 23:48:14 2013 (r336034) @@ -0,0 +1,131 @@ +commit 2f99397b27a407d8f5a34a023a6e54b378d0e32d +Author: Justin Jacobs +Date: Sat Dec 7 04:52:17 2013 -0500 + + Add --help and --version command line flags + + Closes #899 + +diff --git src/GameStateTitle.cpp src/GameStateTitle.cpp +index 4dcaaca..2cdd797 100644 +--- src/GameStateTitle.cpp ++++ src/GameStateTitle.cpp +@@ -64,7 +64,7 @@ GameStateTitle::GameStateTitle() : GameState() { + + // set up labels + label_version = new WidgetLabel(); +- label_version->set(VIEW_W, 0, JUSTIFY_RIGHT, VALIGN_TOP, msg->get("Flare Alpha v0.19"), font->getColor("menu_normal")); ++ label_version->set(VIEW_W, 0, JUSTIFY_RIGHT, VALIGN_TOP, RELEASE_VERSION, font->getColor("menu_normal")); + + // Setup tab order + tablist.add(button_play); +diff --git src/Settings.h src/Settings.h +index 3682960..cee4808 100644 +--- src/Settings.h ++++ src/Settings.h +@@ -27,6 +27,8 @@ FLARE. If not, see http://www.gnu.org/licenses/ + + #include "CommonIncludes.h" + ++const std::string RELEASE_VERSION = "Flare Alpha v0.19"; ++ + class Element{ + public: + std::string name; +diff --git src/main.cpp src/main.cpp +index 43d70d0..beabf3e 100644 +--- src/main.cpp ++++ src/main.cpp +@@ -120,8 +120,10 @@ static void init() { + for(int i = 0; i < SDL_NumJoysticks(); i++) { + printf(" Joy %d) %s\n", i, SDL_JoystickName(i)); + } +- if ((ENABLE_JOYSTICK) && (SDL_NumJoysticks() > 0)) joy = SDL_JoystickOpen(JOYSTICK_DEVICE); +- printf("Using joystick #%d.\n", JOYSTICK_DEVICE); ++ if ((ENABLE_JOYSTICK) && (SDL_NumJoysticks() > 0)) { ++ joy = SDL_JoystickOpen(JOYSTICK_DEVICE); ++ printf("Using joystick #%d.\n", JOYSTICK_DEVICE); ++ } + + // Set sound effects volume from settings file + if (AUDIO) +@@ -213,6 +215,7 @@ string parseArgValue(const string &arg) { + + int main(int argc, char *argv[]) { + bool debug_event = false; ++ bool done = false; + + for (int i = 1 ; i < argc; i++) { + string arg = string(argv[i]); +@@ -227,12 +230,28 @@ int main(int argc, char *argv[]) { + if (!CUSTOM_PATH_DATA.empty() && CUSTOM_PATH_DATA.at(CUSTOM_PATH_DATA.length()-1) != '/') + CUSTOM_PATH_DATA += "/"; + } ++ else if (parseArg(arg) == "version") { ++ printf("%s\n", RELEASE_VERSION.c_str()); ++ done = true; ++ } ++ else if (parseArg(arg) == "help") { ++ printf("\ ++--help Prints this message.\n\n\ ++--version Prints the release version.\n\n\ ++--game Specifies which 'game' to use when launching. A game\n\ ++ determines which parent folder to look for mods in, as well\n\ ++ as where user settings and save data are stored.\n\n\ ++--data-path Specifies an exact path to look for mod data.\n\n\ ++--debug-event Prints verbose hardware input information.\n"); ++ done = true; ++ } + } + +- srand((unsigned int)time(NULL)); +- +- init(); +- mainLoop(debug_event); ++ if (!done) { ++ srand((unsigned int)time(NULL)); ++ init(); ++ mainLoop(debug_event); ++ } + cleanup(); + + return 0; + +commit 23547426abb3e1f55228feda6782607d33348f99 +Author: Justin Jacobs +Date: Sat Dec 7 05:05:00 2013 -0500 + + Display a warning when the --game flag is omitted + +diff --git src/main.cpp src/main.cpp +index beabf3e..200bdd0 100644 +--- src/main.cpp ++++ src/main.cpp +@@ -216,6 +216,7 @@ string parseArgValue(const string &arg) { + int main(int argc, char *argv[]) { + bool debug_event = false; + bool done = false; ++ bool game_warning = true; + + for (int i = 1 ; i < argc; i++) { + string arg = string(argv[i]); +@@ -224,6 +225,7 @@ int main(int argc, char *argv[]) { + } + else if (parseArg(arg) == "game") { + GAME_FOLDER = parseArgValue(arg); ++ game_warning = false; + } + else if (parseArg(arg) == "data-path") { + CUSTOM_PATH_DATA = parseArgValue(arg); +@@ -247,6 +249,11 @@ int main(int argc, char *argv[]) { + } + } + ++ // if a game isn't specified, display a warning ++ if (game_warning) { ++ printf("Warning: A game wasn't specified, falling back to the 'default' game.\nDid you forget the --game flag? (e.g. --game=flare-game).\nSee --help for more details.\n\n"); ++ } ++ + if (!done) { + srand((unsigned int)time(NULL)); + init(); Modified: head/games/flare-game/Makefile ============================================================================== --- head/games/flare/Makefile Thu Dec 5 17:18:40 2013 (r335675) +++ head/games/flare-game/Makefile Mon Dec 9 23:48:14 2013 (r336034) @@ -2,34 +2,34 @@ # $FreeBSD$ PORTNAME= flare -PORTVERSION= 0.18 -PORTEPOCH= 1 +PORTVERSION= 0.19 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}-game/ +MASTER_SITES= SF/${PORTNAME}-game/Linux/ +DISTNAME= ${PORTNAME}-game.${PORTVERSION} +PKGNAMESUFFIX= -game MAINTAINER= amdmi3@FreeBSD.org COMMENT= Free Libre Action Roleplaying Engine LICENSE= GPLv3 +RUN_DEPENDS= flare:${PORTSDIR}/games/flare-engine + USES= cmake -USE_SDL= sdl mixer image ttf CMAKE_BUILD_TYPE= #empty INSTALLS_ICONS= yes CMAKE_ARGS= -DBINDIR="bin" -DDATADIR="share/flare" -LATEST_LINK= flare-rpg - PORTDOCS= * PORTDATA= * -.include +DATADIR= ${PREFIX}/share/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX} + +OPTIONS_DEFINE= DOCS -.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ -.endif .include Modified: head/games/flare-game/distinfo ============================================================================== --- head/games/flare/distinfo Thu Dec 5 17:18:40 2013 (r335675) +++ head/games/flare-game/distinfo Mon Dec 9 23:48:14 2013 (r336034) @@ -1,2 +1,2 @@ -SHA256 (flare-0.18.tar.gz) = 9d99aa010d92c24db72d3c0cb4e7bfcf4b121370bcad92851694d62f1bb599b9 -SIZE (flare-0.18.tar.gz) = 177594730 +SHA256 (flare-game.0.19.tar.gz) = 1b427bbf2e124cb6df40b9400de1d25aaadb6b0ccf764cf7b8d69f96d3008b34 +SIZE (flare-game.0.19.tar.gz) = 177779024 Modified: head/games/flare-game/pkg-descr ============================================================================== --- head/games/flare/pkg-descr Thu Dec 5 17:18:40 2013 (r335675) +++ head/games/flare-game/pkg-descr Mon Dec 9 23:48:14 2013 (r336034) @@ -1,12 +1,7 @@ -Flare (Free Libre Action Roleplaying Engine) is a simple game engine -built to handle a very specific kind of game: single-player 2D -action RPGs. Flare is not a reimplementation of an existing game -or engine. It is a tribute to and exploration of the action RPG -genre. +Flare is a a single-player 2D action RPG with fast-paced action and +a dark fantasy style. -Rather than building a very abstract, robust game engine, the goal -of this project is to build several real games and harvest an engine -from the common, reusable code. The first game, in progress, is a -fantasy dungeon crawl. +It is built on the FLARE engine (Free/Libre Action Roleplaying +Engine). WWW: http://flarerpg.org Modified: head/games/flare-game/pkg-plist ============================================================================== --- head/games/flare/pkg-plist Thu Dec 5 17:18:40 2013 (r335675) +++ head/games/flare-game/pkg-plist Mon Dec 9 23:48:14 2013 (r336034) @@ -1,4 +1,3 @@ -bin/flare share/applications/flare.desktop share/icons/hicolor/scalable/apps/flare.svg @dirrmtry share/icons/hicolor/scalable/apps