diff -Nru devel/godot2.orig/distinfo devel/godot2/distinfo
--- devel/godot2.orig/distinfo	2018-09-12 12:25:35.874880000 +0930
+++ devel/godot2/distinfo	2018-09-09 23:21:19.094159000 +0930
@@ -1,5 +1,5 @@
-TIMESTAMP = 1514402523
-SHA256 (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 07cf3b01367d5ea53805f144bc60711bd79efb53f1f88d57d6a706e6944de8d7
-SIZE (godotengine-godot-2.1.4-stable_GH0.tar.gz) = 14811915
+TIMESTAMP = 1536385697
+SHA256 (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 74179c08bcc20cc89b4ac2785a31f201d81eb4aa875c80ffcb82d9fb80e8e187
+SIZE (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 15026226
 SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75
 SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045
diff -Nru devel/godot2.orig/files/patch-core_image.cpp devel/godot2/files/patch-core_image.cpp
--- devel/godot2.orig/files/patch-core_image.cpp	2018-09-12 12:25:36.022494000 +0930
+++ devel/godot2/files/patch-core_image.cpp	1970-01-01 09:30:00.000000000 +0930
@@ -1,35 +0,0 @@
---- core/image.cpp.orig	2018-01-10 18:34:14 UTC
-+++ core/image.cpp
-@@ -1518,8 +1518,8 @@ Error Image::_decompress_bc() {
- 					col_b |= src[2];
- 
- 					uint8_t table[4][4] = {
--						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
--						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
-+						{ static_cast<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
-+						{ static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_b)&0x1f) << 3), 255 },
- 						{ 0, 0, 0, 255 },
- 						{ 0, 0, 0, 255 }
- 					};
-@@ -1611,8 +1611,8 @@ Error Image::_decompress_bc() {
- 					col_b |= src[8 + 2];
- 
- 					uint8_t table[4][4] = {
--						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
--						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
-+						{ static_cast<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
-+						{ static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_b)&0x1f) << 3), 255 },
- 						{ 0, 0, 0, 255 },
- 						{ 0, 0, 0, 255 }
- 					};
-@@ -1722,8 +1722,8 @@ Error Image::_decompress_bc() {
- 					col_b |= src[8 + 2];
- 
- 					uint8_t table[4][4] = {
--						{ (col_a >> 11) << 3, ((col_a >> 5) & 0x3f) << 2, ((col_a)&0x1f) << 3, 255 },
--						{ (col_b >> 11) << 3, ((col_b >> 5) & 0x3f) << 2, ((col_b)&0x1f) << 3, 255 },
-+						{ static_cast<uint8_t>((col_a >> 11) << 3), static_cast<uint8_t>(((col_a >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_a)&0x1f) << 3), 255 },
-+						{ static_cast<uint8_t>((col_b >> 11) << 3), static_cast<uint8_t>(((col_b >> 5) & 0x3f) << 2), static_cast<uint8_t>(((col_b)&0x1f) << 3), 255 },
- 						{ 0, 0, 0, 255 },
- 						{ 0, 0, 0, 255 }
- 					};
diff -Nru devel/godot2.orig/files/patch-core_ustring.cpp devel/godot2/files/patch-core_ustring.cpp
--- devel/godot2.orig/files/patch-core_ustring.cpp	2018-09-12 12:25:36.043294000 +0930
+++ devel/godot2/files/patch-core_ustring.cpp	1970-01-01 09:30:00.000000000 +0930
@@ -1,11 +0,0 @@
---- core/ustring.cpp.orig	2018-01-10 18:53:28 UTC
-+++ core/ustring.cpp
-@@ -3199,7 +3199,7 @@ String String::http_unescape() const {
- 			if ((ord1 >= '0' && ord1 <= '9') || (ord1 >= 'A' && ord1 <= 'Z')) {
- 				CharType ord2 = ord_at(i + 2);
- 				if ((ord2 >= '0' && ord2 <= '9') || (ord2 >= 'A' && ord2 <= 'Z')) {
--					char bytes[2] = { ord1, ord2 };
-+					char bytes[2] = { static_cast<char>(ord1), static_cast<char>(ord2) };
- 					res += (char)strtol(bytes, NULL, 16);
- 					i += 2;
- 				}
diff -Nru devel/godot2.orig/files/patch-drivers_gles2_rasterizer__gles2.cpp devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp
--- devel/godot2.orig/files/patch-drivers_gles2_rasterizer__gles2.cpp	2018-09-12 12:25:36.077128000 +0930
+++ devel/godot2/files/patch-drivers_gles2_rasterizer__gles2.cpp	1970-01-01 09:30:00.000000000 +0930
@@ -1,30 +0,0 @@
---- drivers/gles2/rasterizer_gles2.cpp.orig	2018-01-10 11:36:45 UTC
-+++ drivers/gles2/rasterizer_gles2.cpp
-@@ -2135,9 +2135,9 @@ Error RasterizerGLES2::_surface_set_arra
- 					for (int i = 0; i < p_surface->array_len; i++) {
- 
- 						GLbyte vector[4] = {
--							CLAMP(src[i].x * 127, -128, 127),
--							CLAMP(src[i].y * 127, -128, 127),
--							CLAMP(src[i].z * 127, -128, 127),
-+							static_cast<GLbyte>CLAMP(src[i].x * 127, -128, 127),
-+							static_cast<GLbyte>CLAMP(src[i].y * 127, -128, 127),
-+							static_cast<GLbyte>CLAMP(src[i].z * 127, -128, 127),
- 							0,
- 						};
- 
-@@ -2169,10 +2169,10 @@ Error RasterizerGLES2::_surface_set_arra
- 					for (int i = 0; i < p_surface->array_len; i++) {
- 
- 						GLbyte xyzw[4] = {
--							CLAMP(src[i * 4 + 0] * 127, -128, 127),
--							CLAMP(src[i * 4 + 1] * 127, -128, 127),
--							CLAMP(src[i * 4 + 2] * 127, -128, 127),
--							CLAMP(src[i * 4 + 3] * 127, -128, 127)
-+							static_cast<GLbyte>CLAMP(src[i * 4 + 0] * 127, -128, 127),
-+							static_cast<GLbyte>CLAMP(src[i * 4 + 1] * 127, -128, 127),
-+							static_cast<GLbyte>CLAMP(src[i * 4 + 2] * 127, -128, 127),
-+							static_cast<GLbyte>CLAMP(src[i * 4 + 3] * 127, -128, 127)
- 						};
- 
- 						copymem(&p_mem[a.ofs + i * stride], xyzw, a.size);
diff -Nru devel/godot2.orig/files/patch-platform_x11_detect.py devel/godot2/files/patch-platform_x11_detect.py
--- devel/godot2.orig/files/patch-platform_x11_detect.py	2018-09-12 12:25:36.042661000 +0930
+++ devel/godot2/files/patch-platform_x11_detect.py	2018-09-09 23:21:19.110802000 +0930
@@ -1,4 +1,4 @@
---- platform/x11/detect.py.orig	2017-08-28 01:55:12 UTC
+--- platform/x11/detect.py.orig	2018-07-29 00:47:52 UTC
 +++ platform/x11/detect.py
 @@ -56,7 +56,9 @@ def get_opts():
          ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
@@ -10,8 +10,8 @@
 +        ('pulseaudio', 'Detect & Use pulseaudio', 'no'),
          ('udev', 'Use udev for gamepad connection callbacks', 'no'),
          ('debug_release', 'Add debug symbols to release version', 'no'),
-     ]
-@@ -84,10 +86,6 @@ def configure(env):
+         ('touch', 'Enable touch events', 'yes'),
+@@ -85,10 +87,6 @@ def configure(env):
  
      env.Append(CPPPATH=['#platform/x11'])
      if (env["use_llvm"] == "yes"):
@@ -22,45 +22,34 @@
          env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
          env.extra_suffix = ".llvm"
      elif (os.system("gcc --version > /dev/null 2>&1") == 0): # GCC
-@@ -125,19 +123,16 @@ def configure(env):
+@@ -126,19 +124,14 @@ def configure(env):
      env.Append(LINKFLAGS=['-pipe'])
  
      if (env["target"] == "release"):
 -        env.Prepend(CCFLAGS=['-Ofast'])
 -        if (env["debug_release"] == "yes"):
 -            env.Prepend(CCFLAGS=['-g2'])
-+
 +        pass
  
      elif (env["target"] == "release_debug"):
- 
+-
 -        env.Prepend(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
 -        if (env["debug_release"] == "yes"):
 -            env.Prepend(CCFLAGS=['-g2'])
+-
 +        env.Prepend(CCFLAGS=['-DDEBUG_ENABLED'])
- 
++        
      elif (env["target"] == "debug"):
  
 -        env.Prepend(CCFLAGS=['-g2', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
 +        env.Prepend(CCFLAGS=['-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
+         env.Append(LINKFLAGS=['-rdynamic'])
  
      env.ParseConfig('pkg-config x11 --cflags --libs')
-     env.ParseConfig('pkg-config xinerama --cflags --libs')
-@@ -148,13 +143,22 @@ def configure(env):
-         # Currently not compatible with OpenSSL 1.1.0+
-         # https://github.com/godotengine/godot/issues/8624
-         import subprocess
--        openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
-+        try:
-+            openssl_version = subprocess.check_output(['pkg-config', 'openssl', '--modversion']).strip('\n')
-+        except:
-+            # approx base openssl version
-+            openssl_version = '1.0.2'
-         if (openssl_version >= "1.1.0"):
-             print("Error: Found system-installed OpenSSL %s, currently only supporting version 1.0.x." % openssl_version)
-             print("Aborting.. You can compile with 'builtin_openssl=yes' to use the bundled version.\n")
-             sys.exit(255)
+@@ -155,7 +148,12 @@ def configure(env):
+         env.Append(CPPFLAGS=['-DTOUCH_ENABLED'])
  
+     if (env['builtin_openssl'] == 'no'):
 -        env.ParseConfig('pkg-config openssl --cflags --libs')
 +        try:
 +            # try to find a port installed openssl
@@ -71,7 +60,7 @@
  
      if (env['builtin_libwebp'] == 'no'):
          env.ParseConfig('pkg-config libwebp --cflags --libs')
-@@ -199,12 +203,13 @@ def configure(env):
+@@ -200,12 +198,13 @@ def configure(env):
      if (env['builtin_glew'] == 'no'):
          env.ParseConfig('pkg-config glew --cflags --libs')
  
@@ -91,7 +80,7 @@
  
      if (platform.system() == "Linux"):
          env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
-@@ -219,6 +224,11 @@ def configure(env):
+@@ -220,6 +219,11 @@ def configure(env):
          else:
              print("libudev development libraries not found, disabling udev support")
  
diff -Nru devel/godot2.orig/files/patch-platform_x11_os__x11.cpp devel/godot2/files/patch-platform_x11_os__x11.cpp
--- devel/godot2.orig/files/patch-platform_x11_os__x11.cpp	2018-09-12 12:25:36.043645000 +0930
+++ devel/godot2/files/patch-platform_x11_os__x11.cpp	1970-01-01 09:30:00.000000000 +0930
@@ -1,11 +0,0 @@
---- platform/x11/os_x11.cpp.orig	2018-01-10 10:08:3 UTC
-+++ platform/x11/os_x11.cpp
-@@ -1243,7 +1243,7 @@ static Property read_property(Display *p
- 
- 	} while (bytes_after != 0);
- 
--	Property p = { ret, actual_format, nitems, actual_type };
-+	Property p = { ret, actual_format, (int)nitems, actual_type };
- 
- 	return p;
- }
diff -Nru devel/godot2.orig/files/patch-SConstruct devel/godot2/files/patch-SConstruct
--- devel/godot2.orig/files/patch-SConstruct	2018-09-12 12:25:36.048437000 +0930
+++ devel/godot2/files/patch-SConstruct	2018-09-09 23:21:19.105585000 +0930
@@ -9,24 +9,25 @@
  if 'TERM' in os.environ:
      env_base['ENV']['TERM'] = os.environ['TERM']
  env_base.AppendENVPath('PATH', os.getenv('PATH'))
-@@ -247,15 +247,16 @@ if selected_platform in platform_list:
+@@ -272,15 +272,16 @@ if selected_platform in platform_list:
      if env["extra_suffix"] != '':
          env.extra_suffix += '.' + env["extra_suffix"]
  
 -    CCFLAGS = env.get('CCFLAGS', '')
 -    env['CCFLAGS'] = ''
 -
--    env.Append(CCFLAGS=string.split(str(CCFLAGS)))
+-    env.Append(CCFLAGS=str(CCFLAGS).split())
 -
 -    CFLAGS = env.get('CFLAGS', '')
 -    env['CFLAGS'] = ''
 -
+-    env.Append(CFLAGS=str(CFLAGS).split())
 +    env['CC'] = os.environ['CC']
 +    env['CXX'] = os.environ['CXX']
 +    
 +    CFLAGS = os.environ['CFLAGS']
 +    env['CFLAGS'] = []
-     env.Append(CFLAGS=string.split(str(CFLAGS)))
++    env.Append(CFLAGS=string.split(str(CFLAGS)))
 +    
 +    CCFLAGS = os.environ['CXXFLAGS']
 +    env['CCFLAGS'] = []
diff -Nru devel/godot2.orig/files/patch-servers_audio_audio__mixer__sw.cpp devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp
--- devel/godot2.orig/files/patch-servers_audio_audio__mixer__sw.cpp	2018-09-12 12:25:35.990629000 +0930
+++ devel/godot2/files/patch-servers_audio_audio__mixer__sw.cpp	1970-01-01 09:30:00.000000000 +0930
@@ -1,24 +0,0 @@
---- servers/audio/audio_mixer_sw.cpp.orig	2018-01-10 15:33:12 UTC
-+++ servers/audio/audio_mixer_sw.cpp
-@@ -280,7 +280,7 @@ void AudioMixerSW::mix_channel(Channel &
- 		//stereo pan
- 		float pan = c.pan * 0.5 + 0.5;
- 		float panv[2] = {
--			(1.0 - pan) * (1 << MIX_VOL_FRAC_BITS),
-+			(1.0f - pan) * (1 << MIX_VOL_FRAC_BITS),
- 			(pan) * (1 << MIX_VOL_FRAC_BITS)
- 		};
- 
-@@ -297,9 +297,9 @@ void AudioMixerSW::mix_channel(Channel &
- 		float pany = c.depth * 0.5 + 0.5;
- 		// with this model every speaker plays at 0.25 energy at the center.. i'm not sure if it's correct but it seems to be balanced
- 		float panv[4] = {
--			(1.0 - pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS),
--			(1.0 - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS),
--			(pany) * (1.0 - panx) * (1 << MIX_VOL_FRAC_BITS),
-+			(1.0f - pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS),
-+			(1.0f - pany) * (panx) * (1 << MIX_VOL_FRAC_BITS),
-+			(pany) * (1.0f - panx) * (1 << MIX_VOL_FRAC_BITS),
- 			(pany) * (panx) * (1 << MIX_VOL_FRAC_BITS)
- 		};
- 
diff -Nru devel/godot2.orig/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp
--- devel/godot2.orig/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp	2018-09-12 12:25:36.044144000 +0930
+++ devel/godot2/files/patch-servers_spatial__sound__2d_spatial__sound__2d__server__sw.cpp	1970-01-01 09:30:00.000000000 +0930
@@ -1,20 +0,0 @@
---- servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp.orig	2018-01-10 18:13:07 UTC
-+++ servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp
-@@ -675,7 +675,7 @@ bool SpatialSound2DServerSW::internal_bu
- 				case 2: {
- 
- 					float p = sd.panning.x * 0.5 + 0.5;
--					float panf[2] = { (1.0 - p), p };
-+					float panf[2] = { (1.0f - p), p };
- 					panf[0] *= sd.volume;
- 					panf[1] *= sd.volume;
- 
-@@ -726,7 +726,7 @@ bool SpatialSound2DServerSW::internal_bu
- 
- 					float xp = sd.panning.x * 0.5 + 0.5;
- 					float yp = sd.panning.y * 0.5 + 0.5;
--					float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) };
-+					float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) };
- 					panf[0] *= sd.volume;
- 					panf[1] *= sd.volume;
- 					panf[2] *= sd.volume;
diff -Nru devel/godot2.orig/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp
--- devel/godot2.orig/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp	2018-09-12 12:25:36.023087000 +0930
+++ devel/godot2/files/patch-servers_spatial__sound_spatial__sound__server__sw.cpp	1970-01-01 09:30:00.000000000 +0930
@@ -1,20 +0,0 @@
---- servers/spatial_sound/spatial_sound_server_sw.cpp.orig	2018-01-10 16:17:16 UTC
-+++ servers/spatial_sound/spatial_sound_server_sw.cpp
-@@ -689,7 +689,7 @@ bool SpatialSoundServerSW::internal_buff
- 				case 2: {
- 
- 					float p = sd.panning.x * 0.5 + 0.5;
--					float panf[2] = { (1.0 - p), p };
-+					float panf[2] = { (1.0f - p), p };
- 					panf[0] *= sd.volume;
- 					panf[1] *= sd.volume;
- 
-@@ -740,7 +740,7 @@ bool SpatialSoundServerSW::internal_buff
- 
- 					float xp = sd.panning.x * 0.5 + 0.5;
- 					float yp = sd.panning.y * 0.5 + 0.5;
--					float panf[4] = { (1.0 - xp) * (1.0 - yp), (xp) * (1.0 - yp), (1.0 - xp) * (yp), (xp) * (yp) };
-+					float panf[4] = { (1.0f - xp) * (1.0f - yp), (xp) * (1.0f - yp), (1.0f - xp) * (yp), (xp) * (yp) };
- 					panf[0] *= sd.volume;
- 					panf[1] *= sd.volume;
- 					panf[2] *= sd.volume;
diff -Nru devel/godot2.orig/Makefile devel/godot2/Makefile
--- devel/godot2.orig/Makefile	2018-09-12 12:25:35.899367000 +0930
+++ devel/godot2/Makefile	2018-09-12 12:25:28.128618000 +0930
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	godot
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION=	2
 CATEGORIES=	devel games
 PKGNAMESUFFIX?=	2
 
@@ -25,7 +24,7 @@
 		xmessage:x11/xmessage
 
 USES=		compiler:c++11-lib pkgconfig scons ssl
-USE_XORG=	x11 xcursor xinerama xrandr
+USE_XORG=	x11 xcursor xi xinerama xrandr
 USE_GL=		gl glu
 
 USE_GITHUB=	yes
@@ -54,6 +53,7 @@
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_MAKE_ARGS=		alsa=yes
 EXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
+EXAMPLES_GH_TAGNAME=	2.1.4-stable:DEMOS
 EXAMPLES_PORTEXAMPLES=	*
 OSS_MAKE_ARGS=		oss=yes
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
@@ -61,6 +61,7 @@
 TOOLS_DESC=		Include development tools (IDE)
 TOOLS_MAKE_ARGS=	target=release_debug tools=yes
 TOOLS_MAKE_ARGS_OFF=	target=release tools=no
+TOOLS_LDFLAGS=	-lexecinfo
 TOOLS_DESKTOP_ENTRIES=	"Godot-v2" "${COMMENT}" "${GODOTFILE}" \
 			"${GODOTFILE}" "Development;IDE;" ""
 TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \