11 files changed, 244 insertions, 95 deletions

diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 1814debbabc7..b6c2a9428d74 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.12
-PORTREVISION=	2
+DISTVERSION=	4.3.16
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index 393100269dc5..108a1619f509 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.3.12.tar.bz2) = db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f
-SIZE (VirtualBox-4.3.12.tar.bz2) = 90346010
-SHA256 (VBoxGuestAdditions_4.3.12.iso) = c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d
-SIZE (VBoxGuestAdditions_4.3.12.iso) = 64770048
+SHA256 (VirtualBox-4.3.16.tar.bz2) = 99c32e646dbc93cbf4cc0b62ca6c1d24113a295fd758dc15724c14908dd6dcb3
+SIZE (VirtualBox-4.3.16.tar.bz2) = 97875965
+SHA256 (VBoxGuestAdditions_4.3.16.iso) = d58f678613bd37f5f94bcf324708af63572fc8582833a2558574090231fd080f
+SIZE (VBoxGuestAdditions_4.3.16.iso) = 58232832
diff --git a/emulators/virtualbox-ose/files/patch-Config.kmk b/emulators/virtualbox-ose/files/patch-Config.kmk
index f5bb9a607357..6fa848c740fe 100644
--- a/emulators/virtualbox-ose/files/patch-Config.kmk
+++ b/emulators/virtualbox-ose/files/patch-Config.kmk
@@ -1,6 +1,6 @@
---- Config.kmk.orig	2014-03-26 15:12:14.000000000 -0400
-+++ Config.kmk	2014-05-09 14:58:40.000000000 -0400
-@@ -334,7 +334,7 @@
+--- Config.kmk.orig	2014-07-16 16:59:27.000000000 -0400
++++ Config.kmk	2014-07-16 17:12:48.000000000 -0400
+@@ -339,7 +339,7 @@
  # Include documentation in the package
  VBOX_WITH_DOCS_PACKING = 1
  # Include CHM when building docs (unset in LocalConfig.kmk to suppress CHM)
@@ -8,8 +8,8 @@
 +ifn1of ($(KBUILD_TARGET), freebsd linux)
   VBOX_WITH_DOCS_CHM = 1
  endif
- # Include translations
-@@ -584,7 +584,7 @@
+ # By default only include translations in documentation-only builds
+@@ -602,7 +602,7 @@
  # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
  VBOX_WITH_VBOX_IMG =
  # Enables the VPX module for VM video capturing
@@ -18,7 +18,7 @@
   VBOX_WITH_VPX = 1
  endif
  # Enable shared folders
-@@ -877,10 +877,6 @@
+@@ -891,10 +891,6 @@
   VBOX_WITH_VBOXSDL=
  endif
  
@@ -29,16 +29,16 @@
  ifeq ($(KBUILD_TARGET),haiku)
   # Don't bother with SDL ttf for now.
   VBOX_WITH_SECURELABEL=
-@@ -1035,7 +1031,7 @@
-  VBOX_WITH_OS2_ADDITIONS_BIN=
+@@ -1050,7 +1046,7 @@
   VBOX_WITH_SECURELABEL=
   VBOX_WITH_KCHMVIEWER=
+  VBOX_WITH_PLUGIN_CRYPT=
 - ifn1of ($(KBUILD_TARGET), linux)
 + ifn1of ($(KBUILD_TARGET), freebsd linux)
    VBOX_WITH_DOCS=
    VBOX_WITH_DOCS_PACKING=
   endif
-@@ -3399,16 +3395,16 @@
+@@ -3476,16 +3472,16 @@
  	$(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \
  	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
  	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
@@ -58,8 +58,12 @@
  	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
  	-nostdinc
  TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
-@@ -3642,8 +3638,6 @@
- 	/usr/X11R6/include \
+@@ -3719,12 +3715,8 @@
+ TEMPLATE_VBOXR3EXE_TOOL                = GXX3
+ TEMPLATE_VBOXR3EXE_LIBS                = pthread
+ TEMPLATE_VBOXR3EXE_INCS               += \
+-	/usr/include \
+-	/usr/X11R6/include \
  	/usr/local/include
  TEMPLATE_VBOXR3EXE_LIBPATH            += \
 -	/usr/lib \
@@ -67,17 +71,21 @@
  	/usr/local/lib
   else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBOXR3EXE_TOOL                = GXX3PLAIN
-@@ -3880,7 +3874,7 @@
- # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
- # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
- endif
--ifn1of ($(KBUILD_TARGET), win os2)
-+ifn1of ($(KBUILD_TARGET), win os2 freebsd)
+@@ -3982,7 +3974,7 @@
+  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)
++else ifn1of ($(KBUILD_TARGET), os2 freebsd)
   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))
  endif
