Index: head/devel/godot/Makefile
===================================================================
--- head/devel/godot/Makefile	(revision 421410)
+++ head/devel/godot/Makefile	(revision 421411)
@@ -1,95 +1,95 @@
 # Created by: Shane Ambler <FreeBSD@Shaneware.biz>
 # $FreeBSD$
 
 PORTNAME=	godot
 PORTVERSION=	2.1
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	devel games
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT?=	Game runtime engine
 
 LICENSE=		MIT CCBYv3
 LICENSE_COMB=		multi
 LICENSE_NAME_CCBYv3=	Creative Commons Attribution 3.0 Unported license
 LICENSE_FILE_CCBYv3=	${WRKSRC}/LOGO_LICENSE.md
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.md
 LICENSE_PERMS_CCBYv3=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
 		xdg-open:devel/xdg-utils \
 		xmessage:x11/xmessage
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	godotengine
 
 USES=		compiler:c++11-lib pkgconfig scons ssl
 USE_XORG=	x11 xcursor xinerama xrandr
 USE_GL=		gl
 
 MAKE_ARGS+=	platform=x11
 MAKE_ARGS+=	${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 MAKE_ARGS_clang=	use_llvm=yes
 CXXFLAGS+=	-DGLEW_NO_GLU -DRTAUDIO_ENABLED
 CXXFLAGS_i386=	${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_i386_gcc=	-march=i586
 
 OPTIONS_DEFINE=	EXAMPLES TOOLS
 OPTIONS_DEFAULT=	OSS
 # Moved to devel/godot-tools
 OPTIONS_EXCLUDE?=	EXAMPLES TOOLS
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA OSS PULSEAUDIO
 
 EXAMPLES_GH_PROJECT=	godot-demo-projects:DEMOS
 # Branch HEAD for PORTVERSION
 EXAMPLES_GH_TAGNAME=	dfa1274:DEMOS
 EXAMPLES_PORTEXAMPLES=	*
 TOOLS_DESC=	Include development tools (IDE)
 TOOLS_MAKE_ARGS=	target=release_debug tools=yes
 TOOLS_MAKE_ARGS_OFF=	target=release tools=no
 TOOLS_DESKTOP_ENTRIES=	"Godot" "${COMMENT}" "${GODOTFILE}" \
 			"${GODOTFILE}" "Development;IDE;" ""
 TOOLS_PLIST_FILES=	share/pixmaps/${GODOTFILE}.png \
 			share/pixmaps/${GODOTFILE}.svg
 
 AUDIO_DESC=		Audio support
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_MAKE_ARGS=		alsa=yes
 OSS_MAKE_ARGS=		oss=yes
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_MAKE_ARGS=	pulseaudio=yes
 
 GODOTFILE=		${PORTNAME}${PKGNAMESUFFIX}
 PLIST_FILES=	bin/${GODOTFILE}
 
 .ifmake makesum
 # Always include optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \
 		${WRKSRC}/methods.py
 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
 		${WRKSRC}/platform/x11/os_x11.cpp
 
 # The official godot binary name reflects options used to compile
 # We just want a simple name matching the portname
 # This gives us bin/godot for runtime and bin/godot-tools for the IDE
 do-install:
-	@cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
+	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
 		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
 
 do-install-EXAMPLES-on:
 	(cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \
 		${STAGEDIR}${EXAMPLESDIR})
 
 do-install-TOOLS-on:
 	${INSTALL_DATA} ${WRKSRC}/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png
 	${INSTALL_DATA} ${WRKSRC}/icon.svg \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
 
 .include <bsd.port.mk>
Index: head/devel/godot/files/patch-SConstruct
===================================================================
--- head/devel/godot/files/patch-SConstruct	(revision 421410)
+++ head/devel/godot/files/patch-SConstruct	(revision 421411)
@@ -1,26 +1,35 @@
 --- SConstruct.orig	2016-08-09 07:52:15 UTC
 +++ SConstruct
+@@ -63,7 +63,7 @@ elif (os.name=="nt"):
+ 	if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
+ 		custom_tools=['mingw']
+ 
+-env_base=Environment(tools=custom_tools);
++env_base=Environment(tools=custom_tools, ENV = os.environ);
+ env_base.AppendENVPath('PATH', os.getenv('PATH'))
+ env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
+ env_base.global_defaults=global_defaults
 @@ -231,15 +231,17 @@ if selected_platform in platform_list:
  	if env["extra_suffix"] != '' :
  		env.extra_suffix += '.'+env["extra_suffix"]
  
 -	CCFLAGS = env.get('CCFLAGS', '')
 -	env['CCFLAGS'] = ''
 +	env['CC'] = os.environ['CC']
 +	env['CXX'] = os.environ['CXX']
 +	
 +	CFLAGS = os.environ['CFLAGS']
 +	env['CFLAGS'] = []
 +	env.Append(CFLAGS=string.split(str(CFLAGS)))
  
 +	CCFLAGS = os.environ['CXXFLAGS']
 +	env['CCFLAGS'] = []
  	env.Append(CCFLAGS=string.split(str(CCFLAGS)))
  
 -	CFLAGS = env.get('CFLAGS', '')
 -	env['CFLAGS'] = ''
 -
 -	env.Append(CFLAGS=string.split(str(CFLAGS)))
  
  	LINKFLAGS = env.get('LINKFLAGS', '')
  	env['LINKFLAGS'] = ''
Index: head/devel/godot/pkg-descr
===================================================================
--- head/devel/godot/pkg-descr	(revision 421410)
+++ head/devel/godot/pkg-descr	(revision 421411)
@@ -1,6 +1,6 @@
 Godot is a multi-platform 2D and 3D game engine. It also provides a feature rich
 development environment.
 
 Easily deploy your game on IOS, android, OSX, Linux, Steam, Windows or PS3.
 
-WWW: http://www.godotengine.org
+WWW: http://www.godotengine.org/