6 files changed, 22 insertions, 72 deletions

diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile
index 5e02cf3d17fb..50b97cfa7773 100644
--- a/games/stuntrally/Makefile
+++ b/games/stuntrally/Makefile
@@ -2,16 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	stuntrally
-PORTVERSION=	2.6
-PORTREVISION=	9
+PORTVERSION=	2.6.1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@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}" \
diff --git a/games/stuntrally/distinfo b/games/stuntrally/distinfo
index 29975a414989..914b5fc98d81 100644
--- a/games/stuntrally/distinfo
+++ b/games/stuntrally/distinfo
@@ -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
diff --git a/games/stuntrally/files/patch-CMakeLists.txt b/games/stuntrally/files/patch-CMakeLists.txt
index 4ea71bb312de..889cfed15710 100644
--- a/games/stuntrally/files/patch-CMakeLists.txt
+++ b/games/stuntrally/files/patch-CMakeLists.txt
@@ -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")
diff --git a/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp b/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp
deleted file mode 100644
index 4f8f4f7dda85..000000000000
--- a/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/ogre/BaseApp_Create.cpp.orig	2015-09-18 09:21:11 UTC
-+++ source/ogre/BaseApp_Create.cpp
-@@ -254,7 +254,7 @@ bool BaseApp::configure()
- 
- 	mRoot->initialise(false);
- 
--	Uint32 flags = SDL_INIT_VIDEO|SDL_INIT_JOYSTICK|SDL_INIT_HAPTIC|SDL_INIT_NOPARACHUTE;
-+	Uint32 flags = SDL_INIT_VIDEO|SDL_INIT_JOYSTICK|SDL_INIT_NOPARACHUTE;
- 	if (SDL_WasInit(flags) == 0)
- 	{
- 		SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software");
diff --git a/games/stuntrally/files/patch-source_shiny_CMakeLists.txt b/games/stuntrally/files/patch-source_shiny_CMakeLists.txt
deleted file mode 100644
index fb6368c2b026..000000000000
--- a/games/stuntrally/files/patch-source_shiny_CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- source/shiny/CMakeLists.txt.orig	2015-09-18 09:21:11 UTC
-+++ source/shiny/CMakeLists.txt
-@@ -41,21 +41,9 @@ if(BUILD_SHARED_LIBS)
-     set_target_properties(${SHINY_LIBRARY} PROPERTIES SOVERSION "${SHINY_MAJOR_VERSION}.${SHINY_MINOR_VERSION}")
- endif(BUILD_SHARED_LIBS)
- 
--if(BUILD_SHARED_LIBS)
--    install(TARGETS ${SHINY_LIBRARY}
--            LIBRARY DESTINATION lib${LIB_SUFFIX}
--            RUNTIME DESTINATION lib${LIB_SUFFIX})
--else(BUILD_SHARED_LIBS)
--    install(TARGETS ${SHINY_LIBRARY}
--            ARCHIVE DESTINATION lib${LIB_SUFFIX}
--            RUNTIME DESTINATION lib${LIB_SUFFIX})
--endif(BUILD_SHARED_LIBS)
- file(GLOB HEADERS_EDITOR Editor/*.hpp)
- file(GLOB HEADERS_EXTRA Extra/*.h)
- file(GLOB HEADERS_MAIN Main/*.hpp)
--install(FILES ${HEADERS_EDITOR} DESTINATION include/shiny/Editor)
--install(FILES ${HEADERS_EXTRA} DESTINATION include/shiny/Extra)
--install(FILES ${HEADERS_MAIN} DESTINATION include/shiny/Main)
- 
- set(SHINY_LIBRARIES ${SHINY_LIBRARY})
- 
-@@ -80,17 +68,7 @@ if (SHINY_BUILD_OGRE_PLATFORM)
-     add_library(${SHINY_OGREPLATFORM_LIBRARY} ${SHINY_LIBRARY_TYPE} ${OGRE_PLATFORM_SOURCE_FILES})
-     add_dependencies(${SHINY_OGREPLATFORM_LIBRARY} ${SHINY_LIBRARY})
-     set(SHINY_LIBRARIES ${SHINY_LIBRARIES} ${SHINY_OGREPLATFORM_LIBRARY})
--    if(BUILD_SHARED_LIBS)
--        install(TARGETS ${SHINY_OGREPLATFORM_LIBRARY}
--                LIBRARY DESTINATION lib${LIB_SUFFIX}//OGRE
--                RUNTIME DESTINATION lib${LIB_SUFFIX}//OGRE)
--    else(BUILD_SHARED_LIBS)
--        install(TARGETS ${SHINY_OGREPLATFORM_LIBRARY}
--                ARCHIVE DESTINATION lib${LIB_SUFFIX}//OGRE
--                RUNTIME DESTINATION lib${LIB_SUFFIX}//OGRE)
--    endif(BUILD_SHARED_LIBS)
-     file(GLOB HEADERS_PLATFORM_OGRE Platforms/Ogre/*.hpp)
--    install(FILES ${HEADERS_PLATFORM_OGRE} DESTINATION include/shiny/Platforms/Ogre)
- endif()
- 
- set(SHINY_LIBRARY ${SHINY_LIBRARY} PARENT_SCOPE)
diff --git a/games/stuntrally/files/patch-source_vdrift_cartire.cpp b/games/stuntrally/files/patch-source_vdrift_cartire.cpp
new file mode 100644
index 000000000000..f9e31db234d9
--- /dev/null
+++ b/games/stuntrally/files/patch-source_vdrift_cartire.cpp
@@ -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;
+ }
+