virtualbox: Minor fixes in the NetBSD support

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: virtualbox: Minor fixes in the NetBSD support
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Fri, 08 Jul 2016 22:47:51 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jul 9 00:47:51 2016 +0200
Changeset:	a75c31021140130bd07dba048ee1adbf0ab30522

Modified Files:
	virtualbox/distinfo
	virtualbox/patches/patch-Makefile.kmk
	virtualbox/patches/patch-src_VBox_Additions_netbsd_Makefile.kmk
	virtualbox/patches/patch-src_VBox_Devices_USB_netbsd_USBProxyDevice-netbsd.cpp
	virtualbox/patches/patch-src_VBox_Installer_netbsd_Makefile.kmk
	virtualbox/patches/patch-src_VBox_Runtime_r0drv_netbsd_thread-r0drv-netbsd.c
Added Files:
	virtualbox/patches/patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.cfg
Removed Files:
	virtualbox/patches/patch-out_netbsd.amd64_release_bin_sdk_bindings_xpcom_include_nsprpub_md___netbsd.cfg

Log Message:
virtualbox: Minor fixes in the NetBSD support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a75c31021140130bd07dba048ee1adbf0ab30522

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox/distinfo                                |  12 +-
 virtualbox/patches/patch-Makefile.kmk              |   4 +-
 ..._bindings_xpcom_include_nsprpub_md___netbsd.cfg |  13 --
 .../patch-src_VBox_Additions_netbsd_Makefile.kmk   |  66 +++---
 ...ox_Devices_USB_netbsd_USBProxyDevice-netbsd.cpp | 236 ++++++++++-----------
 .../patch-src_VBox_Installer_netbsd_Makefile.kmk   | 152 ++++++-------
 ...VBox_Runtime_r0drv_netbsd_thread-r0drv-netbsd.c |   8 +-
 ...bs_xpcom18a4_nsprpub_pr_include_md___netbsd.cfg |  13 ++
 8 files changed, 252 insertions(+), 252 deletions(-)

diffs:
diff --git a/virtualbox/distinfo b/virtualbox/distinfo
index a54c869..9c546c8 100644
--- a/virtualbox/distinfo
+++ b/virtualbox/distinfo
@@ -5,7 +5,7 @@ RMD160 (VirtualBox-5.0.16.tar.bz2) = 6d7a5d6cae5367d26a015895c09294ff0282d062
 SHA512 (VirtualBox-5.0.16.tar.bz2) = 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074
 Size (VirtualBox-5.0.16.tar.bz2) = 111062984 bytes
 SHA1 (patch-Config.kmk) = 136895de8ba926bad725f7f7cf084b25ffbf3152
-SHA1 (patch-Makefile.kmk) = fbb5d999abad202368df11756d91ed7e13c646ae
+SHA1 (patch-Makefile.kmk) = e658f6c320a115cbb0592eb6d0bd13b3da65e6a6
 SHA1 (patch-configure) = b360df61c744ffbb335bf5b8b0dae36abd7206c2
 SHA1 (patch-include_VBox_VBoxGuest.h) = 4f41910ca3abbc502bad31cb9f9b427566025765
 SHA1 (patch-include_VBox_ostypes.h) = fd452f95c79b2e5c98a048af21f6561c80adebc5
@@ -14,7 +14,6 @@ SHA1 (patch-include_VBox_usb.h) = c16d333f6dee240f1d4147cc49c04451dfb776a7
 SHA1 (patch-include_iprt_string.h) = dd74a70d35be03f480bbb42db170cf7c5f583e4e
 SHA1 (patch-include_iprt_time.h) = 82e31a8c80606ae6f152e2de9f90f02aad4991b7
 SHA1 (patch-kBuild_header.kmk) = b08bde255f27e9e62d15c649b16a34d72b4d79f6
-SHA1 (patch-out_netbsd.amd64_release_bin_sdk_bindings_xpcom_include_nsprpub_md___netbsd.cfg) = c773c1bb3edb5c8f6ed830b77ba7f42597318b50
 SHA1 (patch-src_VBox_Additions_Makefile.kmk) = e47ebb5cbfb51d103f76e1316b18e835fb5d6b1d
 SHA1 (patch-src_VBox_Additions_common_VBoxGuestLib_VBoxGuestR3Lib.cpp) = 99138a3a7abd00e74c50f0fdc841ac7984e11a08
 SHA1 (patch-src_VBox_Additions_common_VBoxGuestLib_VBoxGuestR3LibLog.cpp) = e0b83d8785a8bfe000c6467d125d3b45c1517ff7
@@ -32,7 +31,7 @@ SHA1 (patch-src_VBox_Additions_common_crOpenGL_fakedri__drv.c) = 9b164dfd0ddc77d
 SHA1 (patch-src_VBox_Additions_netbsd_Installer_pkg-descr) = 656e1953f0b9c8eb09fe25fbb09af502b30efa9c
 SHA1 (patch-src_VBox_Additions_netbsd_Installer_vboxguest.sh) = 25295205110c7a68fc57104f688084b2fc56828c
 SHA1 (patch-src_VBox_Additions_netbsd_Makefile) = 98da08e34af9003a55a121d431a7116374c485cd
-SHA1 (patch-src_VBox_Additions_netbsd_Makefile.kmk) = 3a13ee0eac2bd8995d54da93a5d9e5d4d6fa1ec0
+SHA1 (patch-src_VBox_Additions_netbsd_Makefile.kmk) = 03bc78e8f42b05445e9335fcd2c76e1122887313
 SHA1 (patch-src_VBox_Additions_netbsd_drm_Makefile) = 8b557d6450a658b577b117c6b3b7ab6778768977
 SHA1 (patch-src_VBox_Additions_netbsd_drm_Makefile.kmk) = 0f59622dcc0de56a61becc3dbc158d307e0483ca
 SHA1 (patch-src_VBox_Additions_netbsd_drm_files__vboxvideo__drm) = fdd8b4c6ec76fc765496be62ed0aad6435e5aead
@@ -53,7 +52,7 @@ SHA1 (patch-src_VBox_Devices_Serial_DrvHostSerial.cpp) = 0d007ffe9ee83fa40b66970
 SHA1 (patch-src_VBox_Devices_Storage_DrvHostBase.cpp) = aa5485a0fcd72f6188cca3339e17ca839e60ae1a
 SHA1 (patch-src_VBox_Devices_Storage_DrvHostBase.h) = 1f091530ee9f819c4c0152b6452fb91649b25b3c
 SHA1 (patch-src_VBox_Devices_Storage_DrvHostDVD.cpp) = 2412e4c3fb0cc2eafe9aca57fa03f9f133c6083d
-SHA1 (patch-src_VBox_Devices_USB_netbsd_USBProxyDevice-netbsd.cpp) = 4def83455dc98c31e444b7e3bfc904347f15f756
+SHA1 (patch-src_VBox_Devices_USB_netbsd_USBProxyDevice-netbsd.cpp) = 4e59b2b9576e185d19ff8ac442381d12c6203c17
 SHA1 (patch-src_VBox_Devices_build_VBoxDD.cpp) = eafd6c00f34caf28e560466fe5793b915bbfbfec
 SHA1 (patch-src_VBox_Devices_build_VBoxDD.h) = c5a48d45145eacf0c28b1e1aaf56f0c43fba2db2
 SHA1 (patch-src_VBox_ExtPacks_BusMouseSample_Makefile.kmk) = 30258f2d52fd5d79a6678eb636366956273f2cea
@@ -121,7 +120,7 @@ SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_preflight) = b8918b156eafb5febc
 SHA1 (patch-src_VBox_Installer_linux_VBoxSysInfo.sh) = 67a71cb960c314bf9c02d5459f91fde20e9a68f2
 SHA1 (patch-src_VBox_Installer_linux_debian_control) = 2b75a4db1873ad1e5bd52bfa11448b218cb3bff5
 SHA1 (patch-src_VBox_Installer_linux_rpm_VirtualBox.tmpl.spec) = cf6e5b9f34cb0b708a04d0b552e2c46d6f05526e
-SHA1 (patch-src_VBox_Installer_netbsd_Makefile.kmk) = d6fd8928fda1884a30631196bc9000234c18fa9b
+SHA1 (patch-src_VBox_Installer_netbsd_Makefile.kmk) = cf4b57bb7d83b940a4a6e21760e8f255e76d996f
 SHA1 (patch-src_VBox_Installer_netbsd_pkg-comment) = 4b2ce009a24ab94c1f83c1f4bc6ed4537246d9a1
 SHA1 (patch-src_VBox_Installer_netbsd_pkg-descr) = b7c85ea5685ad7da628247d5926542b82863e748
 SHA1 (patch-src_VBox_Installer_netbsd_pkg__plist) = f8c784bb044bde2a3e78382f98c8479cb0b5054e
@@ -175,7 +174,7 @@ SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_semmutex-r0drv-netbsd.c) = b560eaf7a9f
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_sleepqueue-r0drv-netbsd.h) = 3aab753113d2ee1af15bf58799d4bf608447bc77
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_spinlock-r0drv-netbsd.c) = 9bfc083274e80d0707bc335580e04acb84934ec6
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h) = b1e998b8e79471a313f16aa8a74342e6d2e4a61c
-SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_thread-r0drv-netbsd.c) = 0717c0b70e1f90e12d7489960cc9e7f6ac3638b1
+SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_thread-r0drv-netbsd.c) = 72050cedb648a1f8a40045d0754eb9b069ccb6ba
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_thread2-r0drv-netbsd.c) = 911cecba018896d7626a1cb7ef60c00d8159d419
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_time-r0drv-netbsd.c) = c3e475887b1751943ac066187d5034f3c1ba9b72
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_timer-r0drv-netbsd.c) = 9ff20109f3b7459544b0de405e305c0ee5a89ac0
@@ -208,6 +207,7 @@ SHA1 (patch-src_VBox_ValidationKit_testmanager_core_coreconsts.py) = 68eec44aa0d
 SHA1 (patch-src_VBox_ValidationKit_tests_autostart_tdAutostart1.py) = 750ed6069a119efe97ebc082b74d6a1c8ee6950a
 SHA1 (patch-src_apps_Makefile.kmk) = 578f077b8961fab80d839c7024e3e89cec29c3e0
 SHA1 (patch-src_libs_libxml2-2.9.2_include_vboxconfig.h) = 461438f04dcf7f54051f897834f3fc6457ddfdf0
