40 files changed, 1918 insertions, 517 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index c7ccc18b0014..463adeabd527 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	3.1.51r25618
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -23,6 +23,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		as86:${PORTSDIR}/devel/dev86 \
 		kmk:${PORTSDIR}/devel/kBuild
 
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}_OSE
 USE_RC_SUBR=	vboxguest
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/emulators/virtualbox-ose-additions/pkg-plist b/emulators/virtualbox-ose-additions/pkg-plist
index 00493af8aebe..7b1b3a50f819 100644
--- a/emulators/virtualbox-ose-additions/pkg-plist
+++ b/emulators/virtualbox-ose-additions/pkg-plist
@@ -12,5 +12,5 @@ sbin/VBoxService
 %%X11%%@dirrmtry lib
 @cwd /
 %%KMODDIR%%/vboxguest.ko
-@exec /usr/sbin/kldxref %%KMODDIR%%
-@unexec /usr/sbin/kldxref %%KMODDIR%%
+@exec /usr/sbin/kldxref /%%KMODDIR%%
+@unexec /usr/sbin/kldxref /%%KMODDIR%%
\ No newline at end of file
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index d099cac53a61..f5c99e36580b 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.1.2
-PORTREVISION=	1
+DISTVERSION=	3.1.4
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -23,6 +22,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		as86:${PORTSDIR}/devel/dev86 \
 		kmk:${PORTSDIR}/devel/kBuild
 
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}_OSE
 USE_RC_SUBR=	vboxnet
 ONLY_FOR_ARCHS=	i386 amd64
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --nofatal \
 		--disable-alsa --disable-dbus --disable-python \
 		--build-headless
 
-CONFLICTS=	bcc-[0-9]*
+CONFLICTS=	bcc-[0-9]* virtualbox-ose-kmod-devel-3*
 
 OPTIONS=	DEBUG "Build with debugging symbols" off
 
