Index: head/emulators/virtualbox-ose/files/patch-Config.kmk
===================================================================
--- head/emulators/virtualbox-ose/files/patch-Config.kmk	(revision 494756)
+++ head/emulators/virtualbox-ose/files/patch-Config.kmk	(revision 494757)
@@ -1,184 +1,184 @@
 --- Config.kmk.orig	2019-01-25 18:24:01 UTC
 +++ Config.kmk
 @@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
   # Enable OSS audio support.
   VBOX_WITH_AUDIO_OSS = 1
  endif
 -if1of ($(KBUILD_TARGET), linux)
 +if1of ($(KBUILD_TARGET), freebsd linux)
   # Enable ALSA audio support.
   VBOX_WITH_AUDIO_ALSA = 1
  endif
 -if1of ($(KBUILD_TARGET), linux)
 +if1of ($(KBUILD_TARGET), freebsd linux)
   # Enable PulseAudio audio support.
   VBOX_WITH_AUDIO_PULSE = 1
  endif
 @@ -464,11 +464,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
  # Enable PCI passthrough support.
  VBOX_WITH_PCI_PASSTHROUGH = 1
  # Enable statically linked dbus support.
 -if1of ($(KBUILD_TARGET), linux solaris)
 +if1of ($(KBUILD_TARGET), freebsd linux solaris)
   VBOX_WITH_DBUS = 1
  endif
  # Enable building PAM modules.
 -if1of ($(KBUILD_TARGET), linux solaris)
 +if1of ($(KBUILD_TARGET), freebsd linux solaris)
   VBOX_WITH_PAM = 1
  endif
  # Enable internal networking.
 @@ -664,7 +664,7 @@ VBOX_WITH_TESTCASES = 1
  VBOX_WITH_VDITOOL =
  # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
  VBOX_WITH_VBOX_IMG =
 -if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
 +if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
   # Enables the video capturing support.
   VBOX_WITH_VIDEOREC = 1
   # Enable VPX (VP8 / VP9 codec), used for video capturing.
 @@ -992,10 +992,6 @@ ifeq ($(KBUILD_TARGET),darwin)
   VBOX_WITH_VBOXSDL=
  endif
  
 -ifeq ($(KBUILD_TARGET),freebsd)
 - VBOX_WITH_DOCS=
 -endif
 -
  ifeq ($(KBUILD_TARGET),haiku)
   # Don't bother with SDL ttf for now.
   VBOX_WITH_SECURELABEL=
 @@ -1155,7 +1151,7 @@ ifdef VBOX_OSE
   VBOX_WITH_KCHMVIEWER=
   VBOX_WITH_PLUGIN_CRYPT=
   VBOX_WITH_DRAG_AND_DROP_PROMISES=
 - ifn1of ($(KBUILD_TARGET), linux)
 + ifn1of ($(KBUILD_TARGET), freebsd linux)
    VBOX_WITH_DOCS=
    VBOX_WITH_DOCS_PACKING=
   endif
 @@ -1176,13 +1172,13 @@ ifdef VBOX_OSE
   ifn1of ($(KBUILD_TARGET), darwin linux solaris win)
    VBOX_WITH_INSTALLER=
   endif
 + # Undefine codec libraries which are not needed.
 + VBOX_WITH_LIBOPUS=
 + # Disable video recording (with audio support).
 + VBOX_WITH_AUDIO_VIDEOREC=
   if1of ($(KBUILD_TARGET), win)
 -  # Undefine codec libraries which are not needed.
    VBOX_WITH_LIBVPX=
 -  VBOX_WITH_LIBOPUS=
 -  # Disable video recording (with audio support).
    VBOX_WITH_VIDEOREC=
 -  VBOX_WITH_AUDIO_VIDEOREC=
   endif
   # branding
   VBOX_BRAND_LICENSE_HTML             := $(PATH_ROOT)/doc/License-gpl-2.0.html
 @@ -4556,7 +4552,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS              =  \
  	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
  	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
  	-nostdinc -std=c99
 -TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
 +TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
  TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
  	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
  	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
 @@ -4857,6 +4853,7 @@ TEMPLATE_VBOXR3EXE_LDFLAGS.x86         = -m32
  TEMPLATE_VBOXR3EXE_LDFLAGS.amd64       = -m64
  TEMPLATE_VBOXR3EXE_LDFLAGS.sparc32     = -m32
  TEMPLATE_VBOXR3EXE_LDFLAGS.sparc64     = -m64
 +TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd     = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
  TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
  TEMPLATE_VBOXR3EXE_LDFLAGS.solaris     = -Wl,-z,ignore # same as VBOX_LD_as_needed
  TEMPLATE_VBOXR3EXE_LDFLAGS.debug       = $(VBOX_GCC_SANITIZER_FLAGS)
 @@ -4889,10 +4886,17 @@ TEMPLATE_VBOXR3EXE_LIBPATH            += \
  TEMPLATE_VBOXR3EXE_CFLAGS             += -fno-pic
  TEMPLATE_VBOXR3EXE_CXXFLAGS           += -fno-pic
  TEMPLATE_VBOXR3EXE_LDFLAGS            += -fno-pic
 - else if1of ($(KBUILD_TARGET), freebsd openbsd)
 + else if1of ($(KBUILD_TARGET), freebsd)
  TEMPLATE_VBOXR3EXE_TOOL                = GXX3
  TEMPLATE_VBOXR3EXE_LIBS                = pthread
  TEMPLATE_VBOXR3EXE_INCS               += \
 +	/usr/local/include
 +TEMPLATE_VBOXR3EXE_LIBPATH            += \
 +	/usr/local/lib
 + else if1of ($(KBUILD_TARGET), openbsd)
 +TEMPLATE_VBOXR3EXE_TOOL                = GXX3
 +TEMPLATE_VBOXR3EXE_LIBS                = pthread
 +TEMPLATE_VBOXR3EXE_INCS               += \
  	/usr/include \
  	/usr/X11R6/include \
  	/usr/local/include
 @@ -5183,7 +5187,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain
   TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86       = $(NOT_SUCH_VARIABLE)
   TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64     = $(NOT_SUCH_VARIABLE)
 -else ifn1of ($(KBUILD_TARGET), os2 solaris)
 +else ifn1of ($(KBUILD_TARGET), freebsd os2 solaris)
   # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
 @@ -5710,10 +5714,18 @@ TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTI
   else ifeq ($(KBUILD_TARGET),haiku)
  TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
  TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) network stdc++ supc++
 - else if1of ($(KBUILD_TARGET), freebsd openbsd)