+SHA1 (patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.cfg) = ef93614e10b24f2952202b90db6fc26c0c83ddac
 SHA1 (patch-src_recompiler_Makefile.kmk) = 0f849ac56932b41882f056df3b59a5626fe8608b
 SHA1 (patch-src_recompiler_exec.c) = b8d61864eb2b6426607c850585b1ccd11446e905
 SHA1 (patch-tools_bin_gen-slickedit-workspace.sh) = 3db84478c9d4235319cccbe2c2d57c540f859738
diff --git a/virtualbox/patches/patch-Makefile.kmk b/virtualbox/patches/patch-Makefile.kmk
index f0df6b8..c1c3804 100644
--- a/virtualbox/patches/patch-Makefile.kmk
+++ b/virtualbox/patches/patch-Makefile.kmk
@@ -76,7 +76,7 @@ $NetBSD$
 +#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 +#else
 +#	$(call VBOX_BLD_VM_MSG_BEGIN,NetBSD/amd64 extension packs)
-+#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
++#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_NBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
 +#	$(call VBOX_BLD_VM_MSG_END__,NetBSD/amd64 extension packs)
 +#endif
 +
@@ -85,7 +85,7 @@ $NetBSD$
 +#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
 +#else
 +#	$(call VBOX_BLD_VM_MSG_BEGIN,NetBSD/x86 extension packs)
-+#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
++#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_NBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
 +#	$(call VBOX_BLD_VM_MSG_END__,NetBSD/x86 extension packs)
 +#endif
 +
diff --git a/virtualbox/patches/patch-out_netbsd.amd64_release_bin_sdk_bindings_xpcom_include_nsprpub_md___netbsd.cfg b/virtualbox/patches/patch-out_netbsd.amd64_release_bin_sdk_bindings_xpcom_include_nsprpub_md___netbsd.cfg
deleted file mode 100644
index f455383..0000000
--- a/virtualbox/patches/patch-out_netbsd.amd64_release_bin_sdk_bindings_xpcom_include_nsprpub_md___netbsd.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- out/netbsd.amd64/release/bin/sdk/bindings/xpcom/include/nsprpub/md/_netbsd.cfg.orig	2016-03-04 19:30:36.000000000 +0000
-+++ out/netbsd.amd64/release/bin/sdk/bindings/xpcom/include/nsprpub/md/_netbsd.cfg
-@@ -140,7 +140,7 @@
- #define PR_ALIGN_OF_DOUBLE  8
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__alpha__)
-+#elif defined(__alpha__) || defined(__x86_64__)
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
- #define	HAVE_LONG_LONG
diff --git a/virtualbox/patches/patch-src_VBox_Additions_netbsd_Makefile.kmk b/virtualbox/patches/patch-src_VBox_Additions_netbsd_Makefile.kmk
index 0f9b42f..4eb5a71 100644
--- a/virtualbox/patches/patch-src_VBox_Additions_netbsd_Makefile.kmk
+++ b/virtualbox/patches/patch-src_VBox_Additions_netbsd_Makefile.kmk
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/VBox/Additions/netbsd/Makefile.kmk.orig	2016-07-07 07:08:46.386807464 +0000
+--- src/VBox/Additions/netbsd/Makefile.kmk.orig	2016-07-08 22:38:39.547935183 +0000
 +++ src/VBox/Additions/netbsd/Makefile.kmk
 @@ -0,0 +1,191 @@
 +#  Makefile.kmk $
@@ -34,10 +34,10 @@ $NetBSD$
 +#
 +# Globals
 +#
-+VBOX_FBSD_ADD_INS_OUT_DIR          := $(PATH_TARGET)/Additions/Installer/netbsd
++VBOX_NBSD_ADD_INS_OUT_DIR          := $(PATH_TARGET)/Additions/Installer/netbsd
 +BLDDIRS                            += \
-+		$(VBOX_FBSD_ADD_INS_OUT_DIR) \
-+		$(VBOX_FBSD_ADD_INS_OUT_DIR)/module
++		$(VBOX_NBSD_ADD_INS_OUT_DIR) \
++		$(VBOX_NBSD_ADD_INS_OUT_DIR)/module
 +VBOX_PATH_NETBSD_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/Installer
 +VBOX_PATH_X11_ADDITION_INSTALLER     := $(PATH_ROOT)/src/VBox/Additions/x11/Installer
 +
@@ -46,7 +46,7 @@ $NetBSD$
 +# Targets
 +#
 +ifndef VBOX_OSE
-+ BLDDIRS     += $(VBOX_FBSD_ADD_INS_OUT_DIR) $(VBOX_FBSD_ADD_INS_OUT_DIR)/module
++ BLDDIRS     += $(VBOX_NBSD_ADD_INS_OUT_DIR) $(VBOX_NBSD_ADD_INS_OUT_DIR)/module
 + PACKING     += $(PATH_STAGE_BIN)/additions/VBoxNetBSDAdditions.tbz
 + OTHER_CLEAN += $(PACKING)
 +endif
@@ -55,7 +55,7 @@ $NetBSD$
 +#
 +# Files to install
 +#
-+VBOX_FBSD_ADD_STRIP_BIN = \
++VBOX_NBSD_ADD_STRIP_BIN = \
 +	VBoxService \
 +	VBoxClient \
 +	VBoxControl \
@@ -80,38 +80,38 @@ $NetBSD$
 +	VBoxOGLpassthroughspu.so \
 +	VBoxOGL.so
 +
-+VBOX_FBSD_ADD_MODULES = \
++VBOX_NBSD_ADD_MODULES = \
 +	vboxguest \
 +	vboxvideo_drm
 +
 +#
 +# All the bin files that go into the archives.
 +#
-+VBOX_FBSD_ADD_DBG_SYM_FILES := $(addsuffix .dbgsym,$(VBOX_FBSD_ADD_STRIP_BIN))
-+VBOX_FBSD_ADD_INS_FILES := $(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_BIN) $(VBOX_FBSD_ADD_STRIP_OBJ) $(VBOX_FBSD_ADD_DBG_SYM_FILES))
-+VBOX_FBSD_ADD_INS_MODULES := $(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/,$(VBOX_FBSD_ADD_MODULES))
++VBOX_NBSD_ADD_DBG_SYM_FILES := $(addsuffix .dbgsym,$(VBOX_NBSD_ADD_STRIP_BIN))
++VBOX_NBSD_ADD_INS_FILES := $(addprefix $(VBOX_NBSD_ADD_INS_OUT_DIR)/,$(VBOX_NBSD_ADD_STRIP_BIN) $(VBOX_NBSD_ADD_STRIP_OBJ) $(VBOX_NBSD_ADD_DBG_SYM_FILES))
++VBOX_NBSD_ADD_INS_MODULES := $(addprefix $(VBOX_NBSD_ADD_INS_OUT_DIR)/module/,$(VBOX_NBSD_ADD_MODULES))
 +
 +# Cleanup of the the installer directory files
-+OTHER_CLEAN += $(VBOX_FBSD_ADD_INS_FILES)) $(VBOX_FBSD_ADD_INS_MODULES)
++OTHER_CLEAN += $(VBOX_NBSD_ADD_INS_FILES)) $(VBOX_NBSD_ADD_INS_MODULES)
 +