diff --git a/emulators/virtualbox-ose-kmod-legacy/distinfo b/emulators/virtualbox-ose-kmod-legacy/distinfo
index af7117996821..8704130cd8c6 100644
--- a/emulators/virtualbox-ose-kmod-legacy/distinfo
+++ b/emulators/virtualbox-ose-kmod-legacy/distinfo
@@ -1,3 +1,3 @@
-MD5 (VirtualBox-3.1.2-OSE.tar.bz2) = e7808f16114f5b1a65aa2df1aa33e1a7
-SHA256 (VirtualBox-3.1.2-OSE.tar.bz2) = 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1
-SIZE (VirtualBox-3.1.2-OSE.tar.bz2) = 55553394
+MD5 (VirtualBox-3.1.4-OSE.tar.bz2) = d32066cb9ebfa4930a2c5ad6227de26f
+SHA256 (VirtualBox-3.1.4-OSE.tar.bz2) = 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
+SIZE (VirtualBox-3.1.4-OSE.tar.bz2) = 55850055
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
new file mode 100644
index 000000000000..314c9823a1fb
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
@@ -0,0 +1,10 @@
+--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig	2010-03-02 10:32:26.000000000 +0100
++++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv	2010-03-02 10:32:50.000000000 +0100
+@@ -162,6 +162,7 @@
+     ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \
+     ${PATH_ROOT}/src/VBox/Runtime/VBox/strformat-vbox.cpp=>VBox/strformat-vbox.c \
+     ${PATH_OUT}/version-generated.h=>version-generated.h \
++    ${PATH_OUT}/product-generated.h=>product-generated.h \
+ "
+ 
+ FILES_VBOXDRV_BIN=" \
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-files_vboxnetadp b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-files_vboxnetadp
new file mode 100644
index 000000000000..bf2d21b82883
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-files_vboxnetadp
@@ -0,0 +1,9 @@
+--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp.orig	2010-03-02 09:41:17.000000000 +0100
++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp	2010-03-02 09:41:43.000000000 +0100
+@@ -75,5 +75,6 @@
+     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h=>r0drv/freebsd/the-freebsd-kernel.h \
+     ${PATH_OUT}/version-generated.h=>version-generated.h \
++    ${PATH_OUT}/product-generated.h=>product-generated.h \
+ "
+ 
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-files_vboxnetflt b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-files_vboxnetflt
new file mode 100644
index 000000000000..5bb4b25908ce
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-files_vboxnetflt
@@ -0,0 +1,9 @@
+--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt.orig	2010-02-12 20:49:08.000000000 +0100
++++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt	2010-03-02 09:59:00.000000000 +0100
+@@ -80,5 +80,6 @@
+     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h=>r0drv/freebsd/the-freebsd-kernel.h \
+     ${PATH_OUT}/version-generated.h=>version-generated.h \
++    ${PATH_OUT}/product-generated.h=>product-generated.h \
+ "
+ 
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
new file mode 100644
index 000000000000..5dca2a1e2cd0
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
@@ -0,0 +1,870 @@
+Index: src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
+===================================================================
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	(Revision 58727)
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	(Arbeitskopie)
+@@ -43,6 +43,16 @@
+ #include <iprt/process.h>
+ #include "internal/memobj.h"
+ 
++/**
++ * Our pmap_enter version
++ */
++#if __FreeBSD_version >= 701105
++# define MY_PMAP_ENTER(pPhysMap, AddrR3, pPage, fProt, fWired) \
++    pmap_enter(pPhysMap, AddrR3, VM_PROT_NONE, pPage, fProt, fWired)
++#else
++# define MY_PMAP_ENTER(pPhysMap, AddrR3, pPage, fProt, fWired) \
++    pmap_enter(pPhysMap, AddrR3, pPage, fProt, fWired)
++#endif
+ 
+ /*******************************************************************************
+ *   Structures and Typedefs                                                    *
+@@ -54,12 +64,24 @@
+ {
+     /** The core structure. */
+     RTR0MEMOBJINTERNAL  Core;
+-    /** The VM object associated with the allocation. */
+-    vm_object_t         pObject;
+-    /** the VM object associated with the mapping.
+-     * In mapping mem object, this is the shadow object?
+-     * In a allocation/enter mem object, this is the shared object we constructed (contig, perhaps alloc). */
+-    vm_object_t         pMappingObject;
++    /** Type dependent data */
++    union
++    {
++        /** Non physical memory allocations */
++        struct
++        {
++            /** The VM object associated with the allocation. */
++            vm_object_t         pObject;
++        } NonPhys;
++        /** Physical memory allocations */
++        struct
++        {
++            /** Number of pages */
++            uint32_t            cPages;
++            /** Array of pages - variable */
++            vm_page_t           apPages[1];
++        } Phys;
++    } u;
+ } RTR0MEMOBJFREEBSD, *PRTR0MEMOBJFREEBSD;
+ 
+ 
+@@ -69,7 +91,45 @@
+ *   Internal Functions                                                         *
+ *******************************************************************************/
+ 
++/**
++ * Gets the virtual memory map the specified object is mapped into.
++ *
++ * @returns VM map handle on success, NULL if no map.
++ * @param   pMem                The memory object.
++ */
++static vm_map_t rtR0MemObjFreeBSDGetMap(PRTR0MEMOBJINTERNAL pMem)
++{
++    switch (pMem->enmType)
++    {
++        case RTR0MEMOBJTYPE_PAGE:
++        case RTR0MEMOBJTYPE_LOW:
++        case RTR0MEMOBJTYPE_CONT:
++            return kernel_map;
+ 
++        case RTR0MEMOBJTYPE_PHYS:
++        case RTR0MEMOBJTYPE_PHYS_NC:
++            return NULL; /* pretend these have no mapping atm. */
++
++        case RTR0MEMOBJTYPE_LOCK:
++            return pMem->u.Lock.R0Process == NIL_RTR0PROCESS
++                ? kernel_map
++                : &((struct proc *)pMem->u.Lock.R0Process)->p_vmspace->vm_map;
++
++        case RTR0MEMOBJTYPE_RES_VIRT:
++            return pMem->u.ResVirt.R0Process == NIL_RTR0PROCESS
++                ? kernel_map
++                : &((struct proc *)pMem->u.ResVirt.R0Process)->p_vmspace->vm_map;
++
++        case RTR0MEMOBJTYPE_MAPPING:
++            return pMem->u.Mapping.R0Process == NIL_RTR0PROCESS
++                ? kernel_map
++                : &((struct proc *)pMem->u.Mapping.R0Process)->p_vmspace->vm_map;
++
++        default:
++            return NULL;
++    }
++}
++
+ int rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
+ {
+     PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)pMem;
+@@ -79,53 +139,37 @@
+     {
+         case RTR0MEMOBJTYPE_CONT:
+             contigfree(pMemFreeBSD->Core.pv, pMemFreeBSD->Core.cb, M_IPRTMOBJ);
+-            if (pMemFreeBSD->pMappingObject)
+-            {
+-                rc = vm_map_remove(kernel_map,
+-                                   (vm_offset_t)pMemFreeBSD->Core.pv,
+-                                   (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+-                AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+-            }
+             break;
+ 
+         case RTR0MEMOBJTYPE_PAGE:
+-            if (pMemFreeBSD->pObject)
++        {
++            rc = vm_map_remove(kernel_map,
++                                (vm_offset_t)pMemFreeBSD->Core.pv,
++                                (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
++            AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
++
++            vm_page_lock_queues();
++            for (uint32_t iPage = 0; iPage < pMemFreeBSD->u.Phys.cPages; iPage++)
+             {
+-                rc = vm_map_remove(kernel_map,
+-                                   (vm_offset_t)pMemFreeBSD->Core.pv,
+-                                   (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+-                AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
++                vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++                vm_page_unwire(pPage, 0);
++                vm_page_free(pPage);
+             }
+-            else
+-            {
+-                contigfree(pMemFreeBSD->Core.pv, pMemFreeBSD->Core.cb, M_IPRTMOBJ);
+-                if (pMemFreeBSD->pMappingObject)
+-                {
+-                    rc = vm_map_remove(kernel_map,
+-                                       (vm_offset_t)pMemFreeBSD->Core.pv,
+-                                       (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+-                    AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+-                }
+-            }
++            vm_page_unlock_queues();
+             break;
++        }
+ 
+         case RTR0MEMOBJTYPE_LOCK:
+         {
+-            int fFlags = VM_MAP_WIRE_NOHOLES;
+             vm_map_t pMap = kernel_map;
+ 
+             if (pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+-            {
+                 pMap = &((struct proc *)pMemFreeBSD->Core.u.Lock.R0Process)->p_vmspace->vm_map;
+-                fFlags |= VM_MAP_WIRE_USER;
+-            }
+-            else
+-                fFlags |= VM_MAP_WIRE_SYSTEM;
+ 
+             rc = vm_map_unwire(pMap,
+                                (vm_offset_t)pMemFreeBSD->Core.pv,
+                                (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb,
+-                               fFlags);
++                               VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
+             AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+             break;
+         }
+@@ -146,8 +190,6 @@
+         {
+             vm_map_t pMap = kernel_map;
+ 
+-            /* vm_map_remove will unmap the pages we inserted with pmap_enter */
+-            AssertMsg(pMemFreeBSD->pMappingObject != NULL, ("MappingObject is NULL\n"));
+             if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
+                 pMap = &((struct proc *)pMemFreeBSD->Core.u.Mapping.R0Process)->p_vmspace->vm_map;
+ 
+@@ -158,10 +200,22 @@
+             break;
+         }
+ 
++        case RTR0MEMOBJTYPE_PHYS:
++        case RTR0MEMOBJTYPE_PHYS_NC:
++        {
++            vm_page_lock_queues();
++            for (uint32_t iPage = 0; iPage < pMemFreeBSD->u.Phys.cPages; iPage++)
++            {
++                vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++                vm_page_unwire(pPage, 0);
++                vm_page_free(pPage);
++            }
++            vm_page_unlock_queues();
++            break;
++        }
++
+         /* unused: */
+         case RTR0MEMOBJTYPE_LOW:
+-        case RTR0MEMOBJTYPE_PHYS:
+-        case RTR0MEMOBJTYPE_PHYS_NC:
+         default:
+             AssertMsgFailed(("enmType=%d\n", pMemFreeBSD->Core.enmType));
+             return VERR_INTERNAL_ERROR;
+@@ -177,95 +231,83 @@
+     size_t cPages = cb >> PAGE_SHIFT;
+ 
+     /* create the object. */
+-    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_PAGE, NULL, cb);
++    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJFREEBSD, u.Phys.apPages[cPages]),
++                                                                       RTR0MEMOBJTYPE_PAGE, NULL, cb);
+     if (!pMemFreeBSD)
+         return VERR_NO_MEMORY;
+ 
+-    pMemFreeBSD->pObject = vm_object_allocate(OBJT_DEFAULT, cPages);
+-    if (pMemFreeBSD->pObject)
++    pMemFreeBSD->u.Phys.cPages = cPages;
++
++    vm_offset_t MapAddress = vm_map_min(kernel_map);
++    rc = vm_map_find(kernel_map,                /* map */
++                     NULL,                      /* object */
++                     0,                         /* offset */
++                     &MapAddress,               /* addr (IN/OUT) */
++                     cb,                        /* length */
++                     TRUE,                      /* find_space */
++                     fExecutable                /* protection */
++                     ? VM_PROT_ALL
++                     : VM_PROT_RW,
++                     VM_PROT_ALL,               /* max(_prot) */
++                     0);                        /* cow (copy-on-write) */
++    if (rc == KERN_SUCCESS)
+     {
+-        vm_offset_t MapAddress = vm_map_min(kernel_map);
+-        rc = vm_map_find(kernel_map,                    /* map */
+-                         pMemFreeBSD->pObject,          /* object */
+-                         0,                             /* offset */
+-                         &MapAddress,                   /* addr (IN/OUT) */
+-                         cb,                            /* length */
+-                         TRUE,                          /* find_space */
+-                         fExecutable                    /* protection */
+-                         ? VM_PROT_ALL
+-                         : VM_PROT_RW,
+-                         VM_PROT_ALL,                   /* max(_prot) */
+-                         FALSE);                        /* cow (copy-on-write) */
+-        if (rc == KERN_SUCCESS)
++        rc = VINF_SUCCESS;
++
++        for (size_t iPage = 0; iPage < cPages; iPage++)
+         {
+-            vm_offset_t AddressDst = MapAddress;
++            vm_page_t   pPage;
+ 
+-            rc = VINF_SUCCESS;
++            pPage = vm_page_alloc(NULL, iPage,
++                                  VM_ALLOC_SYSTEM |
++                                  VM_ALLOC_WIRED | VM_ALLOC_NOOBJ);
+ 
+-            VM_OBJECT_LOCK(pMemFreeBSD->pObject);
+-            for (size_t iPage = 0; iPage < cPages; iPage++)
++            if (!pPage)
+             {
+-                vm_pindex_t PageIndex = OFF_TO_IDX(AddressDst);
+-                vm_page_t   pPage;
+-
+-                pPage = vm_page_alloc(pMemFreeBSD->pObject, PageIndex,
+-                                      VM_ALLOC_NOBUSY | VM_ALLOC_SYSTEM |
+-                                      VM_ALLOC_WIRED);
+-
+-#if __FreeBSD_version >= 800000 /** @todo Find exact version number */
+-                /* Fixes crashes during VM termination on FreeBSD8-CURRENT amd64
+-                 * with kernel debugging enabled. */
+-                vm_page_set_valid(pPage, 0, PAGE_SIZE);
+-#endif
+-
+-                if (pPage)
++                /*
++                    * Out of pages
++                    * Remove already allocated pages
++                    */
++                while (iPage-- > 0)
+                 {
++                    pPage = pMemFreeBSD->u.Phys.apPages[iPage];
+                     vm_page_lock_queues();
+-                    vm_page_wire(pPage);
++                    vm_page_unwire(pPage, 0);
++                    vm_page_free(pPage);
+                     vm_page_unlock_queues();
+-                    /* Put the page into the page table now. */
+-#if __FreeBSD_version >= 701105
+-                    pmap_enter(kernel_map->pmap, AddressDst, VM_PROT_NONE, pPage,
+-                               fExecutable
+-                               ? VM_PROT_ALL
+-                               : VM_PROT_RW,
+-                               TRUE);
+-#else
+-                    pmap_enter(kernel_map->pmap, AddressDst, pPage,
+-                               fExecutable
+-                               ? VM_PROT_ALL
+-                               : VM_PROT_RW,
+-                               TRUE);
+-#endif
+                 }
+-                else
+-                {
+-                    /*
+-                     * Allocation failed. vm_map_remove will remove any
+-                     * page already alocated.
+-                     */
+-                    rc = VERR_NO_MEMORY;
+-                    break;
+-                }
+-                AddressDst += PAGE_SIZE;
++                rc = VERR_NO_MEMORY;
++                break;
+             }
+-            VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
+ 
+-            if (rc == VINF_SUCCESS)
++            pPage->valid = VM_PAGE_BITS_ALL;
++            pMemFreeBSD->u.Phys.apPages[iPage] = pPage;
++        }
++
++        if (rc == VINF_SUCCESS)
++        {
++            vm_offset_t AddressDst = MapAddress;
++
++            for (size_t iPage = 0; iPage < cPages; iPage++)
+             {
+-                pMemFreeBSD->Core.pv = (void *)MapAddress;
+-                *ppMem = &pMemFreeBSD->Core;
+-                return VINF_SUCCESS;
++                vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++
++                MY_PMAP_ENTER(kernel_map->pmap, AddressDst, pPage,
++                              fExecutable
++                              ? VM_PROT_ALL
++                              : VM_PROT_RW,
++                              TRUE);
++
++                AddressDst += PAGE_SIZE;
+             }
+ 
+-            vm_map_remove(kernel_map,
+-                          MapAddress,
+-                          MapAddress + cb);
++            /* Store start address */
++            pMemFreeBSD->Core.pv = (void *)MapAddress;
++            *ppMem = &pMemFreeBSD->Core;
++            return VINF_SUCCESS;
+         }
+-        rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+     }
+-    else
+-        rc = VERR_NO_MEMORY;
++    rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+ 
+     rtR0MemObjDelete(&pMemFreeBSD->Core);
+     return rc;
+@@ -325,12 +367,99 @@
+     return VERR_NO_MEMORY;
+ }
+ 
++static void rtR0MemObjFreeBSDPhysPageInit(vm_page_t pPage, vm_pindex_t iPage)
++{
++    pPage->wire_count = 1;
++    pPage->pindex     = iPage;
++    pPage->act_count  = 0;
++    pPage->oflags     = 0;
++    pPage->flags      = PG_UNMANAGED;
++    atomic_add_int(&cnt.v_wire_count, 1);
++}
+ 
+-int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
++static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJTYPE enmType,
++                                           size_t cb,
++                                           RTHCPHYS PhysHighest, size_t uAlignment,
++                                           bool fContiguous)
+ {
+-    /** @todo check if there is a more appropriate API somewhere.. */
++    int        rc = VINF_SUCCESS;
++    uint32_t   cPages = cb >> PAGE_SHIFT;
++    vm_paddr_t VmPhysAddrHigh;
+ 
+     /* create the object. */
++    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJFREEBSD, u.Phys.apPages[cPages]),
++                                                                       enmType, NULL, cb);
++    if (!pMemFreeBSD)
++        return VERR_NO_MEMORY;
++
++    pMemFreeBSD->u.Phys.cPages = cPages;
++
++    if (PhysHighest != NIL_RTHCPHYS)
++        VmPhysAddrHigh = PhysHighest;
++    else
++        VmPhysAddrHigh = ~(vm_paddr_t)0;
++
++    if (fContiguous)
++    {
++        vm_page_t pPage = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
++
++        if (pPage)
++            for (uint32_t iPage = 0; iPage < cPages; iPage++)
++            {
++                rtR0MemObjFreeBSDPhysPageInit(&pPage[iPage], iPage);
++                pMemFreeBSD->u.Phys.apPages[iPage] = &pPage[iPage];
++            }
++        else
++            rc = VERR_NO_MEMORY;
++    }
++    else
++    {
++        /* Allocate page by page */
++        for (uint32_t iPage = 0; iPage < cPages; iPage++)
++        {
++            vm_page_t pPage = vm_phys_alloc_contig(1, 0, VmPhysAddrHigh, uAlignment, 0);
++
++            if (!pPage)
++            {
++                /* Free all allocated pages */
++                while (iPage-- > 0)
++                {
++                    pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++                    vm_page_lock_queues();
++                    vm_page_unwire(pPage, 0);
++                    vm_page_free(pPage);
++                    vm_page_unlock_queues();
++                }
++                rc = VERR_NO_MEMORY;
++                break;
++            }
++            rtR0MemObjFreeBSDPhysPageInit(pPage, iPage);
++            pMemFreeBSD->u.Phys.apPages[iPage] = pPage;
++        }
++    }
++
++    if (RT_FAILURE(rc))
++        rtR0MemObjDelete(&pMemFreeBSD->Core);
++    else
++    {
++        if (enmType == RTR0MEMOBJTYPE_PHYS)
++        {
++            pMemFreeBSD->Core.u.Phys.PhysBase = VM_PAGE_TO_PHYS(pMemFreeBSD->u.Phys.apPages[0]);
++            pMemFreeBSD->Core.u.Phys.fAllocated = true;
++        }
++
++        *ppMem = &pMemFreeBSD->Core;
++    }
++
++    return rc;
++}
++
++int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
++{
++#if 1
++    return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS, cb, PhysHighest, PAGE_SIZE, true);
++#else
++    /* create the object. */
+     PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_CONT, NULL, cb);
+     if (!pMemFreeBSD)
+         return VERR_NO_MEMORY;
+@@ -340,7 +469,7 @@
+                                         M_IPRTMOBJ,           /* type */
+                                         M_NOWAIT | M_ZERO,    /* flags */
+                                         0,                    /* lowest physical address*/
+-                                        PhysHighest,          /* highest physical address */
++                                        _4G-1,                /* highest physical address */
+                                         PAGE_SIZE,            /* alignment. */
+                                         0);                   /* boundrary */
+     if (pMemFreeBSD->Core.pv)
+@@ -352,13 +481,17 @@
+ 
+     rtR0MemObjDelete(&pMemFreeBSD->Core);
+     return VERR_NO_MEMORY;
++#endif
+ }
+ 
+ 
+ int rtR0MemObjNativeAllocPhysNC(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
+ {
+-    /** @todo rtR0MemObjNativeAllocPhys / freebsd */
++#if 1
++    return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS_NC, cb, PhysHighest, PAGE_SIZE, false);
++#else
+     return VERR_NOT_SUPPORTED;
++#endif
+ }
+ 
+ 
+@@ -377,13 +510,18 @@
+ }
+ 
+ 
+-int rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3Ptr, size_t cb, uint32_t fAccess, RTR0PROCESS R0Process)
++/**
++ * Worker locking the memory in either kernel or user maps.
++ */
++static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTERNAL ppMem, vm_map_t pVmMap,
++                                     vm_offset_t AddrStart, size_t cb, uint32_t fAccess,
++                                     RTR0PROCESS R0Process)
+ {
+     int rc;
+     NOREF(fAccess);
+ 
+     /* create the object. */
+-    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_LOCK, (void *)R3Ptr, cb);
++    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_LOCK, (void *)AddrStart, cb);
+     if (!pMemFreeBSD)
+         return VERR_NO_MEMORY;
+ 
+@@ -391,10 +529,10 @@
+      * We could've used vslock here, but we don't wish to be subject to
+      * resource usage restrictions, so we'll call vm_map_wire directly.
+      */
+-    rc = vm_map_wire(&((struct proc *)R0Process)->p_vmspace->vm_map, /* the map */
+-                     (vm_offset_t)R3Ptr,                             /* start */
+-                     (vm_offset_t)R3Ptr + cb,                        /* end */
+-                     VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES);        /* flags */
++    rc = vm_map_wire(pVmMap,                                         /* the map */
++                     AddrStart,                                      /* start */
++                     AddrStart + cb,                                 /* end */
++                     VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);      /* flags */
+     if (rc == KERN_SUCCESS)
+     {
+         pMemFreeBSD->Core.u.Lock.R0Process = R0Process;
+@@ -406,29 +544,25 @@
+ }
+ 
+ 
+-int rtR0MemObjNativeLockKernel(PPRTR0MEMOBJINTERNAL ppMem, void *pv, size_t cb, uint32_t fAccess)
++int rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3Ptr, size_t cb, uint32_t fAccess, RTR0PROCESS R0Process)
+ {
+-    int rc;
+-    NOREF(fAccess);
++    return rtR0MemObjNativeLockInMap(ppMem,
++                                     &((struct proc *)R0Process)->p_vmspace->vm_map,
++                                     (vm_offset_t)R3Ptr,
++                                     cb,
++                                     fAccess,
++                                     R0Process);
++}
+ 
+-    /* create the object. */
+-    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_LOCK, pv, cb);
+-    if (!pMemFreeBSD)
+-        return VERR_NO_MEMORY;
+ 
+-    /* lock the memory */
+-    rc = vm_map_wire(kernel_map,                                    /* the map */
+-                     (vm_offset_t)pv,                               /* start */
+-                     (vm_offset_t)pv + cb,                          /* end */
+-                     VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);     /* flags - SYSTEM? */
+-    if (rc == KERN_SUCCESS)
+-    {
+-        pMemFreeBSD->Core.u.Lock.R0Process = NIL_RTR0PROCESS;
+-        *ppMem = &pMemFreeBSD->Core;
+-        return VINF_SUCCESS;
+-    }
+-    rtR0MemObjDelete(&pMemFreeBSD->Core);
+-    return VERR_NO_MEMORY;/** @todo fix mach -> vbox error conversion for freebsd. */
++int rtR0MemObjNativeLockKernel(PPRTR0MEMOBJINTERNAL ppMem, void *pv, size_t cb, uint32_t fAccess)
++{
++    return rtR0MemObjNativeLockInMap(ppMem,
++                                     kernel_map,
++                                     (vm_offset_t)pv,
++                                     cb,
++                                     fAccess,
++                                     NIL_RTR0PROCESS);
+ }
+ 
+ 
+@@ -465,8 +599,8 @@
+     /*
+      * Allocate an empty VM object and map it into the requested map.
+      */
+-    pMemFreeBSD->pObject = vm_object_allocate(OBJT_DEFAULT, cb >> PAGE_SHIFT);
+-    if (pMemFreeBSD->pObject)
++    pMemFreeBSD->u.NonPhys.pObject = vm_object_allocate(OBJT_DEFAULT, cb >> PAGE_SHIFT);
++    if (pMemFreeBSD->u.NonPhys.pObject)
+     {
+         vm_offset_t MapAddress = pvFixed != (void *)-1
+                                ? (vm_offset_t)pvFixed
+@@ -477,7 +611,7 @@
+                           MapAddress + cb);
+ 
+         rc = vm_map_find(pMap,                          /* map */
+-                         pMemFreeBSD->pObject,          /* object */
++                         pMemFreeBSD->u.NonPhys.pObject, /* object */
+                          0,                             /* offset */
+                          &MapAddress,                   /* addr (IN/OUT) */
+                          cb,                            /* length */
+@@ -500,7 +634,7 @@
+             *ppMem = &pMemFreeBSD->Core;
+             return VINF_SUCCESS;
+         }
+-        vm_object_deallocate(pMemFreeBSD->pObject);
++        vm_object_deallocate(pMemFreeBSD->u.NonPhys.pObject);
+         rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+     }
+     else
+@@ -535,74 +669,9 @@
+     if (uAlignment > PAGE_SIZE)
+         return VERR_NOT_SUPPORTED;
+ 
+-
+-
+ /* Phys: see pmap_mapdev in i386/i386/pmap.c (http://fxr.watson.org/fxr/source/i386/i386/pmap.c?v=RELENG62#L2860) */
+-
+-#if 0
+ /** @todo finish the implementation. */
+ 
+-    int rc;
+-    void *pvR0 = NULL;
+-    PRTR0MEMOBJFREEBSD pMemToMapOs2 = (PRTR0MEMOBJFREEBSD)pMemToMap;
+-    switch (pMemToMapOs2->Core.enmType)
+-    {
+-        /*
+-         * These has kernel mappings.
+-         */
+-        case RTR0MEMOBJTYPE_PAGE:
+-        case RTR0MEMOBJTYPE_LOW:
+-        case RTR0MEMOBJTYPE_CONT:
+-            pvR0 = pMemToMapOs2->Core.pv;
+-            break;
+-
+-        case RTR0MEMOBJTYPE_PHYS_NC:
+-        case RTR0MEMOBJTYPE_PHYS:
+-            pvR0 = pMemToMapOs2->Core.pv;
+-            if (!pvR0)
+-            {
+-                /* no ring-0 mapping, so allocate a mapping in the process. */
+-                AssertMsgReturn(uAlignment == PAGE_SIZE, ("%#zx\n", uAlignment), VERR_NOT_SUPPORTED);
+-                AssertMsgReturn(fProt & RTMEM_PROT_WRITE, ("%#x\n", fProt), VERR_NOT_SUPPORTED);
+-                Assert(!pMemToMapOs2->Core.u.Phys.fAllocated);
+-                ULONG ulPhys = pMemToMapOs2->Core.u.Phys.PhysBase;
+-                rc = KernVMAlloc(pMemToMapOs2->Core.cb, VMDHA_PHYS, &pvR0, (PPVOID)&ulPhys, NULL);
+-                if (rc)
+-                    return RTErrConvertFromOS2(rc);
+-                pMemToMapOs2->Core.pv = pvR0;
+-            }
+-            break;
+-
+-        case RTR0MEMOBJTYPE_LOCK:
+-            if (pMemToMapOs2->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+-                return VERR_NOT_SUPPORTED; /** @todo implement this... */
+-            pvR0 = pMemToMapOs2->Core.pv;
+-            break;
+-
+-        case RTR0MEMOBJTYPE_RES_VIRT:
+-        case RTR0MEMOBJTYPE_MAPPING:
+-        default:
+-            AssertMsgFailed(("enmType=%d\n", pMemToMapOs2->Core.enmType));
+-            return VERR_INTERNAL_ERROR;
+-    }
+-
+-    /*
+-     * Create a dummy mapping object for it.
+-     *
+-     * All mappings are read/write/execute in OS/2 and there isn't
+-     * any cache options, so sharing is ok. And the main memory object
+-     * isn't actually freed until all the mappings have been freed up
+-     * (reference counting).
+-     */
+-    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJOS2, Lock), RTR0MEMOBJTYPE_MAPPING, pvR0, pMemToMapOs2->Core.cb);
+-    if (pMemFreeBSD)
+-    {
+-        pMemFreeBSD->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
+-        *ppMem = &pMemFreeBSD->Core;
+-        return VINF_SUCCESS;
+-    }
+-    return VERR_NO_MEMORY;
+-#endif
+     return VERR_NOT_IMPLEMENTED;
+ }
+ 
+@@ -618,10 +687,10 @@
+     if (uAlignment > PAGE_SIZE)
+         return VERR_NOT_SUPPORTED;
+ 
+-    int             rc;
+-    vm_object_t     pObjectToMap = ((PRTR0MEMOBJFREEBSD)pMemToMap)->pObject;
+-    struct proc    *pProc     = (struct proc *)R0Process;
+-    struct vm_map  *pProcMap  = &pProc->p_vmspace->vm_map;
++    int                rc;
++    PRTR0MEMOBJFREEBSD pMemToMapFreeBSD = (PRTR0MEMOBJFREEBSD)pMemToMap;
++    struct proc       *pProc            = (struct proc *)R0Process;
++    struct vm_map     *pProcMap         = &pProc->p_vmspace->vm_map;
+ 
+     /* calc protection */
+     vm_prot_t       ProtectionFlags = 0;
+@@ -639,48 +708,57 @@
+     vm_offset_t AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + lim_max(pProc, RLIMIT_DATA));
+     PROC_UNLOCK(pProc);
+ 
+-    vm_object_t pObjectNew = vm_object_allocate(OBJT_PHYS, pMemToMap->cb >> PAGE_SHIFT);
+-    if (!RT_UNLIKELY(pObjectNew))
+-        return VERR_NO_MEMORY;
+-
+     /* Insert the object in the map. */
+     rc = vm_map_find(pProcMap,              /* Map to insert the object in */
+-                        pObjectNew  ,          /* Object to map */
+-                        0,                     /* Start offset in the object */
+-                        &AddrR3,               /* Start address IN/OUT */
+-                        pMemToMap->cb,         /* Size of the mapping */
+-                        TRUE,                  /* Whether a suitable address should be searched for first */
+-                        ProtectionFlags,       /* protection flags */
+-                        VM_PROT_ALL,           /* Maximum protection flags */
+-                        0);                    /* Copy on write */
++                     NULL,                  /* Object to map */
++                     0,                     /* Start offset in the object */
++                     &AddrR3,               /* Start address IN/OUT */
++                     pMemToMap->cb,         /* Size of the mapping */
++                     TRUE,                  /* Whether a suitable address should be searched for first */
++                     ProtectionFlags,       /* protection flags */
++                     VM_PROT_ALL,           /* Maximum protection flags */
++                     0);                    /* Copy on write */
+ 
+     /* Map the memory page by page into the destination map. */
+     if (rc == KERN_SUCCESS)
+     {
+-        size_t         cLeft        = pMemToMap->cb >> PAGE_SHIFT;
+-        vm_offset_t    AddrToMap    = (vm_offset_t)pMemToMap->pv;
++        size_t         cPages       = pMemToMap->cb >> PAGE_SHIFT;;
+         pmap_t         pPhysicalMap = pProcMap->pmap;
+         vm_offset_t    AddrR3Dst    = AddrR3;
+ 
+-        /* Insert the memory page by page into the mapping. */
+-        while (cLeft-- > 0)
++        if (   pMemToMap->enmType == RTR0MEMOBJTYPE_PHYS
++            || pMemToMap->enmType == RTR0MEMOBJTYPE_PHYS_NC
++            || pMemToMap->enmType == RTR0MEMOBJTYPE_PAGE)
+         {
+-            vm_page_t Page = PHYS_TO_VM_PAGE(vtophys(AddrToMap));
++            /* Mapping physical allocations */
++            Assert(cPages == pMemToMapFreeBSD->u.Phys.cPages);
+ 
+-#if __FreeBSD_version >= 701105
+-            pmap_enter(pPhysicalMap, AddrR3Dst, VM_PROT_NONE, Page, ProtectionFlags, TRUE);
+-#else
+-            pmap_enter(pPhysicalMap, AddrR3Dst, Page, ProtectionFlags, TRUE);
+-#endif
+-            AddrToMap += PAGE_SIZE;
+-            AddrR3Dst += PAGE_SIZE;
++            /* Insert the memory page by page into the mapping. */
++            for (uint32_t iPage = 0; iPage < cPages; iPage++)
++            {
++                vm_page_t pPage = pMemToMapFreeBSD->u.Phys.apPages[iPage];
++
++                MY_PMAP_ENTER(pPhysicalMap, AddrR3Dst, pPage, ProtectionFlags, TRUE);
++                AddrR3Dst += PAGE_SIZE;
++            }
+         }
+-        pObjectToMap = pObjectNew;
++        else
++        {
++            /* Mapping cont or low memory types */
++            vm_offset_t AddrToMap = (vm_offset_t)pMemToMap->pv;
++
++            for (uint32_t iPage = 0; iPage < cPages; iPage++)
++            {
++                vm_page_t pPage = PHYS_TO_VM_PAGE(vtophys(AddrToMap));
++
++                MY_PMAP_ENTER(pPhysicalMap, AddrR3Dst, pPage, ProtectionFlags, TRUE);
++                AddrR3Dst += PAGE_SIZE;
++                AddrToMap += PAGE_SIZE;
++            }
++        }
+     }
+-    else
+-        vm_object_deallocate(pObjectNew);
+ 
+-    if (rc == KERN_SUCCESS)
++    if (RT_SUCCESS(rc))
+     {
+         /*
+          * Create a mapping object for it.
+@@ -693,7 +771,6 @@
+         {
+             Assert((vm_offset_t)pMemFreeBSD->Core.pv == AddrR3);
+             pMemFreeBSD->Core.u.Mapping.R0Process = R0Process;
+-            pMemFreeBSD->pMappingObject = pObjectToMap;
+             *ppMem = &pMemFreeBSD->Core;
+             return VINF_SUCCESS;
+         }
+@@ -702,19 +779,33 @@
+         AssertMsg(rc == KERN_SUCCESS, ("Deleting mapping failed\n"));
+     }
+ 
+-    if (pObjectToMap)
+-        vm_object_deallocate(pObjectToMap);
+-
+     return VERR_NO_MEMORY;
+ }
+ 
+ 
+ int rtR0MemObjNativeProtect(PRTR0MEMOBJINTERNAL pMem, size_t offSub, size_t cbSub, uint32_t fProt)
+ {
+-    NOREF(pMem);
+-    NOREF(offSub);
+-    NOREF(cbSub);
+-    NOREF(fProt);
++    vm_prot_t          ProtectionFlags = 0;
++    vm_offset_t        AddrStart       = (uintptr_t)pMem->pv + offSub;
++    vm_offset_t        AddrEnd         = AddrStart + cbSub;
++    vm_map_t           pVmMap          = rtR0MemObjFreeBSDGetMap(pMem);
++
++    if (!pVmMap)
++        return VERR_NOT_SUPPORTED;
++
++    if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE)
++        ProtectionFlags = VM_PROT_NONE;
++    if ((fProt & RTMEM_PROT_READ) == RTMEM_PROT_READ)
++        ProtectionFlags |= VM_PROT_READ;
++    if ((fProt & RTMEM_PROT_WRITE) == RTMEM_PROT_WRITE)
++        ProtectionFlags |= VM_PROT_WRITE;
++    if ((fProt & RTMEM_PROT_EXEC) == RTMEM_PROT_EXEC)
++        ProtectionFlags |= VM_PROT_EXECUTE;
++
++    int krc = vm_map_protect(pVmMap, AddrStart, AddrEnd, ProtectionFlags, FALSE);
++    if (krc == KERN_SUCCESS)
++        return VINF_SUCCESS;
++
+     return VERR_NOT_SUPPORTED;
+ }
+ 
+@@ -726,17 +817,35 @@
+     switch (pMemFreeBSD->Core.enmType)
+     {
+         case RTR0MEMOBJTYPE_LOCK:
++        {
+             if (    pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS
+                 &&  pMemFreeBSD->Core.u.Lock.R0Process != (RTR0PROCESS)curproc)
+             {
+                 /* later */
+                 return NIL_RTHCPHYS;
+             }
+-            /* fall thru*/
+-        case RTR0MEMOBJTYPE_PAGE:
++
++            vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
++
++            struct proc    *pProc     = (struct proc *)pMemFreeBSD->Core.u.Lock.R0Process;
++            struct vm_map  *pProcMap  = &pProc->p_vmspace->vm_map;
++            pmap_t pPhysicalMap       = pProcMap->pmap;
++
++            return pmap_extract(pPhysicalMap, pb);
++        }
++
+         case RTR0MEMOBJTYPE_MAPPING:
+         {
+-            uint8_t *pb = (uint8_t *)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
++            vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
++
++            if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
++            {
++                struct proc    *pProc     = (struct proc *)pMemFreeBSD->Core.u.Mapping.R0Process;
++                struct vm_map  *pProcMap  = &pProc->p_vmspace->vm_map;
++                pmap_t pPhysicalMap       = pProcMap->pmap;
++
++                return pmap_extract(pPhysicalMap, pb);
++            }
+             return vtophys(pb);
+         }
+ 
+@@ -746,7 +855,10 @@
+         case RTR0MEMOBJTYPE_PHYS:
+             return pMemFreeBSD->Core.u.Phys.PhysBase + (iPage << PAGE_SHIFT);
+ 
++        case RTR0MEMOBJTYPE_PAGE:
+         case RTR0MEMOBJTYPE_PHYS_NC:
++            return VM_PAGE_TO_PHYS(pMemFreeBSD->u.Phys.apPages[iPage]);
++
+         case RTR0MEMOBJTYPE_RES_VIRT:
+         case RTR0MEMOBJTYPE_LOW:
+         default:
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
new file mode 100644
index 000000000000..cd45a42457b6
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
@@ -0,0 +1,13 @@
+Index: src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h
+===================================================================
+--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h	(Revision 58727)
++++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h	(Arbeitskopie)
+@@ -64,6 +64,8 @@
+ #include <vm/vm_kern.h>
+ #include <vm/vm_param.h>        /* KERN_SUCCESS ++ */
+ #include <vm/vm_page.h>
++#include <vm/vm_phys.h>         /* vm_phys_alloc_* */
++#include <sys/vmmeter.h>        /* cnt */
+ #include <sys/resourcevar.h>
+ #include <machine/cpu.h>
+ 
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-VMM-VMMR0-GMMR0.cpp b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-VMM-VMMR0-GMMR0.cpp
new file mode 100644
index 000000000000..e446cd457d4c
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-VMM-VMMR0-GMMR0.cpp
@@ -0,0 +1,13 @@
+Index: src/VBox/VMM/VMMR0/GMMR0.cpp
+===================================================================
+--- src/VBox/VMM/VMMR0/GMMR0.cpp	(Revision 58727)
++++ src/VBox/VMM/VMMR0/GMMR0.cpp	(Arbeitskopie)
+@@ -661,7 +661,7 @@
+         else
+             SUPR0Printf("GMMR0Init: RTR0MemObjAllocPhysNC(,64K,Any) -> %d!\n", rc);
+ #else
+-# ifdef RT_OS_WINDOWS
++# if defined(RT_OS_WINDOWS) || defined(RT_OS_FREEBSD)
+         pGMM->fLegacyAllocationMode = false;
+ # else
+         pGMM->fLegacyAllocationMode = true;
diff --git a/emulators/virtualbox-ose-kmod-legacy/pkg-plist b/emulators/virtualbox-ose-kmod-legacy/pkg-plist
index 3219ac8ef38f..ef2cca5a6af2 100644
--- a/emulators/virtualbox-ose-kmod-legacy/pkg-plist
+++ b/emulators/virtualbox-ose-kmod-legacy/pkg-plist
@@ -3,5 +3,6 @@
 %%KMODDIR%%/vboxdrv.ko
 %%KMODDIR%%/vboxnetadp.ko
 %%KMODDIR%%/vboxnetflt.ko
