5 files changed, 8 insertions, 36 deletions

diff --git a/games/traingame/Makefile b/games/traingame/Makefile
index 3d72f2a7f824..79a46dc6bf54 100644
--- a/games/traingame/Makefile
+++ b/games/traingame/Makefile
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	traingame
-PORTVERSION=	0.2.2
-PORTREVISION=	5
+PORTVERSION=	0.3
 CATEGORIES=	games
 MASTER_SITES=	SF/nemysisfreebsdp/${CATEGORIES}/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}_icons${EXTRACT_SUFX}:icons
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Game about Trains
@@ -19,13 +17,14 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	nickg
 GH_PROJECT=	traingame
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	83abcc9
+GH_COMMIT=	eacfbc3
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
 		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
 
-USES=		cmake compiler:c++11-lib pkgconfig
+USES=		cmake compiler:c++11-lib dos2unix pkgconfig
+DOS2UNIX_GLOB=	*.mtl *.obj
 USE_CXXSTD=	c++11
 USE_SDL=	sdl image
 USE_GL=		glew
diff --git a/games/traingame/distinfo b/games/traingame/distinfo
index 6b9633a0aaab..baf23e9e8ef1 100644
--- a/games/traingame/distinfo
+++ b/games/traingame/distinfo
@@ -1,4 +1,4 @@
-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
+SHA256 (traingame-0.3.tar.gz) = 321d6b524835dd5527df696b8aba07c5cdf48bac87995420d886af9dee2e32d4
+SIZE (traingame-0.3.tar.gz) = 1057438
+SHA256 (traingame_icons.tar.gz) = f35937ac4893a4d803888fc2d8d3890a769bda77548a1dc45c09b95738f3dbb7
+SIZE (traingame_icons.tar.gz) = 25088
diff --git a/games/traingame/files/patch-src__CrossoverTrack.cpp b/games/traingame/files/patch-src__CrossoverTrack.cpp
deleted file mode 100644
index d2dfb833ac0f..000000000000
--- a/games/traingame/files/patch-src__CrossoverTrack.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./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<ITrackSegment *>(new CrossoverTrack));
- }
diff --git a/games/traingame/files/patch-src__SDLWindow.cpp b/games/traingame/files/patch-src__SDLWindow.cpp
deleted file mode 100644
index 459ab9057096..000000000000
--- a/games/traingame/files/patch-src__SDLWindow.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./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<IWindow>(new SDLWindow);
-+   return shared_ptr<IWindow>(static_cast<IWindow *>(new SDLWindow));
- }
diff --git a/games/traingame/files/patch-src__StraightTrack.cpp b/games/traingame/files/patch-src__StraightTrack.cpp
deleted file mode 100644
index 88dceb57cb80..000000000000
--- a/games/traingame/files/patch-src__StraightTrack.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./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<string>(a_direction));
- 
--   return ITrackSegmentPtr(new StraightTrack(real_dir));
-+   return ITrackSegmentPtr(static_cast<ITrackSegment *>(new StraightTrack(real_dir)));
- }