Index: head/games/fs2open/Makefile
===================================================================
--- head/games/fs2open/Makefile	(revision 535071)
+++ head/games/fs2open/Makefile	(revision 535072)
@@ -1,38 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	fs2open
 DISTVERSIONPREFIX=	release_
 DISTVERSION=	19_0_0
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Open source video engine of FreeSpace 2
 
 LICENSE=	VOLITION
 LICENSE_NAME=	Volition Copyright
 LICENSE_FILE=	${WRKSRC}/Copying.md
 LICENSE_PERMS=	dist-mirror auto-accept
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libpng.so:graphics/png
 
-USES=		cmake compiler:c++11-lang lua:51 jpeg openal pkgconfig sdl
+USES=		cmake compiler:gcc-c++11-lib lua:51 jpeg openal pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	scp-fs2open
 GH_PROJECT=	fs2open.github.com
 GH_TUPLE=	asarium:cmake-modules:7cef957:cmakemodules/cmake/external/rpavlik-cmake-modules \
 		asarium:libRocket:6e5f399:libRocket/lib/libRocket
 USE_SDL=	sdl2
 
 CMAKE_OFF=	ENABLE_COTIRE
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 
 LDFLAGS_i386=	-Wl,-znotext
 
 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-code_model_modelread.cpp
===================================================================
--- head/games/fs2open/files/patch-code_model_modelread.cpp	(revision 535071)
+++ head/games/fs2open/files/patch-code_model_modelread.cpp	(revision 535072)
@@ -1,20 +1,35 @@
---- code/model/modelread.cpp.orig	2020-02-10 13:38:06 UTC
+--- code/model/modelread.cpp.orig	2020-01-25 16:45:09 UTC
 +++ code/model/modelread.cpp
 @@ -5341,7 +5341,7 @@ void swap_bsp_sortnorms( polymodel * pm, ubyte * p )
  }
  #endif // BIG_ENDIAN
  
 -void swap_bsp_data( polymodel *  /*pm*/, void * /*model_ptr*/ )
 +void swap_bsp_data( polymodel *pm, void *model_ptr )
  {
  #if BYTE_ORDER == BIG_ENDIAN
  	ubyte *p = (ubyte *)model_ptr;
-@@ -5397,7 +5397,7 @@ void swap_bsp_data( polymodel *  /*pm*/, void * /*mode
+@@ -5394,10 +5394,13 @@ void swap_bsp_data( polymodel *  /*pm*/, void * /*mode
+ 	}
+ 
+ 	return;
++#else
++(void)pm;
++(void)model_ptr;
  #endif
  }
  
 -void swap_sldc_data(ubyte * /*buffer*/)
 +void swap_sldc_data(ubyte * buffer)
  {
  #if BYTE_ORDER == BIG_ENDIAN
  	char *type_p = (char *)(buffer);
+@@ -5439,6 +5442,8 @@ void swap_sldc_data(ubyte * /*buffer*/)
+ 			shld_polys[i] = INTEL_INT(shld_polys[i]);
+ 		}			
+ 	}
++#else
++(void)buffer;
+ #endif
+ }
+