Index: head/games/fs2open/Makefile
===================================================================
--- head/games/fs2open/Makefile	(revision 503748)
+++ head/games/fs2open/Makefile	(revision 503749)
@@ -1,35 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	fs2open
 DISTVERSIONPREFIX=	release_
 DISTVERSION=	3_8_0
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Open source video engine of FreeSpace 2
 
 LICENSE=	VOLITION
 LICENSE_NAME=	Volition Copyright
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror auto-accept
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libpng16.so:graphics/png
 
 USES=		cmake compiler:c++11-lang lua:51 jpeg openal pkgconfig sdl
+LLD_UNSAFE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	scp-fs2open
 GH_PROJECT=	fs2open.github.com
 GH_TUPLE=	asarium:cmake-modules:7cef957:cmakemodules/cmake/external/rpavlik-cmake-modules \
 		sakra:cotire:40a46bf:cotire/cmake/external/cotire
 USE_SDL=	sdl2
 
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 
 PLIST_FILES=	bin/fs2_open
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/fs2_open \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/games/fs2open/files/patch-cmake_toolchain-clang.cmake
===================================================================
--- head/games/fs2open/files/patch-cmake_toolchain-clang.cmake	(revision 503748)
+++ head/games/fs2open/files/patch-cmake_toolchain-clang.cmake	(revision 503749)
@@ -1,11 +1,32 @@
---- cmake/toolchain-clang.cmake.orig	2018-06-24 19:14:21 UTC
+--- cmake/toolchain-clang.cmake.orig	2017-08-22 16:56:27 UTC
 +++ cmake/toolchain-clang.cmake
+@@ -8,8 +8,8 @@ option(CLANG_ENABLE_LEAK_CHECK "Enable -fsanitize=leak
+ option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize=address" OFF)
+ 
+ # These are the default values
+-set(C_BASE_FLAGS "-march=native -pipe")
+-set(CXX_BASE_FLAGS "-march=native -pipe")
++set(C_BASE_FLAGS "${CMAKE_C_FLAGS_RELEASE}")
++set(CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
+ 
+ # For C and C++, the values can be overwritten independently
+ if(DEFINED ENV{CXXFLAGS})
 @@ -80,7 +80,7 @@ if(SUPPORTS_SHIFT_NEGATIVE_VALUE)
  	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-shift-negative-value")
  endif()
  
 -set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable")
 +set(COMPILER_FLAGS_RELEASE "-Wno-unused-variable")
  
  set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")
  
+@@ -93,9 +93,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+ 
+ set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
+ set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
+-
+-
+-set(CMAKE_EXE_LINKER_FLAGS "")
+ 
+ if (SANITIZE_FLAGS)
+ 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZE_FLAGS}")
Index: head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake
===================================================================
--- head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake	(revision 503748)
+++ head/games/fs2open/files/patch-cmake_toolchain-gcc.cmake	(revision 503749)
@@ -1,11 +1,31 @@
---- cmake/toolchain-gcc.cmake.orig	2018-06-24 19:15:11 UTC
+--- cmake/toolchain-gcc.cmake.orig	2017-08-22 16:56:27 UTC
 +++ cmake/toolchain-gcc.cmake
-@@ -87,7 +87,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -W
+@@ -10,8 +10,8 @@ option(GCC_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize
+ option(GCC_ENABLE_SANITIZE_UNDEFINED "Enable -fsanitize=undefined" OFF)
  
+ # These are the default values
+-set(C_BASE_FLAGS "-march=native -pipe")
+-set(CXX_BASE_FLAGS "-march=native -pipe")
++set(C_BASE_FLAGS "${CMAKE_C_FLAGS_RELEASE}" )
++set(CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
+ 
+ # For C and C++, the values can be overwritten independently
+ if(DEFINED ENV{CFLAGS})
+@@ -87,7 +87,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-deprecated 
+ 
  set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter")
  
 -set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered")
 +set(COMPILER_FLAGS_RELEASE "-Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered")
  
  set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")
  
+@@ -100,8 +100,6 @@ set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
+ 
+ set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
+ set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
+-
+-set(CMAKE_EXE_LINKER_FLAGS "")
+ 
+ IF (MINGW)
+ 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++ -Wl,--enable-auto-import")