4 files changed, 6 insertions, 42 deletions

diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index b8e8a4d7ada4..87c521dd865c 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	openmw
-PORTVERSION=	0.41.0
+PORTVERSION=	0.42.0
 DISTVERSIONPREFIX=	openmw-
-PORTREVISION=	7
 CATEGORIES=	games
 
 MAINTAINER=	tobik@FreeBSD.org
diff --git a/games/openmw/distinfo b/games/openmw/distinfo
index 3a163799f867..f03c35783fb4 100644
--- a/games/openmw/distinfo
+++ b/games/openmw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482715659
-SHA256 (OpenMW-openmw-openmw-0.41.0_GH0.tar.gz) = a3e1c7d060dc461b9b63ceb5d9ec56b90c1bdcbfd37f0c7c7310c38ec7e3e21d
-SIZE (OpenMW-openmw-openmw-0.41.0_GH0.tar.gz) = 4884093
+TIMESTAMP = 1501104139
+SHA256 (OpenMW-openmw-openmw-0.42.0_GH0.tar.gz) = f133f7494182cc379cb77f0fb663d2f2d95560a199af8e78d58324da29d6c71a
+SIZE (OpenMW-openmw-openmw-0.42.0_GH0.tar.gz) = 4961643
diff --git a/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp b/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
index 52d68594c957..92aa100a3f49 100644
--- a/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
+++ b/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
@@ -1,6 +1,6 @@
---- apps/openmw/mwinput/inputmanagerimp.cpp.orig	2016-08-15 09:27:54 UTC
+--- apps/openmw/mwinput/inputmanagerimp.cpp.orig	2017-06-29 22:52:28 UTC
 +++ apps/openmw/mwinput/inputmanagerimp.cpp
-@@ -119,11 +119,12 @@ namespace MWInput
+@@ -122,11 +122,12 @@ namespace MWInput
                  SDL_ControllerDeviceEvent evt;
                  evt.which = i;
                  controllerAdded(mFakeDeviceID, evt);
@@ -15,28 +15,3 @@
              }
          }
  
-@@ -389,6 +390,8 @@ namespace MWInput
-             {
-                 float xAxis = mInputBinder->getChannel(A_MoveLeftRight)->getValue()*2.0f-1.0f;
-                 float yAxis = mInputBinder->getChannel(A_MoveForwardBackward)->getValue()*2.0f-1.0f;
-+                if (mInvertY)
-+                    yAxis *= -1;
-                 float zAxis = mInputBinder->getChannel(A_LookUpDown)->getValue()*2.0f-1.0f;
-                 const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
- 
-@@ -456,13 +459,13 @@ namespace MWInput
-                     {
-                         triedToMove = true;
-                         mPlayer->setAutoMove (false);
--                        mPlayer->setForwardBackward (1);
-+                        mPlayer->setForwardBackward (mInvertY ? -1 : 1);
-                     }
-                     else if (yAxis > .5)
-                     {
-                         triedToMove = true;
-                         mPlayer->setAutoMove (false);
--                        mPlayer->setForwardBackward (-1);
-+                        mPlayer->setForwardBackward (mInvertY ? 1 : -1);
-                     }
- 
-                     else if(mPlayer->getAutoMove())
diff --git a/games/openmw/files/patch-files_gamecontrollerdb.txt b/games/openmw/files/patch-files_gamecontrollerdb.txt
deleted file mode 100644
index 7c5a3a5c5f2c..000000000000
--- a/games/openmw/files/patch-files_gamecontrollerdb.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- files/gamecontrollerdb.txt.orig	2016-08-15 09:27:54 UTC
-+++ files/gamecontrollerdb.txt
-@@ -150,3 +150,7 @@ AD1B00000000000001F9000000000000,Gamesto
- 03000000380700001647000010040000,Mad Catz Wired Xbox 360 Controller,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
- 030000006f0e00003901000020060000,Afterglow Wired Controller for Xbox One,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,platform:Linux,
- 030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,platform:Linux,a:b0,b:b2,x:b1,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,
-+
-+# FreeBSD
-+30783030303520283229000000000000,X360 Controller,platform:FreeBSD,x:b13,a:b11,b:b12,y:b14,back:b5,guide:b4,guide:b10,start:b4,dpleft:b2,dpdown:b1,dpright:b3,dpup:b0,leftshoulder:b8,lefttrigger:b9,lefttrigger:a2,rightshoulder:b9,righttrigger:a5,leftstick:b6,rightstick:b7,leftx:a0,lefty:a1,rightx:a3,righty:a4,
-+30783030303520283029000000000000,X360 Controller,platform:FreeBSD,x:b13,a:b11,b:b12,y:b14,back:b5,guide:b4,guide:b10,start:b4,dpleft:b2,dpdown:b1,dpright:b3,dpup:b0,leftshoulder:b8,lefttrigger:b9,lefttrigger:a2,rightshoulder:b9,righttrigger:a5,leftstick:b6,rightstick:b7,leftx:a0,lefty:a1,rightx:a3,righty:a4,