-+# pattern rule for copying the debug info from the VBOX_FBSD_ADD_STRIP_BIN files to the installation directory
-+$(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_DBG_SYM_FILES)): \
-+		$(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
++# pattern rule for copying the debug info from the VBOX_NBSD_ADD_STRIP_BIN files to the installation directory
++$(addprefix $(VBOX_NBSD_ADD_INS_OUT_DIR)/,$(VBOX_NBSD_ADD_DBG_SYM_FILES)): \
++		$(VBOX_NBSD_ADD_INS_OUT_DIR)/%.dbgsym : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
 +	$(call MSG_TOOL,copydbg,$<,$@)
 +	$(QUIET)objcopy --only-keep-debug $< $@
 +
-+# pattern rule for stripping and copying the VBOX_FBSD_ADD_STRIP_BIN files to the installation directory
-+$(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_BIN)): \
-+		$(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% \
-+		$(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym \
++# pattern rule for stripping and copying the VBOX_NBSD_ADD_STRIP_BIN files to the installation directory
++$(addprefix $(VBOX_NBSD_ADD_INS_OUT_DIR)/,$(VBOX_NBSD_ADD_STRIP_BIN)): \
++		$(VBOX_NBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% \
++		$(VBOX_NBSD_ADD_INS_OUT_DIR)/%.dbgsym \
 +		| $$(dir $$@)
 +	$(call MSG_INST_FILE,$<,$@)
 +	$(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
 +	$(QUIET)objcopy --add-gnu-debuglink=$(addsuffix .dbgsym,$@) $@
 +
-+# pattern rule for stripping and copying the VBOX_FBSD_ADD_STRIP_OBJ files to the installation directory
-+$(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_OBJ)): \
-+		$(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
++# pattern rule for stripping and copying the VBOX_NBSD_ADD_STRIP_OBJ files to the installation directory
++$(addprefix $(VBOX_NBSD_ADD_INS_OUT_DIR)/,$(VBOX_NBSD_ADD_STRIP_OBJ)): \
++		$(VBOX_NBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
 +	$(call MSG_INST_FILE,$<,$@)
 +ifeq ($(VBOX_DO_STRIP),)
 +	$(QUIET)$(INSTALL) -m 0644 $< $@
@@ -121,14 +121,14 @@ $NetBSD$
 +	$(QUIET)$(RM) -f -- $@.tmp
 +endif
 +
-+# pattern rule for copying the VBOX_FBSD_ADD_MODULES files to the installation directory
-+$(VBOX_FBSD_ADD_INS_MODULES): \
-+		$(VBOX_FBSD_ADD_INS_OUT_DIR)/module/% : $(PATH_STAGE_BIN)/additions/src/% | $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/
++# pattern rule for copying the VBOX_NBSD_ADD_MODULES files to the installation directory
++$(VBOX_NBSD_ADD_INS_MODULES): \
++		$(VBOX_NBSD_ADD_INS_OUT_DIR)/module/% : $(PATH_STAGE_BIN)/additions/src/% | $(VBOX_NBSD_ADD_INS_OUT_DIR)/module/
 +	$(call MSG_INST_FILE,$<,$@)
 +# Remove target directories first, otherwise the behaviour of cp will not be
 +# what we want if it already exists. See the cp manual page for more details.
 +	$(QUIET)$(RM) -Rf $@
-+	$(QUIET)cp -af $< $(VBOX_FBSD_ADD_INS_OUT_DIR)/module
++	$(QUIET)cp -af $< $(VBOX_NBSD_ADD_INS_OUT_DIR)/module
 +
 +
 +INSTALLS += $(if $(VBOX_OSE),, fbsd_add_inst-nobin)
@@ -148,7 +148,7 @@ $NetBSD$
 +GuestDrivers-src_SOURCES = Makefile
 +
 +# this file needs editing before it can be included in the generic installer.
-+$(VBOX_FBSD_ADD_INS_OUT_DIR)/install.sh: \
++$(VBOX_NBSD_ADD_INS_OUT_DIR)/install.sh: \
 +	$(VBOX_PATH_NETBSD_ADDITION_INSTALLER)/install.sh | $$(dir $$@)
 +	$(QUIET)$(SED) \
 +	    -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
@@ -156,11 +156,11 @@ $NetBSD$
 +	    -e "s;_OSE_;$(VBOX_OSE);g" \
 +	    -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
 +	    -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
-+	    --output $(VBOX_FBSD_ADD_INS_OUT_DIR)/install_.sh \
++	    --output $(VBOX_NBSD_ADD_INS_OUT_DIR)/install_.sh \
 +	    $<
-+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_FBSD_ADD_INS_OUT_DIR)/install_.sh $@
-+	$(QUIET)$(RM) $(VBOX_FBSD_ADD_INS_OUT_DIR)/install_.sh
-+OTHERS_CLEAN += $(VBOX_FBSD_ADD_INS_OUT_DIR)/install.sh
++	$(QUIET)$(INSTALL) -m 0755 $(VBOX_NBSD_ADD_INS_OUT_DIR)/install_.sh $@
++	$(QUIET)$(RM) $(VBOX_NBSD_ADD_INS_OUT_DIR)/install_.sh
++OTHERS_CLEAN += $(VBOX_NBSD_ADD_INS_OUT_DIR)/install.sh
 +
 +
 +include $(FILE_KBUILD_SUB_FOOTER)
@@ -180,9 +180,9 @@ $NetBSD$
 +$(PATH_STAGE_BIN)/additions/VBoxNetBSDAdditions.tbz: \
 +		$$(fbsd_add_inst-nobin_2_STAGE_TARGETS) \
 +		$$(fbsd_add_inst-bin_2_STAGE_TARGETS) \
-+		$(VBOX_FBSD_ADD_INS_FILES) \
-+		$(VBOX_FBSD_ADD_INS_MODULES) \
-+		$(VBOX_FBSD_ADD_INS_OUT_DIR)/install.sh \
++		$(VBOX_NBSD_ADD_INS_FILES) \
++		$(VBOX_NBSD_ADD_INS_MODULES) \
++		$(VBOX_NBSD_ADD_INS_OUT_DIR)/install.sh \
 +		$(wildcard $(PATH_STAGE_BIN)/additions/src/*) \
 +		$(wildcard $(PATH_STAGE_BIN)/additions/src/*/*) \
 +		$(wildcard $(PATH_STAGE_BIN)/additions/src/*/*/*) \
diff --git a/virtualbox/patches/patch-src_VBox_Devices_USB_netbsd_USBProxyDevice-netbsd.cpp b/virtualbox/patches/patch-src_VBox_Devices_USB_netbsd_USBProxyDevice-netbsd.cpp
index f00988d..b90f531 100644
--- a/virtualbox/patches/patch-src_VBox_Devices_USB_netbsd_USBProxyDevice-netbsd.cpp
+++ b/virtualbox/patches/patch-src_VBox_Devices_USB_netbsd_USBProxyDevice-netbsd.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/VBox/Devices/USB/netbsd/USBProxyDevice-netbsd.cpp.orig	2016-07-07 07:08:46.468615794 +0000
+--- src/VBox/Devices/USB/netbsd/USBProxyDevice-netbsd.cpp.orig	2016-07-08 22:38:39.836808295 +0000
 +++ src/VBox/Devices/USB/netbsd/USBProxyDevice-netbsd.cpp
 @@ -0,0 +1,1061 @@
 +/*  USBProxyDevice-netbsd.cpp $ */
@@ -62,8 +62,8 @@ $NetBSD$
 +#include "../USBProxyDevice.h"
 +
 +/** Maximum endpoints supported. */
-+#define USBFBSD_MAXENDPOINTS 127
-+#define USBFBSD_MAXFRAMES 56
++#define USBNBSD_MAXENDPOINTS 127
++#define USBNBSD_MAXFRAMES 56
 +
 +/** This really needs to be defined in vusb.h! */
 +#ifndef VUSB_DIR_TO_DEV
@@ -74,16 +74,16 @@ $NetBSD$
 +/*********************************************************************************************************************************
 +*   Structures and Typedefs                                                                                                      *
 +*********************************************************************************************************************************/
-+typedef struct USBENDPOINTFBSD
++typedef struct USBENDPOINTNBSD
 +{
 +    /** Flag whether it is opened. */
 +    bool     fOpen;
 +    /** Flag whether it is cancelling. */
 +    bool     fCancelling;
 +    /** Buffer pointers. */
-+    void    *apvData[USBFBSD_MAXFRAMES];
++    void    *apvData[USBNBSD_MAXFRAMES];
 +    /** Buffer lengths. */
-+    uint32_t acbData[USBFBSD_MAXFRAMES];
++    uint32_t acbData[USBNBSD_MAXFRAMES];
 +    /** Initial buffer length. */
 +    uint32_t cbData0;
 +    /** Pointer to the URB. */
@@ -94,12 +94,12 @@ $NetBSD$
 +    unsigned cMaxIo;
 +    /** Maximum frame count. */
 +    unsigned cMaxFrames;
-+} USBENDPOINTFBSD, *PUSBENDPOINTFBSD;
++} USBENDPOINTNBSD, *PUSBENDPOINTNBSD;
 +
 +/**
 + * Data for the NetBSD usb proxy backend.
 + */
-+typedef struct USBPROXYDEVFBSD
++typedef struct USBPROXYDEVNBSD
 +{
 +    /** The open file. */
 +    RTFILE                 hFile;
@@ -112,10 +112,10 @@ $NetBSD$
 +    /** Pipe handle for waking up - reading end. */
 +    RTPIPE                 hPipeWakeupR;
 +    /** Software endpoint structures */
-+    USBENDPOINTFBSD        aSwEndpoint[USBFBSD_MAXENDPOINTS];
++    USBENDPOINTNBSD        aSwEndpoint[USBNBSD_MAXENDPOINTS];
 +    /** Kernel endpoint structures */
-+    struct usb_fs_endpoint aHwEndpoint[USBFBSD_MAXENDPOINTS];
-+} USBPROXYDEVFBSD, *PUSBPROXYDEVFBSD;
++    struct usb_fs_endpoint aHwEndpoint[USBNBSD_MAXENDPOINTS];
++} USBPROXYDEVNBSD, *PUSBPROXYDEVNBSD;
 +
 +
 +/*********************************************************************************************************************************
@@ -140,13 +140,13 @@ $NetBSD$
 +                                  void *pvArg, bool fHandleNoDev)
 +{
 +    int rc = VINF_SUCCESS;
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +
 +    LogFlow(("usbProxyNetBSDDoIoCtl: iCmd=%#x\n", iCmd));
 +
 +    do
 +    {
-+        rc = ioctl(RTFileToNative(pDevFBSD->hFile), iCmd, pvArg);
++        rc = ioctl(RTFileToNative(pDevNBSD->hFile), iCmd, pvArg);
 +        if (rc >= 0)
 +            return VINF_SUCCESS;
 +    } while (errno == EINTR);
@@ -171,27 +171,27 @@ $NetBSD$
 +static int usbProxyNetBSDFsInit(PUSBPROXYDEV pProxyDev)
 +{
 +    struct usb_fs_init UsbFsInit;
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +    int rc;
 +
 +    LogFlow(("usbProxyNetBSDFsInit: pProxyDev=%p\n", (void *)pProxyDev));
 +
 +    /* Sanity check */
-+    AssertPtrReturn(pDevFBSD, VERR_INVALID_PARAMETER);
++    AssertPtrReturn(pDevNBSD, VERR_INVALID_PARAMETER);
 +
-+    if (pDevFBSD->fInit == true)
++    if (pDevNBSD->fInit == true)
 +        return VINF_SUCCESS;
 +
 +    /* Zero default */
 +    memset(&UsbFsInit, 0, sizeof(UsbFsInit));
 +
-+    UsbFsInit.pEndpoints = pDevFBSD->aHwEndpoint;
-+    UsbFsInit.ep_index_max = USBFBSD_MAXENDPOINTS;
++    UsbFsInit.pEndpoints = pDevNBSD->aHwEndpoint;
++    UsbFsInit.ep_index_max = USBNBSD_MAXENDPOINTS;
 +
 +    /* Init USB subsystem */
 +    rc = usbProxyNetBSDDoIoCtl(pProxyDev, USB_FS_INIT, &UsbFsInit, false);
 +    if (RT_SUCCESS(rc))
-+        pDevFBSD->fInit = true;
++        pDevNBSD->fInit = true;
 +
 +    return rc;
 +}
@@ -202,19 +202,19 @@ $NetBSD$
 +static int usbProxyNetBSDFsUnInit(PUSBPROXYDEV pProxyDev)
 +{
 +    struct usb_fs_uninit UsbFsUninit;
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +    int rc;
 +
 +    LogFlow(("usbProxyNetBSDFsUnInit: ProxyDev=%p\n", (void *)pProxyDev));
 +
 +    /* Sanity check */
-+    AssertPtrReturn(pDevFBSD, VERR_INVALID_PARAMETER);
++    AssertPtrReturn(pDevNBSD, VERR_INVALID_PARAMETER);
 +
-+    if (pDevFBSD->fInit != true)
++    if (pDevNBSD->fInit != true)
 +        return VINF_SUCCESS;
 +
 +    /* Close any open endpoints. */
-+    for (unsigned n = 0; n != USBFBSD_MAXENDPOINTS; n++)
++    for (unsigned n = 0; n != USBNBSD_MAXENDPOINTS; n++)
 +        usbProxyNetBSDEndpointClose(pProxyDev, n);
 +
 +    /* Zero default */
@@ -223,7 +223,7 @@ $NetBSD$
 +    /* Uninit USB subsystem */
 +    rc = usbProxyNetBSDDoIoCtl(pProxyDev, USB_FS_UNINIT, &UsbFsUninit, false);
 +    if (RT_SUCCESS(rc))
-+        pDevFBSD->fInit = false;
++        pDevNBSD->fInit = false;
 +
 +    return rc;
 +}
@@ -253,8 +253,8 @@ $NetBSD$
 +
 +static int usbProxyNetBSDEndpointOpen(PUSBPROXYDEV pProxyDev, int Endpoint, bool fIsoc, int index)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
-+    PUSBENDPOINTFBSD pEndpointFBSD = NULL; /* shut up gcc */
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
++    PUSBENDPOINTNBSD pEndpointNBSD = NULL; /* shut up gcc */
 +    struct usb_fs_endpoint *pXferEndpoint;
 +    struct usb_fs_open UsbFsOpen;
 +    int rc;
@@ -262,35 +262,35 @@ $NetBSD$
 +    LogFlow(("usbProxyNetBSDEndpointOpen: pProxyDev=%p Endpoint=%d\n",
 +             (void *)pProxyDev, Endpoint));
 +
-+    for (; index < USBFBSD_MAXENDPOINTS; index++)
++    for (; index < USBNBSD_MAXENDPOINTS; index++)
 +    {
-+        pEndpointFBSD = &pDevFBSD->aSwEndpoint[index];
-+        if (pEndpointFBSD->fCancelling)
++        pEndpointNBSD = &pDevNBSD->aSwEndpoint[index];
++        if (pEndpointNBSD->fCancelling)
 +            continue;
-+        if (   pEndpointFBSD->fOpen
-+            && !pEndpointFBSD->pUrb
-+            && (int)pEndpointFBSD->iEpNum == Endpoint)
++        if (   pEndpointNBSD->fOpen
++            && !pEndpointNBSD->pUrb
++            && (int)pEndpointNBSD->iEpNum == Endpoint)
 +            return index;
 +    }
 +
-+    if (index == USBFBSD_MAXENDPOINTS)
++    if (index == USBNBSD_MAXENDPOINTS)
 +    {
-+        for (index = 0; index != USBFBSD_MAXENDPOINTS; index++)
++        for (index = 0; index != USBNBSD_MAXENDPOINTS; index++)
 +        {
-+            pEndpointFBSD = &pDevFBSD->aSwEndpoint[index];
-+            if (pEndpointFBSD->fCancelling)
++            pEndpointNBSD = &pDevNBSD->aSwEndpoint[index];
++            if (pEndpointNBSD->fCancelling)
 +                continue;
-+            if (!pEndpointFBSD->fOpen)
++            if (!pEndpointNBSD->fOpen)
 +                break;
 +        }
-+        if (index == USBFBSD_MAXENDPOINTS)
++        if (index == USBNBSD_MAXENDPOINTS)
 +            return -1;
 +    }
 +    /* set ppBuffer and pLength */
 +
-+    pXferEndpoint = &pDevFBSD->aHwEndpoint[index];
-+    pXferEndpoint->ppBuffer = &pEndpointFBSD->apvData[0];
-+    pXferEndpoint->pLength = &pEndpointFBSD->acbData[0];
++    pXferEndpoint = &pDevNBSD->aHwEndpoint[index];
++    pXferEndpoint->ppBuffer = &pEndpointNBSD->apvData[0];
++    pXferEndpoint->pLength = &pEndpointNBSD->acbData[0];
 +
 +    LogFlow(("usbProxyNetBSDEndpointOpen: ep_index=%d ep_num=%d\n",
 +             index, Endpoint));
@@ -302,7 +302,7 @@ $NetBSD$
 +    UsbFsOpen.max_bufsize = 256 * 1024;
 +    /* Hardcoded assumption about the URBs we get. */
 +
-+    UsbFsOpen.max_frames = fIsoc ? USBFBSD_MAXFRAMES : 2;
++    UsbFsOpen.max_frames = fIsoc ? USBNBSD_MAXFRAMES : 2;
 +
 +    rc = usbProxyNetBSDDoIoCtl(pProxyDev, USB_FS_OPEN, &UsbFsOpen, true);
 +    if (RT_FAILURE(rc))
@@ -312,11 +312,11 @@ $NetBSD$
 +
 +        return -1;
 +    }