-@@ -4221,8 +4215,6 @@
- 	/usr/X11R6/include \
+@@ -4370,12 +4362,8 @@
+ TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
+ TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
+ TEMPLATE_VBOXMAINEXE_INCS               += \
+-	/usr/include \
+-	/usr/X11R6/include \
  	/usr/local/include
  TEMPLATE_VBOXMAINEXE_LIBPATH            += \
 -	/usr/lib \
@@ -85,8 +93,12 @@
  	/usr/local/lib
  else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
-@@ -4688,8 +4680,6 @@
- 	/usr/X11R6/include \
+@@ -4838,12 +4826,8 @@
+ 	$(VBOX_LIBPATH_X11)
+    ifeq ($(KBUILD_TARGET),freebsd)
+     TEMPLATE_VBOXQT4GUIEXE_INCS += \
+-	/usr/include \
+-	/usr/X11R6/include \
  	/usr/local/include
      TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
 -	/usr/lib \
@@ -94,12 +106,16 @@
  	/usr/local/lib
     endif
     ifeq ($(KBUILD_TARGET),solaris)
-@@ -4884,8 +4874,6 @@
- 	/usr/X11R6/include \
+@@ -5035,12 +5019,8 @@
+ TEMPLATE_VBoxBldProg_TOOL                = GXX3
+ TEMPLATE_VBoxBldProg_LIBS                = pthread
+ TEMPLATE_VBoxBldProg_INCS               += \
+-	/usr/include \
+-	/usr/X11R6/include \
  	/usr/local/include
- TEMPLATE_VBOXBLDPROG_LIBPATH            += \
+ TEMPLATE_VBoxBldProg_LIBPATH            += \
 -	/usr/lib \
 -	/usr/X11R6/lib \
  	/usr/local/lib
   else ifeq ($(KBUILD_HOST),solaris)
- TEMPLATE_VBOXBLDPROG_TOOL                = GXX3PLAIN
+ TEMPLATE_VBoxBldProg_TOOL                = GXX3PLAIN
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
index c5da5f97aa81..92b4c351ed96 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
@@ -1,30 +1,17 @@
---- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig	2014-03-26 15:12:42.000000000 -0400
-+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient	2014-04-01 13:38:20.000000000 -0400
-@@ -30,8 +30,8 @@
- xorgbin=Xorg
- found=`which Xorg | grep "no Xorg"`
- if test ! -z "$found"; then
--    if test -f "/usr/X11/bin/Xorg"; then
--        xorgbin=/usr/X11/bin/Xorg
-+    if test -f "/usr/local/bin/Xorg"; then
-+        xorgbin=/usr/local/bin/Xorg
-     else
-         exit 1
-     fi
-@@ -42,11 +42,11 @@
-     no_display=1
+--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig	2014-09-09 23:47:06.000000000 +0400
++++ src/VBox/Additions/x11/Installer/98vboxadd-xclient	2014-09-10 23:59:10.884611643 +0400
+@@ -28,9 +28,9 @@
+ # we had in mind, so we do not start VBoxClient in that case.  We do not use
+ # "exit" here as this script is "source"d, not executed.
+ if test -z "${SSH_CONNECTION}"; then
+-  /usr/bin/VBoxClient --clipboard
+-  /usr/bin/VBoxClient --checkhostversion
+-  /usr/bin/VBoxClient --display
+-  /usr/bin/VBoxClient --seamless
+-  /usr/bin/VBoxClient --draganddrop
++  /usr/local/bin/VBoxClient --clipboard
++  /usr/local/bin/VBoxClient --checkhostversion
++  /usr/local/bin/VBoxClient --display
++  /usr/local/bin/VBoxClient --seamless
++  /usr/local/bin/VBoxClient --draganddrop
  fi