-@exec /usr/sbin/kldxref %%KMODDIR%%
-@unexec /usr/sbin/kldxref %%KMODDIR%%
+@exec /usr/sbin/kldxref /%%KMODDIR%%
+@unexec /usr/sbin/kldxref /%%KMODDIR%%
+
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index d099cac53a61..f5c99e36580b 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.1.2
-PORTREVISION=	1
+DISTVERSION=	3.1.4
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -23,6 +22,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		as86:${PORTSDIR}/devel/dev86 \
 		kmk:${PORTSDIR}/devel/kBuild
 
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}_OSE
 USE_RC_SUBR=	vboxnet
 ONLY_FOR_ARCHS=	i386 amd64
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --nofatal \
 		--disable-alsa --disable-dbus --disable-python \
 		--build-headless
 
-CONFLICTS=	bcc-[0-9]*
+CONFLICTS=	bcc-[0-9]* virtualbox-ose-kmod-devel-3*
 
 OPTIONS=	DEBUG "Build with debugging symbols" off
 
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index af7117996821..8704130cd8c6 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,3 +1,3 @@
-MD5 (VirtualBox-3.1.2-OSE.tar.bz2) = e7808f16114f5b1a65aa2df1aa33e1a7
-SHA256 (VirtualBox-3.1.2-OSE.tar.bz2) = 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1
-SIZE (VirtualBox-3.1.2-OSE.tar.bz2) = 55553394
+MD5 (VirtualBox-3.1.4-OSE.tar.bz2) = d32066cb9ebfa4930a2c5ad6227de26f
+SHA256 (VirtualBox-3.1.4-OSE.tar.bz2) = 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
+SIZE (VirtualBox-3.1.4-OSE.tar.bz2) = 55850055
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
new file mode 100644
index 000000000000..314c9823a1fb
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv
@@ -0,0 +1,10 @@
+--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig	2010-03-02 10:32:26.000000000 +0100
++++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv	2010-03-02 10:32:50.000000000 +0100
+@@ -162,6 +162,7 @@
+     ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \
+     ${PATH_ROOT}/src/VBox/Runtime/VBox/strformat-vbox.cpp=>VBox/strformat-vbox.c \
+     ${PATH_OUT}/version-generated.h=>version-generated.h \
++    ${PATH_OUT}/product-generated.h=>product-generated.h \
+ "
+ 
+ FILES_VBOXDRV_BIN=" \
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-files_vboxnetadp b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-files_vboxnetadp
new file mode 100644
index 000000000000..bf2d21b82883
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-files_vboxnetadp
@@ -0,0 +1,9 @@
+--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp.orig	2010-03-02 09:41:17.000000000 +0100
++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp	2010-03-02 09:41:43.000000000 +0100
+@@ -75,5 +75,6 @@
+     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h=>r0drv/freebsd/the-freebsd-kernel.h \
+     ${PATH_OUT}/version-generated.h=>version-generated.h \
++    ${PATH_OUT}/product-generated.h=>product-generated.h \
+ "
+ 
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-files_vboxnetflt b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-files_vboxnetflt
new file mode 100644
index 000000000000..5bb4b25908ce
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-files_vboxnetflt
@@ -0,0 +1,9 @@
+--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt.orig	2010-02-12 20:49:08.000000000 +0100
++++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt	2010-03-02 09:59:00.000000000 +0100
+@@ -80,5 +80,6 @@
+     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h=>r0drv/freebsd/the-freebsd-kernel.h \
+     ${PATH_OUT}/version-generated.h=>version-generated.h \
++    ${PATH_OUT}/product-generated.h=>product-generated.h \
+ "
+ 
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
new file mode 100644
index 000000000000..5dca2a1e2cd0
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
@@ -0,0 +1,870 @@
+Index: src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
+===================================================================
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	(Revision 58727)
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	(Arbeitskopie)
+@@ -43,6 +43,16 @@
+ #include <iprt/process.h>
+ #include "internal/memobj.h"
+ 
++/**
++ * Our pmap_enter version
++ */
++#if __FreeBSD_version >= 701105
++# define MY_PMAP_ENTER(pPhysMap, AddrR3, pPage, fProt, fWired) \
++    pmap_enter(pPhysMap, AddrR3, VM_PROT_NONE, pPage, fProt, fWired)
++#else
++# define MY_PMAP_ENTER(pPhysMap, AddrR3, pPage, fProt, fWired) \
++    pmap_enter(pPhysMap, AddrR3, pPage, fProt, fWired)
++#endif
+ 
+ /*******************************************************************************
+ *   Structures and Typedefs                                                    *
+@@ -54,12 +64,24 @@
+ {
+     /** The core structure. */
+     RTR0MEMOBJINTERNAL  Core;
+-    /** The VM object associated with the allocation. */
+-    vm_object_t         pObject;
+-    /** the VM object associated with the mapping.
+-     * In mapping mem object, this is the shadow object?
+-     * In a allocation/enter mem object, this is the shared object we constructed (contig, perhaps alloc). */
+-    vm_object_t         pMappingObject;
++    /** Type dependent data */
++    union
++    {
++        /** Non physical memory allocations */
++        struct
++        {
++            /** The VM object associated with the allocation. */
++            vm_object_t         pObject;
++        } NonPhys;
++        /** Physical memory allocations */
++        struct
++        {
++            /** Number of pages */
++            uint32_t            cPages;
++            /** Array of pages - variable */
++            vm_page_t           apPages[1];
++        } Phys;
++    } u;
+ } RTR0MEMOBJFREEBSD, *PRTR0MEMOBJFREEBSD;
+ 
+ 
+@@ -69,7 +91,45 @@
+ *   Internal Functions                                                         *
+ *******************************************************************************/
+ 
++/**
++ * Gets the virtual memory map the specified object is mapped into.
++ *
++ * @returns VM map handle on success, NULL if no map.
++ * @param   pMem                The memory object.
++ */
++static vm_map_t rtR0MemObjFreeBSDGetMap(PRTR0MEMOBJINTERNAL pMem)
++{
++    switch (pMem->enmType)
++    {
++        case RTR0MEMOBJTYPE_PAGE:
++        case RTR0MEMOBJTYPE_LOW:
++        case RTR0MEMOBJTYPE_CONT:
++            return kernel_map;
+ 
++        case RTR0MEMOBJTYPE_PHYS:
++        case RTR0MEMOBJTYPE_PHYS_NC:
++            return NULL; /* pretend these have no mapping atm. */
++
++        case RTR0MEMOBJTYPE_LOCK:
++            return pMem->u.Lock.R0Process == NIL_RTR0PROCESS
++                ? kernel_map
++                : &((struct proc *)pMem->u.Lock.R0Process)->p_vmspace->vm_map;
++
++        case RTR0MEMOBJTYPE_RES_VIRT:
++            return pMem->u.ResVirt.R0Process == NIL_RTR0PROCESS
++                ? kernel_map
++                : &((struct proc *)pMem->u.ResVirt.R0Process)->p_vmspace->vm_map;
++
++        case RTR0MEMOBJTYPE_MAPPING:
++            return pMem->u.Mapping.R0Process == NIL_RTR0PROCESS
++                ? kernel_map
++                : &((struct proc *)pMem->u.Mapping.R0Process)->p_vmspace->vm_map;
++
++        default:
++            return NULL;
++    }
++}
++
+ int rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
+ {
+     PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)pMem;
+@@ -79,53 +139,37 @@
+     {
+         case RTR0MEMOBJTYPE_CONT:
+             contigfree(pMemFreeBSD->Core.pv, pMemFreeBSD->Core.cb, M_IPRTMOBJ);
+-            if (pMemFreeBSD->pMappingObject)
+-            {
+-                rc = vm_map_remove(kernel_map,
+-                                   (vm_offset_t)pMemFreeBSD->Core.pv,
+-                                   (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+-                AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+-            }
+             break;
+ 
+         case RTR0MEMOBJTYPE_PAGE:
+-            if (pMemFreeBSD->pObject)
++        {
++            rc = vm_map_remove(kernel_map,
++                                (vm_offset_t)pMemFreeBSD->Core.pv,
++                                (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
++            AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
++
++            vm_page_lock_queues();
++            for (uint32_t iPage = 0; iPage < pMemFreeBSD->u.Phys.cPages; iPage++)
+             {
+-                rc = vm_map_remove(kernel_map,
+-                                   (vm_offset_t)pMemFreeBSD->Core.pv,
+-                                   (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+-                AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
++                vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++                vm_page_unwire(pPage, 0);
++                vm_page_free(pPage);
+             }
+-            else
+-            {
+-                contigfree(pMemFreeBSD->Core.pv, pMemFreeBSD->Core.cb, M_IPRTMOBJ);
+-                if (pMemFreeBSD->pMappingObject)
+-                {
+-                    rc = vm_map_remove(kernel_map,
+-                                       (vm_offset_t)pMemFreeBSD->Core.pv,
+-                                       (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb);
+-                    AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+-                }
+-            }
++            vm_page_unlock_queues();
+             break;
++        }
+ 
+         case RTR0MEMOBJTYPE_LOCK:
+         {
+-            int fFlags = VM_MAP_WIRE_NOHOLES;
+             vm_map_t pMap = kernel_map;
+ 
+             if (pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+-            {
+                 pMap = &((struct proc *)pMemFreeBSD->Core.u.Lock.R0Process)->p_vmspace->vm_map;
+-                fFlags |= VM_MAP_WIRE_USER;
+-            }
+-            else
+-                fFlags |= VM_MAP_WIRE_SYSTEM;
+ 
+             rc = vm_map_unwire(pMap,
+                                (vm_offset_t)pMemFreeBSD->Core.pv,
+                                (vm_offset_t)pMemFreeBSD->Core.pv + pMemFreeBSD->Core.cb,
+-                               fFlags);
++                               VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
+             AssertMsg(rc == KERN_SUCCESS, ("%#x", rc));
+             break;
+         }
+@@ -146,8 +190,6 @@
+         {
+             vm_map_t pMap = kernel_map;
+ 
+-            /* vm_map_remove will unmap the pages we inserted with pmap_enter */
+-            AssertMsg(pMemFreeBSD->pMappingObject != NULL, ("MappingObject is NULL\n"));
+             if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
+                 pMap = &((struct proc *)pMemFreeBSD->Core.u.Mapping.R0Process)->p_vmspace->vm_map;
+ 
+@@ -158,10 +200,22 @@
+             break;
+         }
+ 
++        case RTR0MEMOBJTYPE_PHYS:
++        case RTR0MEMOBJTYPE_PHYS_NC:
++        {
++            vm_page_lock_queues();
++            for (uint32_t iPage = 0; iPage < pMemFreeBSD->u.Phys.cPages; iPage++)
++            {
++                vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++                vm_page_unwire(pPage, 0);
++                vm_page_free(pPage);
++            }
++            vm_page_unlock_queues();
++            break;
++        }
++
+         /* unused: */
+         case RTR0MEMOBJTYPE_LOW:
+-        case RTR0MEMOBJTYPE_PHYS:
+-        case RTR0MEMOBJTYPE_PHYS_NC:
+         default:
+             AssertMsgFailed(("enmType=%d\n", pMemFreeBSD->Core.enmType));
+             return VERR_INTERNAL_ERROR;
+@@ -177,95 +231,83 @@
+     size_t cPages = cb >> PAGE_SHIFT;
+ 
+     /* create the object. */
+-    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_PAGE, NULL, cb);
++    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJFREEBSD, u.Phys.apPages[cPages]),
++                                                                       RTR0MEMOBJTYPE_PAGE, NULL, cb);
+     if (!pMemFreeBSD)
+         return VERR_NO_MEMORY;
+ 
+-    pMemFreeBSD->pObject = vm_object_allocate(OBJT_DEFAULT, cPages);
+-    if (pMemFreeBSD->pObject)
++    pMemFreeBSD->u.Phys.cPages = cPages;
++
++    vm_offset_t MapAddress = vm_map_min(kernel_map);
++    rc = vm_map_find(kernel_map,                /* map */
++                     NULL,                      /* object */
++                     0,                         /* offset */
++                     &MapAddress,               /* addr (IN/OUT) */
++                     cb,                        /* length */
++                     TRUE,                      /* find_space */
++                     fExecutable                /* protection */
++                     ? VM_PROT_ALL
++                     : VM_PROT_RW,
++                     VM_PROT_ALL,               /* max(_prot) */
++                     0);                        /* cow (copy-on-write) */
++    if (rc == KERN_SUCCESS)
+     {
+-        vm_offset_t MapAddress = vm_map_min(kernel_map);
+-        rc = vm_map_find(kernel_map,                    /* map */
+-                         pMemFreeBSD->pObject,          /* object */
+-                         0,                             /* offset */
+-                         &MapAddress,                   /* addr (IN/OUT) */
+-                         cb,                            /* length */
+-                         TRUE,                          /* find_space */
+-                         fExecutable                    /* protection */
+-                         ? VM_PROT_ALL
+-                         : VM_PROT_RW,
+-                         VM_PROT_ALL,                   /* max(_prot) */
+-                         FALSE);                        /* cow (copy-on-write) */
+-        if (rc == KERN_SUCCESS)
++        rc = VINF_SUCCESS;
++
++        for (size_t iPage = 0; iPage < cPages; iPage++)
+         {
+-            vm_offset_t AddressDst = MapAddress;
++            vm_page_t   pPage;
+ 
+-            rc = VINF_SUCCESS;
++            pPage = vm_page_alloc(NULL, iPage,
++                                  VM_ALLOC_SYSTEM |
++                                  VM_ALLOC_WIRED | VM_ALLOC_NOOBJ);
+ 
+-            VM_OBJECT_LOCK(pMemFreeBSD->pObject);
+-            for (size_t iPage = 0; iPage < cPages; iPage++)
++            if (!pPage)
+             {
+-                vm_pindex_t PageIndex = OFF_TO_IDX(AddressDst);
+-                vm_page_t   pPage;
+-
+-                pPage = vm_page_alloc(pMemFreeBSD->pObject, PageIndex,
+-                                      VM_ALLOC_NOBUSY | VM_ALLOC_SYSTEM |
+-                                      VM_ALLOC_WIRED);
+-
+-#if __FreeBSD_version >= 800000 /** @todo Find exact version number */
+-                /* Fixes crashes during VM termination on FreeBSD8-CURRENT amd64
+-                 * with kernel debugging enabled. */
+-                vm_page_set_valid(pPage, 0, PAGE_SIZE);
+-#endif
+-
+-                if (pPage)
++                /*
++                    * Out of pages
++                    * Remove already allocated pages
++                    */
++                while (iPage-- > 0)
+                 {
++                    pPage = pMemFreeBSD->u.Phys.apPages[iPage];
+                     vm_page_lock_queues();
+-                    vm_page_wire(pPage);
++                    vm_page_unwire(pPage, 0);
++                    vm_page_free(pPage);
+                     vm_page_unlock_queues();
+-                    /* Put the page into the page table now. */
+-#if __FreeBSD_version >= 701105
+-                    pmap_enter(kernel_map->pmap, AddressDst, VM_PROT_NONE, pPage,
+-                               fExecutable
+-                               ? VM_PROT_ALL
+-                               : VM_PROT_RW,
+-                               TRUE);
+-#else
+-                    pmap_enter(kernel_map->pmap, AddressDst, pPage,
+-                               fExecutable
+-                               ? VM_PROT_ALL
+-                               : VM_PROT_RW,
+-                               TRUE);
+-#endif
+                 }
+-                else
+-                {
+-                    /*
+-                     * Allocation failed. vm_map_remove will remove any
+-                     * page already alocated.
+-                     */
+-                    rc = VERR_NO_MEMORY;
+-                    break;
+-                }
+-                AddressDst += PAGE_SIZE;
++                rc = VERR_NO_MEMORY;
++                break;
+             }
+-            VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
+ 
+-            if (rc == VINF_SUCCESS)
++            pPage->valid = VM_PAGE_BITS_ALL;
++            pMemFreeBSD->u.Phys.apPages[iPage] = pPage;
++        }
++
++        if (rc == VINF_SUCCESS)
++        {
++            vm_offset_t AddressDst = MapAddress;
++
++            for (size_t iPage = 0; iPage < cPages; iPage++)
+             {
+-                pMemFreeBSD->Core.pv = (void *)MapAddress;
+-                *ppMem = &pMemFreeBSD->Core;
+-                return VINF_SUCCESS;
++                vm_page_t pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++
++                MY_PMAP_ENTER(kernel_map->pmap, AddressDst, pPage,
++                              fExecutable
++                              ? VM_PROT_ALL
++                              : VM_PROT_RW,
++                              TRUE);
++
++                AddressDst += PAGE_SIZE;
+             }
+ 
+-            vm_map_remove(kernel_map,
+-                          MapAddress,
+-                          MapAddress + cb);
++            /* Store start address */
++            pMemFreeBSD->Core.pv = (void *)MapAddress;
++            *ppMem = &pMemFreeBSD->Core;
++            return VINF_SUCCESS;
+         }
+-        rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+     }
+-    else
+-        rc = VERR_NO_MEMORY;
++    rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+ 
+     rtR0MemObjDelete(&pMemFreeBSD->Core);
+     return rc;
+@@ -325,12 +367,99 @@
+     return VERR_NO_MEMORY;
+ }
+ 
++static void rtR0MemObjFreeBSDPhysPageInit(vm_page_t pPage, vm_pindex_t iPage)
++{
++    pPage->wire_count = 1;
++    pPage->pindex     = iPage;
++    pPage->act_count  = 0;
++    pPage->oflags     = 0;
++    pPage->flags      = PG_UNMANAGED;
++    atomic_add_int(&cnt.v_wire_count, 1);
++}
+ 
+-int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
++static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJTYPE enmType,
++                                           size_t cb,
++                                           RTHCPHYS PhysHighest, size_t uAlignment,
++                                           bool fContiguous)
+ {
+-    /** @todo check if there is a more appropriate API somewhere.. */
++    int        rc = VINF_SUCCESS;
++    uint32_t   cPages = cb >> PAGE_SHIFT;
++    vm_paddr_t VmPhysAddrHigh;
+ 
+     /* create the object. */
++    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJFREEBSD, u.Phys.apPages[cPages]),
++                                                                       enmType, NULL, cb);
++    if (!pMemFreeBSD)
++        return VERR_NO_MEMORY;
++
++    pMemFreeBSD->u.Phys.cPages = cPages;
++
++    if (PhysHighest != NIL_RTHCPHYS)
++        VmPhysAddrHigh = PhysHighest;
++    else
++        VmPhysAddrHigh = ~(vm_paddr_t)0;
++
++    if (fContiguous)
++    {
++        vm_page_t pPage = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
++
++        if (pPage)
++            for (uint32_t iPage = 0; iPage < cPages; iPage++)
++            {
++                rtR0MemObjFreeBSDPhysPageInit(&pPage[iPage], iPage);
++                pMemFreeBSD->u.Phys.apPages[iPage] = &pPage[iPage];
++            }
++        else
++            rc = VERR_NO_MEMORY;
++    }
++    else
++    {
++        /* Allocate page by page */
++        for (uint32_t iPage = 0; iPage < cPages; iPage++)
++        {
++            vm_page_t pPage = vm_phys_alloc_contig(1, 0, VmPhysAddrHigh, uAlignment, 0);
++
++            if (!pPage)
++            {
++                /* Free all allocated pages */
++                while (iPage-- > 0)
++                {
++                    pPage = pMemFreeBSD->u.Phys.apPages[iPage];
++                    vm_page_lock_queues();
++                    vm_page_unwire(pPage, 0);
++                    vm_page_free(pPage);
++                    vm_page_unlock_queues();
++                }
++                rc = VERR_NO_MEMORY;
++                break;
++            }
++            rtR0MemObjFreeBSDPhysPageInit(pPage, iPage);
++            pMemFreeBSD->u.Phys.apPages[iPage] = pPage;
++        }
++    }
++
++    if (RT_FAILURE(rc))
++        rtR0MemObjDelete(&pMemFreeBSD->Core);
++    else
++    {
++        if (enmType == RTR0MEMOBJTYPE_PHYS)
++        {
++            pMemFreeBSD->Core.u.Phys.PhysBase = VM_PAGE_TO_PHYS(pMemFreeBSD->u.Phys.apPages[0]);
++            pMemFreeBSD->Core.u.Phys.fAllocated = true;
++        }
++
++        *ppMem = &pMemFreeBSD->Core;
++    }
++
++    return rc;
++}
++
++int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
++{
++#if 1
++    return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS, cb, PhysHighest, PAGE_SIZE, true);
++#else
++    /* create the object. */
+     PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_CONT, NULL, cb);
+     if (!pMemFreeBSD)
+         return VERR_NO_MEMORY;
+@@ -340,7 +469,7 @@
+                                         M_IPRTMOBJ,           /* type */
+                                         M_NOWAIT | M_ZERO,    /* flags */
+                                         0,                    /* lowest physical address*/
+-                                        PhysHighest,          /* highest physical address */
++                                        _4G-1,                /* highest physical address */
+                                         PAGE_SIZE,            /* alignment. */
+                                         0);                   /* boundrary */
+     if (pMemFreeBSD->Core.pv)
+@@ -352,13 +481,17 @@
+ 
+     rtR0MemObjDelete(&pMemFreeBSD->Core);
+     return VERR_NO_MEMORY;
++#endif
+ }
+ 
+ 
+ int rtR0MemObjNativeAllocPhysNC(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest)
+ {
+-    /** @todo rtR0MemObjNativeAllocPhys / freebsd */
++#if 1
++    return rtR0MemObjFreeBSDAllocPhysPages(ppMem, RTR0MEMOBJTYPE_PHYS_NC, cb, PhysHighest, PAGE_SIZE, false);
++#else
+     return VERR_NOT_SUPPORTED;
++#endif
+ }
+ 
+ 
+@@ -377,13 +510,18 @@
+ }
+ 
+ 
+-int rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3Ptr, size_t cb, uint32_t fAccess, RTR0PROCESS R0Process)
++/**
++ * Worker locking the memory in either kernel or user maps.
++ */
++static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTERNAL ppMem, vm_map_t pVmMap,
++                                     vm_offset_t AddrStart, size_t cb, uint32_t fAccess,
++                                     RTR0PROCESS R0Process)
+ {
+     int rc;
+     NOREF(fAccess);
+ 
+     /* create the object. */
+-    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_LOCK, (void *)R3Ptr, cb);
++    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_LOCK, (void *)AddrStart, cb);
+     if (!pMemFreeBSD)
+         return VERR_NO_MEMORY;
+ 
+@@ -391,10 +529,10 @@
+      * We could've used vslock here, but we don't wish to be subject to
+      * resource usage restrictions, so we'll call vm_map_wire directly.
+      */
+-    rc = vm_map_wire(&((struct proc *)R0Process)->p_vmspace->vm_map, /* the map */
+-                     (vm_offset_t)R3Ptr,                             /* start */
+-                     (vm_offset_t)R3Ptr + cb,                        /* end */
+-                     VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES);        /* flags */
++    rc = vm_map_wire(pVmMap,                                         /* the map */
++                     AddrStart,                                      /* start */
++                     AddrStart + cb,                                 /* end */
++                     VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);      /* flags */
+     if (rc == KERN_SUCCESS)
+     {
+         pMemFreeBSD->Core.u.Lock.R0Process = R0Process;
+@@ -406,29 +544,25 @@
+ }
+ 
+ 
+-int rtR0MemObjNativeLockKernel(PPRTR0MEMOBJINTERNAL ppMem, void *pv, size_t cb, uint32_t fAccess)
++int rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3Ptr, size_t cb, uint32_t fAccess, RTR0PROCESS R0Process)
+ {
+-    int rc;
+-    NOREF(fAccess);
++    return rtR0MemObjNativeLockInMap(ppMem,
++                                     &((struct proc *)R0Process)->p_vmspace->vm_map,
++                                     (vm_offset_t)R3Ptr,
++                                     cb,
++                                     fAccess,
++                                     R0Process);
++}
+ 
+-    /* create the object. */
+-    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD), RTR0MEMOBJTYPE_LOCK, pv, cb);
+-    if (!pMemFreeBSD)
+-        return VERR_NO_MEMORY;
+ 
+-    /* lock the memory */
+-    rc = vm_map_wire(kernel_map,                                    /* the map */
+-                     (vm_offset_t)pv,                               /* start */
+-                     (vm_offset_t)pv + cb,                          /* end */
+-                     VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);     /* flags - SYSTEM? */
+-    if (rc == KERN_SUCCESS)
+-    {
+-        pMemFreeBSD->Core.u.Lock.R0Process = NIL_RTR0PROCESS;
+-        *ppMem = &pMemFreeBSD->Core;
+-        return VINF_SUCCESS;
+-    }
+-    rtR0MemObjDelete(&pMemFreeBSD->Core);
+-    return VERR_NO_MEMORY;/** @todo fix mach -> vbox error conversion for freebsd. */
++int rtR0MemObjNativeLockKernel(PPRTR0MEMOBJINTERNAL ppMem, void *pv, size_t cb, uint32_t fAccess)
++{
++    return rtR0MemObjNativeLockInMap(ppMem,
++                                     kernel_map,
++                                     (vm_offset_t)pv,
++                                     cb,
++                                     fAccess,
++                                     NIL_RTR0PROCESS);
+ }
+ 
+ 
+@@ -465,8 +599,8 @@
+     /*
+      * Allocate an empty VM object and map it into the requested map.
+      */
+-    pMemFreeBSD->pObject = vm_object_allocate(OBJT_DEFAULT, cb >> PAGE_SHIFT);
+-    if (pMemFreeBSD->pObject)
++    pMemFreeBSD->u.NonPhys.pObject = vm_object_allocate(OBJT_DEFAULT, cb >> PAGE_SHIFT);
++    if (pMemFreeBSD->u.NonPhys.pObject)
+     {
+         vm_offset_t MapAddress = pvFixed != (void *)-1
+                                ? (vm_offset_t)pvFixed
+@@ -477,7 +611,7 @@
+                           MapAddress + cb);
+ 
+         rc = vm_map_find(pMap,                          /* map */
+-                         pMemFreeBSD->pObject,          /* object */
++                         pMemFreeBSD->u.NonPhys.pObject, /* object */
+                          0,                             /* offset */
+                          &MapAddress,                   /* addr (IN/OUT) */
+                          cb,                            /* length */
+@@ -500,7 +634,7 @@
+             *ppMem = &pMemFreeBSD->Core;
+             return VINF_SUCCESS;
+         }
+-        vm_object_deallocate(pMemFreeBSD->pObject);
++        vm_object_deallocate(pMemFreeBSD->u.NonPhys.pObject);
+         rc = VERR_NO_MEMORY; /** @todo fix translation (borrow from darwin) */
+     }
+     else
+@@ -535,74 +669,9 @@
+     if (uAlignment > PAGE_SIZE)
+         return VERR_NOT_SUPPORTED;
+ 
+-
+-
+ /* Phys: see pmap_mapdev in i386/i386/pmap.c (http://fxr.watson.org/fxr/source/i386/i386/pmap.c?v=RELENG62#L2860) */
+-
+-#if 0
+ /** @todo finish the implementation. */
+ 
+-    int rc;
+-    void *pvR0 = NULL;
+-    PRTR0MEMOBJFREEBSD pMemToMapOs2 = (PRTR0MEMOBJFREEBSD)pMemToMap;
+-    switch (pMemToMapOs2->Core.enmType)
+-    {
+-        /*
+-         * These has kernel mappings.
+-         */
+-        case RTR0MEMOBJTYPE_PAGE:
+-        case RTR0MEMOBJTYPE_LOW:
+-        case RTR0MEMOBJTYPE_CONT:
+-            pvR0 = pMemToMapOs2->Core.pv;
+-            break;
+-
+-        case RTR0MEMOBJTYPE_PHYS_NC:
+-        case RTR0MEMOBJTYPE_PHYS:
+-            pvR0 = pMemToMapOs2->Core.pv;
+-            if (!pvR0)
+-            {
+-                /* no ring-0 mapping, so allocate a mapping in the process. */
+-                AssertMsgReturn(uAlignment == PAGE_SIZE, ("%#zx\n", uAlignment), VERR_NOT_SUPPORTED);
+-                AssertMsgReturn(fProt & RTMEM_PROT_WRITE, ("%#x\n", fProt), VERR_NOT_SUPPORTED);
+-                Assert(!pMemToMapOs2->Core.u.Phys.fAllocated);
+-                ULONG ulPhys = pMemToMapOs2->Core.u.Phys.PhysBase;
+-                rc = KernVMAlloc(pMemToMapOs2->Core.cb, VMDHA_PHYS, &pvR0, (PPVOID)&ulPhys, NULL);
+-                if (rc)
+-                    return RTErrConvertFromOS2(rc);
+-                pMemToMapOs2->Core.pv = pvR0;
+-            }
+-            break;
+-
+-        case RTR0MEMOBJTYPE_LOCK:
+-            if (pMemToMapOs2->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+-                return VERR_NOT_SUPPORTED; /** @todo implement this... */
+-            pvR0 = pMemToMapOs2->Core.pv;
+-            break;
+-
+-        case RTR0MEMOBJTYPE_RES_VIRT:
+-        case RTR0MEMOBJTYPE_MAPPING:
+-        default:
+-            AssertMsgFailed(("enmType=%d\n", pMemToMapOs2->Core.enmType));
+-            return VERR_INTERNAL_ERROR;
+-    }
+-
+-    /*
+-     * Create a dummy mapping object for it.
+-     *
+-     * All mappings are read/write/execute in OS/2 and there isn't
+-     * any cache options, so sharing is ok. And the main memory object
+-     * isn't actually freed until all the mappings have been freed up
+-     * (reference counting).
+-     */
+-    PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(RT_OFFSETOF(RTR0MEMOBJOS2, Lock), RTR0MEMOBJTYPE_MAPPING, pvR0, pMemToMapOs2->Core.cb);
+-    if (pMemFreeBSD)
+-    {
+-        pMemFreeBSD->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
+-        *ppMem = &pMemFreeBSD->Core;
+-        return VINF_SUCCESS;
+-    }
+-    return VERR_NO_MEMORY;
+-#endif
+     return VERR_NOT_IMPLEMENTED;
+ }
+ 
+@@ -618,10 +687,10 @@
+     if (uAlignment > PAGE_SIZE)
+         return VERR_NOT_SUPPORTED;
+ 
+-    int             rc;
+-    vm_object_t     pObjectToMap = ((PRTR0MEMOBJFREEBSD)pMemToMap)->pObject;
+-    struct proc    *pProc     = (struct proc *)R0Process;
+-    struct vm_map  *pProcMap  = &pProc->p_vmspace->vm_map;
++    int                rc;
++    PRTR0MEMOBJFREEBSD pMemToMapFreeBSD = (PRTR0MEMOBJFREEBSD)pMemToMap;
++    struct proc       *pProc            = (struct proc *)R0Process;
++    struct vm_map     *pProcMap         = &pProc->p_vmspace->vm_map;
+ 
+     /* calc protection */
+     vm_prot_t       ProtectionFlags = 0;
+@@ -639,48 +708,57 @@
+     vm_offset_t AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + lim_max(pProc, RLIMIT_DATA));
+     PROC_UNLOCK(pProc);
+ 
+-    vm_object_t pObjectNew = vm_object_allocate(OBJT_PHYS, pMemToMap->cb >> PAGE_SHIFT);
+-    if (!RT_UNLIKELY(pObjectNew))
+-        return VERR_NO_MEMORY;
+-
+     /* Insert the object in the map. */
+     rc = vm_map_find(pProcMap,              /* Map to insert the object in */
+-                        pObjectNew  ,          /* Object to map */
+-                        0,                     /* Start offset in the object */
+-                        &AddrR3,               /* Start address IN/OUT */
+-                        pMemToMap->cb,         /* Size of the mapping */
+-                        TRUE,                  /* Whether a suitable address should be searched for first */
+-                        ProtectionFlags,       /* protection flags */
+-                        VM_PROT_ALL,           /* Maximum protection flags */
+-                        0);                    /* Copy on write */
++                     NULL,                  /* Object to map */
++                     0,                     /* Start offset in the object */
++                     &AddrR3,               /* Start address IN/OUT */
++                     pMemToMap->cb,         /* Size of the mapping */
++                     TRUE,                  /* Whether a suitable address should be searched for first */
++                     ProtectionFlags,       /* protection flags */
++                     VM_PROT_ALL,           /* Maximum protection flags */
++                     0);                    /* Copy on write */
+ 
+     /* Map the memory page by page into the destination map. */
+     if (rc == KERN_SUCCESS)
+     {
+-        size_t         cLeft        = pMemToMap->cb >> PAGE_SHIFT;
+-        vm_offset_t    AddrToMap    = (vm_offset_t)pMemToMap->pv;
++        size_t         cPages       = pMemToMap->cb >> PAGE_SHIFT;;
+         pmap_t         pPhysicalMap = pProcMap->pmap;
+         vm_offset_t    AddrR3Dst    = AddrR3;
+ 
+-        /* Insert the memory page by page into the mapping. */
+-        while (cLeft-- > 0)
++        if (   pMemToMap->enmType == RTR0MEMOBJTYPE_PHYS
++            || pMemToMap->enmType == RTR0MEMOBJTYPE_PHYS_NC
++            || pMemToMap->enmType == RTR0MEMOBJTYPE_PAGE)
+         {
+-            vm_page_t Page = PHYS_TO_VM_PAGE(vtophys(AddrToMap));
++            /* Mapping physical allocations */
++            Assert(cPages == pMemToMapFreeBSD->u.Phys.cPages);
+ 
+-#if __FreeBSD_version >= 701105
+-            pmap_enter(pPhysicalMap, AddrR3Dst, VM_PROT_NONE, Page, ProtectionFlags, TRUE);
+-#else
+-            pmap_enter(pPhysicalMap, AddrR3Dst, Page, ProtectionFlags, TRUE);
+-#endif
+-            AddrToMap += PAGE_SIZE;
+-            AddrR3Dst += PAGE_SIZE;
++            /* Insert the memory page by page into the mapping. */
++            for (uint32_t iPage = 0; iPage < cPages; iPage++)
++            {
++                vm_page_t pPage = pMemToMapFreeBSD->u.Phys.apPages[iPage];
++
++                MY_PMAP_ENTER(pPhysicalMap, AddrR3Dst, pPage, ProtectionFlags, TRUE);
++                AddrR3Dst += PAGE_SIZE;
++            }
+         }
+-        pObjectToMap = pObjectNew;
++        else
++        {
++            /* Mapping cont or low memory types */
++            vm_offset_t AddrToMap = (vm_offset_t)pMemToMap->pv;
++
++            for (uint32_t iPage = 0; iPage < cPages; iPage++)
++            {
++                vm_page_t pPage = PHYS_TO_VM_PAGE(vtophys(AddrToMap));
++
++                MY_PMAP_ENTER(pPhysicalMap, AddrR3Dst, pPage, ProtectionFlags, TRUE);
++                AddrR3Dst += PAGE_SIZE;
++                AddrToMap += PAGE_SIZE;
++            }
++        }
+     }
+-    else
+-        vm_object_deallocate(pObjectNew);
+ 
+-    if (rc == KERN_SUCCESS)
++    if (RT_SUCCESS(rc))
+     {
+         /*
+          * Create a mapping object for it.
+@@ -693,7 +771,6 @@
+         {
+             Assert((vm_offset_t)pMemFreeBSD->Core.pv == AddrR3);
+             pMemFreeBSD->Core.u.Mapping.R0Process = R0Process;
+-            pMemFreeBSD->pMappingObject = pObjectToMap;
+             *ppMem = &pMemFreeBSD->Core;
+             return VINF_SUCCESS;
+         }
+@@ -702,19 +779,33 @@
+         AssertMsg(rc == KERN_SUCCESS, ("Deleting mapping failed\n"));
+     }
+ 
+-    if (pObjectToMap)
+-        vm_object_deallocate(pObjectToMap);
+-
+     return VERR_NO_MEMORY;
+ }
+ 
+ 
+ int rtR0MemObjNativeProtect(PRTR0MEMOBJINTERNAL pMem, size_t offSub, size_t cbSub, uint32_t fProt)
+ {
+-    NOREF(pMem);
+-    NOREF(offSub);
+-    NOREF(cbSub);
+-    NOREF(fProt);
++    vm_prot_t          ProtectionFlags = 0;
++    vm_offset_t        AddrStart       = (uintptr_t)pMem->pv + offSub;
++    vm_offset_t        AddrEnd         = AddrStart + cbSub;
++    vm_map_t           pVmMap          = rtR0MemObjFreeBSDGetMap(pMem);
++
++    if (!pVmMap)
++        return VERR_NOT_SUPPORTED;
++
++    if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE)
++        ProtectionFlags = VM_PROT_NONE;
++    if ((fProt & RTMEM_PROT_READ) == RTMEM_PROT_READ)
++        ProtectionFlags |= VM_PROT_READ;
++    if ((fProt & RTMEM_PROT_WRITE) == RTMEM_PROT_WRITE)
++        ProtectionFlags |= VM_PROT_WRITE;
++    if ((fProt & RTMEM_PROT_EXEC) == RTMEM_PROT_EXEC)
++        ProtectionFlags |= VM_PROT_EXECUTE;
++
++    int krc = vm_map_protect(pVmMap, AddrStart, AddrEnd, ProtectionFlags, FALSE);
++    if (krc == KERN_SUCCESS)
++        return VINF_SUCCESS;
++
+     return VERR_NOT_SUPPORTED;
+ }
+ 
+@@ -726,17 +817,35 @@
+     switch (pMemFreeBSD->Core.enmType)
+     {
+         case RTR0MEMOBJTYPE_LOCK:
++        {
+             if (    pMemFreeBSD->Core.u.Lock.R0Process != NIL_RTR0PROCESS
+                 &&  pMemFreeBSD->Core.u.Lock.R0Process != (RTR0PROCESS)curproc)
+             {
+                 /* later */
+                 return NIL_RTHCPHYS;
+             }
+-            /* fall thru*/
+-        case RTR0MEMOBJTYPE_PAGE:
++
++            vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
++
++            struct proc    *pProc     = (struct proc *)pMemFreeBSD->Core.u.Lock.R0Process;
++            struct vm_map  *pProcMap  = &pProc->p_vmspace->vm_map;
++            pmap_t pPhysicalMap       = pProcMap->pmap;
++
++            return pmap_extract(pPhysicalMap, pb);
++        }
++
+         case RTR0MEMOBJTYPE_MAPPING:
+         {
+-            uint8_t *pb = (uint8_t *)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
++            vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
++
++            if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
++            {
++                struct proc    *pProc     = (struct proc *)pMemFreeBSD->Core.u.Mapping.R0Process;
++                struct vm_map  *pProcMap  = &pProc->p_vmspace->vm_map;
++                pmap_t pPhysicalMap       = pProcMap->pmap;
++
++                return pmap_extract(pPhysicalMap, pb);
++            }
+             return vtophys(pb);
+         }
+ 
+@@ -746,7 +855,10 @@
+         case RTR0MEMOBJTYPE_PHYS:
+             return pMemFreeBSD->Core.u.Phys.PhysBase + (iPage << PAGE_SHIFT);
+ 
++        case RTR0MEMOBJTYPE_PAGE:
+         case RTR0MEMOBJTYPE_PHYS_NC:
++            return VM_PAGE_TO_PHYS(pMemFreeBSD->u.Phys.apPages[iPage]);
++
+         case RTR0MEMOBJTYPE_RES_VIRT:
+         case RTR0MEMOBJTYPE_LOW:
+         default:
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
new file mode 100644
index 000000000000..cd45a42457b6
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
@@ -0,0 +1,13 @@
+Index: src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h
+===================================================================
+--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h	(Revision 58727)
++++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h	(Arbeitskopie)
+@@ -64,6 +64,8 @@
+ #include <vm/vm_kern.h>
+ #include <vm/vm_param.h>        /* KERN_SUCCESS ++ */
+ #include <vm/vm_page.h>
++#include <vm/vm_phys.h>         /* vm_phys_alloc_* */
++#include <sys/vmmeter.h>        /* cnt */
+ #include <sys/resourcevar.h>
+ #include <machine/cpu.h>
+ 
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-VMM-VMMR0-GMMR0.cpp b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-VMM-VMMR0-GMMR0.cpp
new file mode 100644
index 000000000000..e446cd457d4c
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-VMM-VMMR0-GMMR0.cpp
@@ -0,0 +1,13 @@
+Index: src/VBox/VMM/VMMR0/GMMR0.cpp
+===================================================================
+--- src/VBox/VMM/VMMR0/GMMR0.cpp	(Revision 58727)
++++ src/VBox/VMM/VMMR0/GMMR0.cpp	(Arbeitskopie)
+@@ -661,7 +661,7 @@
+         else
+             SUPR0Printf("GMMR0Init: RTR0MemObjAllocPhysNC(,64K,Any) -> %d!\n", rc);
+ #else
+-# ifdef RT_OS_WINDOWS
++# if defined(RT_OS_WINDOWS) || defined(RT_OS_FREEBSD)
+         pGMM->fLegacyAllocationMode = false;
+ # else
+         pGMM->fLegacyAllocationMode = true;
diff --git a/emulators/virtualbox-ose-kmod/pkg-plist b/emulators/virtualbox-ose-kmod/pkg-plist
index 3219ac8ef38f..ef2cca5a6af2 100644
--- a/emulators/virtualbox-ose-kmod/pkg-plist
+++ b/emulators/virtualbox-ose-kmod/pkg-plist
@@ -3,5 +3,6 @@
 %%KMODDIR%%/vboxdrv.ko
 %%KMODDIR%%/vboxnetadp.ko
 %%KMODDIR%%/vboxnetflt.ko