-+    pEndpointFBSD->fOpen = true;
-+    pEndpointFBSD->pUrb = NULL;
-+    pEndpointFBSD->iEpNum = Endpoint;
-+    pEndpointFBSD->cMaxIo = UsbFsOpen.max_bufsize;
-+    pEndpointFBSD->cMaxFrames = UsbFsOpen.max_frames;
++    pEndpointNBSD->fOpen = true;
++    pEndpointNBSD->pUrb = NULL;
++    pEndpointNBSD->iEpNum = Endpoint;
++    pEndpointNBSD->cMaxIo = UsbFsOpen.max_bufsize;
++    pEndpointNBSD->cMaxFrames = UsbFsOpen.max_frames;
 +
 +    return index;
 +}
@@ -328,8 +328,8 @@ $NetBSD$
 + */
 +static int usbProxyNetBSDEndpointClose(PUSBPROXYDEV pProxyDev, int Endpoint)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
-+    PUSBENDPOINTFBSD pEndpointFBSD = &pDevFBSD->aSwEndpoint[Endpoint];
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
++    PUSBENDPOINTNBSD pEndpointNBSD = &pDevNBSD->aSwEndpoint[Endpoint];
 +    struct usb_fs_close UsbFsClose;
 +    int rc = VINF_SUCCESS;
 +
@@ -337,16 +337,16 @@ $NetBSD$
 +             (void *)pProxyDev, Endpoint));
 +
 +    /* check for cancelling */
-+    if (pEndpointFBSD->pUrb != NULL)
++    if (pEndpointNBSD->pUrb != NULL)
 +    {
-+        pEndpointFBSD->fCancelling = true;
-+        pDevFBSD->fCancelling = true;
++        pEndpointNBSD->fCancelling = true;
++        pDevNBSD->fCancelling = true;
 +    }
 +
 +    /* check for opened */
-+    if (pEndpointFBSD->fOpen)
++    if (pEndpointNBSD->fOpen)
 +    {
-+        pEndpointFBSD->fOpen = false;
++        pEndpointNBSD->fOpen = false;
 +
 +        /* Zero default */
 +        memset(&UsbFsClose, 0, sizeof(UsbFsClose));
@@ -375,7 +375,7 @@ $NetBSD$
 +static DECLCALLBACK(int) usbProxyNetBSDOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress,
 +                                             void *pvBackend)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +    int rc;
 +
 +    LogFlow(("usbProxyNetBSDOpen: pProxyDev=%p pszAddress=%s\n", pProxyDev, pszAddress));
@@ -392,18 +392,18 @@ $NetBSD$
 +        /*
 +         * Initialize the NetBSD backend data.
 +         */
-+        pDevFBSD->hFile = hFile;
++        pDevNBSD->hFile = hFile;
 +        rc = usbProxyNetBSDFsInit(pProxyDev);
 +        if (RT_SUCCESS(rc))
 +        {
 +            /*
 +             * Create wakeup pipe.
 +             */
-+            rc = RTPipeCreate(&pDevFBSD->hPipeWakeupR, &pDevFBSD->hPipeWakeupW, 0);
++            rc = RTPipeCreate(&pDevNBSD->hPipeWakeupR, &pDevNBSD->hPipeWakeupW, 0);
 +            if (RT_SUCCESS(rc))
 +            {
 +                LogFlow(("usbProxyNetBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n",
-+                         pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg));
++                         pProxyDev, pszAddress, pDevNBSD->hFile, pProxyDev->iActiveCfg));
 +
 +                return VINF_SUCCESS;
 +            }