-+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd     = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
 + else if1of ($(KBUILD_TARGET), freebsd)
  TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
  TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
++TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd     = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
  TEMPLATE_VBOXMAINEXE_INCS               += \
 +	/usr/local/include
 +TEMPLATE_VBOXMAINEXE_LIBPATH            += \
 +	/usr/local/lib
 + else if1of ($(KBUILD_TARGET), openbsd)
 +TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
 +TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
 +TEMPLATE_VBOXMAINEXE_INCS               += \
  	/usr/include \
  	/usr/X11R6/include \
  	/usr/local/include
 @@ -6252,13 +6264,10 @@ ifdef VBOX_WITH_QTGUI
     TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
  	$(VBOX_LIBPATH_X11)
     ifeq ($(KBUILD_TARGET),freebsd)
 +    TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
      TEMPLATE_VBOXQTGUIEXE_INCS += \
 -	/usr/include \
 -	/usr/X11R6/include \
  	/usr/local/include
      TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
 -	/usr/lib \
 -	/usr/X11R6/lib \
  	/usr/local/lib
     endif
     ifeq ($(KBUILD_TARGET),solaris)
 @@ -6477,10 +6486,17 @@ TEMPLATE_VBoxBldProg_TOOL                = GXX3
  TEMPLATE_VBoxBldProg_LIBS                = network iconv
  TEMPLATE_VBoxBldProg_LIBPATH            += \
  	/boot/common/lib
 - else if1of ($(KBUILD_HOST), freebsd openbsd)
 + else if1of ($(KBUILD_HOST), freebsd)
  TEMPLATE_VBoxBldProg_TOOL                = GXX3
  TEMPLATE_VBoxBldProg_LIBS                = pthread
  TEMPLATE_VBoxBldProg_INCS               += \
 +	/usr/local/include
 +TEMPLATE_VBoxBldProg_LIBPATH            += \
 +	/usr/local/lib
 + else if1of ($(KBUILD_HOST), openbsd)
 +TEMPLATE_VBoxBldProg_TOOL                = GXX3
 +TEMPLATE_VBoxBldProg_LIBS                = pthread
 +TEMPLATE_VBoxBldProg_INCS               += \
  	/usr/include \
  	/usr/X11R6/include \
  	/usr/local/include
 @@ -6887,6 +6903,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin  += \
  	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
  	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
  TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux    = -Wl,--no-as-needed
 +TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.freebsd  = -Wl,--no-as-needed
  TEMPLATE_VBOXCROGLR3HOSTDLL_BLDDIRS          = $(VBOX_PATH_CROGL_GENFILES)/
  ifeq ($(KBUILD_TARGET),darwin)
   TEMPLATE_VBOXCROGLR3HOSTDLL_CFLAGS          = $(TEMPLATE_VBOXR3NP_CFLAGS) -Wno-deprecated-declarations