From owner-svn-ports-all@FreeBSD.ORG Sat Mar 15 20:55:34 2014 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 D53645E1; Sat, 15 Mar 2014 20:55:34 +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 C09FC359; Sat, 15 Mar 2014 20:55:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2FKtY5u076854; Sat, 15 Mar 2014 20:55:34 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2FKtXdX076848; Sat, 15 Mar 2014 20:55:33 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201403152055.s2FKtXdX076848@svn.freebsd.org> From: Rusmir Dusko Date: Sat, 15 Mar 2014 20:55:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348378 - in head/games/traingame: . 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, 15 Mar 2014 20:55:35 -0000 Author: nemysis Date: Sat Mar 15 20:55:33 2014 New Revision: 348378 URL: http://svnweb.freebsd.org/changeset/ports/348378 QAT: https://qat.redports.org/buildarchive/r348378/ Log: - Change master sites, use GitHub=yes - Fix build with Clang, add patches [1] - Disable Clang warnings with CFLAGS+=-Wno-return-type - Remove obsolete REINPLACE, changed by upstream - Change do-install, cosmetical changes - Change pkg-descr Reviewed by: tijl@ [1] Thanks to for help: nox@, dim@, Horia Racoviceanu , frogs <4721 at hushmail.com> Added: head/games/traingame/files/patch-src__CrossoverTrack.cpp (contents, props changed) head/games/traingame/files/patch-src__SDLWindow.cpp (contents, props changed) head/games/traingame/files/patch-src__StraightTrack.cpp (contents, props changed) Modified: head/games/traingame/Makefile head/games/traingame/distinfo head/games/traingame/pkg-descr Modified: head/games/traingame/Makefile ============================================================================== --- head/games/traingame/Makefile Sat Mar 15 20:21:49 2014 (r348377) +++ head/games/traingame/Makefile Sat Mar 15 20:55:33 2014 (r348378) @@ -5,10 +5,9 @@ PORTNAME= traingame PORTVERSION= 0.2.2 PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= http://www.nickg.me.uk/files/:game \ - SF/nemysisfreebsdp/${CATEGORIES}/:icons -DISTFILES= TrainGame-${DISTVERSION}${EXTRACT_SUFX}:game \ - ${PORTNAME}_icons.tar.gz:icons +MASTER_SITES= SF/nemysisfreebsdp/${CATEGORIES}/:icons +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}_icons${EXTRACT_SUFX}:icons DIST_SUBDIR= ${PORTNAME} MAINTAINER= nemysis@FreeBSD.org @@ -16,35 +15,37 @@ COMMENT= Game about Trains LICENSE= GPLv3 +USE_GITHUB= yes +GH_ACCOUNT= nickg +GH_PROJECT= traingame +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 83abcc9 + LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ libboost_filesystem.so:${PORTSDIR}/devel/boost-libs -WRKSRC= ${WRKDIR}/TrainGame-${PORTVERSION} +CXXFLAGS+= -std=c++11 -USES= cmake pkgconfig +USES= cmake compiler:c++11-lib pkgconfig +USE_CXXSTD= gnu++11 USE_SDL= sdl image USE_GL= glew -USE_GCC= yes + +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -Wno-return-type PORTDOCS= model_notes.txt models.gnuplot +OPTIONS_DEFINE= DOCS INSTALLS_ICONS= yes ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 -SUB_FILES= ${PORTNAME} \ - ${PORTNAME}-map \ - pkg-message - -OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -e 's|shared_ptr|std::shared_ptr|' \ - ${WRKSRC}/src/Mesh.cpp +SUB_FILES= ${PORTNAME} ${PORTNAME}-map pkg-message do-install: -.for d in ${PORTNAME} ${PORTNAME}-map - ${INSTALL_SCRIPT} ${WRKDIR}/${d} ${STAGEDIR}${PREFIX}/bin/ +.for f in ${PORTNAME} ${PORTNAME}-map + ${INSTALL_SCRIPT} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/bin/ .endfor .for d in buildings engines fonts images layouts maps schemas trees waggons @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) Modified: head/games/traingame/distinfo ============================================================================== --- head/games/traingame/distinfo Sat Mar 15 20:21:49 2014 (r348377) +++ head/games/traingame/distinfo Sat Mar 15 20:55:33 2014 (r348378) @@ -1,4 +1,4 @@ -SHA256 (traingame/TrainGame-0.2.2.tar.gz) = d25fdda2bdfe27543debb64f901911534006538ad5f7dbf40da5622e177436e7 -SIZE (traingame/TrainGame-0.2.2.tar.gz) = 1057361 +SHA256 (traingame/traingame-0.2.2.tar.gz) = 32bba6c133250649e6a6372a0a77cd9144fde7557e2e141c930bf1ae2bf4c695 +SIZE (traingame/traingame-0.2.2.tar.gz) = 1057378 SHA256 (traingame/traingame_icons.tar.gz) = f35937ac4893a4d803888fc2d8d3890a769bda77548a1dc45c09b95738f3dbb7 SIZE (traingame/traingame_icons.tar.gz) = 25088 Added: head/games/traingame/files/patch-src__CrossoverTrack.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/traingame/files/patch-src__CrossoverTrack.cpp Sat Mar 15 20:55:33 2014 (r348378) @@ -0,0 +1,9 @@ +--- ./src/CrossoverTrack.cpp.orig 2013-12-21 13:18:27.000000000 +0100 ++++ ./src/CrossoverTrack.cpp 2014-03-15 19:51:31.988732983 +0100 +@@ -215,5 +215,5 @@ + + ITrackSegmentPtr make_crossover_track() + { +- return ITrackSegmentPtr(new CrossoverTrack); ++ return ITrackSegmentPtr(static_cast(new CrossoverTrack)); + } Added: head/games/traingame/files/patch-src__SDLWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/traingame/files/patch-src__SDLWindow.cpp Sat Mar 15 20:55:33 2014 (r348378) @@ -0,0 +1,9 @@ +--- ./src/SDLWindow.cpp.orig 2013-12-21 13:18:27.000000000 +0100 ++++ ./src/SDLWindow.cpp 2014-03-15 19:52:52.290284158 +0100 +@@ -406,5 +406,5 @@ + // Construct and initialise an OpenGL SDL window + IWindowPtr make_sdl_window() + { +- return shared_ptr(new SDLWindow); ++ return shared_ptr(static_cast(new SDLWindow)); + } Added: head/games/traingame/files/patch-src__StraightTrack.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/traingame/files/patch-src__StraightTrack.cpp Sat Mar 15 20:55:33 2014 (r348378) @@ -0,0 +1,9 @@ +--- ./src/StraightTrack.cpp.orig 2013-12-21 13:18:27.000000000 +0100 ++++ ./src/StraightTrack.cpp 2014-03-15 19:53:57.938221605 +0100 +@@ -259,5 +259,5 @@ + throw runtime_error("Illegal straight track direction: " + + lexical_cast(a_direction)); + +- return ITrackSegmentPtr(new StraightTrack(real_dir)); ++ return ITrackSegmentPtr(static_cast(new StraightTrack(real_dir))); + } Modified: head/games/traingame/pkg-descr ============================================================================== --- head/games/traingame/pkg-descr Sat Mar 15 20:21:49 2014 (r348377) +++ head/games/traingame/pkg-descr Sat Mar 15 20:55:33 2014 (r348378) @@ -1,7 +1,7 @@ -Train Game (working title) is a game about trains! Woo! You control a train -which you drive around a 3D world picking up cargo, trundle it about, -and deliver it for PROFIT; whilst avoiding disasters like falling off the rails, -hitting other trains, bad weather, or privatisation. +Train Game is a game about trains! Woo! You control a train which you drive +around a 3D world picking up cargo, trundle it about, and deliver it for PROFIT; +whilst avoiding disasters like falling off the rails, hitting other trains, +bad weather, or privatisation. Imagine Elite but with trains instead of space craft. Cant believe no ones thought of it before.