--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig	2020-07-10 02:56:34.000000000 +1000
+++ src/VBox/Frontends/VirtualBox/Makefile.kmk	2020-08-23 11:15:27.237900000 +1000
@@ -104,6 +104,7 @@
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
 VirtualBox_DEFS.linux     = VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
 VirtualBox_DEFS.solaris   = VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
+VirtualBox_DEFS.bsdsunix  = VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
 VirtualBox_DEFS.freebsd   = VBOX_WITH_MASKED_SEAMLESS VBOX_WITH_TRANSLUCENT_SEAMLESS
 VirtualBox_DEFS.darwin    = VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
 VirtualBox_DEFS.win       = VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
@@ -113,6 +114,7 @@
 endif
 VirtualBox_DEFS.linux     += VBOX_WS_X11
 VirtualBox_DEFS.solaris   += VBOX_WS_X11
+VirtualBox_DEFS.bsdsunix  += VBOX_WS_X11
 VirtualBox_DEFS.freebsd   += VBOX_WS_X11
 VirtualBox_DEFS.darwin    += VBOX_WS_MAC
 VirtualBox_DEFS.win       += VBOX_WS_WIN
@@ -123,6 +125,7 @@
 	$(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA) \
 	$(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE) \
 	$(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
+	$(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),bsdsunix),VBOX_WITH_NETFLT) \
 	$(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \
 	$(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \
 	$(if $(VBOX_WITH_UDPTUNNEL),VBOX_WITH_UDPTUNNEL) \
@@ -220,10 +223,12 @@
 # This library is required for multi-monitor support
 VirtualBox_LIBS.linux   += Xinerama
 VirtualBox_LIBS.solaris += Xinerama
+VirtualBox_LIBS.bsdsunix += Xinerama
 VirtualBox_LIBS.freebsd += Xinerama
 
 VirtualBox_LIBS.linux   += xcb
 VirtualBox_LIBS.solaris += xcb
+VirtualBox_LIBS.bsdsunix += xcb
 VirtualBox_LIBS.freebsd += xcb
 
 ifneq ($(KBUILD_TARGET),win)
@@ -273,7 +278,7 @@
 	$(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib \
 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
-if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
+if1of ($(KBUILD_TARGET), bsdsunix freebsd linux netbsd openbsd solaris) # X11
  VirtualBox_LIBS         += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
 endif
 
@@ -281,6 +286,7 @@
  VirtualBox_LIBS.win       += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
  VirtualBox_LIBS.solaris   += GL
  VirtualBox_LIBS.linux     += GL
+ VirtualBox_LIBS.bsdsunix  += GL
  VirtualBox_LIBS.freebsd   += GL
  VirtualBox_LDFLAGS.darwin += -framework OpenGL
 endif
@@ -586,6 +592,8 @@
 	src/globals/UIDesktopWidgetWatchdog.cpp
 VirtualBox_QT_MOCSRCS.solaris += \
 	src/globals/UIDesktopWidgetWatchdog.cpp
+VirtualBox_QT_MOCSRCS.bsdsunix += \
+	src/globals/UIDesktopWidgetWatchdog.cpp
 VirtualBox_QT_MOCSRCS.freebsd += \
 	src/globals/UIDesktopWidgetWatchdog.cpp
 
@@ -849,7 +857,7 @@
 	src/platform/darwin/UICocoaDockIconPreview.mm \
 	src/platform/darwin/UIWindowMenuManager.cpp \
 
-if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
+if1of ($(KBUILD_TARGET), bsdsunix freebsd linux netbsd openbsd solaris) # X11
  VirtualBox_SOURCES += \
  	src/platform/x11/UIDesktopServices_x11.cpp \
  	src/platform/x11/VBoxX11Helper.cpp \
@@ -897,6 +905,8 @@
  VirtualBox_SOURCES += \
 	src/VBoxFBOverlay.cpp \
 	src/VBoxGLSupportInfo.cpp
+ VirtualBox_CXXFLAGS.bsdsunix += -std=c++11
+ VirtualBox_CXXFLAGS.freebsd += -std=c++11
 endif
 
 #
@@ -920,6 +930,7 @@
 VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport
 VirtualBox_QT_MODULES.linux   += X11Extras
 VirtualBox_QT_MODULES.solaris += X11Extras
+VirtualBox_QT_MODULES.bsdsunix += X11Extras
 VirtualBox_QT_MODULES.freebsd += X11Extras
 VirtualBox_QT_MODULES.darwin  += MacExtras
 VirtualBox_QT_MODULES.win     += WinExtras
@@ -1059,6 +1070,7 @@
   VirtualBoxPch_SRC_HANDLERS   = .h:def_src_handler_cxx
   VirtualBoxPch_SOURCES.darwin  = $(NO_SUCH_VARIABLE)
   VirtualBoxPch_SOURCES.solaris = $(NO_SUCH_VARIABLE)
+  VirtualBoxPch_SOURCES.bsdsunix = $(NO_SUCH_VARIABLE)
   VirtualBoxPch_SOURCES.freebsd = $(NO_SUCH_VARIABLE)
   VirtualBoxPch_SOURCES.linux   = $(NO_SUCH_VARIABLE)
   VirtualBoxPch_SOURCES.win     = $(NO_SUCH_VARIABLE)
@@ -1212,7 +1224,7 @@
 # App for testing GL support
 #
 if defined(VBOX_WITH_VIDEOHWACCEL)
- if1of ($(KBUILD_TARGET), win linux freebsd)
+ if1of ($(KBUILD_TARGET), win bsdsunix linux freebsd)
   LIBRARIES += VBoxOGL2D
   VBoxOGL2D_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE),VBOXMAINEXE)
   VBoxOGL2D_DEFS = QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
@@ -1220,6 +1232,8 @@
   VBoxOGL2D_SOURCES = \
 	src/VBoxGLSupportInfo.cpp
   VBoxOGL2D_INCS = include
+  VBoxOGL2D_CXXFLAGS.bsdsunix += -std=c++11
+  VBoxOGL2D_CXXFLAGS.freebsd += -std=c++11
  endif
 endif