-@exec /usr/sbin/kldxref %%KMODDIR%%
-@unexec /usr/sbin/kldxref %%KMODDIR%%
+@exec /usr/sbin/kldxref /%%KMODDIR%%
+@unexec /usr/sbin/kldxref /%%KMODDIR%%
+
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index e8e9f4994189..2f40e0d12050 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.1.2
-PORTREVISION=	1
+DISTVERSION=	3.1.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -44,7 +43,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}"
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
 
-CONFLICTS=	bcc-[0-9]* virtualbox-ose-additions-3*
+CONFLICTS=	bcc-[0-9]* virtualbox-ose-devel-3* virtualbox-ose-additions-3* virtualbox-ose-additions-devel-3*
 
 VBOXGROUP?=	vboxusers
 VBOXGID?=	920
diff --git a/emulators/virtualbox-ose-legacy/distinfo b/emulators/virtualbox-ose-legacy/distinfo
index e1b840762c30..e8f71b53a0e7 100644
--- a/emulators/virtualbox-ose-legacy/distinfo
+++ b/emulators/virtualbox-ose-legacy/distinfo
@@ -1,6 +1,6 @@
-MD5 (VirtualBox-3.1.2-OSE.tar.bz2) = e7808f16114f5b1a65aa2df1aa33e1a7
-SHA256 (VirtualBox-3.1.2-OSE.tar.bz2) = 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1
-SIZE (VirtualBox-3.1.2-OSE.tar.bz2) = 55553394
-MD5 (VBoxGuestAdditions_3.1.2.iso) = d1ac5c53fb889338849134e07a6bc16f
-SHA256 (VBoxGuestAdditions_3.1.2.iso) = 0180a76f011f3992a70e5168d24ce04a08a23fc94858140096a8fa175e742489
-SIZE (VBoxGuestAdditions_3.1.2.iso) = 33337344
+MD5 (VirtualBox-3.1.4-OSE.tar.bz2) = d32066cb9ebfa4930a2c5ad6227de26f
+SHA256 (VirtualBox-3.1.4-OSE.tar.bz2) = 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
+SIZE (VirtualBox-3.1.4-OSE.tar.bz2) = 55850055
+MD5 (VBoxGuestAdditions_3.1.4.iso) = 2f203836d5168d391ca2fae81e1c52fc
+SHA256 (VBoxGuestAdditions_3.1.4.iso) = a6f35be6317d15abe103f841420fcb96ee1e36e2458414999fb0c2bd073427f5
+SIZE (VBoxGuestAdditions_3.1.4.iso) = 29765632
diff --git a/emulators/virtualbox-ose-legacy/files/patch-configure b/emulators/virtualbox-ose-legacy/files/patch-configure
index a4aaf507ccc9..ba2a1c428bcd 100644
--- a/emulators/virtualbox-ose-legacy/files/patch-configure
+++ b/emulators/virtualbox-ose-legacy/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2009-12-17 15:23:05.000000000 +0100
-+++ configure	2009-12-21 14:25:45.000000000 +0100
+--- configure.orig	2010-01-28 16:34:50.000000000 +0100
++++ configure	2010-01-28 22:16:50.000000000 +0100
 @@ -107,7 +107,7 @@
  GENISOIMAGE="genisoimage"
  MKISOFS="mkisofs"
