svn commit: r500172 - in head/games/stuntrally: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Apr 26 21:54:11 2019
New Revision: 500172
URL: https://svnweb.freebsd.org/changeset/ports/500172

Log:
  - Update to 2.6.1

Added:
  head/games/stuntrally/files/patch-source_vdrift_cartire.cpp   (contents, props changed)
Deleted:
  head/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp
  head/games/stuntrally/files/patch-source_shiny_CMakeLists.txt
Modified:
  head/games/stuntrally/Makefile
  head/games/stuntrally/distinfo
  head/games/stuntrally/files/patch-CMakeLists.txt

Modified: head/games/stuntrally/Makefile
==============================================================================
--- head/games/stuntrally/Makefile	Fri Apr 26 21:53:16 2019	(r500171)
+++ head/games/stuntrally/Makefile	Fri Apr 26 21:54:11 2019	(r500172)
@@ -2,16 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	stuntrally
-PORTVERSION=	2.6
-PORTREVISION=	9
+PORTVERSION=	2.6.1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	3D racing game based on VDrift and OGRE with track editor
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	f7703d8d3f30.patch:-p1
-
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/License.txt
 
@@ -20,7 +16,7 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 USE_GITHUB=	yes
 GH_TUPLE=	stuntrally:tracks:${PORTVERSION}:tracks/data/tracks
 
-USES=		compiler:c++11-lib cmake dos2unix pkgconfig
+USES=		compiler:c++11-lib cmake dos2unix pkgconfig sdl
 USE_CXXSTD=	gnu++11
 DOS2UNIX_FILES=	source/ogre/BaseApp_Create.cpp
 CMAKE_ARGS=	-DSHARE_INSTALL="${DATADIR_REL}" \

Modified: head/games/stuntrally/distinfo
==============================================================================
--- head/games/stuntrally/distinfo	Fri Apr 26 21:53:16 2019	(r500171)
+++ head/games/stuntrally/distinfo	Fri Apr 26 21:54:11 2019	(r500172)
@@ -1,7 +1,5 @@
-TIMESTAMP = 1500906591
-SHA256 (stuntrally-stuntrally-2.6_GH0.tar.gz) = 8cc309d27d26f78dcc596440547d68b5e41d02ef830df2d52d38611d45ebbaca
-SIZE (stuntrally-stuntrally-2.6_GH0.tar.gz) = 651577187
-SHA256 (stuntrally-tracks-2.6_GH0.tar.gz) = 4bce700516a2a178ac04cfbf7df2887ba42225802f5a3e670f770ea01345687b
-SIZE (stuntrally-tracks-2.6_GH0.tar.gz) = 355793120
-SHA256 (f7703d8d3f30.patch) = 25d881ab7e21b438cfedd2a9c7c813e93c7143e87b7a99ef734025d998444282
-SIZE (f7703d8d3f30.patch) = 5343
+TIMESTAMP = 1555952779
+SHA256 (stuntrally-stuntrally-2.6.1_GH0.tar.gz) = 9bf0507c4235ffaeee019a852124b6cffc311afe3275ae8472eadff4441fb8ff
+SIZE (stuntrally-stuntrally-2.6.1_GH0.tar.gz) = 651581700
+SHA256 (stuntrally-tracks-2.6.1_GH0.tar.gz) = fa83ecf6dcc6e906542f3bd07677ad4369cfe4d12c639837a0f90946d47dd474
+SIZE (stuntrally-tracks-2.6.1_GH0.tar.gz) = 355800929

Modified: head/games/stuntrally/files/patch-CMakeLists.txt
==============================================================================
--- head/games/stuntrally/files/patch-CMakeLists.txt	Fri Apr 26 21:53:16 2019	(r500171)
+++ head/games/stuntrally/files/patch-CMakeLists.txt	Fri Apr 26 21:54:11 2019	(r500172)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-09-18 09:21:11 UTC
+--- CMakeLists.txt.orig	2019-03-16 14:58:09 UTC
 +++ CMakeLists.txt
-@@ -16,14 +16,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINAR
+@@ -16,12 +16,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
  	message(FATAL_ERROR "In-source builds are not permitted. Make a separate folder for building:\nmkdir build; cd build; cmake ..\nBefore that, remove the files already created:\nrm -rf CMakeCache.txt CMakeFiles")
  endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
  
@@ -10,8 +10,6 @@
 -	set(CMAKE_BUILD_TYPE RelWithDebInfo
 -	CACHE STRING "Type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
 -endif(NOT CMAKE_BUILD_TYPE)
--
--
+ 
+ 
  # Set default compile flags for GCC
- if(CMAKE_COMPILER_IS_GNUCXX)
- 	message(STATUS "GCC detected, adding compile flags")

Added: head/games/stuntrally/files/patch-source_vdrift_cartire.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/stuntrally/files/patch-source_vdrift_cartire.cpp	Fri Apr 26 21:54:11 2019	(r500172)
@@ -0,0 +1,11 @@
+--- source/vdrift/cartire.cpp.orig	2019-03-16 14:58:09 UTC
++++ source/vdrift/cartire.cpp
+@@ -280,7 +280,7 @@ Dbl CARTIRE::Pacejka_Fx (Dbl sigma, Dbl Fz, Dbl fricti
+ 
+ 	maxforce_output = D;
+ 
+-	assert(!std::isnan(Fx));
++	assert(!isnan(Fx));
+ 	return Fx;
+ }
+