- 
--/usr/bin/VBoxClient --clipboard
--/usr/bin/VBoxClient --checkhostversion
-+/usr/local/bin/VBoxClient --clipboard
-+/usr/local/bin/VBoxClient --checkhostversion
- test -z "$no_display" &&
--    /usr/bin/VBoxClient --display
-+    /usr/local/bin/VBoxClient --display
- test -z "$no_display" &&
--    /usr/bin/VBoxClient --seamless
-+    /usr/local/bin/VBoxClient --seamless
- test -z "$no_display" &&
--    /usr/bin/VBoxClient --draganddrop
-+    /usr/local/bin/VBoxClient --draganddrop
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
index 7f5ea7b042dc..3ca631699f11 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
@@ -1,6 +1,6 @@
---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2014-02-25 12:00:33.000000000 -0500
-+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2014-02-26 16:10:28.000000000 -0500
-@@ -33,7 +33,7 @@
+--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2014-09-14 16:52:56.396443385 +0400
++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2014-09-14 16:57:44.198422874 +0400
+@@ -36,7 +36,7 @@
  vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
  vboxvideo_15_DEFS := \
  	$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS
@@ -9,7 +9,7 @@
   vboxvideo_15_DEFS += \
   	VBOX_DRI
  endif
-@@ -198,7 +198,7 @@
+@@ -201,7 +201,7 @@
  vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
@@ -18,7 +18,7 @@
   vboxvideo_drv_15_DEFS += \
   	VBOX_DRI_OLD
  endif
-@@ -207,7 +207,7 @@
+@@ -210,7 +210,7 @@
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3
  vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
  vboxvideo_drv_15_SOURCES  = $(vboxvideo_drv_13_SOURCES)
@@ -27,7 +27,7 @@
   vboxvideo_drv_15_SOURCES += \
   	vboxvideo_dri.c
  endif
-@@ -220,7 +220,7 @@
+@@ -223,7 +223,7 @@
  vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
@@ -36,7 +36,7 @@
   vboxvideo_drv_16_DEFS += \
   	VBOX_DRI_OLD
  endif
-@@ -238,11 +238,19 @@
+@@ -241,11 +241,19 @@
  vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
@@ -56,7 +56,7 @@
  if1of ($(KBUILD_TARGET), linux solaris)
   vboxvideo_drv_17_SOURCES += \
   	vboxvideo_dri2.c
-@@ -256,6 +264,10 @@
+@@ -259,6 +267,10 @@
  vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
@@ -67,7 +67,7 @@
  vboxvideo_drv_18_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0
-@@ -270,6 +282,10 @@
+@@ -273,6 +285,10 @@
  vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
@@ -78,7 +78,15 @@
  vboxvideo_drv_19_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0
-@@ -288,7 +304,11 @@
+@@ -287,11 +303,19 @@
+ vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
++if1of ($(KBUILD_TARGET), freebsd)
++ vboxvideo_drv_19_DEFS += \
++ 	VBOX_DRI_OLD
++endif
+ vboxvideo_drv_110_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0
  vboxvideo_drv_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -91,7 +99,15 @@
  
  
  #
-@@ -302,7 +322,7 @@
+@@ -301,11 +325,15 @@
+ vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
++if1of ($(KBUILD_TARGET), freebsd)
++ vboxvideo_drv_111_DEFS += \
++ 	VBOX_DRI_OLD
++endif
+ vboxvideo_drv_111_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0
  vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -100,7 +116,15 @@
  
  
  #
-@@ -316,7 +336,7 @@
+@@ -315,11 +343,15 @@
+ vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
++if1of ($(KBUILD_TARGET), freebsd)
++ vboxvideo_drv_112_DEFS += \
++ 	VBOX_DRI_OLD
++endif
+ vboxvideo_drv_112_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0
  vboxvideo_drv_112_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -109,7 +133,15 @@
  
  
  #
-@@ -330,7 +350,7 @@
+@@ -329,11 +361,15 @@
+ vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
++if1of ($(KBUILD_TARGET), freebsd)
++ vboxvideo_drv_113_DEFS += \
++ 	VBOX_DRI_OLD
++endif
+ vboxvideo_drv_113_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0
  vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -118,7 +150,15 @@
  
  
  #
-@@ -344,7 +364,7 @@
+@@ -343,11 +379,15 @@
+ vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
++if1of ($(KBUILD_TARGET), freebsd)
++ vboxvideo_drv_114_DEFS += \
++ 	VBOX_DRI_OLD
++endif
+ vboxvideo_drv_114_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0
  vboxvideo_drv_114_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -127,7 +167,15 @@
  
  
  #
-@@ -358,7 +378,7 @@
+@@ -357,11 +397,15 @@
+ vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000
++if1of ($(KBUILD_TARGET), freebsd)
++ vboxvideo_drv_115_DEFS += \
++ 	VBOX_DRI_OLD
++endif
+ vboxvideo_drv_115_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0
  vboxvideo_drv_115_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