@@ -430,7 +430,7 @@ $NetBSD$
 + */
 +static DECLCALLBACK(int) usbProxyNetBSDInit(PUSBPROXYDEV pProxyDev)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +    int rc;
 +
 +    LogFlow(("usbProxyNetBSDInit: pProxyDev=%s\n",
@@ -460,20 +460,20 @@ $NetBSD$
 + */
 +static DECLCALLBACK(void) usbProxyNetBSDClose(PUSBPROXYDEV pProxyDev)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +
 +    LogFlow(("usbProxyNetBSDClose: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
 +
 +    /* sanity check */
-+    AssertPtrReturnVoid(pDevFBSD);
++    AssertPtrReturnVoid(pDevNBSD);
 +
 +    usbProxyNetBSDFsUnInit(pProxyDev);
 +
-+    RTPipeClose(pDevFBSD->hPipeWakeupR);
-+    RTPipeClose(pDevFBSD->hPipeWakeupW);
++    RTPipeClose(pDevNBSD->hPipeWakeupR);
++    RTPipeClose(pDevNBSD->hPipeWakeupW);
 +
-+    RTFileClose(pDevFBSD->hFile);
-+    pDevFBSD->hFile = NIL_RTFILE;
++    RTFileClose(pDevNBSD->hFile);
++    pDevNBSD->hFile = NIL_RTFILE;
 +
 +    LogFlow(("usbProxyNetBSDClose: returns\n"));
 +}
@@ -486,7 +486,7 @@ $NetBSD$
 + */
 +static DECLCALLBACK(int) usbProxyNetBSDReset(PUSBPROXYDEV pProxyDev, bool fResetOnNetBSD)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +    int iParm;
 +    int rc = VINF_SUCCESS;
 +
@@ -543,7 +543,7 @@ $NetBSD$
 + */
 +static DECLCALLBACK(int) usbProxyNetBSDSetConfig(PUSBPROXYDEV pProxyDev, int iCfg)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +    int iCfgIndex;
 +    int rc;
 +
@@ -632,7 +632,7 @@ $NetBSD$
 + */
 +static DECLCALLBACK(int) usbProxyNetBSDSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int iAlt)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +    struct usb_alt_interface UsbIntAlt;
 +    int rc;
 +
@@ -694,8 +694,8 @@ $NetBSD$
 + */
 +static DECLCALLBACK(int) usbProxyNetBSDUrbQueue(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
-+    PUSBENDPOINTFBSD pEndpointFBSD;
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
++    PUSBENDPOINTNBSD pEndpointNBSD;
 +    struct usb_fs_endpoint *pXferEndpoint;
 +    struct usb_fs_start UsbFsStart;
 +    unsigned cFrames;
@@ -724,8 +724,8 @@ $NetBSD$
 +    if (index < 0)
 +        return VERR_INVALID_PARAMETER;
 +
-+    pEndpointFBSD = &pDevFBSD->aSwEndpoint[index];
-+    pXferEndpoint = &pDevFBSD->aHwEndpoint[index];
++    pEndpointNBSD = &pDevNBSD->aSwEndpoint[index];
++    pXferEndpoint = &pDevNBSD->aHwEndpoint[index];
 +
 +    pbData = pUrb->abData;
 +
@@ -733,20 +733,20 @@ $NetBSD$
 +    {
 +        case VUSBXFERTYPE_MSG:
 +        {
-+            pEndpointFBSD->apvData[0] = pbData;
-+            pEndpointFBSD->acbData[0] = 8;
++            pEndpointNBSD->apvData[0] = pbData;
++            pEndpointNBSD->acbData[0] = 8;
 +
 +            /* check wLength */
 +            if (pbData[6] || pbData[7])
 +            {
-+                pEndpointFBSD->apvData[1] = pbData + 8;
-+                pEndpointFBSD->acbData[1] = pbData[6] | (pbData[7] << 8);
++                pEndpointNBSD->apvData[1] = pbData + 8;
++                pEndpointNBSD->acbData[1] = pbData[6] | (pbData[7] << 8);
 +                cFrames = 2;
 +            }
 +            else
 +            {
-+                pEndpointFBSD->apvData[1] = NULL;
-+                pEndpointFBSD->acbData[1] = 0;
++                pEndpointNBSD->apvData[1] = NULL;
++                pEndpointNBSD->acbData[1] = 0;
 +                cFrames = 1;
 +            }
 +
@@ -765,10 +765,10 @@ $NetBSD$
 +
 +            for (i = 0; i < pUrb->cIsocPkts; i++)
 +            {
-+                if (i >= pEndpointFBSD->cMaxFrames)
++                if (i >= pEndpointNBSD->cMaxFrames)
 +                    break;
-+                pEndpointFBSD->apvData[i] = pbData + pUrb->aIsocPkts[i].off;
-+                pEndpointFBSD->acbData[i] = pUrb->aIsocPkts[i].cb;
++                pEndpointNBSD->apvData[i] = pbData + pUrb->aIsocPkts[i].off;
++                pEndpointNBSD->acbData[i] = pUrb->aIsocPkts[i].cb;
 +            }
 +            /* Timeout handling will be done during reap. */
 +            pXferEndpoint->timeout = USB_FS_TIMEOUT_NONE;
@@ -778,14 +778,14 @@ $NetBSD$
 +        }
 +        default:
 +        {
-+            pEndpointFBSD->apvData[0] = pbData;
-+            pEndpointFBSD->cbData0 = pUrb->cbData;
++            pEndpointNBSD->apvData[0] = pbData;
++            pEndpointNBSD->cbData0 = pUrb->cbData;
 +
 +            /* XXX maybe we have to loop */
-+            if (pUrb->cbData > pEndpointFBSD->cMaxIo)
-+                pEndpointFBSD->acbData[0] = pEndpointFBSD->cMaxIo;
++            if (pUrb->cbData > pEndpointNBSD->cMaxIo)
++                pEndpointNBSD->acbData[0] = pEndpointNBSD->cMaxIo;
 +            else
-+                pEndpointFBSD->acbData[0] = pUrb->cbData;
++                pEndpointNBSD->acbData[0] = pUrb->cbData;
 +
 +            /* Timeout handling will be done during reap. */
 +            pXferEndpoint->timeout = USB_FS_TIMEOUT_NONE;
@@ -808,8 +808,8 @@ $NetBSD$
 +
 +    LogFlow(("usbProxyNetBSDUrbQueue: USB_FS_START returned rc=%d "
 +             "len[0]=%u len[1]=%u cbData=%u index=%u ep_num=%u\n", rc,
-+             (unsigned)pEndpointFBSD->acbData[0],
-+             (unsigned)pEndpointFBSD->acbData[1],
++             (unsigned)pEndpointNBSD->acbData[0],
++             (unsigned)pEndpointNBSD->acbData[1],
 +             (unsigned)pUrb->cbData,
 +             (unsigned)index, (unsigned)ep_num));
 +
@@ -823,7 +823,7 @@ $NetBSD$
 +        return rc;
 +    }
 +    pUrb->Dev.pvPrivate = (void *)(long)(index + 1);
-+    pEndpointFBSD->pUrb = pUrb;
++    pEndpointNBSD->pUrb = pUrb;
 +
 +    return rc;
 +}
@@ -839,8 +839,8 @@ $NetBSD$
 +static DECLCALLBACK(PVUSBURB) usbProxyNetBSDUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
 +{
 +    struct usb_fs_endpoint *pXferEndpoint;
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
-+    PUSBENDPOINTFBSD pEndpointFBSD;
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
++    PUSBENDPOINTNBSD pEndpointNBSD;
 +    PVUSBURB pUrb;
 +    struct usb_fs_complete UsbFsComplete;
 +    struct pollfd pfd[2];
@@ -854,16 +854,16 @@ $NetBSD$
 +    pUrb = NULL;
 +
 +    /* check for cancelled transfers */
-+    if (pDevFBSD->fCancelling)
++    if (pDevNBSD->fCancelling)
 +    {
-+        for (unsigned n = 0; n < USBFBSD_MAXENDPOINTS; n++)
++        for (unsigned n = 0; n < USBNBSD_MAXENDPOINTS; n++)
 +        {
-+            pEndpointFBSD = &pDevFBSD->aSwEndpoint[n];
-+            if (pEndpointFBSD->fCancelling)
++            pEndpointNBSD = &pDevNBSD->aSwEndpoint[n];
++            if (pEndpointNBSD->fCancelling)
 +            {
-+                pEndpointFBSD->fCancelling = false;
-+                pUrb = pEndpointFBSD->pUrb;
-+                pEndpointFBSD->pUrb = NULL;
++                pEndpointNBSD->fCancelling = false;
++                pUrb = pEndpointNBSD->pUrb;
++                pEndpointNBSD->pUrb = NULL;
 +
 +                if (pUrb != NULL)
 +                    break;
@@ -891,7 +891,7 @@ $NetBSD$
 +            }
 +            return pUrb;
 +        }
-+        pDevFBSD->fCancelling = false;
++        pDevNBSD->fCancelling = false;
 +    }
 +    /* Zero default */
 +
@@ -901,17 +901,17 @@ $NetBSD$
 +    rc = usbProxyNetBSDDoIoCtl(pProxyDev, USB_FS_COMPLETE, &UsbFsComplete, true);
 +    if (RT_SUCCESS(rc))
 +    {
-+        pXferEndpoint = &pDevFBSD->aHwEndpoint[UsbFsComplete.ep_index];
-+        pEndpointFBSD = &pDevFBSD->aSwEndpoint[UsbFsComplete.ep_index];
++        pXferEndpoint = &pDevNBSD->aHwEndpoint[UsbFsComplete.ep_index];
++        pEndpointNBSD = &pDevNBSD->aSwEndpoint[UsbFsComplete.ep_index];
 +
 +        LogFlow(("usbProxyNetBSDUrbReap: Reaped "
-+                 "URB %#p\n", pEndpointFBSD->pUrb));
++                 "URB %#p\n", pEndpointNBSD->pUrb));
 +
 +        if (pXferEndpoint->status == USB_ERR_CANCELLED)
 +            goto repeat;
 +
-+        pUrb = pEndpointFBSD->pUrb;
-+        pEndpointFBSD->pUrb = NULL;
++        pUrb = pEndpointNBSD->pUrb;
++        pEndpointNBSD->pUrb = NULL;
 +        if (pUrb == NULL)
 +            goto repeat;
 +
@@ -933,7 +933,7 @@ $NetBSD$
 +        switch (pUrb->enmType)
 +        {
 +            case VUSBXFERTYPE_MSG:
-+                pUrb->cbData = pEndpointFBSD->acbData[0] + pEndpointFBSD->acbData[1];
++                pUrb->cbData = pEndpointNBSD->acbData[0] + pEndpointNBSD->acbData[1];
 +                break;
 +            case VUSBXFERTYPE_ISOC:
 +            {
@@ -944,10 +944,10 @@ $NetBSD$
 +                pUrb->cbData = 0;
 +                for (n = 0; n < (int)pUrb->cIsocPkts; n++)
 +                {
-+                    if (n >= (int)pEndpointFBSD->cMaxFrames)
++                    if (n >= (int)pEndpointNBSD->cMaxFrames)
 +                        break;
-+                    pUrb->cbData += pEndpointFBSD->acbData[n];
-+                    pUrb->aIsocPkts[n].cb = pEndpointFBSD->acbData[n];
++                    pUrb->cbData += pEndpointNBSD->acbData[n];
++                    pUrb->aIsocPkts[n].cb = pEndpointNBSD->acbData[n];
 +                }
 +                for (; n < (int)pUrb->cIsocPkts; n++)
 +                    pUrb->aIsocPkts[n].cb = 0;
@@ -955,7 +955,7 @@ $NetBSD$
 +                break;
 +            }
 +            default:
-+                pUrb->cbData = pEndpointFBSD->acbData[0];
++                pUrb->cbData = pEndpointNBSD->acbData[0];
 +                break;
 +        }
 +
@@ -963,19 +963,19 @@ $NetBSD$
 +                 "len[0]=%d len[1]=%d\n",
 +                 (int)pXferEndpoint->status,
 +                 (unsigned)UsbFsComplete.ep_index,
-+                 (unsigned)pEndpointFBSD->acbData[0],
-+                 (unsigned)pEndpointFBSD->acbData[1]));
++                 (unsigned)pEndpointNBSD->acbData[0],
++                 (unsigned)pEndpointNBSD->acbData[1]));
 +
 +    }
 +    else if (cMillies != 0 && rc == VERR_RESOURCE_BUSY)
 +    {
 +        for (;;)
 +        {
-+            pfd[0].fd = RTFileToNative(pDevFBSD->hFile);
++            pfd[0].fd = RTFileToNative(pDevNBSD->hFile);
 +            pfd[0].events = POLLIN | POLLRDNORM;
 +            pfd[0].revents = 0;
 +
-+            pfd[1].fd = RTPipeToNative(pDevFBSD->hPipeWakeupR);
++            pfd[1].fd = RTPipeToNative(pDevNBSD->hPipeWakeupR);
 +            pfd[1].events = POLLIN | POLLRDNORM;
 +            pfd[1].revents = 0;
 +
@@ -987,7 +987,7 @@ $NetBSD$
 +                    /* Got woken up, drain pipe. */
 +                    uint8_t bRead;
 +                    size_t cbIgnored = 0;
-+                    RTPipeRead(pDevFBSD->hPipeWakeupR, &bRead, 1, &cbIgnored);
++                    RTPipeRead(pDevNBSD->hPipeWakeupR, &bRead, 1, &cbIgnored);
 +                    /* Make sure we return from this function */
 +                    cMillies = 0;
 +                }
@@ -1013,7 +1013,7 @@ $NetBSD$
 +
 +    index = (int)(long)pUrb->Dev.pvPrivate - 1;
 +
-+    if (index < 0 || index >= USBFBSD_MAXENDPOINTS)
++    if (index < 0 || index >= USBNBSD_MAXENDPOINTS)
 +        return VINF_SUCCESS; /* invalid index, pretend success. */
 +
 +    LogFlow(("usbProxyNetBSDUrbCancel: epindex=%u\n", (unsigned)index));
@@ -1022,12 +1022,12 @@ $NetBSD$
 +
 +static DECLCALLBACK(int) usbProxyNetBSDWakeup(PUSBPROXYDEV pProxyDev)
 +{
-+    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    PUSBPROXYDEVNBSD pDevNBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVNBSD);
 +    size_t cbIgnored;
 +
 +    LogFlowFunc(("pProxyDev=%p\n", pProxyDev));
 +
-+    return RTPipeWrite(pDevFBSD->hPipeWakeupW, "", 1, &cbIgnored);
++    return RTPipeWrite(pDevNBSD->hPipeWakeupW, "", 1, &cbIgnored);
 +}
 +
 +/**
@@ -1038,7 +1038,7 @@ $NetBSD$
 +    /* pszName */
 +    "host",
 +    /* cbBackend */
