diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 74c145ff9d9..93ab4e94fc2 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2017/05/24 13:06:47 kirby Exp $
+# $OpenBSD: Makefile,v 1.33 2017/05/27 08:18:46 espie Exp $
 
 ONLY_FOR_ARCHS=	amd64 i386
 
@@ -17,11 +17,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += GL GLEW GLU Qt5Core Qt5Gui Qt5Script Qt5Widgets SDL2 X11
 WANTLIB += Xrandr c crypto fontconfig freetype fribidi harfbuzz iconv
 WANTLIB += intl m ogg openal physfs png pthread theora vorbis
-WANTLIB += vorbisfile z
+WANTLIB += vorbisfile z ${LIBECXX}
 
-MODULES=	x11/qt5 gcc4
-MODGCC4_ARCHS =	*
-MODGCC4_LANGS +=c++
+MODULES=	x11/qt5
+WANT_CXX =	base gcc
 
 LIB_DEPENDS=	audio/libogg \
 		audio/libvorbis \
@@ -49,7 +48,13 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		ac_cv_path_MOC4="${LOCALBASE}/bin/moc4" \
 		ac_cv_path_UIC4="${LOCALBASE}/bin/uic4"
 
+# XXX this is a horrible hack to make sure we get to our glm
+# which is 100% incompatible with ports glm
+MAKE_FLAGS += "DEFS=-DHAVE_CONFIG_H -I${WRKSRC}/includefirst"
+
 pre-configure:
+	mkdir -p ${WRKSRC}/includefirst
+	ln -sf ${WRKSRC}/3rdparty/glm ${WRKSRC}/includefirst/glm
 .for _prog in git svn svnversion
 	@cd ${WRKDIR}/bin && ln -sf /usr/bin/true ${_prog}
 .endfor
diff --git a/games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl b/games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
new file mode 100644
index 00000000000..7ea7a428d5c
--- /dev/null
+++ b/games/warzone2100/patches/patch-3rdparty_glm_core_type_half_inl
@@ -0,0 +1,18 @@
+$OpenBSD: patch-3rdparty_glm_core_type_half_inl,v 1.1 2017/05/27 08:18:46 espie Exp $
+
+Index: 3rdparty/glm/core/type_half.inl
+--- 3rdparty/glm/core/type_half.inl.orig
++++ 3rdparty/glm/core/type_half.inl
+@@ -135,9 +135,9 @@ namespace detail
+ 		// of float and half (127 versus 15).
+ 		//
+ 
+-		register int s =  (i >> 16) & 0x00008000;
+-		register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
+-		register int m =   i        & 0x007fffff;
++		int s =  (i >> 16) & 0x00008000;
++		int e = ((i >> 23) & 0x000000ff) - (127 - 15);
++		int m =   i        & 0x007fffff;
+ 
+ 		//
+ 		// Now reassemble s, e and m into a half:
diff --git a/games/warzone2100/patches/patch-configure_ac b/games/warzone2100/patches/patch-configure_ac
index 278423ea81b..1de4e8a56b0 100644
--- a/games/warzone2100/patches/patch-configure_ac
+++ b/games/warzone2100/patches/patch-configure_ac
@@ -1,9 +1,10 @@
-$OpenBSD: patch-configure_ac,v 1.10 2016/08/02 10:19:55 kirby Exp $
---- configure.ac.orig	Thu Jul 28 11:16:04 2016
-+++ configure.ac	Mon Aug  1 18:02:15 2016
-@@ -285,7 +285,7 @@ fi
- 
+$OpenBSD: patch-configure_ac,v 1.11 2017/05/27 08:18:46 espie Exp $
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -289,7 +289,7 @@ fi
  WZ_WARNINGS_GCC="-Wall -Wextra ${WZ_Wno_}unused-parameter ${WZ_Wno_}sign-compare -Wcast-align -Wwrite-strings -Wpointer-arith ${WZ_Wno_}format-security"
+ AX_C_CHECK_FLAG([-Werror -Wno-expansion-to-defined -Wno-error=cpp], [#warning x], , WZ_WARNINGS_GCC="${WZ_WARNINGS_GCC} -Wno-expansion-to-defined")
  WZ_WARNINGS_GCC_C="${WZ_WARNINGS_GCC} -Wstrict-prototypes -Wdeclaration-after-statement ${CFLAGS_IGNORE_WARNINGS}"
 -WZ_WARNINGS_GCC_CXX="${WZ_Wno_}enum-compare ${WZ_WARNINGS_GCC}"
 +WZ_WARNINGS_GCC_CXX="${WZ_WARNINGS_GCC}"
diff --git a/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp b/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp
new file mode 100644
index 00000000000..a4a417b2e5f
--- /dev/null
+++ b/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler_cpp
@@ -0,0 +1,13 @@
+$OpenBSD: patch-lib_exceptionhandler_exceptionhandler_cpp,v 1.4 2017/05/27 08:18:46 espie Exp $
+
+Index: lib/exceptionhandler/exceptionhandler.cpp
+--- lib/exceptionhandler/exceptionhandler.cpp.orig
++++ lib/exceptionhandler/exceptionhandler.cpp
+@@ -117,6 +117,7 @@ static LONG WINAPI windowsExceptionHandler(PEXCEPTION_
+ # include <stdint.h>
+ # include <signal.h>
+ # include <string.h>
++# include <errno.h>
+ 
+ // POSIX headers:
+ # include <unistd.h>
diff --git a/games/warzone2100/patches/patch-lib_netplay_netplay_cpp b/games/warzone2100/patches/patch-lib_netplay_netplay_cpp
new file mode 100644
index 00000000000..f3b2a2d1b0e
--- /dev/null
+++ b/games/warzone2100/patches/patch-lib_netplay_netplay_cpp
@@ -0,0 +1,14 @@
+$OpenBSD: patch-lib_netplay_netplay_cpp,v 1.1 2017/05/27 08:18:46 espie Exp $
+
+Index: lib/netplay/netplay.cpp
+--- lib/netplay/netplay.cpp.orig
++++ lib/netplay/netplay.cpp
+@@ -1783,7 +1783,7 @@ static void NETcheckPlayers(void)
+ // We should not block here.
+ bool NETrecvNet(NETQUEUE *queue, uint8_t *type)
+ {
+-	switch (upnp_status)
++	switch (static_cast<int>(upnp_status))
+ 	{
+ 	case UPNP_ERROR_CONTROL_NOT_AVAILABLE:
+ 	case UPNP_ERROR_DEVICE_NOT_FOUND: