- Update to 4.3.6

Obtained from: svn.redports.org/virtualbox Thanks to: all testers of the 3 CFTs
author: Bernhard Froehlich <decke@FreeBSD.org> 2014-01-23 17:18:42 +0000
committer: Bernhard Froehlich <decke@FreeBSD.org> 2014-01-23 17:18:42 +0000
commit: 580dc0dd08648bc3e799c8b7f475f2ff24b77e05 (patch)
tree: d6dc22e0cb0fdcb6529738f948708420583f1b2b /emulators
parent: - Stage support (diff)
28 files changed, 175 insertions, 654 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 1d4a3486d203..80d2eb2df217 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.22
+DISTVERSION=	4.3.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -27,6 +27,7 @@ USES=		iconv kmod
 USE_GCC=	any
 ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
+USE_PYTHON_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 HAS_CONFIGURE=	yes
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index f6a742ba3954..24e378bdad60 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
-SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
+SHA256 (VirtualBox-4.3.6.tar.bz2) = c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27
+SIZE (VirtualBox-4.3.6.tar.bz2) = 89609199
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
new file mode 100644
index 000000000000..ed9f2b80ce46
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
@@ -0,0 +1,10 @@
+--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig	2013-11-29 14:20:37.000000000 -0500
++++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile	2013-12-15 00:12:59.000000000 -0500
+@@ -155,6 +155,7 @@
+ SRCS += \
+ 	semspinmutex-r0drv-generic.c \
+ 	mpnotification-r0drv-generic.c \
++	threadctxhooks-r0drv-generic.c \
+ 	RTMpIsCpuWorkPending-r0drv-generic.c
+ 
+ .PATH:	${.CURDIR}/VBox
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
new file mode 100644
index 000000000000..cde44a17359a
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
@@ -0,0 +1,10 @@
+--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig	2014-01-04 05:34:34.000000000 +0000
++++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest	2014-01-04 05:34:41.000000000 +0000
+@@ -185,6 +185,7 @@
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h=>r0drv/freebsd/sleepqueue-r0drv-freebsd.h \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c=>r0drv/generic/semspinmutex-r0drv-generic.c \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp=>r0drv/generic/mpnotification-r0drv-generic.c \
++    ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/threadctxhooks-r0drv-generic.cpp=>r0drv/generic/threadctxhooks-r0drv-generic.c \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp=>r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.c \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \
+     ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
deleted file mode 100644
index f8b9743c21c8..000000000000
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2013-09-06 06:30:30.000000000 -0600
-+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2013-09-18 12:01:45.000000000 -0600
-@@ -79,8 +79,13 @@
-             return VERR_NO_EXEC_MEMORY;
- 
-         /* Addr contains a start address vm_map_find will start searching for suitable space at. */
-+#if __FreeBSD_version >= 1000055
-+        int rc = vm_map_find(kernel_map, pVmObject, 0, &Addr,
-+                             cbAllocated, 0, VMFS_ANY_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
-+#else
-         int rc = vm_map_find(kernel_map, pVmObject, 0, &Addr,
-                              cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0);
-+#endif
-         if (rc == KERN_SUCCESS)
-         {
-             rc = vm_map_wire(kernel_map, Addr, Addr + cbAllocated,
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
index b666b7ed0362..b760cfe7f940 100644
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
@@ -7,17 +7,11 @@ From Alan L. Cox on FreeBSD-current:
     answer that question.
 
 [1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html
----
- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-index 5c90cf3..1176b51 100644
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-@@ -164,14 +164,19 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-         {
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-11-29 12:04:53.000000000 +0100
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-11-29 12:37:29.000000000 +0100
+@@ -168,14 +168,19 @@
              VM_OBJECT_LOCK(pMemFreeBSD->pObject);
+ #endif
              vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
 +#if __FreeBSD_version < 900000
 +            /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
@@ -32,10 +26,10 @@ index 5c90cf3..1176b51 100644
 +#if __FreeBSD_version < 900000
              vm_page_unlock_queues();
 +#endif
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-@@ -263,11 +268,15 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
+ #else
+@@ -291,11 +296,15 @@
              while (iPage-- > 0)
              {
                  pPage = vm_page_lookup(pObject, iPage);
@@ -49,8 +43,5 @@ index 5c90cf3..1176b51 100644
                  vm_page_unlock_queues();
 +#endif
              }
-             VM_OBJECT_UNLOCK(pObject);
-             return rcNoMem;
--- 
-1.7.11.5
-
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pObject);
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
deleted file mode 100644
index 6dfe0b99208e..000000000000
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-09-06 12:30:30.000000000 +0000
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-09-21 18:12:53.000000000 +0000
-@@ -286,9 +286,15 @@
-     pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
- 
-     /* No additional object reference for auto-deallocation upon unmapping. */
-+#if __FreeBSD_version >= 1000055
-+    rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
-+                     &MapAddress, pMemFreeBSD->Core.cb, 0, VMFS_ANY_SPACE,
-+                     fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
-+#else
-     rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
-                      &MapAddress, pMemFreeBSD->Core.cb, VMFS_ANY_SPACE,
-                      fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
-+#endif
- 
-     if (rc == KERN_SUCCESS)
-     {
-@@ -551,6 +557,9 @@
-                      0,                             /* offset */
-                      &MapAddress,                   /* addr (IN/OUT) */
-                      cb,                            /* length */
-+#if __FreeBSD_version >= 1000055
-+                     0,                             /* max addr */
-+#endif
-                      pvFixed == (void *)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
-                                                     /* find_space */
-                      VM_PROT_NONE,                  /* protection */
-@@ -628,6 +637,9 @@
-                      offSub,                /* Start offset in the object */
-                      &Addr,                 /* Start address IN/OUT */
-                      cbSub,                 /* Size of the mapping */
-+#if __FreeBSD_version >= 1000055
-+                     0,                     /* Upper bound of mapping */
-+#endif
-                      VMFS_ANY_SPACE,        /* Whether a suitable address should be searched for first */
-                      ProtectionFlags,       /* protection flags */
-                      VM_PROT_ALL,           /* Maximum protection flags */
-@@ -704,6 +716,9 @@
-                      0,                     /* Start offset in the object */
-                      &AddrR3,               /* Start address IN/OUT */
-                      pMemToMap->cb,         /* Size of the mapping */
-+#if __FreeBSD_version >= 1000055
-+                     0,                     /* Upper bound of the mapping */
-+#endif
-                      R3PtrFixed == (RTR3PTR)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
-                                             /* Whether a suitable address should be searched for first */
-                      ProtectionFlags,       /* protection flags */
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c
deleted file mode 100644
index 82d7d1c297d6..000000000000
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c
+++ /dev/null
@@ -1,132 +0,0 @@
-$FreeBSD$
-
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-03-20 19:19:36.795745576 -0700
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-03-20 19:15:35.164791970 -0700
-@@ -162,7 +162,11 @@
-         case RTR0MEMOBJTYPE_PHYS:
-         case RTR0MEMOBJTYPE_PHYS_NC:
-         {
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-+#endif
-             vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
- #if __FreeBSD_version < 900000
-             /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
-@@ -177,7 +181,12 @@
- #if __FreeBSD_version < 900000
-             vm_page_unlock_queues();
- #endif
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-+#endif
-+
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-         }
-@@ -205,10 +214,18 @@
- 
-     while (cTries <= 1)
-     {
-+#if __FreeBSD_version >= 1000030
-+        VM_OBJECT_WLOCK(pObject);
-+#else
-         VM_OBJECT_LOCK(pObject);
-+#endif
-         pPages = vm_page_alloc_contig(pObject, iPIndex, fFlags, cPages, 0,
-                                       VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
-+#if __FreeBSD_version >= 1000030
-+        VM_OBJECT_WUNLOCK(pObject);
-+#else
-         VM_OBJECT_UNLOCK(pObject);
-+#endif
-         if (pPages)
-             break;
-         vm_pageout_grow_cache(cTries, 0, VmPhysAddrHigh);
-@@ -228,7 +245,11 @@
- 
-     if (!pPages)
-         return pPages;
-+#if __FreeBSD_version >= 1000030
-+    VM_OBJECT_WLOCK(pObject);
-+#else
-     VM_OBJECT_LOCK(pObject);
-+#endif
-     for (vm_pindex_t iPage = 0; iPage < cPages; iPage++)
-     {
-         vm_page_t pPage = pPages + iPage;
-@@ -240,7 +261,11 @@
-             atomic_add_int(&cnt.v_wire_count, 1);
-         }
-     }
-+#if __FreeBSD_version >= 1000030
-+    VM_OBJECT_WUNLOCK(pObject);
-+#else
-     VM_OBJECT_UNLOCK(pObject);
-+#endif
-     return pPages;
- #endif
- }
-@@ -264,7 +289,11 @@
-         if (!pPage)
-         {
-             /* Free all allocated pages */
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WLOCK(pObject);
-+#else
-             VM_OBJECT_LOCK(pObject);
-+#endif
-             while (iPage-- > 0)
-             {
-                 pPage = vm_page_lookup(pObject, iPage);
-@@ -278,7 +307,11 @@
-                 vm_page_unlock_queues();
- #endif
-             }
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WUNLOCK(pObject);
-+#else
-             VM_OBJECT_UNLOCK(pObject);
-+#endif
-             return rcNoMem;
-         }
-     }
-@@ -411,9 +444,17 @@
-         if (fContiguous)
-         {
-             Assert(enmType == RTR0MEMOBJTYPE_PHYS);
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-+#endif
-             pMemFreeBSD->Core.u.Phys.PhysBase = VM_PAGE_TO_PHYS(vm_page_find_least(pMemFreeBSD->pObject, 0));
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-+#endif
-             pMemFreeBSD->Core.u.Phys.fAllocated = true;
-         }
- 
-@@ -823,9 +864,17 @@
-         case RTR0MEMOBJTYPE_PHYS_NC:
-         {
-             RTHCPHYS addr;
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-+#endif
-             addr = VM_PAGE_TO_PHYS(vm_page_lookup(pMemFreeBSD->pObject, iPage));
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-+#endif
-             return addr;
-         }
- 
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
deleted file mode 100644
index c8ab61f1e48a..000000000000
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig	2013-03-05 14:28:07.000000000 +0000
-+++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h	2013-03-28 13:10:34.000000000 +0000
-@@ -50,6 +50,9 @@
- #include <sys/unistd.h>
- #include <sys/kthread.h>
- #include <sys/lock.h>
-+#if __FreeBSD_version >= 1000030
-+#include <sys/rwlock.h>
-+#endif
- #include <sys/mutex.h>
- #include <sys/sched.h>
- #include <sys/callout.h>
-@@ -64,6 +67,7 @@
- #include <vm/vm_kern.h>
- #include <vm/vm_param.h>        /* KERN_SUCCESS ++ */
- #include <vm/vm_page.h>
-+#include <vm/vm_pageout.h>
- #include <vm/vm_phys.h>         /* vm_phys_alloc_* */
- #include <vm/vm_extern.h>       /* kmem_alloc_attr */
- #include <sys/vmmeter.h>        /* cnt */
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 25ec858845e9..c4fc22ee79c1 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.22
+DISTVERSION=	4.3.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		as86:${PORTSDIR}/devel/dev86 \
 		kmk:${PORTSDIR}/devel/kBuild
 
+USES=		kmod
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxnet
@@ -33,15 +34,13 @@ CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --nofatal \
 		--build-headless
 
 CONFLICTS=	bcc-[0-9]*
-CONFLICTS_INSTALL=	virtualbox-ose-kmod-devel-[3,4]* virtualbox-ose-kmod-legacy-[3,4]*
+CONFLICTS_INSTALL=	virtualbox-ose-kmod-devel-4* virtualbox-ose-kmod-legacy-4*
 
 OPTIONS_DEFINE=	DEBUG VIMAGE
 DEBUG_DESC=	Debug symbols, additional logs and assertions
 VIMAGE_DESC=	VIMAGE virtual networking support
 
 NO_STAGE=	yes
-
-USES=		kmod
 .include <bsd.port.options.mk>
 
 VBOX_BIN=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/src
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index f6a742ba3954..24e378bdad60 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
-SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
+SHA256 (VirtualBox-4.3.6.tar.bz2) = c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27
+SIZE (VirtualBox-4.3.6.tar.bz2) = 89609199
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
new file mode 100644
index 000000000000..56fa83e858e0
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
@@ -0,0 +1,10 @@
+--- 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 @@
+ SRCS += \
+ 	semspinmutex-r0drv-generic.c \
+ 	mpnotification-r0drv-generic.c \
++	threadctxhooks-r0drv-generic.c \
+ 	RTMpIsCpuWorkPending-r0drv-generic.c
+ 
+ .PATH:	${.CURDIR}/VBox
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
deleted file mode 100644
index f8b9743c21c8..000000000000
--- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2013-09-06 06:30:30.000000000 -0600
-+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2013-09-18 12:01:45.000000000 -0600
-@@ -79,8 +79,13 @@
-             return VERR_NO_EXEC_MEMORY;
- 
-         /* Addr contains a start address vm_map_find will start searching for suitable space at. */
-+#if __FreeBSD_version >= 1000055
-+        int rc = vm_map_find(kernel_map, pVmObject, 0, &Addr,
-+                             cbAllocated, 0, VMFS_ANY_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
-+#else
-         int rc = vm_map_find(kernel_map, pVmObject, 0, &Addr,
-                              cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0);
-+#endif
-         if (rc == KERN_SUCCESS)
-         {
-             rc = vm_map_wire(kernel_map, Addr, Addr + cbAllocated,
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
index b666b7ed0362..b760cfe7f940 100644
--- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
@@ -7,17 +7,11 @@ From Alan L. Cox on FreeBSD-current:
     answer that question.
 
 [1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html
----
- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-index 5c90cf3..1176b51 100644
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-@@ -164,14 +164,19 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-         {
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-11-29 12:04:53.000000000 +0100
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-11-29 12:37:29.000000000 +0100
+@@ -168,14 +168,19 @@
              VM_OBJECT_LOCK(pMemFreeBSD->pObject);
+ #endif
              vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
 +#if __FreeBSD_version < 900000
 +            /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
@@ -32,10 +26,10 @@ index 5c90cf3..1176b51 100644
 +#if __FreeBSD_version < 900000
              vm_page_unlock_queues();
 +#endif
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-@@ -263,11 +268,15 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
+ #else
+@@ -291,11 +296,15 @@
              while (iPage-- > 0)
              {
                  pPage = vm_page_lookup(pObject, iPage);
@@ -49,8 +43,5 @@ index 5c90cf3..1176b51 100644
                  vm_page_unlock_queues();
 +#endif
              }
-             VM_OBJECT_UNLOCK(pObject);
-             return rcNoMem;
--- 
-1.7.11.5
-
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pObject);
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
deleted file mode 100644
index 6dfe0b99208e..000000000000
--- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-09-06 12:30:30.000000000 +0000
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-09-21 18:12:53.000000000 +0000
-@@ -286,9 +286,15 @@
-     pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
- 
-     /* No additional object reference for auto-deallocation upon unmapping. */
-+#if __FreeBSD_version >= 1000055
-+    rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
-+                     &MapAddress, pMemFreeBSD->Core.cb, 0, VMFS_ANY_SPACE,
-+                     fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
-+#else
-     rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
-                      &MapAddress, pMemFreeBSD->Core.cb, VMFS_ANY_SPACE,
-                      fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
-+#endif
- 
-     if (rc == KERN_SUCCESS)
-     {
-@@ -551,6 +557,9 @@
-                      0,                             /* offset */
-                      &MapAddress,                   /* addr (IN/OUT) */
-                      cb,                            /* length */
-+#if __FreeBSD_version >= 1000055
-+                     0,                             /* max addr */
-+#endif
-                      pvFixed == (void *)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
-                                                     /* find_space */
-                      VM_PROT_NONE,                  /* protection */
-@@ -628,6 +637,9 @@
-                      offSub,                /* Start offset in the object */
-                      &Addr,                 /* Start address IN/OUT */
-                      cbSub,                 /* Size of the mapping */
-+#if __FreeBSD_version >= 1000055
-+                     0,                     /* Upper bound of mapping */
-+#endif
-                      VMFS_ANY_SPACE,        /* Whether a suitable address should be searched for first */
-                      ProtectionFlags,       /* protection flags */
-                      VM_PROT_ALL,           /* Maximum protection flags */
-@@ -704,6 +716,9 @@
-                      0,                     /* Start offset in the object */
-                      &AddrR3,               /* Start address IN/OUT */
-                      pMemToMap->cb,         /* Size of the mapping */
-+#if __FreeBSD_version >= 1000055
-+                     0,                     /* Upper bound of the mapping */
-+#endif
-                      R3PtrFixed == (RTR3PTR)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
-                                             /* Whether a suitable address should be searched for first */
-                      ProtectionFlags,       /* protection flags */
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c
deleted file mode 100644
index 82d7d1c297d6..000000000000
--- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c
+++ /dev/null
@@ -1,132 +0,0 @@
-$FreeBSD$
-
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-03-20 19:19:36.795745576 -0700
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-03-20 19:15:35.164791970 -0700
-@@ -162,7 +162,11 @@
-         case RTR0MEMOBJTYPE_PHYS:
-         case RTR0MEMOBJTYPE_PHYS_NC:
-         {
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-+#endif
-             vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
- #if __FreeBSD_version < 900000
-             /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
-@@ -177,7 +181,12 @@
- #if __FreeBSD_version < 900000
-             vm_page_unlock_queues();
- #endif
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-+#endif
-+
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-         }
-@@ -205,10 +214,18 @@
- 
-     while (cTries <= 1)
-     {
-+#if __FreeBSD_version >= 1000030
-+        VM_OBJECT_WLOCK(pObject);
-+#else
-         VM_OBJECT_LOCK(pObject);
-+#endif
-         pPages = vm_page_alloc_contig(pObject, iPIndex, fFlags, cPages, 0,
-                                       VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
-+#if __FreeBSD_version >= 1000030
-+        VM_OBJECT_WUNLOCK(pObject);
-+#else
-         VM_OBJECT_UNLOCK(pObject);
-+#endif
-         if (pPages)
-             break;
-         vm_pageout_grow_cache(cTries, 0, VmPhysAddrHigh);
-@@ -228,7 +245,11 @@
- 
-     if (!pPages)
-         return pPages;
-+#if __FreeBSD_version >= 1000030
-+    VM_OBJECT_WLOCK(pObject);
-+#else
-     VM_OBJECT_LOCK(pObject);
-+#endif
-     for (vm_pindex_t iPage = 0; iPage < cPages; iPage++)
-     {
-         vm_page_t pPage = pPages + iPage;
-@@ -240,7 +261,11 @@
-             atomic_add_int(&cnt.v_wire_count, 1);
-         }
-     }
-+#if __FreeBSD_version >= 1000030
-+    VM_OBJECT_WUNLOCK(pObject);
-+#else
-     VM_OBJECT_UNLOCK(pObject);
-+#endif
-     return pPages;
- #endif
- }
-@@ -264,7 +289,11 @@
-         if (!pPage)
-         {
-             /* Free all allocated pages */
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WLOCK(pObject);
-+#else
-             VM_OBJECT_LOCK(pObject);
-+#endif
-             while (iPage-- > 0)
-             {
-                 pPage = vm_page_lookup(pObject, iPage);
-@@ -278,7 +307,11 @@
-                 vm_page_unlock_queues();
- #endif
-             }
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WUNLOCK(pObject);
-+#else
-             VM_OBJECT_UNLOCK(pObject);
-+#endif
-             return rcNoMem;
-         }
-     }
-@@ -411,9 +444,17 @@
-         if (fContiguous)
-         {
-             Assert(enmType == RTR0MEMOBJTYPE_PHYS);
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-+#endif
-             pMemFreeBSD->Core.u.Phys.PhysBase = VM_PAGE_TO_PHYS(vm_page_find_least(pMemFreeBSD->pObject, 0));
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-+#endif
-             pMemFreeBSD->Core.u.Phys.fAllocated = true;
-         }
- 
-@@ -823,9 +864,17 @@
-         case RTR0MEMOBJTYPE_PHYS_NC:
-         {
-             RTHCPHYS addr;
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-+#endif
-             addr = VM_PAGE_TO_PHYS(vm_page_lookup(pMemFreeBSD->pObject, iPage));
-+#if __FreeBSD_version >= 1000030
-+            VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-+#else
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-+#endif
-             return addr;
-         }
- 
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
deleted file mode 100644
index 24acae278364..000000000000
--- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$FreeBSD$
-
---- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h	2012-12-19 10:27:29.000000000 -0800
-+++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h	2013-03-20 19:10:15.854804053 -0700
-@@ -50,6 +50,9 @@
- #include <sys/unistd.h>
- #include <sys/kthread.h>
- #include <sys/lock.h>
-+#if __FreeBSD_version >= 1000030
-+#include <sys/rwlock.h>
-+#endif
- #include <sys/mutex.h>
- #include <sys/sched.h>
- #include <sys/callout.h>
diff --git a/emulators/virtualbox-ose-kmod/files/vboxnet.in b/emulators/virtualbox-ose-kmod/files/vboxnet.in
index 073ee3764176..d2745daf7457 100644
--- a/emulators/virtualbox-ose-kmod/files/vboxnet.in
+++ b/emulators/virtualbox-ose-kmod/files/vboxnet.in
@@ -4,7 +4,8 @@
 #
 
 # PROVIDE:	vboxnet
-# REQUIRE:	FILESYSTEMS NETWORKING ldconfig
+# BEFORE:	NETWORKING
+# REQUIRE:	FILESYSTEMS ldconfig
 # KEYWORD:	nojail
 
 #
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 64e4146a6f4f..edcd6e0ce492 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.22
+DISTVERSION=	4.3.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -22,8 +22,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild \
 		gtar:${PORTSDIR}/archivers/gtar \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		python:${PORTSDIR}/lang/python
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libcurl.so:${PORTSDIR}/ftp/curl
@@ -36,18 +35,14 @@ USES=		iconv pkgconfig
 USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	vboxapi
-PYDISTUTILS_PKGVERSION=	1.0
-PYDISTUTILS_NOEGGINFO=	yes
+USE_PYTHON_BUILD=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --passive-mesa
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
 
 CONFLICTS=	bcc-[0-9]*
-CONFLICTS_INSTALL=	virtualbox-ose-devel-[3,4]* virtualbox-ose-legacy-[3,4]* virtualbox-ose-additions-[3,4]* virtualbox-ose-additions-devel-[3,4]*
+CONFLICTS_INSTALL=	virtualbox-ose-devel-4* virtualbox-ose-legacy-4* virtualbox-ose-additions-4* virtualbox-ose-additions-devel-4*
 
 VBOXUSER?=	vboxusers
 VBOXWSUSER?=	vboxusers
@@ -57,9 +52,9 @@ GROUPS=		${VBOXGROUP}
 VBOX_FRONTENDS=	VBoxAutostart VBoxHeadless
 VBOX_GUEST_VER=	${PORTVERSION}
 
-OPTIONS_DEFINE=	QT4 DEBUG GUESTADDITIONS DBUS PULSEAUDIO UDPTUNNEL VDE VNC WEBSERVICE NLS X11
-OPTIONS_DEFAULT=	QT4 DBUS X11 UDPTUNNEL VNC
-OPTIONS_SUB=	X11 QT4 GUESTADDITIONS VNC NLS WEBSERVICE
+OPTIONS_DEFINE=	QT4 DEBUG GUESTADDITIONS DBUS PULSEAUDIO UDPTUNNEL VDE VNC WEBSERVICE NLS X11 VPX PYTHON
+OPTIONS_DEFAULT=	QT4 DBUS X11 UDPTUNNEL VNC WEBSERVICE PYTHON
+OPTIONS_SUB=	X11 QT4 GUESTADDITIONS VNC NLS WEBSERVICE PYTHON
 DEBUG_DESC=	Debug symbols, additional logs and assertions
 QT4_DESC=	Build with QT4 Frontend
 GUESTADDITIONS_DESC=	Build with Guest Additions
@@ -67,6 +62,7 @@ UDPTUNNEL_DESC=	Build with UDP tunnel support
 VDE_DESC=	Build with VDE support
 VNC_DESC=	Build with VNC support
 WEBSERVICE_DESC=	Build Webservice
+VPX_DESC=	Use vpx for video capturing
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
@@ -77,6 +73,9 @@ DBUS_CONFIGURE_OFF=	--disable-dbus
 VNC_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
 VNC_CONFIGURE_ON=	--enable-vnc
 
+VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_CONFIGURE_OFF=	--disable-libvpx
+
 VDE_RUN_DEPENDS=	vde_switch:${PORTSDIR}/net/vde2
 VDE_CONFIGURE_ON=	--enable-vde
 
@@ -116,7 +115,7 @@ BROKEN=		QT4 frontend requires X11 support. Run 'make config' again!
 .if ${PORT_OPTIONS:MX11}
 USE_SDL=	sdl
 USE_XORG=	xcursor xmu inputproto xinerama
-VBOX_FRONTENDS+=VBoxBFE VBoxSDL
+VBOX_FRONTENDS+=VBoxSDL
 .else
 CONFIGURE_ARGS+=--build-headless
 .endif
@@ -130,6 +129,16 @@ VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
 CONFIGURE_ARGS+=--disable-qt4
 .endif
 
+.if ${PORT_OPTIONS:MPYTHON}
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	vboxapi
+PYDISTUTILS_PKGVERSION=	1.0
+PYDISTUTILS_NOEGGINFO=	yes
+.else
+CONFIGURE_ARGS+=--disable-python
+.endif
+
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${VBOX_GUEST_VER}.iso
 GADISTFILES=	${GUESTADDITIONS}:guestadditions
@@ -160,8 +169,9 @@ PLIST_SUB+=	ARCH="${KMK_ARCH}"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 900000 && ${OSVERSION} > 801500
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-src-VBox-Devices-PC-vbox.dsl
+.if ${OSVERSION} < 900000
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp \
+		${FILESDIR}/extrapatch-src-VBox-Devices-PC-vbox.dsl
 .endif
 
 pre-everything::
@@ -256,8 +266,8 @@ do-install:
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${DATADIR}/sdk/bindings/webservice
-.for f in vboxweb.wsdl vboxwebService.wsdl
-	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
+.for f in vboxweb.wsdl
+	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
 .endfor
 .endif
 
@@ -267,12 +277,14 @@ do-install:
 	${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso
 .endif
 
+.if ${PORT_OPTIONS:MPYTHON}
 	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/installer && \
 	VBOX_INSTALL_PATH="${PREFIX}/lib/virtualbox" ${PYTHON_CMD} vboxapisetup.py install
 
 	@${MKDIR} ${PYTHON_SITELIBDIR}
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${PYTHON_SITELIBDIR})
 	${PYTHON_CMD} -mcompileall ${PYTHON_SITELIBDIR}/xpcom/
+.endif
 
 post-install:
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD VBoxExtPackHelperApp VBoxBalloonCtrl ${VBOX_FRONTENDS}
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index c1afb8b75a1e..8eda22d67cee 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
-SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
-SHA256 (VBoxGuestAdditions_4.2.22.iso) = 222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76
-SIZE (VBoxGuestAdditions_4.2.22.iso) = 59686912
+SHA256 (VirtualBox-4.3.6.tar.bz2) = c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27
+SIZE (VirtualBox-4.3.6.tar.bz2) = 89609199
+SHA256 (VBoxGuestAdditions_4.3.6.iso) = 95648fcdb5d028e64145a2fe2f2f28c946d219da366389295a61fed296ca79f0
+SIZE (VBoxGuestAdditions_4.3.6.iso) = 64161792
diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp
new file mode 100644
index 000000000000..18702f2fd30e
--- /dev/null
+++ b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp
@@ -0,0 +1,10 @@
+--- src/VBox/Main/src-server/generic/NetIf-generic.cpp.orig	2013-08-21 13:05:31.000000000 +0400
++++ src/VBox/Main/src-server/generic/NetIf-generic.cpp	2013-08-27 18:17:51.598216723 +0400
+@@ -22,6 +22,7 @@
+ #include <iprt/path.h>
+ #include <iprt/param.h>
+ #include <sys/ioctl.h>
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
+ #include <errno.h>
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk
new file mode 100644
index 000000000000..3212e42b7e55
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk
@@ -0,0 +1,12 @@
+--- src/VBox/Main/Makefile.kmk.orig	2013-11-09 02:27:38.919839981 +0400
++++ src/VBox/Main/Makefile.kmk	2013-11-09 02:19:21.868873439 +0400
+@@ -404,7 +404,8 @@
+ 	src-server/HostDnsServiceResolvConf.cpp
+ 
+ VBoxSVC_SOURCES.freebsd = \
+-	src-server/freebsd/HostHardwareFreeBSD.cpp
++	src-server/freebsd/HostHardwareFreeBSD.cpp \
++	src-server/HostDnsServiceResolvConf.cpp
+ 
+ 
+ ifdef VBOX_WITH_USB
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-scr-server-freebsd-PerformanceFreeBSD.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Main-scr-server-freebsd-PerformanceFreeBSD.cpp
deleted file mode 100644
index 9ef5b64d7175..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-scr-server-freebsd-PerformanceFreeBSD.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig	2012-10-19 19:51:26.256773940 +0400
-+++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp	2012-10-19 19:51:49.835771918 +0400
-@@ -109,5 +109,10 @@
-     return E_NOTIMPL;
- }
- 
-+int getDiskListByFs(const char *name, DiskList& list)
-+{
-+    return VERR_NOT_IMPLEMENTED;
-+}
-+
- } /* namespace pm */
- 
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp
deleted file mode 100644
index e55f2d2bb100..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp.orig	2012-12-19 19:27:17.000000000 +0100
-+++ src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp	2012-12-20 14:55:59.492850918 +0100
-@@ -44,6 +44,7 @@
- #include <netinet/in.h>
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <errno.h>
- 
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
deleted file mode 100644
index f8b9743c21c8..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2013-09-06 06:30:30.000000000 -0600
-+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2013-09-18 12:01:45.000000000 -0600
-@@ -79,8 +79,13 @@
-             return VERR_NO_EXEC_MEMORY;
- 
-         /* Addr contains a start address vm_map_find will start searching for suitable space at. */
-+#if __FreeBSD_version >= 1000055
-+        int rc = vm_map_find(kernel_map, pVmObject, 0, &Addr,
-+                             cbAllocated, 0, VMFS_ANY_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
-+#else
-         int rc = vm_map_find(kernel_map, pVmObject, 0, &Addr,
-                              cbAllocated, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0);
-+#endif
-         if (rc == KERN_SUCCESS)
-         {
-             rc = vm_map_wire(kernel_map, Addr, Addr + cbAllocated,
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
index b666b7ed0362..b760cfe7f940 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
@@ -7,17 +7,11 @@ From Alan L. Cox on FreeBSD-current:
     answer that question.
 
 [1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html
----
- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-index 5c90cf3..1176b51 100644
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-@@ -164,14 +164,19 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-         {
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-11-29 12:04:53.000000000 +0100
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-11-29 12:37:29.000000000 +0100
+@@ -168,14 +168,19 @@
              VM_OBJECT_LOCK(pMemFreeBSD->pObject);
+ #endif
              vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
 +#if __FreeBSD_version < 900000
 +            /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
@@ -32,10 +26,10 @@ index 5c90cf3..1176b51 100644
 +#if __FreeBSD_version < 900000
              vm_page_unlock_queues();
 +#endif
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-@@ -263,11 +268,15 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
+ #else
+@@ -291,11 +296,15 @@
              while (iPage-- > 0)
              {
                  pPage = vm_page_lookup(pObject, iPage);
@@ -49,8 +43,5 @@ index 5c90cf3..1176b51 100644
                  vm_page_unlock_queues();
 +#endif
              }
-             VM_OBJECT_UNLOCK(pObject);
-             return rcNoMem;
--- 
-1.7.11.5
-
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pObject);
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
deleted file mode 100644
index 6dfe0b99208e..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-09-06 12:30:30.000000000 +0000
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-09-21 18:12:53.000000000 +0000
-@@ -286,9 +286,15 @@
-     pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
- 
-     /* No additional object reference for auto-deallocation upon unmapping. */
-+#if __FreeBSD_version >= 1000055
-+    rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
-+                     &MapAddress, pMemFreeBSD->Core.cb, 0, VMFS_ANY_SPACE,
-+                     fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
-+#else
-     rc = vm_map_find(kernel_map, pMemFreeBSD->pObject, 0,
-                      &MapAddress, pMemFreeBSD->Core.cb, VMFS_ANY_SPACE,
-                      fExecutable ? VM_PROT_ALL : VM_PROT_RW, VM_PROT_ALL, 0);
-+#endif
- 
-     if (rc == KERN_SUCCESS)
-     {
-@@ -551,6 +557,9 @@
-                      0,                             /* offset */
-                      &MapAddress,                   /* addr (IN/OUT) */
-                      cb,                            /* length */
-+#if __FreeBSD_version >= 1000055
-+                     0,                             /* max addr */
-+#endif
-                      pvFixed == (void *)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
-                                                     /* find_space */
-                      VM_PROT_NONE,                  /* protection */
-@@ -628,6 +637,9 @@
-                      offSub,                /* Start offset in the object */
-                      &Addr,                 /* Start address IN/OUT */
-                      cbSub,                 /* Size of the mapping */
-+#if __FreeBSD_version >= 1000055
-+                     0,                     /* Upper bound of mapping */
-+#endif
-                      VMFS_ANY_SPACE,        /* Whether a suitable address should be searched for first */
-                      ProtectionFlags,       /* protection flags */
-                      VM_PROT_ALL,           /* Maximum protection flags */
-@@ -704,6 +716,9 @@
-                      0,                     /* Start offset in the object */
-                      &AddrR3,               /* Start address IN/OUT */
-                      pMemToMap->cb,         /* Size of the mapping */
-+#if __FreeBSD_version >= 1000055
-+                     0,                     /* Upper bound of the mapping */
-+#endif
-                      R3PtrFixed == (RTR3PTR)-1 ? VMFS_ANY_SPACE : VMFS_NO_SPACE,
-                                             /* Whether a suitable address should be searched for first */
-                      ProtectionFlags,       /* protection flags */
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index 9347ddf05083..e9bb8a41cd07 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -1,6 +1,5 @@
 bin/VBoxAutostart
 bin/VBoxBalloonCtrl
-%%X11%%bin/VBoxBFE
 bin/VBoxHeadless
 bin/VBoxManage
 bin/VBoxNetAdpCtl
@@ -12,8 +11,6 @@ bin/VBoxXPCOMIPCD
 %%QT4%%bin/VirtualBox
 %%WEBSERVICE%%bin/vboxwebsrv
 %%WEBSERVICE%%bin/webtest
-%%X11%%lib/virtualbox/VBoxBFE
-%%X11%%lib/virtualbox/VBoxBFE.so
 lib/virtualbox/DBGCPlugInDiggers.so
 lib/virtualbox/VBoxAuth.so
 lib/virtualbox/VBoxAutostart
@@ -30,16 +27,16 @@ lib/virtualbox/VBoxGuestControlSvc.so
 lib/virtualbox/VBoxGuestPropSvc.so
 lib/virtualbox/VBoxHeadless
 lib/virtualbox/VBoxHeadless.so
-lib/virtualbox/VBoxHostChannel.so
 %%X11%%lib/virtualbox/VBoxKeyboard.so
 lib/virtualbox/VBoxManage
 lib/virtualbox/VBoxNetAdpCtl
 lib/virtualbox/VBoxNetDHCP
 lib/virtualbox/VBoxNetDHCP.so
+lib/virtualbox/VBoxNetNAT.so
 %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so
 %%X11%%lib/virtualbox/VBoxOGLhosterrorspu.so
 %%X11%%lib/virtualbox/VBoxOGLrenderspu.so
-lib/virtualbox/VBoxPython.so
+%%PYTHON%%lib/virtualbox/VBoxPython.so
 lib/virtualbox/VBoxREM.so
 %%QT4%%lib/virtualbox/VBoxTestOGL
 %%I386%%lib/virtualbox/VBoxREM32.so
@@ -63,9 +60,10 @@ lib/virtualbox/VBoxDDGC.gc
 lib/virtualbox/VMMGC.gc
 lib/virtualbox/VBoxDD2R0.r0
 lib/virtualbox/VBoxDDR0.r0
+lib/virtualbox/VBoxHostChannel.so
 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso
 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso
-lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
+%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
 lib/virtualbox/VMMR0.r0
 %%WEBSERVICE%%lib/virtualbox/vboxwebsrv
 %%WEBSERVICE%%lib/virtualbox/webtest
@@ -240,10 +238,9 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%DATADIR%%/idl/ipcITransactionService.idl
 %%DATADIR%%/idl/ipcITransactionObserver.idl
 %%DATADIR%%/idl/VirtualBox_XPCOM.idl
-%%DATADIR%%/samples/tstVBoxAPILinux.cpp
+%%DATADIR%%/samples/tstVBoxAPIXPCOM.cpp
 %%DATADIR%%/samples/Makefile
 %%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl
-%%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxwebService.wsdl
 include/virtualbox/VBoxCAPI_v2_2.h
 include/virtualbox/VBoxCAPI_v3_0.h
 include/virtualbox/VBoxCAPI_v3_1.h
@@ -251,6 +248,7 @@ include/virtualbox/VBoxCAPI_v3_2.h
 include/virtualbox/VBoxCAPI_v4_0.h
 include/virtualbox/VBoxCAPI_v4_1.h
 include/virtualbox/VBoxCAPI_v4_2.h
+include/virtualbox/VBoxCAPI_v4_3.h
 include/virtualbox/VirtualBox_XPCOM.h
 include/virtualbox/ipcIClientObserver.h
 include/virtualbox/ipcIDConnectService.h
@@ -377,7 +375,6 @@ include/virtualbox/nsprpub/prlink.h
 include/virtualbox/nsprpub/md/_iprt_atomic.h
 include/virtualbox/nsprpub/md/_darwin.h
 include/virtualbox/nsprpub/md/_freebsd.h
-include/virtualbox/nsprpub/md/_l4v2.h
 include/virtualbox/nsprpub/md/_linux.h
 include/virtualbox/nsprpub/md/_macos.h
 include/virtualbox/nsprpub/md/_netbsd.h
@@ -397,7 +394,6 @@ include/virtualbox/nsprpub/md/_netbsd.cfg
 include/virtualbox/nsprpub/md/_openbsd.cfg
 include/virtualbox/nsprpub/md/_os2.cfg
 include/virtualbox/nsprpub/md/_solaris32.cfg
-include/virtualbox/nsprpub/md/_l4v2.cfg
 include/virtualbox/nsprpub/md/_solaris64.cfg
 include/virtualbox/nsprpub/prlock.h
 include/virtualbox/nsprpub/prlog.h
@@ -572,45 +568,45 @@ include/virtualbox/xpcom/nsTraceRefcnt.h
 include/virtualbox/xpcom/nsWeakReference.h
 include/virtualbox/xpcom/nsXPCOMGlue.h
 include/virtualbox/xpcom/xpcom-config.h
-%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py
-%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py
-%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.pyc
-%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info
-%%PYTHON_SITELIBDIR%%/xpcom/__init__.py
-%%PYTHON_SITELIBDIR%%/xpcom/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/components.py
-%%PYTHON_SITELIBDIR%%/xpcom/components.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/file.py
-%%PYTHON_SITELIBDIR%%/xpcom/file.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/nsError.py
-%%PYTHON_SITELIBDIR%%/xpcom/nsError.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/primitives.py
-%%PYTHON_SITELIBDIR%%/xpcom/primitives.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.py
-%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.py
-%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/xpt.py
-%%PYTHON_SITELIBDIR%%/xpcom/xpt.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.py
-%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/factory.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/factory.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/loader.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/loader.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/module.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/module.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/policy.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/xpcom/server
-@dirrm %%PYTHON_SITELIBDIR%%/xpcom/client
-@dirrm %%PYTHON_SITELIBDIR%%/xpcom
-@dirrm %%PYTHON_SITELIBDIR%%/vboxapi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.pyc
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom/server
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom/client
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vboxapi
 @dirrm include/virtualbox/xpcom
 @dirrm include/virtualbox/string
 @dirrm include/virtualbox/nsprpub/private
@@ -619,17 +615,17 @@ include/virtualbox/xpcom/xpcom-config.h
 @dirrm include/virtualbox/nsprpub
 @dirrm include/virtualbox/ipcd
 @dirrm include/virtualbox
-%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%
-%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC
-%%VNC%%@dirrmtry lib/virtualbox/ExtensionPacks
 %%NLS%%@dirrm %%DATADIR%%/nls
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings/webservice
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/idl
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%
 %%QT4%%@dirrmtry share/applications
 @dirrm lib/virtualbox/components
+%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%
+%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC
+%%VNC%%@dirrmtry lib/virtualbox/ExtensionPacks
 %%GUESTADDITIONS%%@dirrm lib/virtualbox/additions
 @dirrmtry lib/virtualbox
author	Bernhard Froehlich <decke@FreeBSD.org>	2014-01-23 17:18:42 +0000
committer	Bernhard Froehlich <decke@FreeBSD.org>	2014-01-23 17:18:42 +0000
commit	580dc0dd08648bc3e799c8b7f475f2ff24b77e05 (patch)
tree	d6dc22e0cb0fdcb6529738f948708420583f1b2b /emulators
parent	- Stage support (diff)