-+    sizeof(USBPROXYDEVFBSD),
++    sizeof(USBPROXYDEVNBSD),
 +    usbProxyNetBSDOpen,
 +    usbProxyNetBSDInit,
 +    usbProxyNetBSDClose,
diff --git a/virtualbox/patches/patch-src_VBox_Installer_netbsd_Makefile.kmk b/virtualbox/patches/patch-src_VBox_Installer_netbsd_Makefile.kmk
index f422eae..1f10771 100644
--- a/virtualbox/patches/patch-src_VBox_Installer_netbsd_Makefile.kmk
+++ b/virtualbox/patches/patch-src_VBox_Installer_netbsd_Makefile.kmk
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/VBox/Installer/netbsd/Makefile.kmk.orig	2016-07-07 07:08:46.625776932 +0000
+--- src/VBox/Installer/netbsd/Makefile.kmk.orig	2016-07-08 22:38:40.777304438 +0000
 +++ src/VBox/Installer/netbsd/Makefile.kmk
 @@ -0,0 +1,338 @@
 +#  Makefile.kmk $
@@ -30,30 +30,30 @@ $NetBSD$
 +#
 +# Globals and targets.
 +#
-+VBOX_PATH_FBSD_INST_SRC      := $(PATH_SUB_CURRENT)
-+VBOX_FBSD_INST_OUT_DIR       := $(PATH_TARGET)/Installer/netbsd
-+VBOX_FBSD_INST_STAGE_DIR     := $(PATH_TARGET)/Installer/netbsd/install
-+VBOX_FBSD_DBG_PATH           := usr/lib/debug/opt/VirtualBox
-+VBOX_FBSD_PACKAGE_NAME        = VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).tbz
-+VBOX_FBSD_INST_LIB_DIR       := $(VBOX_FBSD_INST_STAGE_DIR)/lib
-+VBOX_FBSD_INST_BIN_DIR       := $(VBOX_FBSD_INST_STAGE_DIR)/bin
-+VBOX_FBSD_INST_LIBVBOX_DIR   := $(VBOX_FBSD_INST_LIB_DIR)/virtualbox
-+VBOX_FBSD_INST_SHARE_DIR     := $(VBOX_FBSD_INST_STAGE_DIR)/share
-+VBOX_FBSD_INST_SHAREAPP_DIR  := $(VBOX_FBSD_INST_SHARE_DIR)/applications
-+VBOX_FBSD_INST_SHAREICON_DIR := $(VBOX_FBSD_INST_SHARE_DIR)/pixmaps
-+VBOX_FBSD_INST_SHAREVBOX_DIR := $(VBOX_FBSD_INST_SHARE_DIR)/virtualbox
++VBOX_PATH_NBSD_INST_SRC      := $(PATH_SUB_CURRENT)
++VBOX_NBSD_INST_OUT_DIR       := $(PATH_TARGET)/Installer/netbsd
++VBOX_NBSD_INST_STAGE_DIR     := $(PATH_TARGET)/Installer/netbsd/install
++VBOX_NBSD_DBG_PATH           := usr/lib/debug/opt/VirtualBox
++VBOX_NBSD_PACKAGE_NAME        = VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).tbz
++VBOX_NBSD_INST_LIB_DIR       := $(VBOX_NBSD_INST_STAGE_DIR)/lib
++VBOX_NBSD_INST_BIN_DIR       := $(VBOX_NBSD_INST_STAGE_DIR)/bin
++VBOX_NBSD_INST_LIBVBOX_DIR   := $(VBOX_NBSD_INST_LIB_DIR)/virtualbox
++VBOX_NBSD_INST_SHARE_DIR     := $(VBOX_NBSD_INST_STAGE_DIR)/share
++VBOX_NBSD_INST_SHAREAPP_DIR  := $(VBOX_NBSD_INST_SHARE_DIR)/applications
++VBOX_NBSD_INST_SHAREICON_DIR := $(VBOX_NBSD_INST_SHARE_DIR)/pixmaps
++VBOX_NBSD_INST_SHAREVBOX_DIR := $(VBOX_NBSD_INST_SHARE_DIR)/virtualbox
 +
 +# Unset this to speed up things during makefile hacking.
-+VBOX_FBSD_INST_DEP_ON_MAKEFILE := $(MAKEFILE_CURRENT)
++VBOX_NBSD_INST_DEP_ON_MAKEFILE := $(MAKEFILE_CURRENT)
 +
-+BLDDIRS  += $(VBOX_FBSD_INST_OUT_DIR) $(VBOX_FBSD_INST_STAGE_DIR)
-+PACKING  += $(PATH_STAGE_BIN)/$(VBOX_FBSD_PACKAGE_NAME)
++BLDDIRS  += $(VBOX_NBSD_INST_OUT_DIR) $(VBOX_NBSD_INST_STAGE_DIR)
++PACKING  += $(PATH_STAGE_BIN)/$(VBOX_NBSD_PACKAGE_NAME)
 +
 +OTHER_CLEAN   += \