@@ -36,7 +36,7 @@
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2315,6 +2317,15 @@
+@@ -2318,6 +2320,15 @@
  [ $WITH_QT4    -eq 1 ] && check_qt4
  [ $WITH_PYTHON -eq 1 ] && check_python
  
@@ -52,13 +52,13 @@
  # Linux-specific
  if [ "$OS" = "linux" ]; then
    # don't check for the static libstdc++ in the PUEL version as we build the
-@@ -2332,11 +2343,6 @@
+@@ -2335,11 +2346,6 @@
    else
      cnf_append "VBOX_WITH_ALSA" ""
    fi
 -  if [ $WITH_PULSE -eq 1 ]; then
 -    check_pulse
--  else
+-  elif [ $WITH_PULSE -eq 0 ]; then
 -    cnf_append "VBOX_WITH_PULSE" ""
 -  fi
    if [ $WITH_DBUS -eq 0 ]; then
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp
deleted file mode 100644
index 408d858c1f13..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig	2010-01-18 10:53:11.000000000 +0100
-+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp	2010-01-18 10:53:18.000000000 +0100
-@@ -38,7 +38,6 @@
- # include <sys/socket.h>
- # include <net/if.h>
- # include <unistd.h>
--# include <utmp.h>
- # ifdef RT_OS_SOLARIS
- #  include <sys/sockio.h>
- # endif
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
deleted file mode 100644
index cc5553f7736d..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/VBox/Additions/x11/VBoxClient/Makefile.kmk
-===================================================================
---- src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 25472)
-+++ src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 25473)
-@@ -43,11 +43,14 @@
- 	$(VBOX_LIBPATH32_X11)
- VBoxClient_LIBS.freebsd = \
- 	iconv
-+VBoxClient_LIBS.linux = \
-+	dl
-+VBoxClient_LIBS.solaris = \
-+	dl
- VBoxClient_LIBS = \
- 	$(VBOX_LIB_IPRT_GUEST_R3) \
- 	$(VBOX_LIB_VBGL_R3) \
- 	$(VBOX_LIB_IPRT_GUEST_R3) \
--	dl \
- 	X11 \
- 	Xt
- # These are static replacements for gcc-specific parts of libstdc++
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-Support-SUPR3HardenedMain.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-Support-SUPR3HardenedMain.cpp
deleted file mode 100644
index 4a89fec97dfa..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-Support-SUPR3HardenedMain.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp	(revision 25471)
-+++ src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp	(revision 25472)
-@@ -66,6 +66,9 @@
- #  ifndef CAP_TO_MASK
- #   define CAP_TO_MASK(cap) RT_BIT(cap)
- #  endif
-+# elif defined(RT_OS_FREEBSD)
-+#  include <sys/param.h>
-+#  include <sys/sysctl.h>
- # elif defined(RT_OS_SOLARIS)
- #  include <priv.h>
- # endif
-@@ -325,7 +328,19 @@
-     sprintf(szFileBuf, "/proc/%ld/path/a.out", (long)getpid());
-     int cchLink = readlink(szFileBuf, &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
- # else /* RT_OS_FREEBSD: */
--    int cchLink = readlink("/proc/curproc/file", &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
-+    int aiName[4];
-+    size_t cbPath;
-+
-+    aiName[0] = CTL_KERN;
-+    aiName[1] = KERN_PROC;
-+    aiName[2] = KERN_PROC_PATHNAME;
-+    aiName[3] = getpid();
-+
-+    cbPath = sizeof(g_szSupLibHardenedExePath) - 1;
-+    if(sysctl(aiName, RT_ELEMENTS(aiName), g_szSupLibHardenedExePath, &cbPath, NULL, 0) < 0)
-+       supR3HardenedFatal("supR3HardenedExecDir: sysctl failed\n");
-+
-+    int cchLink = strlen(g_szSupLibHardenedExePath);
- # endif
-     if (cchLink < 0 || cchLink == sizeof(g_szSupLibHardenedExePath) - 1)
-         supR3HardenedFatal("supR3HardenedExecDir: couldn't read \"%s\", errno=%d cchLink=%d\n",
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-include-ConsoleImpl.h b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-include-ConsoleImpl.h
index 2471480886d8..d363775e3da9 100644
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-include-ConsoleImpl.h
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-include-ConsoleImpl.h
@@ -1,6 +1,6 @@
---- src/VBox/Main/include/ConsoleImpl.h.orig
-+++ src/VBox/Main/include/ConsoleImpl.h
-@@ -410,7 +410,7 @@ private:
+--- src/VBox/Main/include/ConsoleImpl.h.orig	2010-02-12 19:49:27.000000000 +0000
++++ src/VBox/Main/include/ConsoleImpl.h	2010-02-13 14:26:54.000000000 +0000
+@@ -410,7 +410,7 @@
  
      HRESULT callTapSetupApplication(bool isStatic, RTFILE tapFD, Bstr &tapDevice,
                                      Bstr &tapSetupApplication);
@@ -9,12 +9,12 @@
      HRESULT attachToTapInterface(INetworkAdapter *networkAdapter);
      HRESULT detachFromTapInterface(INetworkAdapter *networkAdapter);
  #endif
-@@ -582,7 +582,7 @@ private:
-     PPDMLED     mapNetworkLeds[SchemaDefs::NetworkAdapterCount];
-     PPDMLED     mapSharedFolderLed;
-     PPDMLED     mapUSBLed[2];
+@@ -592,7 +592,7 @@
+     PPDMLED      mapNetworkLeds[SchemaDefs::NetworkAdapterCount];
+     PPDMLED      mapSharedFolderLed;
+     PPDMLED      mapUSBLed[2];
 -#if !defined(VBOX_WITH_NETFLT) && (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD))
 +#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
-     Utf8Str     maTAPDeviceName[8];
-     RTFILE      maTapFD[8];
+     Utf8Str      maTAPDeviceName[8];
+     RTFILE       maTapFD[8];
  #endif
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-VBox-log-vbox.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-VBox-log-vbox.cpp
deleted file mode 100644
index 005a25e4a79a..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-VBox-log-vbox.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/VBox/Runtime/VBox/log-vbox.cpp	(revision 25471)
-+++ src/VBox/Runtime/VBox/log-vbox.cpp	(revision 25472)
-@@ -135,6 +135,12 @@
- #  include <Windows.h>
- # elif defined(RT_OS_LINUX)
- #  include <unistd.h>
-+# elif defined(RT_OS_FREEBSD)
-+#  include <sys/param.h>
-+#  include <sys/sysctl.h>
-+#  include <sys/user.h>
-+#  include <stdlib.h>
-+#  include <unistd.h>
- # elif defined(RT_OS_SOLARIS)
- #  define _STRUCTURED_PROC 1
- #  undef _FILE_OFFSET_BITS /* procfs doesn't like this */
-@@ -157,6 +163,7 @@
- # include <iprt/path.h>
- # include <iprt/process.h>
- # include <iprt/string.h>
-+# include <iprt/mem.h>
- # include <stdio.h>
- #endif
- 
-@@ -339,12 +346,8 @@
-             fclose(pFile);
-         }
- 
--#  elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
--#   ifdef RT_OS_LINUX
-+#  elif defined(RT_OS_LINUX)
-         FILE *pFile = fopen("/proc/self/cmdline", "r");
--#   else /* RT_OS_FREEBSD: */
--        FILE *pFile = fopen("/proc/curproc/cmdline", "r");
--#   endif
-         if (pFile)
-         {
-             /* braindead */
-@@ -370,7 +373,44 @@
-                 RTLogLoggerEx(pLogger, 0, ~0U, "\n");
-             fclose(pFile);
-         }
-+#  elif defined(RT_OS_FREEBSD)
-+        char *pszArgFileBuf = NULL;
-+        int aiName[4];
-+        size_t cchArgs;
- 
-+        aiName[0] = CTL_KERN;
-+        aiName[1] = KERN_PROC;
-+        aiName[2] = KERN_PROC_ARGS;
-+        aiName[3] = -1;
-+
-+        /* Retrieve the required length first */
-+        cchArgs = 0;
-+        int rcBSD = sysctl(aiName, RT_ELEMENTS(aiName), NULL, &cchArgs, NULL, 0);
-+
-+        if (cchArgs > 0)
-+        {
-+            pszArgFileBuf = (char *)RTMemAllocZ(cchArgs + 1 /* Safety */);
-+            if (pszArgFileBuf)
-+            {
-+                /* Retrieve the argument list */
-+                rcBSD = sysctl(aiName, RT_ELEMENTS(aiName), pszArgFileBuf, &cchArgs, NULL, 0);
-+                if (!rcBSD)
-+                {
-+                    /*
-+                     * cmdline is a flattened argument list so we need
-+                     * to convert all \0 to blanks
-+                     */
-+                    for(size_t i = 0; i < cchArgs - 1; i++)
-+                    {
-+                       if(pszArgFileBuf[i] == '\0')
-+                          pszArgFileBuf[i] = ' ';
-+                    }
-+
-+                    RTLogLoggerEx(pLogger, 0, ~0U, "Commandline: %s\n", pszArgFileBuf);
-+                }
-+                RTMemFree(pszArgFileBuf);
-+            }
-+        }
- #  elif defined(RT_OS_L4) || defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
-         /* commandline? */
- #  else
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-freebsd-rtProcInitExePath-freebsd.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-freebsd-rtProcInitExePath-freebsd.cpp
deleted file mode 100644
index 2332212ead14..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-freebsd-rtProcInitExePath-freebsd.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp	(revision 25471)
-+++ src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp	(revision 25472)
-@@ -32,6 +32,8 @@
- *   Header Files                                                               *
- *******************************************************************************/
- #define LOG_GROUP RTLOGGROUP_PROCESS
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
- #include <unistd.h>
- #include <errno.h>
- #include <dlfcn.h>
-@@ -47,17 +49,20 @@
- 
- DECLHIDDEN(int) rtProcInitExePath(char *pszPath, size_t cchPath)
- {
--    /*
--     * Read the /proc/curproc/file link, convert to native and return it.
--     */
--    int cchLink = readlink("/proc/curproc/file", pszPath, cchPath - 1);
--    if (cchLink > 0 && (size_t)cchLink <= cchPath - 1)
--    {
--        pszPath[cchLink] = '\0';
-+    int aiName[4];
-+    size_t cchExePath;
- 
-+    aiName[0] = CTL_KERN;
-+    aiName[1] = KERN_PROC;
-+    aiName[2] = KERN_PROC_PATHNAME;
-+    aiName[3] = getpid();
-+
-+    cchExePath = cchPath - 1;
-+    if(sysctl(aiName, RT_ELEMENTS(aiName), pszPath, &cchExePath, NULL, 0) == 0)
-+    {
-         char *pszTmp = NULL;
-         int rc = rtPathFromNative(&pszTmp, pszPath);
--        AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchLink, pszPath), rc);
-+        AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchExePath, pszPath), rc);
- 
-         size_t cch = strlen(pszTmp);
-         AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-@@ -68,39 +73,8 @@
-         return VINF_SUCCESS;
-     }
- 
--    int err = errno;
--
--    /*
--     * Fall back on the dynamic linker since /proc is optional.
--     */
--    void *hExe = dlopen(NULL, 0);
--    if (hExe)
--    {
--        struct link_map const *pLinkMap = 0;
--        if (dlinfo(hExe, RTLD_DI_LINKMAP, &pLinkMap) == 0)
--        {
--            const char *pszImageName = pLinkMap->l_name;
--            if (*pszImageName == '/') /* this may not always be absolute, despite the docs. :-( */
--            {
--                char *pszTmp = NULL;
--                int rc = rtPathFromNative(&pszTmp, pszImageName);
--                AssertMsgRCReturn(rc, ("rc=%Rrc pszImageName=\"%s\"\n", rc, pszImageName), rc);
--
--                size_t cch = strlen(pszTmp);
--                AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
--
--                memcpy(pszPath, pszTmp, cch + 1);
--                RTStrFree(pszTmp);
--
--                return VINF_SUCCESS;
--            }
--            /** @todo Try search the PATH for the file name or append the current
--             *        directory, which ever makes sense... */
--        }
--    }
--
--    int rc = RTErrConvertFromErrno(err);
--    AssertMsgFailed(("rc=%Rrc err=%d cchLink=%d hExe=%p\n", rc, err, cchLink, hExe));
-+    int rc = RTErrConvertFromErrno(errno);
-+    AssertMsgFailed(("rc=%Rrc errno=%d cchLink=%d\n", rc, errno, cchExePath));
-     return rc;
- }
diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist
index 8d1ad96f4e61..b79d9aee860e 100644
--- a/emulators/virtualbox-ose-legacy/pkg-plist
+++ b/emulators/virtualbox-ose-legacy/pkg-plist
@@ -59,6 +59,7 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%NLS%%%%DATADIR%%/nls/VirtualBox_ar.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_ca_VA.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_da.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm
@@ -91,6 +92,7 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%NLS%%%%DATADIR%%/nls/qt_ar.qm
 %%NLS%%%%DATADIR%%/nls/qt_bg.qm
 %%NLS%%%%DATADIR%%/nls/qt_ca.qm
