6 files changed, 22 insertions, 26 deletions

diff --git a/games/dustrac/Makefile b/games/dustrac/Makefile
index b18eeb38ba19..16d788dfeb28 100644
--- a/games/dustrac/Makefile
+++ b/games/dustrac/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	dustrac
-PORTVERSION=	1.9.2
+PORTVERSION=	1.11.0
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/src
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	2D top-view racing game
@@ -19,6 +18,10 @@ CMAKE_ARGS=	-DReleaseBuild=on \
 		-DDOC_PATH=${DOCSDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	juzzlin
+GH_PROJECT=	DustRacing2D
+
 OPTIONS_DEFINE=	DOCS
 
 STRIP_FILES=	bin/dustrac-game \
diff --git a/games/dustrac/distinfo b/games/dustrac/distinfo
index 4f99c1946e07..19462a4a5a60 100644
--- a/games/dustrac/distinfo
+++ b/games/dustrac/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dustrac-1.9.2.tar.gz) = 6254bc0d6db7f16393ba2d9a8f41d0e3ac33448b5e806e641e859a9105b8eb85
-SIZE (dustrac-1.9.2.tar.gz) = 25892050
+SHA256 (juzzlin-DustRacing2D-1.11.0_GH0.tar.gz) = 48512ce979d4c4945dd6b9b4832da88619113477a53f0b7e7edee832f5a582ec
+SIZE (juzzlin-DustRacing2D-1.11.0_GH0.tar.gz) = 27506587
diff --git a/games/dustrac/files/patch-src__common__route.cpp b/games/dustrac/files/patch-src__common__route.cpp
deleted file mode 100644
index 5940ce786e94..000000000000
--- a/games/dustrac/files/patch-src__common__route.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/common/route.cpp.orig	2014-03-29 12:42:23.000000000 +0000
-+++ ./src/common/route.cpp	2014-04-14 11:24:16.431660171 +0000
-@@ -18,6 +18,7 @@
- 
- #include <algorithm>
- #include <cassert>
-+#include <cmath>
- 
- static const int CLOSING_TH = 32;
- 
diff --git a/games/dustrac/files/patch-src__editor__editorview.cpp b/games/dustrac/files/patch-src__editor__editorview.cpp
index 0f9a5bafd957..92fb7e104df6 100644
--- a/games/dustrac/files/patch-src__editor__editorview.cpp
+++ b/games/dustrac/files/patch-src__editor__editorview.cpp
@@ -1,11 +1,10 @@
---- ./src/editor/editorview.cpp.orig	2014-03-29 12:42:23.000000000 +0000
-+++ ./src/editor/editorview.cpp	2014-04-06 15:45:53.624369553 +0000
-@@ -240,7 +240,7 @@
+--- src/editor/editorview.cpp.orig	2015-04-28 17:34:19 UTC
++++ src/editor/editorview.cpp
+@@ -35,6 +35,7 @@
+ #include "tracktile.hpp"
  
-             if (MainWindow::instance()->randomlyRotateObjects())
-             {
--                object.setRotation(std::rand() % 360);
-+                object.setRotation(rand() % 360);
-             }
+ #include <cassert>
++#include <cstdlib>
  
-             scene()->addItem(&object);
+ EditorView::EditorView(EditorData & editorData, QWidget * parent)
+ : QGraphicsView(parent)
diff --git a/games/dustrac/pkg-descr b/games/dustrac/pkg-descr
index 529945dd950d..f0f82cee838f 100644
--- a/games/dustrac/pkg-descr
+++ b/games/dustrac/pkg-descr
@@ -3,7 +3,7 @@ game written in Qt.
 
 Play against challenging computer cars or use the split-screen mode
 to play against your friend.  A level editor for easy level creation
-is included.  Dust Racing 2D is inspired by Super Cars and Slicks’n
+is included.  Dust Racing 2D is inspired by Super Cars and Slicks'n
 Slide.
 
 WWW: http://dustrac.sourceforge.net/
diff --git a/games/dustrac/pkg-plist b/games/dustrac/pkg-plist
index 9c0d0fd71c3d..a2ea1dca3108 100644
--- a/games/dustrac/pkg-plist
+++ b/games/dustrac/pkg-plist
@@ -40,6 +40,7 @@ share/applications/dustrac-game.desktop
 %%DATADIR%%/images/corner45Right.png
 %%DATADIR%%/images/corner45RightPreview.png
 %%DATADIR%%/images/cornerPreview.png
+%%DATADIR%%/images/crashOverlay.png
 %%DATADIR%%/images/creditsHelpBack.png
 %%DATADIR%%/images/cross.png
 %%DATADIR%%/images/cursor.png
@@ -59,7 +60,6 @@ share/applications/dustrac-game.desktop
 %%DATADIR%%/images/lock.png
 %%DATADIR%%/images/logo.png
 %%DATADIR%%/images/mainMenuBack.png
-%%DATADIR%%/images/monospace.png
 %%DATADIR%%/images/mud.png
 %%DATADIR%%/images/pit.png
 %%DATADIR%%/images/plant.png
@@ -68,9 +68,13 @@ share/applications/dustrac-game.desktop
 %%DATADIR%%/images/sand.png
 %%DATADIR%%/images/sandAreaBig.png
 %%DATADIR%%/images/sandAreaCurve.png
+%%DATADIR%%/images/sandEditor.png
 %%DATADIR%%/images/sandGrassCorner.png
 %%DATADIR%%/images/sandGrassCorner2.png
+%%DATADIR%%/images/sandGrassCorner2Editor.png
+%%DATADIR%%/images/sandGrassCornerEditor.png
 %%DATADIR%%/images/sandGrassStraight.png
+%%DATADIR%%/images/sandGrassStraightEditor.png
 %%DATADIR%%/images/settingsBack.png
 %%DATADIR%%/images/skid.png
 %%DATADIR%%/images/sky.png
@@ -116,7 +120,7 @@ share/applications/dustrac-game.desktop
 %%DATADIR%%/sounds/menuClick.ogg
 %%DATADIR%%/sounds/pit.ogg
 %%DATADIR%%/sounds/skid.ogg
-%%DATADIR%%/textures.conf
+%%DATADIR%%/surfaces.conf
 %%DATADIR%%/translations/dustrac-editor_cs.qm
 %%DATADIR%%/translations/dustrac-editor_fi.qm
 %%DATADIR%%/translations/dustrac-editor_fr.qm