6 files changed, 12 insertions, 22 deletions

diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index 06e8857c82eb..1ba129466370 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openmw
-PORTVERSION=	0.39.0
+PORTVERSION=	0.40.0
 DISTVERSIONPREFIX=	openmw-
 CATEGORIES=	games
 
diff --git a/games/openmw/distinfo b/games/openmw/distinfo
index 64643a8e53d6..d79983810e77 100644
--- a/games/openmw/distinfo
+++ b/games/openmw/distinfo
@@ -1,2 +1,3 @@
-SHA256 (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = b0d294b0814099bd93326f7b86dd84fb727d38dd536bf104272112e6d70ae720
-SIZE (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = 4764754
+TIMESTAMP = 1472037205
+SHA256 (OpenMW-openmw-openmw-0.40.0_GH0.tar.gz) = 3f3ad6f29713bd27cbab5dbad7010212b7eba906f3b5542b5c5effb53e5d7944
+SIZE (OpenMW-openmw-openmw-0.40.0_GH0.tar.gz) = 4849783
diff --git a/games/openmw/files/patch-CMakeLists.txt b/games/openmw/files/patch-CMakeLists.txt
deleted file mode 100644
index 4826b1c20c09..000000000000
--- a/games/openmw/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2016-06-30 21:09:52 UTC
-+++ CMakeLists.txt
-@@ -296,7 +296,7 @@ find_package(Boost REQUIRED COMPONENTS $
- find_package(SDL2 REQUIRED)
- find_package(OpenAL REQUIRED)
- find_package(Bullet REQUIRED)
--if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 283)
-+if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 282)
-     message(FATAL_ERROR "OpenMW requires Bullet version 2.83 or later")
- endif()
- 
diff --git a/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp b/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
index cfd40862d66a..52d68594c957 100644
--- a/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
+++ b/games/openmw/files/patch-apps_openmw_mwinput_inputmanagerimp.cpp
@@ -1,4 +1,4 @@
---- apps/openmw/mwinput/inputmanagerimp.cpp.orig	2016-01-12 16:11:28 UTC
+--- apps/openmw/mwinput/inputmanagerimp.cpp.orig	2016-08-15 09:27:54 UTC
 +++ apps/openmw/mwinput/inputmanagerimp.cpp
 @@ -119,11 +119,12 @@ namespace MWInput
                  SDL_ControllerDeviceEvent evt;
diff --git a/games/openmw/files/patch-apps_wizard_CMakeLists.txt b/games/openmw/files/patch-apps_wizard_CMakeLists.txt
index 3461991c3b86..df43b16e0814 100644
--- a/games/openmw/files/patch-apps_wizard_CMakeLists.txt
+++ b/games/openmw/files/patch-apps_wizard_CMakeLists.txt
@@ -1,6 +1,6 @@
---- apps/wizard/CMakeLists.txt.orig	2016-04-06 11:40:42 UTC
+--- apps/wizard/CMakeLists.txt.orig	2016-08-15 09:27:54 UTC
 +++ apps/wizard/CMakeLists.txt
-@@ -147,6 +147,7 @@ endif()
+@@ -137,6 +137,7 @@ endif()
  
  # Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
  if (UNIX AND NOT APPLE)
diff --git a/games/openmw/files/patch-files_gamecontrollerdb.txt b/games/openmw/files/patch-files_gamecontrollerdb.txt
index aa32f8cb1009..7c5a3a5c5f2c 100644
--- a/games/openmw/files/patch-files_gamecontrollerdb.txt
+++ b/games/openmw/files/patch-files_gamecontrollerdb.txt
@@ -1,9 +1,9 @@
---- files/gamecontrollerdb.txt.orig	2016-01-12 16:11:28 UTC
+--- files/gamecontrollerdb.txt.orig	2016-08-15 09:27:54 UTC
 +++ files/gamecontrollerdb.txt
-@@ -99,3 +99,7 @@ ff113133000000000000504944564944,SVEN X-
- 05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,
- 05000000362800000100000003010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,
- 030000008916000001fd000024010000,Razer Onza Classic Edition,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8tart:b7,dpleft:b11,dpdown:b14,dpright:b12,dpup:b13,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
+@@ -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,