+%%NLS%%%%DATADIR%%/nls/qt_ca_VA.qm
 %%NLS%%%%DATADIR%%/nls/qt_cs.qm
 %%NLS%%%%DATADIR%%/nls/qt_da.qm
 %%NLS%%%%DATADIR%%/nls/qt_de.qm
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index e8e9f4994189..2f40e0d12050 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.1.2
-PORTREVISION=	1
+DISTVERSION=	3.1.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -44,7 +43,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}"
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
 
-CONFLICTS=	bcc-[0-9]* virtualbox-ose-additions-3*
+CONFLICTS=	bcc-[0-9]* virtualbox-ose-devel-3* virtualbox-ose-additions-3* virtualbox-ose-additions-devel-3*
 
 VBOXGROUP?=	vboxusers
 VBOXGID?=	920
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index e1b840762c30..e8f71b53a0e7 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,6 +1,6 @@
-MD5 (VirtualBox-3.1.2-OSE.tar.bz2) = e7808f16114f5b1a65aa2df1aa33e1a7
-SHA256 (VirtualBox-3.1.2-OSE.tar.bz2) = 293f582e37eda29efdb53c6468481b446e1964592f5728656b74664f4d32f2b1
-SIZE (VirtualBox-3.1.2-OSE.tar.bz2) = 55553394
-MD5 (VBoxGuestAdditions_3.1.2.iso) = d1ac5c53fb889338849134e07a6bc16f
-SHA256 (VBoxGuestAdditions_3.1.2.iso) = 0180a76f011f3992a70e5168d24ce04a08a23fc94858140096a8fa175e742489
-SIZE (VBoxGuestAdditions_3.1.2.iso) = 33337344
+MD5 (VirtualBox-3.1.4-OSE.tar.bz2) = d32066cb9ebfa4930a2c5ad6227de26f
+SHA256 (VirtualBox-3.1.4-OSE.tar.bz2) = 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
+SIZE (VirtualBox-3.1.4-OSE.tar.bz2) = 55850055
+MD5 (VBoxGuestAdditions_3.1.4.iso) = 2f203836d5168d391ca2fae81e1c52fc
+SHA256 (VBoxGuestAdditions_3.1.4.iso) = a6f35be6317d15abe103f841420fcb96ee1e36e2458414999fb0c2bd073427f5
+SIZE (VBoxGuestAdditions_3.1.4.iso) = 29765632
diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure
index a4aaf507ccc9..ba2a1c428bcd 100644
--- a/emulators/virtualbox-ose/files/patch-configure
+++ b/emulators/virtualbox-ose/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2009-12-17 15:23:05.000000000 +0100
-+++ configure	2009-12-21 14:25:45.000000000 +0100
+--- configure.orig	2010-01-28 16:34:50.000000000 +0100
++++ configure	2010-01-28 22:16:50.000000000 +0100
 @@ -107,7 +107,7 @@
  GENISOIMAGE="genisoimage"
  MKISOFS="mkisofs"