-+	$(addprefix $(VBOX_FBSD_INST_STAGE_DIR)/,\
++	$(addprefix $(VBOX_NBSD_INST_STAGE_DIR)/,\
 +		pkg_plist \
 +		LICENSE) \
-+	$(wildcard $(VBOX_FBSD_INST_OUT_DIR)/VirtualBox-*)
++	$(wildcard $(VBOX_NBSD_INST_OUT_DIR)/VirtualBox-*)
 +
 +#
 +# NetBSD installs.
@@ -82,7 +82,7 @@ $NetBSD$
 +#
 +
 +# Strip these binaries
-+VBOX_FBSD_STRIP_BIN = \
++VBOX_NBSD_STRIP_BIN = \
 +	VBoxDD.so \
 +	VBoxDD2.so \
 +	VBoxREM.so \
@@ -118,7 +118,7 @@ $NetBSD$
 +	$(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 +
 +# Do not remove relocation information of these binaries
-+VBOX_FBSD_STRIP_OBJ = \
++VBOX_NBSD_STRIP_OBJ = \
 +	VBoxDD2RC.rc \
 +	VBoxDD2R0.r0 \
 +	VBoxDDRC.rc \
@@ -127,7 +127,7 @@ $NetBSD$
 +	VMMR0.r0
 +
 +# Do not strip anything of these files
-+VBOX_FBSD_NO_STRIP = \
++VBOX_NBSD_NO_STRIP = \
 +	$(if $(VBOX_OSE),,LICENSE) \
 +	$(if $(VBOX_WITH_MAIN), \
 +	  components/VBoxXPCOMBase.xpt \
@@ -136,13 +136,13 @@ $NetBSD$
 +
 +# EFI firmware
 +ifdef VBOX_WITH_EFIFW_PACKING
-+ VBOX_FBSD_NO_STRIP += \
++ VBOX_NBSD_NO_STRIP += \
 + 	VBoxEFI32.fd \
 + 	VBoxEFI64.fd
 +endif
 +
 +# Symlinks residing in bin/
-+VBOX_FBSD_SYMLINKS = \
++VBOX_NBSD_SYMLINKS = \
 +	$(if $(VBOX_WITH_MAIN), \
 +		VBoxManage \
 +		VBoxSVC) \
@@ -152,76 +152,76 @@ $NetBSD$
 +# Qt4 GUI
 +ifdef VBOX_WITH_QTGUI
 + include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-+ VBOX_FBSD_STRIP_BIN += \
++ VBOX_NBSD_STRIP_BIN += \
 + 	VBoxKeyboard.so \
 + 	VirtualBox \
 + 	$(if $(VBOX_WITH_HARDENING),VirtualBox.so) \
 +	$(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,)
-+ VBOX_FBSD_SYMLINKS += \
++ VBOX_NBSD_SYMLINKS += \
 + 	VirtualBox
-+ VBOX_FBSD_NO_STRIP += \
++ VBOX_NBSD_NO_STRIP += \
 +	$(VBOX_LICENSE_FILES) \
 + 	$(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \
 +	$(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \
 + 	$(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
-+ VBOX_FBSD_DESKTOP_FILE = \
++ VBOX_NBSD_DESKTOP_FILE = \
 +	virtualbox.desktop
-+ VBOX_FBSD_ICON_FILE = \
++ VBOX_NBSD_ICON_FILE = \
 +	VBox.png
 +endif
 +
 +# Guest Additions
 +ifdef VBOX_WITH_ADDITIONS_PACKING
-+ VBOX_FBSD_NO_STRIP += \
++ VBOX_NBSD_NO_STRIP += \
 + 	additions/VBoxGuestAdditions.iso
 +endif
 +
 +# Documentation
 +ifdef VBOX_WITH_DOCS_PACKING
-+ VBOX_FBSD_NO_STRIP += \
++ VBOX_NBSD_NO_STRIP += \
 +	VirtualBox.chm UserManual.pdf \
 +	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf)
-+ VBOX_FBSD_STRIP_BIN += \
++ VBOX_NBSD_STRIP_BIN += \
 +	$(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
 +endif
 +
 +# VRDP
 +ifdef VBOX_WITH_VRDP
-+ VBOX_FBSD_STRIP_BIN += \
++ VBOX_NBSD_STRIP_BIN += \
 +	VBoxVRDP.so \
 +	VBoxAuth.so
-+ VBOX_FBSD_NO_STRIP += \
++ VBOX_NBSD_NO_STRIP += \
 +	rdesktop-vrdp.tar.gz
 + ifdef VBOX_WITH_VRDP_RDESKTOP
-+#  VBOX_FBSD_NO_STRIP += \
++#  VBOX_NBSD_NO_STRIP += \
 +#	rdesktop-vrdp-keymaps
-+  VBOX_FBSD_STRIP_BIN += \
++  VBOX_NBSD_STRIP_BIN += \
 +	rdesktop-vrdp
 + endif
 +endif
 +
 +# Headless
 +ifdef VBOX_WITH_HEADLESS
-+ VBOX_FBSD_STRIP_BIN += \
++ VBOX_NBSD_STRIP_BIN += \
 +	VBoxHeadless \
 +	$(if $(VBOX_WITH_HARDENING),VBoxHeadless.so)
-+ VBOX_FBSD_SYMLINKS += \
++ VBOX_NBSD_SYMLINKS += \
 +	VBoxHeadless
 +endif
 +
 +# Webservices
 +ifdef VBOX_WITH_WEBSERVICES
-+ VBOX_FBSD_STRIP_BIN += \
++ VBOX_NBSD_STRIP_BIN += \
 +	vboxwebsrv \
 +	webtest
-+ VBOX_FBSD_SYMLINKS += \
++ VBOX_NBSD_SYMLINKS += \
 +	vboxwebsrv
 +endif
 +
 +# DTrace library, testcase and scripts (as the rest of this file, this makes bold
 +# ASSUMPTIONS about VBPX_INST_XXX variable values).
 +ifdef VBOX_WITH_DTRACE
-+ VBOX_FBSD_NO_STRIP += \
++ VBOX_NBSD_NO_STRIP += \
 +       $(addprefix dtrace/lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \
 +       $(addprefix dtrace/testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \
 +       $(addprefix dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES))
@@ -230,10 +230,10 @@ $NetBSD$
 +#
 +# All the bin files that goes into the archives.
 +#
-+VBOX_FBSD_ARCH_FILES := $(VBOX_FBSD_STRIP_BIN) $(VBOX_FBSD_STRIP_OBJ) $(VBOX_FBSD_NO_STRIP)
++VBOX_NBSD_ARCH_FILES := $(VBOX_NBSD_STRIP_BIN) $(VBOX_NBSD_STRIP_OBJ) $(VBOX_NBSD_NO_STRIP)
 +
 +# Cleanup of the files we copy/symlink from bin.
-+OTHER_CLEAN += $(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_ARCH_FILES))
++OTHER_CLEAN += $(addprefix $(VBOX_NBSD_INST_LIBVBOX_DIR)/,$(VBOX_NBSD_ARCH_FILES))
 +
 +#
 +# The module source archive
@@ -247,38 +247,38 @@ $NetBSD$
 +# The generic installer.
 +## @todo r=aeichner: Create pkg_plist dynamically based on the available features
 +#
-+$(PATH_STAGE_BIN)/$(VBOX_FBSD_PACKAGE_NAME): \
++$(PATH_STAGE_BIN)/$(VBOX_NBSD_PACKAGE_NAME): \
 +		$(VBOX_VERSION_STAMP) \
-+		$(VBOX_FBSD_INST_OUT_DIR)/pkg_plist \
-+		$(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_ARCH_FILES)) \
-+		$(addprefix $(VBOX_FBSD_INST_BIN_DIR)/,$(VBOX_FBSD_SYMLINKS)) \
++		$(VBOX_NBSD_INST_OUT_DIR)/pkg_plist \
++		$(addprefix $(VBOX_NBSD_INST_LIBVBOX_DIR)/,$(VBOX_NBSD_ARCH_FILES)) \
++		$(addprefix $(VBOX_NBSD_INST_BIN_DIR)/,$(VBOX_NBSD_SYMLINKS)) \
 +		$(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
-+		$(if $(VBOX_WITH_QTGUI),$(addprefix $(VBOX_FBSD_INST_SHAREAPP_DIR)/,$(VBOX_FBSD_DESKTOP_FILE)),) \
-+		$(if $(VBOX_WITH_QTGUI),$(addprefix $(VBOX_FBSD_INST_SHAREICON_DIR)/,$(VBOX_FBSD_ICON_FILE)),) \
-+		$(VBOX_PATH_FBSD_INST_SRC)/postinstall.sh \
-+		$(VBOX_PATH_FBSD_INST_SRC)/postdeinstall.sh
++		$(if $(VBOX_WITH_QTGUI),$(addprefix $(VBOX_NBSD_INST_SHAREAPP_DIR)/,$(VBOX_NBSD_DESKTOP_FILE)),) \
++		$(if $(VBOX_WITH_QTGUI),$(addprefix $(VBOX_NBSD_INST_SHAREICON_DIR)/,$(VBOX_NBSD_ICON_FILE)),) \
++		$(VBOX_PATH_NBSD_INST_SRC)/postinstall.sh \
++		$(VBOX_PATH_NBSD_INST_SRC)/postdeinstall.sh
 +	$(call MSG_TOOL,pkg_create,,$@)
 +	$(QUIET)$(RM) -f $@
 +	$(QUIET)pkg_create \
-+		-I $(VBOX_PATH_FBSD_INST_SRC)/postinstall.sh \
-+		-K $(VBOX_PATH_FBSD_INST_SRC)/postdeinstall.sh \
-+		-c $(VBOX_PATH_FBSD_INST_SRC)/pkg-comment \
-+		-d $(VBOX_PATH_FBSD_INST_SRC)/pkg-descr \
-+		-f $(VBOX_FBSD_INST_OUT_DIR)/pkg_plist \
++		-I $(VBOX_PATH_NBSD_INST_SRC)/postinstall.sh \
++		-K $(VBOX_PATH_NBSD_INST_SRC)/postdeinstall.sh \
++		-c $(VBOX_PATH_NBSD_INST_SRC)/pkg-comment \
++		-d $(VBOX_PATH_NBSD_INST_SRC)/pkg-descr \
++		-f $(VBOX_NBSD_INST_OUT_DIR)/pkg_plist \
 +		-p /usr/local \
-+		-s $(VBOX_FBSD_INST_STAGE_DIR) \
++		-s $(VBOX_NBSD_INST_STAGE_DIR) \
 +		$@
-+	$(QUIET)$(RM) -Rf $(VBOX_FBSD_INST_STAGE_DIR)
++	$(QUIET)$(RM) -Rf $(VBOX_NBSD_INST_STAGE_DIR)
 +
-+$(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_STRIP_BIN)): \
-+		$(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
++$(addprefix $(VBOX_NBSD_INST_LIBVBOX_DIR)/,$(VBOX_NBSD_STRIP_BIN)): \
++		$(VBOX_NBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
 +	$(call MSG_INST_FILE,$<,$@)
 +	$(QUIET)$(INSTALL) -d $(dir $@)
 +	$(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
 +
-+# pattern rule for striping and copying the VBOX_FBSD_STRIP_OBJ files to install/lib/virtualbox
-+$(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_STRIP_OBJ)): \
-+		$(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
++# pattern rule for striping and copying the VBOX_NBSD_STRIP_OBJ files to install/lib/virtualbox
++$(addprefix $(VBOX_NBSD_INST_LIBVBOX_DIR)/,$(VBOX_NBSD_STRIP_OBJ)): \
++		$(VBOX_NBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
 +	$(call MSG_INST_FILE,$<,$@)
 +	$(QUIET)$(INSTALL) -d $(dir $@)
 +ifeq ($(VBOX_DO_STRIP),)
@@ -289,41 +289,41 @@ $NetBSD$
 +	$(QUIET)$(RM) -f -- $@.tmp
 +endif
 +
-+# pattern rule for linking the VBOX_FBSD_NO_STRIP into lib/virtualbox/
-+$(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_NO_STRIP)): \
-+		$(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
++# pattern rule for linking the VBOX_NBSD_NO_STRIP into lib/virtualbox/
++$(addprefix $(VBOX_NBSD_INST_LIBVBOX_DIR)/,$(VBOX_NBSD_NO_STRIP)): \
++		$(VBOX_NBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
 +	$(call MSG_INST_FILE,$<,$@)
 +	$(QUIET)$(INSTALL) -d $(dir $@)
 +	$(QUIET)$(RM) -f $@
 +	$(QUIET)$(INSTALL) -m 0644 $< $@
 +
-+# pattern rule for symlinking the VBOX_FBSD_SYMLINKS into bin/
-+$(addprefix $(VBOX_FBSD_INST_BIN_DIR)/,$(VBOX_FBSD_SYMLINKS)): \
-+		$(VBOX_FBSD_INST_BIN_DIR)/% : $(PATH_STAGE_BIN)/%
++# pattern rule for symlinking the VBOX_NBSD_SYMLINKS into bin/
++$(addprefix $(VBOX_NBSD_INST_BIN_DIR)/,$(VBOX_NBSD_SYMLINKS)): \
++		$(VBOX_NBSD_INST_BIN_DIR)/% : $(PATH_STAGE_BIN)/%
 +	$(call MSG_INST_SYM,$<,$@)
 +	$(QUIET)$(INSTALL) -d $(dir $@)
 +	$(QUIET)$(RM) -f $@
 +	$(QUIET)$(LN_SYMLINK) ../lib/virtualbox/$(notdir $@) $@
 +
-+# pattern rule for copying the VBOX_FBSD_DESKTOP_FILE into share/applications/
-+$(addprefix $(VBOX_FBSD_INST_SHAREAPP_DIR)/,$(VBOX_FBSD_DESKTOP_FILE)): \
-+		$(VBOX_FBSD_INST_SHAREAPP_DIR)/% : $(PATH_STAGE_BIN)/%
++# pattern rule for copying the VBOX_NBSD_DESKTOP_FILE into share/applications/
++$(addprefix $(VBOX_NBSD_INST_SHAREAPP_DIR)/,$(VBOX_NBSD_DESKTOP_FILE)): \
++		$(VBOX_NBSD_INST_SHAREAPP_DIR)/% : $(PATH_STAGE_BIN)/%
 +	$(call MSG_INST_FILE,$<,$@)
 +	$(QUIET)$(INSTALL) -d $(dir $@)
 +	$(QUIET)$(RM) -f $@
 +	$(QUIET)$(INSTALL) -m 0644 $< $@
 +
-+# pattern rule for copying the VBOX_FBSD_ICON_FILE into share/pixmaps/
-+$(addprefix $(VBOX_FBSD_INST_SHAREICON_DIR)/,$(VBOX_FBSD_ICON_FILE)): \
-+		$(VBOX_FBSD_INST_SHAREICON_DIR)/% : $(PATH_STAGE_BIN)/%
++# pattern rule for copying the VBOX_NBSD_ICON_FILE into share/pixmaps/
++$(addprefix $(VBOX_NBSD_INST_SHAREICON_DIR)/,$(VBOX_NBSD_ICON_FILE)): \
++		$(VBOX_NBSD_INST_SHAREICON_DIR)/% : $(PATH_STAGE_BIN)/%
 +	$(call MSG_INST_FILE,$<,$@)
 +	$(QUIET)$(INSTALL) -d $(dir $@)
 +	$(QUIET)$(RM) -f $@
 +	$(QUIET)$(INSTALL) -m 0644 $< $@
 +
 +# Create pkg_plist
-+$(VBOX_FBSD_INST_OUT_DIR)/pkg_plist: \
-+		$(VBOX_PATH_FBSD_INST_SRC)/pkg_plist
++$(VBOX_NBSD_INST_OUT_DIR)/pkg_plist: \
++		$(VBOX_PATH_NBSD_INST_SRC)/pkg_plist
 +	$(call MSG_INST_FILE,$<,$@)
 +	$(QUIET)$(INSTALL) -d $(dir $@)
 +	$(QUIET)$(SED) \
diff --git a/virtualbox/patches/patch-src_VBox_Runtime_r0drv_netbsd_thread-r0drv-netbsd.c b/virtualbox/patches/patch-src_VBox_Runtime_r0drv_netbsd_thread-r0drv-netbsd.c
index c574f28..9bbffbc 100644
--- a/virtualbox/patches/patch-src_VBox_Runtime_r0drv_netbsd_thread-r0drv-netbsd.c
+++ b/virtualbox/patches/patch-src_VBox_Runtime_r0drv_netbsd_thread-r0drv-netbsd.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/VBox/Runtime/r0drv/netbsd/thread-r0drv-netbsd.c.orig	2016-07-07 07:08:47.004520434 +0000
+--- src/VBox/Runtime/r0drv/netbsd/thread-r0drv-netbsd.c.orig	2016-07-08 22:38:41.522099941 +0000
 +++ src/VBox/Runtime/r0drv/netbsd/thread-r0drv-netbsd.c
 @@ -0,0 +1,181 @@
 +/*  thread-r0drv-netbsd.c $ */
@@ -51,7 +51,7 @@ $NetBSD$
 +}
 +
 +
-+static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMillies)
++static int rtR0ThreadNbsdSleepCommon(RTMSINTERVAL cMillies)
 +{
 +    int rc;
 +    int cTicks;
@@ -107,13 +107,13 @@ $NetBSD$
 +
 +RTDECL(int) RTThreadSleep(RTMSINTERVAL cMillies)
 +{
-+    return rtR0ThreadFbsdSleepCommon(cMillies);
++    return rtR0ThreadNbsdSleepCommon(cMillies);
 +}
 +
 +
 +RTDECL(int) RTThreadSleepNoLog(RTMSINTERVAL cMillies)
 +{
-+    return rtR0ThreadFbsdSleepCommon(cMillies);
++    return rtR0ThreadNbsdSleepCommon(cMillies);
 +}
 +
 +
diff --git a/virtualbox/patches/patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.cfg b/virtualbox/patches/patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.cfg
new file mode 100644
index 0000000..022b369
--- /dev/null
+++ b/virtualbox/patches/patch-src_libs_xpcom18a4_nsprpub_pr_include_md___netbsd.cfg
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/libs/xpcom18a4/nsprpub/pr/include/md/_netbsd.cfg.orig	2016-03-04 19:30:36.000000000 +0000
++++ src/libs/xpcom18a4/nsprpub/pr/include/md/_netbsd.cfg
+@@ -140,7 +140,7 @@
+ #define PR_ALIGN_OF_DOUBLE  8
+ #define PR_ALIGN_OF_POINTER 4
+ 
+-#elif defined(__alpha__)
++#elif defined(__alpha__) || defined(__x86_64__)
+ #define IS_LITTLE_ENDIAN 1
+ #undef  IS_BIG_ENDIAN
+ #define	HAVE_LONG_LONG
Prev by Date: virtualbox: Set of patches pushing the NetBSD build forward
Next by Date: atlas: Attempt to reuse lapack's libraries
Previous by Thread: virtualbox: Set of patches pushing the NetBSD build forward
Next by Thread: atlas: Attempt to reuse lapack's libraries
Indexes:
Home | Main Index | Thread Index | Old Index