@@ -135,4 +183,15 @@
 +vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_110_SOURCES)
  
  
- ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+ #
+@@ -371,6 +415,10 @@
+ vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101600000
++if1of ($(KBUILD_TARGET), freebsd)
++ vboxvideo_drv_116_DEFS += \
++ 	VBOX_DRI_OLD
++endif
+ vboxvideo_drv_116_INCS = \
+ 	$(vboxvideo_xorg_INCS) \
+ 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp
new file mode 100644
index 000000000000..37c3fb2bbb1d
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp
@@ -0,0 +1,11 @@
+--- src/VBox/Devices/Storage/DevATA.cpp.orig	2014-07-15 13:24:35.000000000 -0400
++++ src/VBox/Devices/Storage/DevATA.cpp	2014-07-16 18:17:03.000000000 -0400
+@@ -2479,7 +2479,7 @@
+         return 0;
+ 
+     ataH2BE_U16(pbBuf, 0x0); /* feature 0: list of profiles supported */
+-    pbBuf[2] = (0 << 2) | (1 << 1) | (1 || 0); /* version 0, persistent, current */
++    pbBuf[2] = (0 << 2) | (1 << 1) | (1 << 0); /* version 0, persistent, current */
+     pbBuf[3] = 8; /* additional bytes for profiles */
+     /* The MMC-3 spec says that DVD-ROM read capability should be reported
+      * before CD-ROM read capability. */
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp
new file mode 100644
index 000000000000..1616ee2f52a2
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp
@@ -0,0 +1,62 @@
+--- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig	2014-09-09 23:54:12.000000000 +0400
++++ src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp	2014-09-11 00:40:37.313435496 +0400
+@@ -52,6 +52,7 @@
+ #include <iprt/asm.h>
+ #include <iprt/string.h>
+ #include <iprt/file.h>
++#include <iprt/pipe.h>
+ #include "../USBProxyDevice.h"
+ 
+ /** Maximum endpoints supported. */
+@@ -95,12 +96,16 @@
+ {
+     /** The open file. */
+     RTFILE                 hFile;
+-    /** Software endpoint structures */
+-    USBENDPOINTFBSD        aSwEndpoint[USBFBSD_MAXENDPOINTS];
+     /** Flag whether an URB is cancelling. */
+     bool                   fCancelling;
+     /** Flag whether initialised or not */
+     bool                   fInit;
++    /** Pipe handle for waiking up - writing end. */
++    RTPIPE                 hPipeWakeupW;
++    /** Pipe handle for waiking up - reading end. */
++    RTPIPE                 hPipeWakeupR;
++    /** Software endpoint structures */
++    USBENDPOINTFBSD        aSwEndpoint[USBFBSD_MAXENDPOINTS];
+     /** Kernel endpoint structures */
+     struct usb_fs_endpoint aHwEndpoint[USBFBSD_MAXENDPOINTS];
+ } USBPROXYDEVFBSD, *PUSBPROXYDEVFBSD;
+@@ -453,7 +458,6 @@
+     pDevFBSD->hFile = NIL_RTFILE;
+ 
+     RTMemFree(pDevFBSD);
+-    pProxyDev->Backend.pv = NULL;
+ 
+     LogFlow(("usbProxyFreeBSDClose: returns\n"));
+ }
+@@ -984,6 +988,16 @@
+     return usbProxyFreeBSDEndpointClose(pProxyDev, index);
+ }
+ 
++static DECLCALLBACK(int) usbProxyFreeBSDWakeup(PUSBPROXYDEV pProxyDev)
++{
++    PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD);
++    size_t cbIgnored;
++
++    LogFlowFunc(("pProxyDev=%p\n", pProxyDev));
++
++    return RTPipeWrite(pDevFBSD->hPipeWakeupW, "", 1, &cbIgnored);
++}
++
+ /**
+  * The FreeBSD USB Proxy Backend.
+  */
+@@ -1005,6 +1019,7 @@
+     usbProxyFreeBSDUrbQueue,
+     usbProxyFreeBSDUrbCancel,
+     usbProxyFreeBSDUrbReap,
++    usbProxyFreeBSDWakeup,
+     0
+ };
+ 
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
index 56fa83e858e0..6cbc6e1b2193 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
@@ -1,6 +1,14 @@
---- src/VBox/HostDrivers/Support/freebsd/Makefile.orig	2013-10-17 00:51:57.724397794 +0400
-+++ src/VBox/HostDrivers/Support/freebsd/Makefile	2013-10-17 00:52:05.491398026 +0400
-@@ -170,6 +170,7 @@
+--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig	2014-09-09 23:54:29.000000000 +0400
++++ src/VBox/HostDrivers/Support/freebsd/Makefile	2014-09-15 02:58:19.712268153 +0400
+@@ -81,6 +81,7 @@
+ 	handletable.c \
+ 	handletablectx.c \
+ 	once.c \
++	term.c \
+ 	thread.c
+ 
+ .PATH:	${.CURDIR}/common/string
+@@ -170,6 +171,7 @@
  SRCS += \
  	semspinmutex-r0drv-generic.c \
  	mpnotification-r0drv-generic.c \
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
new file mode 100644
index 000000000000..47828ab0cef5
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
@@ -0,0 +1,10 @@
+--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig	2014-09-15 03:01:58.782238686 +0400
++++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv	2014-09-15 03:02:08.840242076 +0400
+@@ -112,6 +112,7 @@
+     ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.h=>common/misc/handletable.h \
+     ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \
+     ${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \
++    ${PATH_ROOT}/src/VBox/Runtime/common/misc/term.cpp=>common/misc/term.c \
+     ${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \
+     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyP.cpp=>common/string/RTStrCopyP.c \
+     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopy.cpp=>common/string/RTStrCopy.c \
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
index 0f80ecabe040..9966761b1b84 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk
@@ -1,8 +1,5 @@
-Ticket #11803: Fails to build with gSOAP 2.8.13
-https://www.virtualbox.org/ticket/11803
-
---- src/VBox/Main/webservice/Makefile.kmk.orig	2013-12-18 11:10:26.000000000 -0500
-+++ src/VBox/Main/webservice/Makefile.kmk	2014-01-09 15:56:26.000000000 -0500
+--- src/VBox/Main/webservice/Makefile.kmk.orig	2014-09-09 23:54:50.000000000 +0400
++++ src/VBox/Main/webservice/Makefile.kmk	2014-09-11 16:34:40.678876468 +0400
 @@ -159,7 +159,6 @@
  RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
  
@@ -20,17 +17,17 @@ https://www.virtualbox.org/ticket/11803
  	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
  	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
  
-@@ -690,17 +687,14 @@
- # want to use wildcard (all commands are expaned when the rule is evaluated).
+@@ -691,17 +688,14 @@
+ # however we cannot as it is subject to caching.  Let the shell do the globbing.
  $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
  	$(RM) -f $@
 -	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
 +	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
  ifdef VBOX_GSOAP_VERBOSE
- 	$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml) $(PATH_TARGET_SOAPDEMOXML)
+ 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/
  endif
--	$(MV) -f $(wildcard $(VBOXWEB_OUT_DIR)/soapvbox*.h) $(PATH_TARGET_SOAPDEMOHEADERS)
- 	$(MV) -f $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)
+-	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/
+ 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/
  	$(APPEND) $@ done
  
 -$(PATH_TARGET_SOAPDEMONSMAPS) \
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
index 255f2563dda1..986b4b9c3cce 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
@@ -1,6 +1,6 @@
---- src/VBox/Runtime/Makefile.kmk.orig	2013-12-18 11:10:31.000000000 -0500
-+++ src/VBox/Runtime/Makefile.kmk	2014-02-21 13:45:17.000000000 -0500
-@@ -157,6 +157,11 @@
+--- src/VBox/Runtime/Makefile.kmk.orig	2014-07-15 13:25:15.000000000 -0400
++++ src/VBox/Runtime/Makefile.kmk	2014-07-16 17:15:58.000000000 -0400
+@@ -146,6 +146,11 @@
  	IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\"
  
  #
@@ -9,10 +9,10 @@
 +r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS)
 +
 +#
- # Unicode Specification reader used to regenerate unidata.cpp.
+ # Unicode Specification reader used to regenerate unidata-*.cpp.
  #
- uniread_TEMPLATE = VBOXBLDPROG
-@@ -906,7 +911,7 @@
+ uniread_TEMPLATE = VBoxBldProg
+@@ -1004,7 +1009,7 @@
  	r3/posix/RTMemProtect-posix.cpp \
  	r3/posix/RTPathUserHome-posix.cpp \
  	r3/posix/RTSystemQueryOSInfo-posix.cpp \