@@ -36,7 +36,7 @@
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2315,6 +2317,15 @@
+@@ -2318,6 +2320,15 @@
  [ $WITH_QT4    -eq 1 ] && check_qt4
  [ $WITH_PYTHON -eq 1 ] && check_python
  
@@ -52,13 +52,13 @@
  # Linux-specific
  if [ "$OS" = "linux" ]; then
    # don't check for the static libstdc++ in the PUEL version as we build the
-@@ -2332,11 +2343,6 @@
+@@ -2335,11 +2346,6 @@
    else
      cnf_append "VBOX_WITH_ALSA" ""
    fi
 -  if [ $WITH_PULSE -eq 1 ]; then
 -    check_pulse
--  else
+-  elif [ $WITH_PULSE -eq 0 ]; then
 -    cnf_append "VBOX_WITH_PULSE" ""
 -  fi
    if [ $WITH_DBUS -eq 0 ]; then
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp
deleted file mode 100644
index 408d858c1f13..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig	2010-01-18 10:53:11.000000000 +0100
-+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp	2010-01-18 10:53:18.000000000 +0100
-@@ -38,7 +38,6 @@
- # include <sys/socket.h>
- # include <net/if.h>
- # include <unistd.h>
--# include <utmp.h>
- # ifdef RT_OS_SOLARIS
- #  include <sys/sockio.h>
- # endif
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
deleted file mode 100644
index cc5553f7736d..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/VBox/Additions/x11/VBoxClient/Makefile.kmk
-===================================================================
---- src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 25472)
-+++ src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 25473)
-@@ -43,11 +43,14 @@
- 	$(VBOX_LIBPATH32_X11)
- VBoxClient_LIBS.freebsd = \
- 	iconv
-+VBoxClient_LIBS.linux = \
-+	dl
-+VBoxClient_LIBS.solaris = \
-+	dl
- VBoxClient_LIBS = \
- 	$(VBOX_LIB_IPRT_GUEST_R3) \
- 	$(VBOX_LIB_VBGL_R3) \
- 	$(VBOX_LIB_IPRT_GUEST_R3) \
--	dl \
- 	X11 \
- 	Xt
- # These are static replacements for gcc-specific parts of libstdc++
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-SUPR3HardenedMain.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-SUPR3HardenedMain.cpp
deleted file mode 100644
index 4a89fec97dfa..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-SUPR3HardenedMain.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp	(revision 25471)
-+++ src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp	(revision 25472)
-@@ -66,6 +66,9 @@
- #  ifndef CAP_TO_MASK
- #   define CAP_TO_MASK(cap) RT_BIT(cap)
- #  endif
-+# elif defined(RT_OS_FREEBSD)
-+#  include <sys/param.h>
-+#  include <sys/sysctl.h>
- # elif defined(RT_OS_SOLARIS)
- #  include <priv.h>
- # endif
-@@ -325,7 +328,19 @@
-     sprintf(szFileBuf, "/proc/%ld/path/a.out", (long)getpid());
-     int cchLink = readlink(szFileBuf, &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
- # else /* RT_OS_FREEBSD: */
--    int cchLink = readlink("/proc/curproc/file", &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
-+    int aiName[4];
-+    size_t cbPath;
-+
-+    aiName[0] = CTL_KERN;
-+    aiName[1] = KERN_PROC;
-+    aiName[2] = KERN_PROC_PATHNAME;
-+    aiName[3] = getpid();
-+
-+    cbPath = sizeof(g_szSupLibHardenedExePath) - 1;
-+    if(sysctl(aiName, RT_ELEMENTS(aiName), g_szSupLibHardenedExePath, &cbPath, NULL, 0) < 0)
-+       supR3HardenedFatal("supR3HardenedExecDir: sysctl failed\n");
-+
-+    int cchLink = strlen(g_szSupLibHardenedExePath);
- # endif
-     if (cchLink < 0 || cchLink == sizeof(g_szSupLibHardenedExePath) - 1)
-         supR3HardenedFatal("supR3HardenedExecDir: couldn't read \"%s\", errno=%d cchLink=%d\n",
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-include-ConsoleImpl.h b/emulators/virtualbox-ose/files/patch-src-VBox-Main-include-ConsoleImpl.h
index 2471480886d8..d363775e3da9 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-include-ConsoleImpl.h
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Main-include-ConsoleImpl.h
@@ -1,6 +1,6 @@
---- src/VBox/Main/include/ConsoleImpl.h.orig
-+++ src/VBox/Main/include/ConsoleImpl.h
-@@ -410,7 +410,7 @@ private:
+--- src/VBox/Main/include/ConsoleImpl.h.orig	2010-02-12 19:49:27.000000000 +0000
++++ src/VBox/Main/include/ConsoleImpl.h	2010-02-13 14:26:54.000000000 +0000
+@@ -410,7 +410,7 @@
  
      HRESULT callTapSetupApplication(bool isStatic, RTFILE tapFD, Bstr &tapDevice,
                                      Bstr &tapSetupApplication);
@@ -9,12 +9,12 @@
      HRESULT attachToTapInterface(INetworkAdapter *networkAdapter);
      HRESULT detachFromTapInterface(INetworkAdapter *networkAdapter);
  #endif
-@@ -582,7 +582,7 @@ private:
-     PPDMLED     mapNetworkLeds[SchemaDefs::NetworkAdapterCount];
-     PPDMLED     mapSharedFolderLed;
-     PPDMLED     mapUSBLed[2];
+@@ -592,7 +592,7 @@
+     PPDMLED      mapNetworkLeds[SchemaDefs::NetworkAdapterCount];
+     PPDMLED      mapSharedFolderLed;
+     PPDMLED      mapUSBLed[2];
 -#if !defined(VBOX_WITH_NETFLT) && (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD))
 +#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
-     Utf8Str     maTAPDeviceName[8];
-     RTFILE      maTapFD[8];
+     Utf8Str      maTAPDeviceName[8];
+     RTFILE       maTapFD[8];
  #endif
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-VBox-log-vbox.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-VBox-log-vbox.cpp
deleted file mode 100644
index 005a25e4a79a..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-VBox-log-vbox.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/VBox/Runtime/VBox/log-vbox.cpp	(revision 25471)
-+++ src/VBox/Runtime/VBox/log-vbox.cpp	(revision 25472)
-@@ -135,6 +135,12 @@
- #  include <Windows.h>
- # elif defined(RT_OS_LINUX)
- #  include <unistd.h>
-+# elif defined(RT_OS_FREEBSD)
-+#  include <sys/param.h>
-+#  include <sys/sysctl.h>
-+#  include <sys/user.h>
-+#  include <stdlib.h>
-+#  include <unistd.h>
- # elif defined(RT_OS_SOLARIS)
- #  define _STRUCTURED_PROC 1
- #  undef _FILE_OFFSET_BITS /* procfs doesn't like this */
-@@ -157,6 +163,7 @@
- # include <iprt/path.h>
- # include <iprt/process.h>
- # include <iprt/string.h>
-+# include <iprt/mem.h>
- # include <stdio.h>
- #endif
- 
-@@ -339,12 +346,8 @@
-             fclose(pFile);
-         }
- 
--#  elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
--#   ifdef RT_OS_LINUX
-+#  elif defined(RT_OS_LINUX)
-         FILE *pFile = fopen("/proc/self/cmdline", "r");
--#   else /* RT_OS_FREEBSD: */
--        FILE *pFile = fopen("/proc/curproc/cmdline", "r");
--#   endif
-         if (pFile)
-         {
-             /* braindead */
-@@ -370,7 +373,44 @@
-                 RTLogLoggerEx(pLogger, 0, ~0U, "\n");
-             fclose(pFile);
-         }
-+#  elif defined(RT_OS_FREEBSD)
-+        char *pszArgFileBuf = NULL;
-+        int aiName[4];
-+        size_t cchArgs;
- 
-+        aiName[0] = CTL_KERN;
-+        aiName[1] = KERN_PROC;
-+        aiName[2] = KERN_PROC_ARGS;
-+        aiName[3] = -1;
-+
-+        /* Retrieve the required length first */
-+        cchArgs = 0;
-+        int rcBSD = sysctl(aiName, RT_ELEMENTS(aiName), NULL, &cchArgs, NULL, 0);
-+
-+        if (cchArgs > 0)
-+        {
-+            pszArgFileBuf = (char *)RTMemAllocZ(cchArgs + 1 /* Safety */);
-+            if (pszArgFileBuf)
-+            {
-+                /* Retrieve the argument list */
-+                rcBSD = sysctl(aiName, RT_ELEMENTS(aiName), pszArgFileBuf, &cchArgs, NULL, 0);
-+                if (!rcBSD)
-+                {
-+                    /*
-+                     * cmdline is a flattened argument list so we need
-+                     * to convert all \0 to blanks
-+                     */
-+                    for(size_t i = 0; i < cchArgs - 1; i++)
-+                    {
-+                       if(pszArgFileBuf[i] == '\0')
-+                          pszArgFileBuf[i] = ' ';
-+                    }
-+
-+                    RTLogLoggerEx(pLogger, 0, ~0U, "Commandline: %s\n", pszArgFileBuf);
-+                }
-+                RTMemFree(pszArgFileBuf);
-+            }
-+        }
- #  elif defined(RT_OS_L4) || defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
-         /* commandline? */
- #  else
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-rtProcInitExePath-freebsd.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-rtProcInitExePath-freebsd.cpp
deleted file mode 100644
index 2332212ead14..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-rtProcInitExePath-freebsd.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp	(revision 25471)
-+++ src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp	(revision 25472)
-@@ -32,6 +32,8 @@
- *   Header Files                                                               *
- *******************************************************************************/
- #define LOG_GROUP RTLOGGROUP_PROCESS
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
- #include <unistd.h>
- #include <errno.h>
- #include <dlfcn.h>
-@@ -47,17 +49,20 @@
- 
- DECLHIDDEN(int) rtProcInitExePath(char *pszPath, size_t cchPath)
- {
--    /*
--     * Read the /proc/curproc/file link, convert to native and return it.
--     */
--    int cchLink = readlink("/proc/curproc/file", pszPath, cchPath - 1);
--    if (cchLink > 0 && (size_t)cchLink <= cchPath - 1)
--    {
--        pszPath[cchLink] = '\0';
-+    int aiName[4];
-+    size_t cchExePath;
- 
-+    aiName[0] = CTL_KERN;
-+    aiName[1] = KERN_PROC;
-+    aiName[2] = KERN_PROC_PATHNAME;
-+    aiName[3] = getpid();
-+
-+    cchExePath = cchPath - 1;
-+    if(sysctl(aiName, RT_ELEMENTS(aiName), pszPath, &cchExePath, NULL, 0) == 0)
-+    {
-         char *pszTmp = NULL;
-         int rc = rtPathFromNative(&pszTmp, pszPath);
--        AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchLink, pszPath), rc);
-+        AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchExePath, pszPath), rc);
- 
-         size_t cch = strlen(pszTmp);
-         AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-@@ -68,39 +73,8 @@
-         return VINF_SUCCESS;
-     }
- 
--    int err = errno;
--
--    /*
--     * Fall back on the dynamic linker since /proc is optional.
--     */
--    void *hExe = dlopen(NULL, 0);
--    if (hExe)
--    {
--        struct link_map const *pLinkMap = 0;
--        if (dlinfo(hExe, RTLD_DI_LINKMAP, &pLinkMap) == 0)
--        {
--            const char *pszImageName = pLinkMap->l_name;
--            if (*pszImageName == '/') /* this may not always be absolute, despite the docs. :-( */
--            {
--                char *pszTmp = NULL;
--                int rc = rtPathFromNative(&pszTmp, pszImageName);
--                AssertMsgRCReturn(rc, ("rc=%Rrc pszImageName=\"%s\"\n", rc, pszImageName), rc);
--
--                size_t cch = strlen(pszTmp);
--                AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
--
--                memcpy(pszPath, pszTmp, cch + 1);
--                RTStrFree(pszTmp);
--
--                return VINF_SUCCESS;
--            }
--            /** @todo Try search the PATH for the file name or append the current
--             *        directory, which ever makes sense... */
--        }
--    }
--
--    int rc = RTErrConvertFromErrno(err);
--    AssertMsgFailed(("rc=%Rrc err=%d cchLink=%d hExe=%p\n", rc, err, cchLink, hExe));
-+    int rc = RTErrConvertFromErrno(errno);
-+    AssertMsgFailed(("rc=%Rrc errno=%d cchLink=%d\n", rc, errno, cchExePath));
-     return rc;
- }
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index 8d1ad96f4e61..b79d9aee860e 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -59,6 +59,7 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%NLS%%%%DATADIR%%/nls/VirtualBox_ar.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_ca_VA.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_da.qm
 %%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm
@@ -91,6 +92,7 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%NLS%%%%DATADIR%%/nls/qt_ar.qm
 %%NLS%%%%DATADIR%%/nls/qt_bg.qm
 %%NLS%%%%DATADIR%%/nls/qt_ca.qm
+%%NLS%%%%DATADIR%%/nls/qt_ca_VA.qm
 %%NLS%%%%DATADIR%%/nls/qt_cs.qm
 %%NLS%%%%DATADIR%%/nls/qt_da.qm
 %%NLS%%%%DATADIR%%/nls/qt_de.qm