- Update to 3.0.51r22226

- Update Guest Additions to 3.0.4
- Add wiki page link to pkg-message
- Add missing libxslt dependency [1]
- Add NLS support [2]
- Installing C and Python bindings [3]
- Add patch to pass a physical disk to vbox [4]

Submitted by:	Guido Falsi <mad AT madpilot.net> [1], nork [2],
		Bernhard Froehlich <decke AT bluelife.at> [3], nox [4]
Thanks to:	All testers and patch submitters their patch already
		included upstream
On behalf of:	vbox@ (decke, dhn, miwi, nox)

45 files changed, 3045 insertions, 175 deletions

diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index 70c1c1d4b56a..44e56c9856b0 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox
-DISTVERSION=	2.2.51.r20457
-PORTREVISION=	3
+DISTVERSION=	3.0.51r22226
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -26,6 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.5:${PORTSDIR}/ftp/curl
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -35,7 +35,6 @@ USE_SDL=	sdl
 USE_CDRTOOLS=	yes
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-2.2.51r20457
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
@@ -45,7 +44,7 @@ CONFLICTS=	bcc-[0-9]*
 VBOXGROUP?=	vboxusers
 VBOXGID?=	920
 VBOX_FRONTENDS=	VBoxBFE VBoxHeadless VBoxSDL
-VBOX_GUEST_VER=	2.2.4
+VBOX_GUEST_VER=	3.0.4
 
 SUB_FILES=	pkg-install
 
@@ -57,7 +56,8 @@ OPTIONS=	QT4 "Build with QT4 Frontend" on \
 		DEBUG "Build with debugging symbols" off \
 		GUESTADDITIONS "Build with Guest Additions" off \
 		DBUS "Build with D-Bus and HAL support" on \
-		PULSEAUDIO "Build with PulseAudio" off
+		PULSEAUDIO "Build with PulseAudio" off \
+		NLS "Native language support" on
 
 .include <bsd.port.options.mk>
 
@@ -77,6 +77,7 @@ PLIST_SUB+=	QT4=""
 .else
 CONFIGURE_ARGS+=--disable-qt4
 PLIST_SUB+=	QT4="@comment "
+WITHOUT_NLS=	yes
 .endif
 
 .if defined(WITH_GUESTADDITIONS)
@@ -105,6 +106,12 @@ CONFIGURE_ARGS+=--disable-dbus
 CONFIGURE_ARGS+=--disable-pulse
 .endif
 
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if !exists(${SRC_BASE}/sys/kern/bus_if.m)
 IGNORE=		requires kernel sources for the kernel module
 .endif
@@ -154,9 +161,20 @@ do-install:
 	${MKDIR} ${KMODDIR}
 	${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR}
 
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR})
+
+	${MKDIR} ${PREFIX}/include/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${PREFIX}/include/virtualbox)
+
 	${MKDIR} ${PREFIX}/lib/virtualbox
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox)
 
+.if !defined(WITHOUT_NLS)
+	${MKDIR} ${PREFIX}/lib/virtualbox/nls
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls)
+.endif
+
 	${MKDIR} ${PREFIX}/bin
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} VBoxTestOGL
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/
@@ -176,6 +194,9 @@ do-install:
 	${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso
 .endif
 
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${PYTHONPREFIX_SITELIBDIR}/virtualbox)
+
 post-install:
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/emulators/virtualbox-ose-kmod-legacy/distinfo b/emulators/virtualbox-ose-kmod-legacy/distinfo
index 83a43ed1146d..d72ab50597c2 100644
--- a/emulators/virtualbox-ose-kmod-legacy/distinfo
+++ b/emulators/virtualbox-ose-kmod-legacy/distinfo
@@ -1,6 +1,6 @@
-MD5 (virtualbox-2.2.51.r20457.tar.bz2) = e95b5130a0276224961c792047975531
-SHA256 (virtualbox-2.2.51.r20457.tar.bz2) = f321c04e20c47d7054b885bd70ea5abcab11bc047f2645dec0ca297dbdb3945b
-SIZE (virtualbox-2.2.51.r20457.tar.bz2) = 50707220
-MD5 (VBoxGuestAdditions_2.2.4.iso) = 00e64c25f87155540a3d106c5257530f
-SHA256 (VBoxGuestAdditions_2.2.4.iso) = 98c4323b87461a02ec5efc6803ec05a101dbea301784a9561cbade7b63a62861
-SIZE (VBoxGuestAdditions_2.2.4.iso) = 28747776
+MD5 (virtualbox-3.0.51r22226.tar.bz2) = bb4bbefdc7635a339629ed2ec790d638
+SHA256 (virtualbox-3.0.51r22226.tar.bz2) = 277967c68ddde036d7a8fb47e343dee8f7389002a89c3fd282e59b351dbf7e06
+SIZE (virtualbox-3.0.51r22226.tar.bz2) = 51353921
+MD5 (VBoxGuestAdditions_3.0.4.iso) = f1347c8dd9323c3d4850462abfaafc08
+SHA256 (VBoxGuestAdditions_3.0.4.iso) = 85ea4675c8960940db05799523314c99e8538439404573d97355d1fc3284e0ba
+SIZE (VBoxGuestAdditions_3.0.4.iso) = 32380928
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-Config.kmk b/emulators/virtualbox-ose-kmod-legacy/files/patch-Config.kmk
deleted file mode 100644
index 81e5f7062b4e..000000000000
--- a/emulators/virtualbox-ose-kmod-legacy/files/patch-Config.kmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- Config.kmk.orig	2009-06-04 18:02:20.000000000 +0200
-+++ Config.kmk	2009-06-04 18:21:07.000000000 +0200
-@@ -1850,7 +1850,7 @@
-  VBOX_OPENSSL_ALL=1
- endif
- 
--if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86)
-+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64)
-  VBOX_WITH_LIBCURL = 1
-  SDK_VBOX_LIBCURL       = .
-  SDK_VBOX_LIBCURL_INCS ?= $(PATH_ROOT)/src/libs/curl-7.19.4/include
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-glloader.py b/emulators/virtualbox-ose-kmod-legacy/files/patch-glloader.py
deleted file mode 100644
index f57aee697ad8..000000000000
--- a/emulators/virtualbox-ose-kmod-legacy/files/patch-glloader.py
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: src/VBox/GuestHost/OpenGL/spu_loader/glloader.py
-@@ -149,7 +149,7 @@
- 		}*/
- #endif
- 	}
--#if !defined(__linux__) && !defined(SunOS)
-+#if !defined(__linux__) && !defined(SunOS) && !defined(__FreeBSD__)
- 	crStrcat( system_path, "/" );
- #endif
- 	crStrcat( system_path, lib );
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-include-iprt-types.h b/emulators/virtualbox-ose-kmod-legacy/files/patch-include-iprt-types.h
new file mode 100644
index 000000000000..35f253a391e7
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-include-iprt-types.h
@@ -0,0 +1,14 @@
+--- include/iprt/types.h.orig	2009-07-12 21:17:13.000000000 +0200
++++ include/iprt/types.h	2009-08-12 21:38:17.000000000 +0200
+@@ -92,6 +92,11 @@
+ #  undef true
+ #  undef bool
+ 
++# elif defined(RT_OS_FREEBSD)
++#  define _UINT64_T_DECLARED
++#  define _INT64_T_DECLARED
++#  include <stddef.h>
++#  include <sys/types.h>
+ # else
+ #  include <stddef.h>
+ #  include <sys/types.h>
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
index 64ed1b6899f8..670495c87b8c 100644
--- a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
@@ -1,6 +1,6 @@
 --- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.old	2009-05-04 20:29:23.000000000 +0200
 +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c	2009-05-04 20:30:28.000000000 +0200
-@@ -228,7 +228,11 @@
+@@ -162,7 +162,11 @@
      if (rc)
      {
          *ppDev = make_dev(&g_VBoxGuestFreeBSDChrDevSW,
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
new file mode 100644
index 000000000000..0a1f735fb79a
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
@@ -0,0 +1,50 @@
+Index: src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
+@@ -54,7 +54,8 @@
+ #ifdef RT_OS_WINDOWS
+ # include <windows.h>
+ # include <winioctl.h>
+-#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
++#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) \
++    || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+ # include <errno.h>
+ # include <sys/ioctl.h>
+ # include <sys/types.h>
+@@ -76,6 +77,9 @@
+ # include <sys/dkio.h>
+ # include <sys/vtoc.h>
+ #endif /* RT_OS_SOLARIS */
++#ifdef RT_OS_FREEBSD
++# include <sys/disk.h>
++#endif /* RT_OS_FREEBSD */
+ 
+ using namespace com;
+ 
+@@ -1013,6 +1017,28 @@
+         vrc = VERR_INVALID_PARAMETER;
+         goto out;
+     }
++#elif defined(RT_OS_FREEBSD)
++    struct stat DevStat;
++    if (!fstat(RawFile, &DevStat) && S_ISCHR(DevStat.st_mode))
++    {
++        off_t cMediasize = 0;
++        if (!ioctl(RawFile, DIOCGMEDIASIZE, &cMediasize))
++        {
++            cbSize = cMediasize;
++        }
++        else
++        {
++            vrc = RTErrConvertFromErrno(errno);
++            RTPrintf("Cannot get the block count for file '%s': %Rrc", rawdisk.raw(), vrc);
++            goto out;
++        }
++    }
++    else
++    {
++        RTPrintf("File '%s' is no character device\n", rawdisk.raw());
++        vrc = VERR_INVALID_PARAMETER;
++        goto out;
++    }
+ #else /* all unrecognized OSes */
+     /* Hopefully this works on all other hosts. If it doesn't, it'll just fail
+      * creating the VMDK, so no real harm done. */
diff --git a/emulators/virtualbox-ose-kmod-legacy/pkg-message b/emulators/virtualbox-ose-kmod-legacy/pkg-message
index 053b176a7388..8de6ce2ffe0c 100644
--- a/emulators/virtualbox-ose-kmod-legacy/pkg-message
+++ b/emulators/virtualbox-ose-kmod-legacy/pkg-message
@@ -14,6 +14,9 @@ You also have to add all users to your vboxusers group in order to use vbox.
 Running VirtualBox as non-root user may fail with a fatal error 
 NS_ERROR_FACTORY_NOT_REGISTERED. In this case delete /tmp/.vbox-*-ipc file.
 
+Check wiki page for known issues and troubleshooting:
+http://wiki.freebsd.org/VirtualBox
+
 Please report any problems to emulation@. Thanks!
 
 =============================================================================
diff --git a/emulators/virtualbox-ose-kmod-legacy/pkg-plist b/emulators/virtualbox-ose-kmod-legacy/pkg-plist
index db7682a96d30..611a88294b9d 100644
--- a/emulators/virtualbox-ose-kmod-legacy/pkg-plist
+++ b/emulators/virtualbox-ose-kmod-legacy/pkg-plist
@@ -31,7 +31,6 @@ lib/virtualbox/VBoxRT.so
 lib/virtualbox/VBoxSDL
 lib/virtualbox/VBoxSDL.so
 lib/virtualbox/VBoxSVC
-lib/virtualbox/VBoxSettings.so
 lib/virtualbox/VBoxSharedClipboard.so
 lib/virtualbox/VBoxSharedCrOpenGL.so
 lib/virtualbox/VBoxSharedFolders.so
@@ -48,20 +47,528 @@ lib/virtualbox/tstMicroGC.gc
 lib/virtualbox/VBoxDD2R0.r0
 lib/virtualbox/VBoxDDR0.r0
 %%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso
-%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_2.2.4.iso
+%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_3.0.4.iso
+lib/virtualbox/VBoxPython2_6.so
 lib/virtualbox/VMMR0.r0
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
 lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VBoxSVCM.so
 lib/virtualbox/components/VBoxC.so
 lib/virtualbox/components/VBoxXPCOMBase.xpt
+%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm
+%%NLS%%lib/virtualbox/nls/qt_ar.qm
+%%NLS%%lib/virtualbox/nls/qt_bg.qm
+%%NLS%%lib/virtualbox/nls/qt_ca.qm
+%%NLS%%lib/virtualbox/nls/qt_cs.qm
+%%NLS%%lib/virtualbox/nls/qt_de.qm
+%%NLS%%lib/virtualbox/nls/qt_el.qm
+%%NLS%%lib/virtualbox/nls/qt_es.qm
+%%NLS%%lib/virtualbox/nls/qt_eu.qm
+%%NLS%%lib/virtualbox/nls/qt_fi.qm
+%%NLS%%lib/virtualbox/nls/qt_fr.qm
+%%NLS%%lib/virtualbox/nls/qt_hu.qm
+%%NLS%%lib/virtualbox/nls/qt_id.qm
+%%NLS%%lib/virtualbox/nls/qt_it.qm
+%%NLS%%lib/virtualbox/nls/qt_ja.qm
+%%NLS%%lib/virtualbox/nls/qt_km_KH.qm
+%%NLS%%lib/virtualbox/nls/qt_ko.qm
+%%NLS%%lib/virtualbox/nls/qt_nl.qm
+%%NLS%%lib/virtualbox/nls/qt_pl.qm
+%%NLS%%lib/virtualbox/nls/qt_pt.qm
+%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/qt_ro.qm
+%%NLS%%lib/virtualbox/nls/qt_ru.qm
+%%NLS%%lib/virtualbox/nls/qt_sk.qm
+%%NLS%%lib/virtualbox/nls/qt_sr.qm
+%%NLS%%lib/virtualbox/nls/qt_sv.qm
+%%NLS%%lib/virtualbox/nls/qt_tr.qm
+%%NLS%%lib/virtualbox/nls/qt_uk.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm
 %%QT4%%share/applications/virtualbox.desktop
 %%QT4%%share/icons/hicolor/48x48/apps/VBox.png
+%%DATADIR%%/idl/nsIDebug.idl
+%%DATADIR%%/idl/nsIInterfaceRequestor.idl
+%%DATADIR%%/idl/nsIMemory.idl
+%%DATADIR%%/idl/nsIProgrammingLanguage.idl
+%%DATADIR%%/idl/nsISupports.idl
+%%DATADIR%%/idl/nsITraceRefcnt.idl
+%%DATADIR%%/idl/nsIWeakReference.idl
+%%DATADIR%%/idl/nsIConsoleMessage.idl
+%%DATADIR%%/idl/nsIConsoleService.idl
+%%DATADIR%%/idl/nsIConsoleListener.idl
+%%DATADIR%%/idl/nsIErrorService.idl
+%%DATADIR%%/idl/nsIException.idl
+%%DATADIR%%/idl/nsIExceptionService.idl
+%%DATADIR%%/idl/nsrootidl.idl
+%%DATADIR%%/idl/nsIClassInfo.idl
+%%DATADIR%%/idl/nsIFactory.idl
+%%DATADIR%%/idl/nsIModule.idl
+%%DATADIR%%/idl/nsIComponentRegistrar.idl
+%%DATADIR%%/idl/nsIServiceManager.idl
+%%DATADIR%%/idl/nsIComponentManager.idl
+%%DATADIR%%/idl/nsICategoryManager.idl
+%%DATADIR%%/idl/nsINativeComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentManagerObsolete.idl
+%%DATADIR%%/idl/nsISupportsArray.idl
+%%DATADIR%%/idl/nsIComponentLoaderManager.idl
+%%DATADIR%%/idl/nsICollection.idl
+%%DATADIR%%/idl/nsISerializable.idl
+%%DATADIR%%/idl/nsIEnumerator.idl
+%%DATADIR%%/idl/nsISimpleEnumerator.idl
+%%DATADIR%%/idl/nsIObserverService.idl
+%%DATADIR%%/idl/nsIObserver.idl
+%%DATADIR%%/idl/nsIAtom.idl
+%%DATADIR%%/idl/nsIAtomService.idl
+%%DATADIR%%/idl/nsIProperties.idl
+%%DATADIR%%/idl/nsIPersistentProperties2.idl
+%%DATADIR%%/idl/nsIRecyclingAllocator.idl
+%%DATADIR%%/idl/nsIStringEnumerator.idl
+%%DATADIR%%/idl/nsISupportsPrimitives.idl
+%%DATADIR%%/idl/nsISupportsIterators.idl
+%%DATADIR%%/idl/nsITimelineService.idl
+%%DATADIR%%/idl/nsIVariant.idl
+%%DATADIR%%/idl/nsIArray.idl
+%%DATADIR%%/idl/nsIPropertyBag.idl
+%%DATADIR%%/idl/nsIHashable.idl
+%%DATADIR%%/idl/nsIDirectoryService.idl
+%%DATADIR%%/idl/nsIDirectoryEnumerator.idl
+%%DATADIR%%/idl/nsIFile.idl
+%%DATADIR%%/idl/nsILocalFile.idl
+%%DATADIR%%/idl/nsIInputStream.idl
+%%DATADIR%%/idl/nsILocalFileMac.idl
+%%DATADIR%%/idl/nsIObjectInputStream.idl
+%%DATADIR%%/idl/nsIBinaryInputStream.idl
+%%DATADIR%%/idl/nsIObjectOutputStream.idl
+%%DATADIR%%/idl/nsIBinaryOutputStream.idl
+%%DATADIR%%/idl/nsIStreamBufferAccess.idl
+%%DATADIR%%/idl/nsIOutputStream.idl
+%%DATADIR%%/idl/nsIByteArrayInputStream.idl
+%%DATADIR%%/idl/nsIFastLoadFileControl.idl
+%%DATADIR%%/idl/nsISeekableStream.idl
+%%DATADIR%%/idl/nsIInputStreamTee.idl
+%%DATADIR%%/idl/nsIFastLoadService.idl
+%%DATADIR%%/idl/nsIMultiplexInputStream.idl
+%%DATADIR%%/idl/nsIPipe.idl
+%%DATADIR%%/idl/nsIAsyncInputStream.idl
+%%DATADIR%%/idl/nsIAsyncOutputStream.idl
+%%DATADIR%%/idl/nsIScriptableInputStream.idl
+%%DATADIR%%/idl/nsIStorageStream.idl
+%%DATADIR%%/idl/nsILineInputStream.idl
+%%DATADIR%%/idl/nsIStringStream.idl
+%%DATADIR%%/idl/nsIProxyObjectManager.idl
+%%DATADIR%%/idl/nsIEventQueue.idl
+%%DATADIR%%/idl/nsIEventQueueService.idl
+%%DATADIR%%/idl/nsIRunnable.idl
+%%DATADIR%%/idl/nsIThread.idl
+%%DATADIR%%/idl/nsIEventTarget.idl
+%%DATADIR%%/idl/nsIEnvironment.idl
+%%DATADIR%%/idl/nsITimer.idl
+%%DATADIR%%/idl/nsITimerInternal.idl
+%%DATADIR%%/idl/nsITimerManager.idl
+%%DATADIR%%/idl/nsIInterfaceInfo.idl
+%%DATADIR%%/idl/nsIProcess.idl
+%%DATADIR%%/idl/nsIXPTLoader.idl
+%%DATADIR%%/idl/nsIInterfaceInfoManager.idl
+%%DATADIR%%/idl/ipcIMessageObserver.idl
+%%DATADIR%%/idl/ipcIService.idl
+%%DATADIR%%/idl/ipcIClientObserver.idl
+%%DATADIR%%/idl/ipcILockService.idl
+%%DATADIR%%/idl/ipcIDConnectService.idl
+%%DATADIR%%/idl/ipcITransactionService.idl
+%%DATADIR%%/idl/ipcITransactionObserver.idl
+%%DATADIR%%/idl/VirtualBox_XPCOM.idl
+%%DATADIR%%/samples/tstVBoxAPILinux.cpp
+%%DATADIR%%/samples/Makefile
+include/virtualbox/VBoxCAPI_v2_2.h
+include/virtualbox/VBoxCAPI_v3_0.h
+include/virtualbox/VBoxCAPI_v3_1.h
+include/virtualbox/VirtualBox_XPCOM.h
+include/virtualbox/ipcIClientObserver.h
+include/virtualbox/ipcIDConnectService.h
+include/virtualbox/ipcILockService.h
+include/virtualbox/ipcIMessageObserver.h
+include/virtualbox/ipcIService.h
+include/virtualbox/ipcITransactionObserver.h
+include/virtualbox/ipcITransactionService.h
+include/virtualbox/ipcd/ipcCID.h
+include/virtualbox/ipcd/ipcLockCID.h
+include/virtualbox/ipcd/ipcMessageReader.h
+include/virtualbox/ipcd/ipcMessageWriter.h
+include/virtualbox/ipcd/ipcModule.h
+include/virtualbox/ipcd/ipcModuleUtil.h
+include/virtualbox/ipcd/ipcdclient.h
+include/virtualbox/nsIArray.h
+include/virtualbox/nsIAsyncInputStream.h
+include/virtualbox/nsIAsyncOutputStream.h
+include/virtualbox/nsIAtom.h
+include/virtualbox/nsIAtomService.h
+include/virtualbox/nsIBinaryInputStream.h
+include/virtualbox/nsIBinaryOutputStream.h
+include/virtualbox/nsIByteArrayInputStream.h
+include/virtualbox/nsICategoryManager.h
+include/virtualbox/nsIClassInfo.h
+include/virtualbox/nsICollection.h
+include/virtualbox/nsIComponentLoader.h
+include/virtualbox/nsIComponentLoaderManager.h
+include/virtualbox/nsIComponentManager.h
+include/virtualbox/nsIComponentManagerObsolete.h
+include/virtualbox/nsIComponentRegistrar.h
+include/virtualbox/nsIConsoleListener.h
+include/virtualbox/nsIConsoleMessage.h
+include/virtualbox/nsIConsoleService.h
+include/virtualbox/nsIDebug.h
+include/virtualbox/nsIDirectoryEnumerator.h
+include/virtualbox/nsIDirectoryService.h
+include/virtualbox/nsIEnumerator.h
+include/virtualbox/nsIEnvironment.h
+include/virtualbox/nsIErrorService.h
+include/virtualbox/nsIEventQueue.h
+include/virtualbox/nsIEventQueueService.h
+include/virtualbox/nsIEventTarget.h
+include/virtualbox/nsIException.h
+include/virtualbox/nsIExceptionService.h
+include/virtualbox/nsIFactory.h
+include/virtualbox/nsIFastLoadFileControl.h
+include/virtualbox/nsIFastLoadService.h
+include/virtualbox/nsIFile.h
+include/virtualbox/nsIHashable.h
+include/virtualbox/nsIInputStream.h
+include/virtualbox/nsIInputStreamTee.h
+include/virtualbox/nsIInterfaceInfo.h
+include/virtualbox/nsIInterfaceInfoManager.h
+include/virtualbox/nsIInterfaceRequestor.h
+include/virtualbox/nsILineInputStream.h
+include/virtualbox/nsILocalFile.h
+include/virtualbox/nsILocalFileMac.h
+include/virtualbox/nsIMemory.h
+include/virtualbox/nsIModule.h
+include/virtualbox/nsIMultiplexInputStream.h
+include/virtualbox/nsINativeComponentLoader.h
+include/virtualbox/nsIObjectInputStream.h
+include/virtualbox/nsIObjectOutputStream.h
+include/virtualbox/nsIObserver.h
+include/virtualbox/nsIObserverService.h
+include/virtualbox/nsIOutputStream.h
+include/virtualbox/nsIPersistentProperties2.h
+include/virtualbox/nsIPipe.h
+include/virtualbox/nsIProcess.h
+include/virtualbox/nsIProgrammingLanguage.h
+include/virtualbox/nsIProperties.h
+include/virtualbox/nsIPropertyBag.h
+include/virtualbox/nsIProxyObjectManager.h
+include/virtualbox/nsIRecyclingAllocator.h
+include/virtualbox/nsIRunnable.h
+include/virtualbox/nsIScriptableInputStream.h
+include/virtualbox/nsISeekableStream.h
+include/virtualbox/nsISerializable.h
+include/virtualbox/nsIServiceManager.h
+include/virtualbox/nsISimpleEnumerator.h
+include/virtualbox/nsIStorageStream.h
+include/virtualbox/nsIStreamBufferAccess.h
+include/virtualbox/nsIStringEnumerator.h
+include/virtualbox/nsIStringStream.h
+include/virtualbox/nsISupports.h
+include/virtualbox/nsISupportsArray.h
+include/virtualbox/nsISupportsIterators.h
+include/virtualbox/nsISupportsPrimitives.h
+include/virtualbox/nsIThread.h
+include/virtualbox/nsITimelineService.h
+include/virtualbox/nsITimer.h
+include/virtualbox/nsITimerInternal.h
+include/virtualbox/nsITimerManager.h
+include/virtualbox/nsITraceRefcnt.h
+include/virtualbox/nsIVariant.h
+include/virtualbox/nsIWeakReference.h
+include/virtualbox/nsIXPTLoader.h
+include/virtualbox/nsprpub/nspr.h
+include/virtualbox/nsprpub/plarena.h
+include/virtualbox/nsprpub/plarenas.h
+include/virtualbox/nsprpub/plbase64.h
+include/virtualbox/nsprpub/plerror.h
+include/virtualbox/nsprpub/plgetopt.h
+include/virtualbox/nsprpub/plhash.h
+include/virtualbox/nsprpub/plresolv.h
+include/virtualbox/nsprpub/plstr.h
+include/virtualbox/nsprpub/pratom.h
+include/virtualbox/nsprpub/prbit.h
+include/virtualbox/nsprpub/prclist.h
+include/virtualbox/nsprpub/prcmon.h
+include/virtualbox/nsprpub/prcountr.h
+include/virtualbox/nsprpub/prcvar.h
+include/virtualbox/nsprpub/prdtoa.h
+include/virtualbox/nsprpub/prenv.h
+include/virtualbox/nsprpub/prerr.h
+include/virtualbox/nsprpub/prerror.h
+include/virtualbox/nsprpub/prinet.h
+include/virtualbox/nsprpub/prinit.h
+include/virtualbox/nsprpub/prinrval.h
+include/virtualbox/nsprpub/prio.h
+include/virtualbox/nsprpub/pripcsem.h
+include/virtualbox/nsprpub/prlink.h
+include/virtualbox/nsprpub/md/_iprt_atomic.h
+include/virtualbox/nsprpub/md/_darwin.h
+include/virtualbox/nsprpub/md/_freebsd.h
+include/virtualbox/nsprpub/md/_l4v2.h
+include/virtualbox/nsprpub/md/_linux.h
+include/virtualbox/nsprpub/md/_macos.h
+include/virtualbox/nsprpub/md/_netbsd.h
+include/virtualbox/nsprpub/md/_openbsd.h
+include/virtualbox/nsprpub/md/_os2_errors.h
+include/virtualbox/nsprpub/md/_os2.h
+include/virtualbox/nsprpub/md/_pcos.h
+include/virtualbox/nsprpub/md/_solaris.h
+include/virtualbox/nsprpub/md/_unix_errors.h
+include/virtualbox/nsprpub/md/_unixos.h
+include/virtualbox/nsprpub/md/_pth.h
+include/virtualbox/nsprpub/md/prosdep.h
+include/virtualbox/nsprpub/md/_freebsd.cfg
+include/virtualbox/nsprpub/md/_linux.cfg
+include/virtualbox/nsprpub/md/_darwin.cfg
+include/virtualbox/nsprpub/md/_netbsd.cfg
+include/virtualbox/nsprpub/md/_openbsd.cfg
+include/virtualbox/nsprpub/md/_os2.cfg
+include/virtualbox/nsprpub/md/_solaris32.cfg
+include/virtualbox/nsprpub/md/_l4v2.cfg
+include/virtualbox/nsprpub/md/_solaris64.cfg
+include/virtualbox/nsprpub/prlock.h
+include/virtualbox/nsprpub/prlog.h
+include/virtualbox/nsprpub/prlong.h
+include/virtualbox/nsprpub/prmem.h
+include/virtualbox/nsprpub/prmon.h
+include/virtualbox/nsprpub/prmwait.h
+include/virtualbox/nsprpub/prnetdb.h
+include/virtualbox/nsprpub/prolock.h
+include/virtualbox/nsprpub/prpdce.h
+include/virtualbox/nsprpub/prprf.h
+include/virtualbox/nsprpub/prproces.h
+include/virtualbox/nsprpub/prrng.h
+include/virtualbox/nsprpub/prrwlock.h
+include/virtualbox/nsprpub/prshm.h
+include/virtualbox/nsprpub/prshma.h
+include/virtualbox/nsprpub/prsystem.h
+include/virtualbox/nsprpub/prthread.h
+include/virtualbox/nsprpub/prtime.h
+include/virtualbox/nsprpub/prtpool.h
+include/virtualbox/nsprpub/prtrace.h
+include/virtualbox/nsprpub/prtypes.h
+include/virtualbox/nsprpub/prvrsion.h
+include/virtualbox/nsprpub/prwin16.h
+include/virtualbox/nsprpub/prcpucfg.h
+include/virtualbox/nsprpub/obsolete/pralarm.h
+include/virtualbox/nsprpub/obsolete/probslet.h
+include/virtualbox/nsprpub/obsolete/protypes.h
+include/virtualbox/nsprpub/obsolete/prsem.h
+include/virtualbox/nsprpub/private/pprio.h
+include/virtualbox/nsprpub/private/pprthred.h
+include/virtualbox/nsprpub/private/prpriv.h
+include/virtualbox/nsrootidl.h
+include/virtualbox/string/nsAString.h
+include/virtualbox/string/nsAlgorithm.h
+include/virtualbox/string/nsCharTraits.h
+include/virtualbox/string/nsDependentString.h
+include/virtualbox/string/nsDependentSubstring.h
+include/virtualbox/string/nsEmbedString.h
+include/virtualbox/string/nsLiteralString.h
+include/virtualbox/string/nsObsoleteAString.h
+include/virtualbox/string/nsPrintfCString.h
+include/virtualbox/string/nsPromiseFlatString.h
+include/virtualbox/string/nsReadableUtils.h
+include/virtualbox/string/nsString.h
+include/virtualbox/string/nsStringAPI.h
+include/virtualbox/string/nsStringFwd.h
+include/virtualbox/string/nsStringIterator.h
+include/virtualbox/string/nsSubstring.h
+include/virtualbox/string/nsSubstringTuple.h
+include/virtualbox/string/nsTAString.h
+include/virtualbox/string/nsTString.h
+include/virtualbox/string/nsTDependentString.h
+include/virtualbox/string/nsTDependentSubstring.h
+include/virtualbox/string/nsTObsoleteAString.h
+include/virtualbox/string/nsTPromiseFlatString.h
+include/virtualbox/string/nsTSubstring.h
+include/virtualbox/string/nsTSubstringTuple.h
+include/virtualbox/string/nsUTF8Utils.h
+include/virtualbox/string/nsXPIDLString.h
+include/virtualbox/string/string-template-def-char.h
+include/virtualbox/string/string-template-def-unichar.h
+include/virtualbox/string/string-template-undef.h
+include/virtualbox/xpcom/nsAgg.h
+include/virtualbox/xpcom/nsAppDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsArray.h
+include/virtualbox/xpcom/nsArrayEnumerator.h
+include/virtualbox/xpcom/nsAtomService.h
+include/virtualbox/xpcom/nsAutoBuffer.h
+include/virtualbox/xpcom/nsAutoLock.h
+include/virtualbox/xpcom/nsAutoPtr.h
+include/virtualbox/xpcom/nsBaseHashtable.h
+include/virtualbox/xpcom/nsCOMArray.h
+include/virtualbox/xpcom/nsCRT.h
+include/virtualbox/xpcom/nsCategoryManagerUtils.h
+include/virtualbox/xpcom/nsCheapSets.h
+include/virtualbox/xpcom/nsClassHashtable.h
+include/virtualbox/xpcom/nsCom.h
+include/virtualbox/xpcom/nsComponentManagerObsolete.h
+include/virtualbox/xpcom/nsComponentManagerUtils.h
+include/virtualbox/xpcom/nsCppSharedAllocator.h
+include/virtualbox/xpcom/nsID.h
+include/virtualbox/xpcom/nsDataHashtable.h
+include/virtualbox/xpcom/nsDebugImpl.h
+include/virtualbox/xpcom/nsDeque.h
+include/virtualbox/xpcom/nsDirectoryService.h
+include/virtualbox/xpcom/nsDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsDirectoryServiceUtils.h
+include/virtualbox/xpcom/nsDoubleHashtable.h
+include/virtualbox/xpcom/nsEnumeratorUtils.h
+include/virtualbox/xpcom/nsError.h
+include/virtualbox/xpcom/nsEscape.h
+include/virtualbox/xpcom/nsEventQueueUtils.h
+include/virtualbox/xpcom/nsFastLoadPtr.h
+include/virtualbox/xpcom/nsFastLoadService.h
+include/virtualbox/xpcom/nsFixedSizeAllocator.h
+include/virtualbox/xpcom/nsHashKeys.h
+include/virtualbox/xpcom/nsHashSets.h
+include/virtualbox/xpcom/nsHashtable.h
+include/virtualbox/xpcom/nsIAllocator.h
+include/virtualbox/xpcom/nsIByteBuffer.h
+include/virtualbox/xpcom/nsIID.h
+include/virtualbox/xpcom/nsIServiceManagerObsolete.h
+include/virtualbox/xpcom/nsIServiceManagerUtils.h
+include/virtualbox/xpcom/nsISupportsBase.h
+include/virtualbox/xpcom/nsISupportsObsolete.h
+include/virtualbox/xpcom/nsIUnicharBuffer.h
+include/virtualbox/xpcom/nsIUnicharInputStream.h
+include/virtualbox/xpcom/nsInt64.h
+include/virtualbox/xpcom/nsInterfaceHashtable.h
+include/virtualbox/xpcom/nsLinebreakConverter.h
+include/virtualbox/xpcom/nsLocalFile.h
+include/virtualbox/xpcom/nsLocalFileUnix.h
+include/virtualbox/xpcom/nsLocalFileOS2.h
+include/virtualbox/xpcom/nsLocalFileOSX.h
+include/virtualbox/xpcom/nsModule.h
+include/virtualbox/xpcom/nsMultiplexInputStream.h
+include/virtualbox/xpcom/nsNativeCharsetUtils.h
+include/virtualbox/xpcom/nsProcess.h
+include/virtualbox/xpcom/nsNativeComponentLoader.h
+include/virtualbox/xpcom/nsObserverService.h
+include/virtualbox/xpcom/nsObsoleteModuleLoading.h
+include/virtualbox/xpcom/nsProxiedService.h
+include/virtualbox/xpcom/nsProxyEvent.h
+include/virtualbox/xpcom/nsProxyRelease.h
+include/virtualbox/xpcom/nsQuickSort.h
+include/virtualbox/xpcom/nsRecyclingAllocator.h
+include/virtualbox/xpcom/nsRefPtrHashtable.h
+include/virtualbox/xpcom/nsScriptableInputStream.h
+include/virtualbox/xpcom/nsStaticAtom.h
+include/virtualbox/xpcom/nsStaticComponent.h
+include/virtualbox/xpcom/nsStaticNameTable.h
+include/virtualbox/xpcom/nsStorageStream.h
+include/virtualbox/xpcom/nsStreamUtils.h
+include/virtualbox/xpcom/nsStringEnumerator.h
+include/virtualbox/xpcom/nsStringIO.h
+include/virtualbox/xpcom/nsTHashtable.h
+include/virtualbox/xpcom/nsStringStream.h
+include/virtualbox/xpcom/nsSupportsArray.h
+include/virtualbox/xpcom/nsSupportsPrimitives.h
+include/virtualbox/xpcom/nsTextFormatter.h
+include/virtualbox/xpcom/nsTime.h
+include/virtualbox/xpcom/nsTraceRefcntImpl.h
+include/virtualbox/xpcom/nsUnitConversion.h
+include/virtualbox/xpcom/nsValueArray.h
+include/virtualbox/xpcom/nsVariant.h
+include/virtualbox/xpcom/nsVoidArray.h
+include/virtualbox/xpcom/nsWeakPtr.h
+include/virtualbox/xpcom/nsXPCOM.h
+include/virtualbox/xpcom/nsXPCOMCID.h
+include/virtualbox/xpcom/nscore.h
+include/virtualbox/xpcom/pldhash.h
+include/virtualbox/xpcom/plevent.h
+include/virtualbox/xpcom/xcDll.h
+include/virtualbox/xpcom/xpt_arena.h
+include/virtualbox/xpcom/xpt_struct.h
+include/virtualbox/xpcom/xpt_xdr.h
+include/virtualbox/xpcom/xptcall.h
+include/virtualbox/xpcom/xptcstubsdecl.inc
+include/virtualbox/xpcom/xptcstubsdef.inc
+include/virtualbox/xpcom/xptinfo.h
+include/virtualbox/xpcom/nsIInterfaceRequestorUtils.h
+include/virtualbox/xpcom/nsISupportsImpl.h
+include/virtualbox/xpcom/nsISupportsUtils.h
+include/virtualbox/xpcom/nsIWeakReferenceUtils.h
+include/virtualbox/xpcom/nsCOMPtr.h
+include/virtualbox/xpcom/nsDebug.h
+include/virtualbox/xpcom/nsGenericFactory.h
+include/virtualbox/xpcom/nsIGenericFactory.h
+include/virtualbox/xpcom/nsMemory.h
+include/virtualbox/xpcom/nsTraceRefcnt.h
+include/virtualbox/xpcom/nsWeakReference.h
+include/virtualbox/xpcom/nsXPCOMGlue.h
+include/virtualbox/xpcom/xpcom-config.h
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/vboxxpcom.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/components.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/file.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/nsError.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/primitives.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpcom_consts.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpt.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/enumerator.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/factory.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/loader.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/module.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/policy.py
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox
+@dirrm include/virtualbox/xpcom
+@dirrm include/virtualbox/string
+@dirrm include/virtualbox/nsprpub/private
+@dirrm include/virtualbox/nsprpub/obsolete
+@dirrm include/virtualbox/nsprpub/md
+@dirrm include/virtualbox/nsprpub
+@dirrm include/virtualbox/ipcd
+@dirrm include/virtualbox
+@dirrm %%DATADIR%%/samples
+@dirrm %%DATADIR%%/idl
+@dirrm %%DATADIR%%
 %%QT4%%@dirrmtry share/icons/hicolor/48x48/apps
 %%QT4%%@dirrmtry share/icons/hicolor/48x48
 %%QT4%%@dirrmtry share/icons/hicolor
 %%QT4%%@dirrmtry share/icons
 %%QT4%%@dirrmtry share/applications
+@dirrm lib/virtualbox/nls
 @dirrm lib/virtualbox/components
 @dirrm lib/virtualbox
 @cwd /
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 70c1c1d4b56a..44e56c9856b0 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox
-DISTVERSION=	2.2.51.r20457
-PORTREVISION=	3
+DISTVERSION=	3.0.51r22226
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -26,6 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.5:${PORTSDIR}/ftp/curl
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -35,7 +35,6 @@ USE_SDL=	sdl
 USE_CDRTOOLS=	yes
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-2.2.51r20457
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
@@ -45,7 +44,7 @@ CONFLICTS=	bcc-[0-9]*
 VBOXGROUP?=	vboxusers
 VBOXGID?=	920
 VBOX_FRONTENDS=	VBoxBFE VBoxHeadless VBoxSDL
-VBOX_GUEST_VER=	2.2.4
+VBOX_GUEST_VER=	3.0.4
 
 SUB_FILES=	pkg-install
 
@@ -57,7 +56,8 @@ OPTIONS=	QT4 "Build with QT4 Frontend" on \
 		DEBUG "Build with debugging symbols" off \
 		GUESTADDITIONS "Build with Guest Additions" off \
 		DBUS "Build with D-Bus and HAL support" on \
-		PULSEAUDIO "Build with PulseAudio" off
+		PULSEAUDIO "Build with PulseAudio" off \
+		NLS "Native language support" on
 
 .include <bsd.port.options.mk>
 
@@ -77,6 +77,7 @@ PLIST_SUB+=	QT4=""
 .else
 CONFIGURE_ARGS+=--disable-qt4
 PLIST_SUB+=	QT4="@comment "
+WITHOUT_NLS=	yes
 .endif
 
 .if defined(WITH_GUESTADDITIONS)
@@ -105,6 +106,12 @@ CONFIGURE_ARGS+=--disable-dbus
 CONFIGURE_ARGS+=--disable-pulse
 .endif
 
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if !exists(${SRC_BASE}/sys/kern/bus_if.m)
 IGNORE=		requires kernel sources for the kernel module
 .endif
@@ -154,9 +161,20 @@ do-install:
 	${MKDIR} ${KMODDIR}
 	${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR}
 
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR})
+
+	${MKDIR} ${PREFIX}/include/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${PREFIX}/include/virtualbox)
+
 	${MKDIR} ${PREFIX}/lib/virtualbox
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox)
 
+.if !defined(WITHOUT_NLS)
+	${MKDIR} ${PREFIX}/lib/virtualbox/nls
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls)
+.endif
+
 	${MKDIR} ${PREFIX}/bin
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} VBoxTestOGL
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/
@@ -176,6 +194,9 @@ do-install:
 	${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso
 .endif
 
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${PYTHONPREFIX_SITELIBDIR}/virtualbox)
+
 post-install:
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index 83a43ed1146d..d72ab50597c2 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,6 +1,6 @@
-MD5 (virtualbox-2.2.51.r20457.tar.bz2) = e95b5130a0276224961c792047975531
-SHA256 (virtualbox-2.2.51.r20457.tar.bz2) = f321c04e20c47d7054b885bd70ea5abcab11bc047f2645dec0ca297dbdb3945b
-SIZE (virtualbox-2.2.51.r20457.tar.bz2) = 50707220
-MD5 (VBoxGuestAdditions_2.2.4.iso) = 00e64c25f87155540a3d106c5257530f
-SHA256 (VBoxGuestAdditions_2.2.4.iso) = 98c4323b87461a02ec5efc6803ec05a101dbea301784a9561cbade7b63a62861
-SIZE (VBoxGuestAdditions_2.2.4.iso) = 28747776
+MD5 (virtualbox-3.0.51r22226.tar.bz2) = bb4bbefdc7635a339629ed2ec790d638
+SHA256 (virtualbox-3.0.51r22226.tar.bz2) = 277967c68ddde036d7a8fb47e343dee8f7389002a89c3fd282e59b351dbf7e06
+SIZE (virtualbox-3.0.51r22226.tar.bz2) = 51353921
+MD5 (VBoxGuestAdditions_3.0.4.iso) = f1347c8dd9323c3d4850462abfaafc08
+SHA256 (VBoxGuestAdditions_3.0.4.iso) = 85ea4675c8960940db05799523314c99e8538439404573d97355d1fc3284e0ba
+SIZE (VBoxGuestAdditions_3.0.4.iso) = 32380928
diff --git a/emulators/virtualbox-ose-kmod/files/patch-Config.kmk b/emulators/virtualbox-ose-kmod/files/patch-Config.kmk
deleted file mode 100644
index 81e5f7062b4e..000000000000
--- a/emulators/virtualbox-ose-kmod/files/patch-Config.kmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- Config.kmk.orig	2009-06-04 18:02:20.000000000 +0200
-+++ Config.kmk	2009-06-04 18:21:07.000000000 +0200
-@@ -1850,7 +1850,7 @@
-  VBOX_OPENSSL_ALL=1
- endif
- 
--if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86)
-+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64)
-  VBOX_WITH_LIBCURL = 1
-  SDK_VBOX_LIBCURL       = .
-  SDK_VBOX_LIBCURL_INCS ?= $(PATH_ROOT)/src/libs/curl-7.19.4/include
diff --git a/emulators/virtualbox-ose-kmod/files/patch-glloader.py b/emulators/virtualbox-ose-kmod/files/patch-glloader.py
deleted file mode 100644
index f57aee697ad8..000000000000
--- a/emulators/virtualbox-ose-kmod/files/patch-glloader.py
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: src/VBox/GuestHost/OpenGL/spu_loader/glloader.py
-@@ -149,7 +149,7 @@
- 		}*/
- #endif
- 	}
--#if !defined(__linux__) && !defined(SunOS)
-+#if !defined(__linux__) && !defined(SunOS) && !defined(__FreeBSD__)
- 	crStrcat( system_path, "/" );
- #endif
- 	crStrcat( system_path, lib );
diff --git a/emulators/virtualbox-ose-kmod/files/patch-include-iprt-types.h b/emulators/virtualbox-ose-kmod/files/patch-include-iprt-types.h
new file mode 100644
index 000000000000..35f253a391e7
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-include-iprt-types.h
@@ -0,0 +1,14 @@
+--- include/iprt/types.h.orig	2009-07-12 21:17:13.000000000 +0200
++++ include/iprt/types.h	2009-08-12 21:38:17.000000000 +0200
+@@ -92,6 +92,11 @@
+ #  undef true
+ #  undef bool
+ 
++# elif defined(RT_OS_FREEBSD)
++#  define _UINT64_T_DECLARED
++#  define _INT64_T_DECLARED
++#  include <stddef.h>
++#  include <sys/types.h>
+ # else
+ #  include <stddef.h>
+ #  include <sys/types.h>
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
index 64ed1b6899f8..670495c87b8c 100644
--- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
@@ -1,6 +1,6 @@
 --- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.old	2009-05-04 20:29:23.000000000 +0200
 +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c	2009-05-04 20:30:28.000000000 +0200
-@@ -228,7 +228,11 @@
+@@ -162,7 +162,11 @@
      if (rc)
      {
          *ppDev = make_dev(&g_VBoxGuestFreeBSDChrDevSW,
diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
new file mode 100644
index 000000000000..0a1f735fb79a
--- /dev/null
+++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
@@ -0,0 +1,50 @@
+Index: src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
+@@ -54,7 +54,8 @@
+ #ifdef RT_OS_WINDOWS
+ # include <windows.h>
+ # include <winioctl.h>
+-#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
++#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) \
++    || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+ # include <errno.h>
+ # include <sys/ioctl.h>
+ # include <sys/types.h>
+@@ -76,6 +77,9 @@
+ # include <sys/dkio.h>
+ # include <sys/vtoc.h>
+ #endif /* RT_OS_SOLARIS */
++#ifdef RT_OS_FREEBSD
++# include <sys/disk.h>
++#endif /* RT_OS_FREEBSD */
+ 
+ using namespace com;
+ 
+@@ -1013,6 +1017,28 @@
+         vrc = VERR_INVALID_PARAMETER;
+         goto out;
+     }
++#elif defined(RT_OS_FREEBSD)
++    struct stat DevStat;
++    if (!fstat(RawFile, &DevStat) && S_ISCHR(DevStat.st_mode))
++    {
++        off_t cMediasize = 0;
++        if (!ioctl(RawFile, DIOCGMEDIASIZE, &cMediasize))
++        {
++            cbSize = cMediasize;
++        }
++        else
++        {
++            vrc = RTErrConvertFromErrno(errno);
++            RTPrintf("Cannot get the block count for file '%s': %Rrc", rawdisk.raw(), vrc);
++            goto out;
++        }
++    }
++    else
++    {
++        RTPrintf("File '%s' is no character device\n", rawdisk.raw());
++        vrc = VERR_INVALID_PARAMETER;
++        goto out;
++    }
+ #else /* all unrecognized OSes */
+     /* Hopefully this works on all other hosts. If it doesn't, it'll just fail
+      * creating the VMDK, so no real harm done. */
diff --git a/emulators/virtualbox-ose-kmod/pkg-message b/emulators/virtualbox-ose-kmod/pkg-message
index 053b176a7388..8de6ce2ffe0c 100644
--- a/emulators/virtualbox-ose-kmod/pkg-message
+++ b/emulators/virtualbox-ose-kmod/pkg-message
@@ -14,6 +14,9 @@ You also have to add all users to your vboxusers group in order to use vbox.
 Running VirtualBox as non-root user may fail with a fatal error 
 NS_ERROR_FACTORY_NOT_REGISTERED. In this case delete /tmp/.vbox-*-ipc file.
 
+Check wiki page for known issues and troubleshooting:
+http://wiki.freebsd.org/VirtualBox
+
 Please report any problems to emulation@. Thanks!
 
 =============================================================================
diff --git a/emulators/virtualbox-ose-kmod/pkg-plist b/emulators/virtualbox-ose-kmod/pkg-plist
index db7682a96d30..611a88294b9d 100644
--- a/emulators/virtualbox-ose-kmod/pkg-plist
+++ b/emulators/virtualbox-ose-kmod/pkg-plist
@@ -31,7 +31,6 @@ lib/virtualbox/VBoxRT.so
 lib/virtualbox/VBoxSDL
 lib/virtualbox/VBoxSDL.so
 lib/virtualbox/VBoxSVC
-lib/virtualbox/VBoxSettings.so
 lib/virtualbox/VBoxSharedClipboard.so
 lib/virtualbox/VBoxSharedCrOpenGL.so
 lib/virtualbox/VBoxSharedFolders.so
@@ -48,20 +47,528 @@ lib/virtualbox/tstMicroGC.gc
 lib/virtualbox/VBoxDD2R0.r0
 lib/virtualbox/VBoxDDR0.r0
 %%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso
-%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_2.2.4.iso
+%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_3.0.4.iso
+lib/virtualbox/VBoxPython2_6.so
 lib/virtualbox/VMMR0.r0
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
 lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VBoxSVCM.so
 lib/virtualbox/components/VBoxC.so
 lib/virtualbox/components/VBoxXPCOMBase.xpt
+%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm
+%%NLS%%lib/virtualbox/nls/qt_ar.qm
+%%NLS%%lib/virtualbox/nls/qt_bg.qm
+%%NLS%%lib/virtualbox/nls/qt_ca.qm
+%%NLS%%lib/virtualbox/nls/qt_cs.qm
+%%NLS%%lib/virtualbox/nls/qt_de.qm
+%%NLS%%lib/virtualbox/nls/qt_el.qm
+%%NLS%%lib/virtualbox/nls/qt_es.qm
+%%NLS%%lib/virtualbox/nls/qt_eu.qm
+%%NLS%%lib/virtualbox/nls/qt_fi.qm
+%%NLS%%lib/virtualbox/nls/qt_fr.qm
+%%NLS%%lib/virtualbox/nls/qt_hu.qm
+%%NLS%%lib/virtualbox/nls/qt_id.qm
+%%NLS%%lib/virtualbox/nls/qt_it.qm
+%%NLS%%lib/virtualbox/nls/qt_ja.qm
+%%NLS%%lib/virtualbox/nls/qt_km_KH.qm
+%%NLS%%lib/virtualbox/nls/qt_ko.qm
+%%NLS%%lib/virtualbox/nls/qt_nl.qm
+%%NLS%%lib/virtualbox/nls/qt_pl.qm
+%%NLS%%lib/virtualbox/nls/qt_pt.qm
+%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/qt_ro.qm
+%%NLS%%lib/virtualbox/nls/qt_ru.qm
+%%NLS%%lib/virtualbox/nls/qt_sk.qm
+%%NLS%%lib/virtualbox/nls/qt_sr.qm
+%%NLS%%lib/virtualbox/nls/qt_sv.qm
+%%NLS%%lib/virtualbox/nls/qt_tr.qm
+%%NLS%%lib/virtualbox/nls/qt_uk.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm
 %%QT4%%share/applications/virtualbox.desktop
 %%QT4%%share/icons/hicolor/48x48/apps/VBox.png
+%%DATADIR%%/idl/nsIDebug.idl
+%%DATADIR%%/idl/nsIInterfaceRequestor.idl
+%%DATADIR%%/idl/nsIMemory.idl
+%%DATADIR%%/idl/nsIProgrammingLanguage.idl
+%%DATADIR%%/idl/nsISupports.idl
+%%DATADIR%%/idl/nsITraceRefcnt.idl
+%%DATADIR%%/idl/nsIWeakReference.idl
+%%DATADIR%%/idl/nsIConsoleMessage.idl
+%%DATADIR%%/idl/nsIConsoleService.idl
+%%DATADIR%%/idl/nsIConsoleListener.idl
+%%DATADIR%%/idl/nsIErrorService.idl
+%%DATADIR%%/idl/nsIException.idl
+%%DATADIR%%/idl/nsIExceptionService.idl
+%%DATADIR%%/idl/nsrootidl.idl
+%%DATADIR%%/idl/nsIClassInfo.idl
+%%DATADIR%%/idl/nsIFactory.idl
+%%DATADIR%%/idl/nsIModule.idl
+%%DATADIR%%/idl/nsIComponentRegistrar.idl
+%%DATADIR%%/idl/nsIServiceManager.idl
+%%DATADIR%%/idl/nsIComponentManager.idl
+%%DATADIR%%/idl/nsICategoryManager.idl
+%%DATADIR%%/idl/nsINativeComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentManagerObsolete.idl
+%%DATADIR%%/idl/nsISupportsArray.idl
+%%DATADIR%%/idl/nsIComponentLoaderManager.idl
+%%DATADIR%%/idl/nsICollection.idl
+%%DATADIR%%/idl/nsISerializable.idl
+%%DATADIR%%/idl/nsIEnumerator.idl
+%%DATADIR%%/idl/nsISimpleEnumerator.idl
+%%DATADIR%%/idl/nsIObserverService.idl
+%%DATADIR%%/idl/nsIObserver.idl
+%%DATADIR%%/idl/nsIAtom.idl
+%%DATADIR%%/idl/nsIAtomService.idl
+%%DATADIR%%/idl/nsIProperties.idl
+%%DATADIR%%/idl/nsIPersistentProperties2.idl
+%%DATADIR%%/idl/nsIRecyclingAllocator.idl
+%%DATADIR%%/idl/nsIStringEnumerator.idl
+%%DATADIR%%/idl/nsISupportsPrimitives.idl
+%%DATADIR%%/idl/nsISupportsIterators.idl
+%%DATADIR%%/idl/nsITimelineService.idl
+%%DATADIR%%/idl/nsIVariant.idl
+%%DATADIR%%/idl/nsIArray.idl
+%%DATADIR%%/idl/nsIPropertyBag.idl
+%%DATADIR%%/idl/nsIHashable.idl
+%%DATADIR%%/idl/nsIDirectoryService.idl
+%%DATADIR%%/idl/nsIDirectoryEnumerator.idl
+%%DATADIR%%/idl/nsIFile.idl
+%%DATADIR%%/idl/nsILocalFile.idl
+%%DATADIR%%/idl/nsIInputStream.idl
+%%DATADIR%%/idl/nsILocalFileMac.idl
+%%DATADIR%%/idl/nsIObjectInputStream.idl
+%%DATADIR%%/idl/nsIBinaryInputStream.idl
+%%DATADIR%%/idl/nsIObjectOutputStream.idl
+%%DATADIR%%/idl/nsIBinaryOutputStream.idl
+%%DATADIR%%/idl/nsIStreamBufferAccess.idl
+%%DATADIR%%/idl/nsIOutputStream.idl
+%%DATADIR%%/idl/nsIByteArrayInputStream.idl
+%%DATADIR%%/idl/nsIFastLoadFileControl.idl
+%%DATADIR%%/idl/nsISeekableStream.idl
+%%DATADIR%%/idl/nsIInputStreamTee.idl
+%%DATADIR%%/idl/nsIFastLoadService.idl
+%%DATADIR%%/idl/nsIMultiplexInputStream.idl
+%%DATADIR%%/idl/nsIPipe.idl
+%%DATADIR%%/idl/nsIAsyncInputStream.idl
+%%DATADIR%%/idl/nsIAsyncOutputStream.idl
+%%DATADIR%%/idl/nsIScriptableInputStream.idl
+%%DATADIR%%/idl/nsIStorageStream.idl
+%%DATADIR%%/idl/nsILineInputStream.idl
+%%DATADIR%%/idl/nsIStringStream.idl
+%%DATADIR%%/idl/nsIProxyObjectManager.idl
+%%DATADIR%%/idl/nsIEventQueue.idl
+%%DATADIR%%/idl/nsIEventQueueService.idl
+%%DATADIR%%/idl/nsIRunnable.idl
+%%DATADIR%%/idl/nsIThread.idl
+%%DATADIR%%/idl/nsIEventTarget.idl
+%%DATADIR%%/idl/nsIEnvironment.idl
+%%DATADIR%%/idl/nsITimer.idl
+%%DATADIR%%/idl/nsITimerInternal.idl
+%%DATADIR%%/idl/nsITimerManager.idl
+%%DATADIR%%/idl/nsIInterfaceInfo.idl
+%%DATADIR%%/idl/nsIProcess.idl
+%%DATADIR%%/idl/nsIXPTLoader.idl
+%%DATADIR%%/idl/nsIInterfaceInfoManager.idl
+%%DATADIR%%/idl/ipcIMessageObserver.idl
+%%DATADIR%%/idl/ipcIService.idl
+%%DATADIR%%/idl/ipcIClientObserver.idl
+%%DATADIR%%/idl/ipcILockService.idl
+%%DATADIR%%/idl/ipcIDConnectService.idl
+%%DATADIR%%/idl/ipcITransactionService.idl
+%%DATADIR%%/idl/ipcITransactionObserver.idl
+%%DATADIR%%/idl/VirtualBox_XPCOM.idl
+%%DATADIR%%/samples/tstVBoxAPILinux.cpp
+%%DATADIR%%/samples/Makefile
+include/virtualbox/VBoxCAPI_v2_2.h
+include/virtualbox/VBoxCAPI_v3_0.h
+include/virtualbox/VBoxCAPI_v3_1.h
+include/virtualbox/VirtualBox_XPCOM.h
+include/virtualbox/ipcIClientObserver.h
+include/virtualbox/ipcIDConnectService.h
+include/virtualbox/ipcILockService.h
+include/virtualbox/ipcIMessageObserver.h
+include/virtualbox/ipcIService.h
+include/virtualbox/ipcITransactionObserver.h
+include/virtualbox/ipcITransactionService.h
+include/virtualbox/ipcd/ipcCID.h
+include/virtualbox/ipcd/ipcLockCID.h
+include/virtualbox/ipcd/ipcMessageReader.h
+include/virtualbox/ipcd/ipcMessageWriter.h
+include/virtualbox/ipcd/ipcModule.h
+include/virtualbox/ipcd/ipcModuleUtil.h
+include/virtualbox/ipcd/ipcdclient.h
+include/virtualbox/nsIArray.h
+include/virtualbox/nsIAsyncInputStream.h
+include/virtualbox/nsIAsyncOutputStream.h
+include/virtualbox/nsIAtom.h
+include/virtualbox/nsIAtomService.h
+include/virtualbox/nsIBinaryInputStream.h
+include/virtualbox/nsIBinaryOutputStream.h
+include/virtualbox/nsIByteArrayInputStream.h
+include/virtualbox/nsICategoryManager.h
+include/virtualbox/nsIClassInfo.h
+include/virtualbox/nsICollection.h
+include/virtualbox/nsIComponentLoader.h
+include/virtualbox/nsIComponentLoaderManager.h
+include/virtualbox/nsIComponentManager.h
+include/virtualbox/nsIComponentManagerObsolete.h
+include/virtualbox/nsIComponentRegistrar.h
+include/virtualbox/nsIConsoleListener.h
+include/virtualbox/nsIConsoleMessage.h
+include/virtualbox/nsIConsoleService.h
+include/virtualbox/nsIDebug.h
+include/virtualbox/nsIDirectoryEnumerator.h
+include/virtualbox/nsIDirectoryService.h
+include/virtualbox/nsIEnumerator.h
+include/virtualbox/nsIEnvironment.h
+include/virtualbox/nsIErrorService.h
+include/virtualbox/nsIEventQueue.h
+include/virtualbox/nsIEventQueueService.h
+include/virtualbox/nsIEventTarget.h
+include/virtualbox/nsIException.h
+include/virtualbox/nsIExceptionService.h
+include/virtualbox/nsIFactory.h
+include/virtualbox/nsIFastLoadFileControl.h
+include/virtualbox/nsIFastLoadService.h
+include/virtualbox/nsIFile.h
+include/virtualbox/nsIHashable.h
+include/virtualbox/nsIInputStream.h
+include/virtualbox/nsIInputStreamTee.h
+include/virtualbox/nsIInterfaceInfo.h
+include/virtualbox/nsIInterfaceInfoManager.h
+include/virtualbox/nsIInterfaceRequestor.h
+include/virtualbox/nsILineInputStream.h
+include/virtualbox/nsILocalFile.h
+include/virtualbox/nsILocalFileMac.h
+include/virtualbox/nsIMemory.h
+include/virtualbox/nsIModule.h
+include/virtualbox/nsIMultiplexInputStream.h
+include/virtualbox/nsINativeComponentLoader.h
+include/virtualbox/nsIObjectInputStream.h
+include/virtualbox/nsIObjectOutputStream.h
+include/virtualbox/nsIObserver.h
+include/virtualbox/nsIObserverService.h
+include/virtualbox/nsIOutputStream.h
+include/virtualbox/nsIPersistentProperties2.h
+include/virtualbox/nsIPipe.h
+include/virtualbox/nsIProcess.h
+include/virtualbox/nsIProgrammingLanguage.h
+include/virtualbox/nsIProperties.h
+include/virtualbox/nsIPropertyBag.h
+include/virtualbox/nsIProxyObjectManager.h
+include/virtualbox/nsIRecyclingAllocator.h
+include/virtualbox/nsIRunnable.h
+include/virtualbox/nsIScriptableInputStream.h
+include/virtualbox/nsISeekableStream.h
+include/virtualbox/nsISerializable.h
+include/virtualbox/nsIServiceManager.h
+include/virtualbox/nsISimpleEnumerator.h
+include/virtualbox/nsIStorageStream.h
+include/virtualbox/nsIStreamBufferAccess.h
+include/virtualbox/nsIStringEnumerator.h
+include/virtualbox/nsIStringStream.h
+include/virtualbox/nsISupports.h
+include/virtualbox/nsISupportsArray.h
+include/virtualbox/nsISupportsIterators.h
+include/virtualbox/nsISupportsPrimitives.h
+include/virtualbox/nsIThread.h
+include/virtualbox/nsITimelineService.h
+include/virtualbox/nsITimer.h
+include/virtualbox/nsITimerInternal.h
+include/virtualbox/nsITimerManager.h
+include/virtualbox/nsITraceRefcnt.h
+include/virtualbox/nsIVariant.h
+include/virtualbox/nsIWeakReference.h
+include/virtualbox/nsIXPTLoader.h
+include/virtualbox/nsprpub/nspr.h
+include/virtualbox/nsprpub/plarena.h
+include/virtualbox/nsprpub/plarenas.h
+include/virtualbox/nsprpub/plbase64.h
+include/virtualbox/nsprpub/plerror.h
+include/virtualbox/nsprpub/plgetopt.h
+include/virtualbox/nsprpub/plhash.h
+include/virtualbox/nsprpub/plresolv.h
+include/virtualbox/nsprpub/plstr.h
+include/virtualbox/nsprpub/pratom.h
+include/virtualbox/nsprpub/prbit.h
+include/virtualbox/nsprpub/prclist.h
+include/virtualbox/nsprpub/prcmon.h
+include/virtualbox/nsprpub/prcountr.h
+include/virtualbox/nsprpub/prcvar.h
+include/virtualbox/nsprpub/prdtoa.h
+include/virtualbox/nsprpub/prenv.h
+include/virtualbox/nsprpub/prerr.h
+include/virtualbox/nsprpub/prerror.h
+include/virtualbox/nsprpub/prinet.h
+include/virtualbox/nsprpub/prinit.h
+include/virtualbox/nsprpub/prinrval.h
+include/virtualbox/nsprpub/prio.h
+include/virtualbox/nsprpub/pripcsem.h
+include/virtualbox/nsprpub/prlink.h
+include/virtualbox/nsprpub/md/_iprt_atomic.h
+include/virtualbox/nsprpub/md/_darwin.h
+include/virtualbox/nsprpub/md/_freebsd.h
+include/virtualbox/nsprpub/md/_l4v2.h
+include/virtualbox/nsprpub/md/_linux.h
+include/virtualbox/nsprpub/md/_macos.h
+include/virtualbox/nsprpub/md/_netbsd.h
+include/virtualbox/nsprpub/md/_openbsd.h
+include/virtualbox/nsprpub/md/_os2_errors.h
+include/virtualbox/nsprpub/md/_os2.h
+include/virtualbox/nsprpub/md/_pcos.h
+include/virtualbox/nsprpub/md/_solaris.h
+include/virtualbox/nsprpub/md/_unix_errors.h
+include/virtualbox/nsprpub/md/_unixos.h
+include/virtualbox/nsprpub/md/_pth.h
+include/virtualbox/nsprpub/md/prosdep.h
+include/virtualbox/nsprpub/md/_freebsd.cfg
+include/virtualbox/nsprpub/md/_linux.cfg
+include/virtualbox/nsprpub/md/_darwin.cfg
+include/virtualbox/nsprpub/md/_netbsd.cfg
+include/virtualbox/nsprpub/md/_openbsd.cfg
+include/virtualbox/nsprpub/md/_os2.cfg
+include/virtualbox/nsprpub/md/_solaris32.cfg
+include/virtualbox/nsprpub/md/_l4v2.cfg
+include/virtualbox/nsprpub/md/_solaris64.cfg
+include/virtualbox/nsprpub/prlock.h
+include/virtualbox/nsprpub/prlog.h
+include/virtualbox/nsprpub/prlong.h
+include/virtualbox/nsprpub/prmem.h
+include/virtualbox/nsprpub/prmon.h
+include/virtualbox/nsprpub/prmwait.h
+include/virtualbox/nsprpub/prnetdb.h
+include/virtualbox/nsprpub/prolock.h
+include/virtualbox/nsprpub/prpdce.h
+include/virtualbox/nsprpub/prprf.h
+include/virtualbox/nsprpub/prproces.h
+include/virtualbox/nsprpub/prrng.h
+include/virtualbox/nsprpub/prrwlock.h
+include/virtualbox/nsprpub/prshm.h
+include/virtualbox/nsprpub/prshma.h
+include/virtualbox/nsprpub/prsystem.h
+include/virtualbox/nsprpub/prthread.h
+include/virtualbox/nsprpub/prtime.h
+include/virtualbox/nsprpub/prtpool.h
+include/virtualbox/nsprpub/prtrace.h
+include/virtualbox/nsprpub/prtypes.h
+include/virtualbox/nsprpub/prvrsion.h
+include/virtualbox/nsprpub/prwin16.h
+include/virtualbox/nsprpub/prcpucfg.h
+include/virtualbox/nsprpub/obsolete/pralarm.h
+include/virtualbox/nsprpub/obsolete/probslet.h
+include/virtualbox/nsprpub/obsolete/protypes.h
+include/virtualbox/nsprpub/obsolete/prsem.h
+include/virtualbox/nsprpub/private/pprio.h
+include/virtualbox/nsprpub/private/pprthred.h
+include/virtualbox/nsprpub/private/prpriv.h
+include/virtualbox/nsrootidl.h
+include/virtualbox/string/nsAString.h
+include/virtualbox/string/nsAlgorithm.h
+include/virtualbox/string/nsCharTraits.h
+include/virtualbox/string/nsDependentString.h
+include/virtualbox/string/nsDependentSubstring.h
+include/virtualbox/string/nsEmbedString.h
+include/virtualbox/string/nsLiteralString.h
+include/virtualbox/string/nsObsoleteAString.h
+include/virtualbox/string/nsPrintfCString.h
+include/virtualbox/string/nsPromiseFlatString.h
+include/virtualbox/string/nsReadableUtils.h
+include/virtualbox/string/nsString.h
+include/virtualbox/string/nsStringAPI.h
+include/virtualbox/string/nsStringFwd.h
+include/virtualbox/string/nsStringIterator.h
+include/virtualbox/string/nsSubstring.h
+include/virtualbox/string/nsSubstringTuple.h
+include/virtualbox/string/nsTAString.h
+include/virtualbox/string/nsTString.h
+include/virtualbox/string/nsTDependentString.h
+include/virtualbox/string/nsTDependentSubstring.h
+include/virtualbox/string/nsTObsoleteAString.h
+include/virtualbox/string/nsTPromiseFlatString.h
+include/virtualbox/string/nsTSubstring.h
+include/virtualbox/string/nsTSubstringTuple.h
+include/virtualbox/string/nsUTF8Utils.h
+include/virtualbox/string/nsXPIDLString.h
+include/virtualbox/string/string-template-def-char.h
+include/virtualbox/string/string-template-def-unichar.h
+include/virtualbox/string/string-template-undef.h
+include/virtualbox/xpcom/nsAgg.h
+include/virtualbox/xpcom/nsAppDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsArray.h
+include/virtualbox/xpcom/nsArrayEnumerator.h
+include/virtualbox/xpcom/nsAtomService.h
+include/virtualbox/xpcom/nsAutoBuffer.h
+include/virtualbox/xpcom/nsAutoLock.h
+include/virtualbox/xpcom/nsAutoPtr.h
+include/virtualbox/xpcom/nsBaseHashtable.h
+include/virtualbox/xpcom/nsCOMArray.h
+include/virtualbox/xpcom/nsCRT.h
+include/virtualbox/xpcom/nsCategoryManagerUtils.h
+include/virtualbox/xpcom/nsCheapSets.h
+include/virtualbox/xpcom/nsClassHashtable.h
+include/virtualbox/xpcom/nsCom.h
+include/virtualbox/xpcom/nsComponentManagerObsolete.h
+include/virtualbox/xpcom/nsComponentManagerUtils.h
+include/virtualbox/xpcom/nsCppSharedAllocator.h
+include/virtualbox/xpcom/nsID.h
+include/virtualbox/xpcom/nsDataHashtable.h
+include/virtualbox/xpcom/nsDebugImpl.h
+include/virtualbox/xpcom/nsDeque.h
+include/virtualbox/xpcom/nsDirectoryService.h
+include/virtualbox/xpcom/nsDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsDirectoryServiceUtils.h
+include/virtualbox/xpcom/nsDoubleHashtable.h
+include/virtualbox/xpcom/nsEnumeratorUtils.h
+include/virtualbox/xpcom/nsError.h
+include/virtualbox/xpcom/nsEscape.h
+include/virtualbox/xpcom/nsEventQueueUtils.h
+include/virtualbox/xpcom/nsFastLoadPtr.h
+include/virtualbox/xpcom/nsFastLoadService.h
+include/virtualbox/xpcom/nsFixedSizeAllocator.h
+include/virtualbox/xpcom/nsHashKeys.h
+include/virtualbox/xpcom/nsHashSets.h
+include/virtualbox/xpcom/nsHashtable.h
+include/virtualbox/xpcom/nsIAllocator.h
+include/virtualbox/xpcom/nsIByteBuffer.h
+include/virtualbox/xpcom/nsIID.h
+include/virtualbox/xpcom/nsIServiceManagerObsolete.h
+include/virtualbox/xpcom/nsIServiceManagerUtils.h
+include/virtualbox/xpcom/nsISupportsBase.h
+include/virtualbox/xpcom/nsISupportsObsolete.h
+include/virtualbox/xpcom/nsIUnicharBuffer.h
+include/virtualbox/xpcom/nsIUnicharInputStream.h
+include/virtualbox/xpcom/nsInt64.h
+include/virtualbox/xpcom/nsInterfaceHashtable.h
+include/virtualbox/xpcom/nsLinebreakConverter.h
+include/virtualbox/xpcom/nsLocalFile.h
+include/virtualbox/xpcom/nsLocalFileUnix.h
+include/virtualbox/xpcom/nsLocalFileOS2.h
+include/virtualbox/xpcom/nsLocalFileOSX.h
+include/virtualbox/xpcom/nsModule.h
+include/virtualbox/xpcom/nsMultiplexInputStream.h
+include/virtualbox/xpcom/nsNativeCharsetUtils.h
+include/virtualbox/xpcom/nsProcess.h
+include/virtualbox/xpcom/nsNativeComponentLoader.h
+include/virtualbox/xpcom/nsObserverService.h
+include/virtualbox/xpcom/nsObsoleteModuleLoading.h
+include/virtualbox/xpcom/nsProxiedService.h
+include/virtualbox/xpcom/nsProxyEvent.h
+include/virtualbox/xpcom/nsProxyRelease.h
+include/virtualbox/xpcom/nsQuickSort.h
+include/virtualbox/xpcom/nsRecyclingAllocator.h
+include/virtualbox/xpcom/nsRefPtrHashtable.h
+include/virtualbox/xpcom/nsScriptableInputStream.h
+include/virtualbox/xpcom/nsStaticAtom.h
+include/virtualbox/xpcom/nsStaticComponent.h
+include/virtualbox/xpcom/nsStaticNameTable.h
+include/virtualbox/xpcom/nsStorageStream.h
+include/virtualbox/xpcom/nsStreamUtils.h
+include/virtualbox/xpcom/nsStringEnumerator.h
+include/virtualbox/xpcom/nsStringIO.h
+include/virtualbox/xpcom/nsTHashtable.h
+include/virtualbox/xpcom/nsStringStream.h
+include/virtualbox/xpcom/nsSupportsArray.h
+include/virtualbox/xpcom/nsSupportsPrimitives.h
+include/virtualbox/xpcom/nsTextFormatter.h
+include/virtualbox/xpcom/nsTime.h
+include/virtualbox/xpcom/nsTraceRefcntImpl.h
+include/virtualbox/xpcom/nsUnitConversion.h
+include/virtualbox/xpcom/nsValueArray.h
+include/virtualbox/xpcom/nsVariant.h
+include/virtualbox/xpcom/nsVoidArray.h
+include/virtualbox/xpcom/nsWeakPtr.h
+include/virtualbox/xpcom/nsXPCOM.h
+include/virtualbox/xpcom/nsXPCOMCID.h
+include/virtualbox/xpcom/nscore.h
+include/virtualbox/xpcom/pldhash.h
+include/virtualbox/xpcom/plevent.h
+include/virtualbox/xpcom/xcDll.h
+include/virtualbox/xpcom/xpt_arena.h
+include/virtualbox/xpcom/xpt_struct.h
+include/virtualbox/xpcom/xpt_xdr.h
+include/virtualbox/xpcom/xptcall.h
+include/virtualbox/xpcom/xptcstubsdecl.inc
+include/virtualbox/xpcom/xptcstubsdef.inc
+include/virtualbox/xpcom/xptinfo.h
+include/virtualbox/xpcom/nsIInterfaceRequestorUtils.h
+include/virtualbox/xpcom/nsISupportsImpl.h
+include/virtualbox/xpcom/nsISupportsUtils.h
+include/virtualbox/xpcom/nsIWeakReferenceUtils.h
+include/virtualbox/xpcom/nsCOMPtr.h
+include/virtualbox/xpcom/nsDebug.h
+include/virtualbox/xpcom/nsGenericFactory.h
+include/virtualbox/xpcom/nsIGenericFactory.h
+include/virtualbox/xpcom/nsMemory.h
+include/virtualbox/xpcom/nsTraceRefcnt.h
+include/virtualbox/xpcom/nsWeakReference.h
+include/virtualbox/xpcom/nsXPCOMGlue.h
+include/virtualbox/xpcom/xpcom-config.h
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/vboxxpcom.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/components.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/file.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/nsError.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/primitives.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpcom_consts.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpt.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/enumerator.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/factory.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/loader.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/module.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/policy.py
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox
+@dirrm include/virtualbox/xpcom
+@dirrm include/virtualbox/string
+@dirrm include/virtualbox/nsprpub/private
+@dirrm include/virtualbox/nsprpub/obsolete
+@dirrm include/virtualbox/nsprpub/md
+@dirrm include/virtualbox/nsprpub
+@dirrm include/virtualbox/ipcd
+@dirrm include/virtualbox
+@dirrm %%DATADIR%%/samples
+@dirrm %%DATADIR%%/idl
+@dirrm %%DATADIR%%
 %%QT4%%@dirrmtry share/icons/hicolor/48x48/apps
 %%QT4%%@dirrmtry share/icons/hicolor/48x48
 %%QT4%%@dirrmtry share/icons/hicolor
 %%QT4%%@dirrmtry share/icons
 %%QT4%%@dirrmtry share/applications
+@dirrm lib/virtualbox/nls
 @dirrm lib/virtualbox/components
 @dirrm lib/virtualbox
 @cwd /
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 70c1c1d4b56a..44e56c9856b0 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox
-DISTVERSION=	2.2.51.r20457
-PORTREVISION=	3
+DISTVERSION=	3.0.51r22226
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -26,6 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.5:${PORTSDIR}/ftp/curl
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -35,7 +35,6 @@ USE_SDL=	sdl
 USE_CDRTOOLS=	yes
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-2.2.51r20457
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
@@ -45,7 +44,7 @@ CONFLICTS=	bcc-[0-9]*
 VBOXGROUP?=	vboxusers
 VBOXGID?=	920
 VBOX_FRONTENDS=	VBoxBFE VBoxHeadless VBoxSDL
-VBOX_GUEST_VER=	2.2.4
+VBOX_GUEST_VER=	3.0.4
 
 SUB_FILES=	pkg-install
 
@@ -57,7 +56,8 @@ OPTIONS=	QT4 "Build with QT4 Frontend" on \
 		DEBUG "Build with debugging symbols" off \
 		GUESTADDITIONS "Build with Guest Additions" off \
 		DBUS "Build with D-Bus and HAL support" on \
-		PULSEAUDIO "Build with PulseAudio" off
+		PULSEAUDIO "Build with PulseAudio" off \
+		NLS "Native language support" on
 
 .include <bsd.port.options.mk>
 
@@ -77,6 +77,7 @@ PLIST_SUB+=	QT4=""
 .else
 CONFIGURE_ARGS+=--disable-qt4
 PLIST_SUB+=	QT4="@comment "
+WITHOUT_NLS=	yes
 .endif
 
 .if defined(WITH_GUESTADDITIONS)
@@ -105,6 +106,12 @@ CONFIGURE_ARGS+=--disable-dbus
 CONFIGURE_ARGS+=--disable-pulse
 .endif
 
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if !exists(${SRC_BASE}/sys/kern/bus_if.m)
 IGNORE=		requires kernel sources for the kernel module
 .endif
@@ -154,9 +161,20 @@ do-install:
 	${MKDIR} ${KMODDIR}
 	${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR}
 
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR})
+
+	${MKDIR} ${PREFIX}/include/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${PREFIX}/include/virtualbox)
+
 	${MKDIR} ${PREFIX}/lib/virtualbox
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox)
 
+.if !defined(WITHOUT_NLS)
+	${MKDIR} ${PREFIX}/lib/virtualbox/nls
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls)
+.endif
+
 	${MKDIR} ${PREFIX}/bin
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} VBoxTestOGL
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/
@@ -176,6 +194,9 @@ do-install:
 	${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso
 .endif
 
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${PYTHONPREFIX_SITELIBDIR}/virtualbox)
+
 post-install:
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/emulators/virtualbox-ose-legacy/distinfo b/emulators/virtualbox-ose-legacy/distinfo
index 83a43ed1146d..d72ab50597c2 100644
--- a/emulators/virtualbox-ose-legacy/distinfo
+++ b/emulators/virtualbox-ose-legacy/distinfo
@@ -1,6 +1,6 @@
-MD5 (virtualbox-2.2.51.r20457.tar.bz2) = e95b5130a0276224961c792047975531
-SHA256 (virtualbox-2.2.51.r20457.tar.bz2) = f321c04e20c47d7054b885bd70ea5abcab11bc047f2645dec0ca297dbdb3945b
-SIZE (virtualbox-2.2.51.r20457.tar.bz2) = 50707220
-MD5 (VBoxGuestAdditions_2.2.4.iso) = 00e64c25f87155540a3d106c5257530f
-SHA256 (VBoxGuestAdditions_2.2.4.iso) = 98c4323b87461a02ec5efc6803ec05a101dbea301784a9561cbade7b63a62861
-SIZE (VBoxGuestAdditions_2.2.4.iso) = 28747776
+MD5 (virtualbox-3.0.51r22226.tar.bz2) = bb4bbefdc7635a339629ed2ec790d638
+SHA256 (virtualbox-3.0.51r22226.tar.bz2) = 277967c68ddde036d7a8fb47e343dee8f7389002a89c3fd282e59b351dbf7e06
+SIZE (virtualbox-3.0.51r22226.tar.bz2) = 51353921
+MD5 (VBoxGuestAdditions_3.0.4.iso) = f1347c8dd9323c3d4850462abfaafc08
+SHA256 (VBoxGuestAdditions_3.0.4.iso) = 85ea4675c8960940db05799523314c99e8538439404573d97355d1fc3284e0ba
+SIZE (VBoxGuestAdditions_3.0.4.iso) = 32380928
diff --git a/emulators/virtualbox-ose-legacy/files/patch-Config.kmk b/emulators/virtualbox-ose-legacy/files/patch-Config.kmk
deleted file mode 100644
index 81e5f7062b4e..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-Config.kmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- Config.kmk.orig	2009-06-04 18:02:20.000000000 +0200
-+++ Config.kmk	2009-06-04 18:21:07.000000000 +0200
-@@ -1850,7 +1850,7 @@
-  VBOX_OPENSSL_ALL=1
- endif
- 
--if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86)
-+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64)
-  VBOX_WITH_LIBCURL = 1
-  SDK_VBOX_LIBCURL       = .
-  SDK_VBOX_LIBCURL_INCS ?= $(PATH_ROOT)/src/libs/curl-7.19.4/include
diff --git a/emulators/virtualbox-ose-legacy/files/patch-glloader.py b/emulators/virtualbox-ose-legacy/files/patch-glloader.py
deleted file mode 100644
index f57aee697ad8..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-glloader.py
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: src/VBox/GuestHost/OpenGL/spu_loader/glloader.py
-@@ -149,7 +149,7 @@
- 		}*/
- #endif
- 	}
--#if !defined(__linux__) && !defined(SunOS)
-+#if !defined(__linux__) && !defined(SunOS) && !defined(__FreeBSD__)
- 	crStrcat( system_path, "/" );
- #endif
- 	crStrcat( system_path, lib );
diff --git a/emulators/virtualbox-ose-legacy/files/patch-include-iprt-types.h b/emulators/virtualbox-ose-legacy/files/patch-include-iprt-types.h
new file mode 100644
index 000000000000..35f253a391e7
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-include-iprt-types.h
@@ -0,0 +1,14 @@
+--- include/iprt/types.h.orig	2009-07-12 21:17:13.000000000 +0200
++++ include/iprt/types.h	2009-08-12 21:38:17.000000000 +0200
+@@ -92,6 +92,11 @@
+ #  undef true
+ #  undef bool
+ 
++# elif defined(RT_OS_FREEBSD)
++#  define _UINT64_T_DECLARED
++#  define _INT64_T_DECLARED
++#  include <stddef.h>
++#  include <sys/types.h>
+ # else
+ #  include <stddef.h>
+ #  include <sys/types.h>
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
index 64ed1b6899f8..670495c87b8c 100644
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
@@ -1,6 +1,6 @@
 --- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.old	2009-05-04 20:29:23.000000000 +0200
 +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c	2009-05-04 20:30:28.000000000 +0200
-@@ -228,7 +228,11 @@
+@@ -162,7 +162,11 @@
      if (rc)
      {
          *ppDev = make_dev(&g_VBoxGuestFreeBSDChrDevSW,
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
new file mode 100644
index 000000000000..0a1f735fb79a
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
@@ -0,0 +1,50 @@
+Index: src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
+@@ -54,7 +54,8 @@
+ #ifdef RT_OS_WINDOWS
+ # include <windows.h>
+ # include <winioctl.h>
+-#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
++#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) \
++    || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+ # include <errno.h>
+ # include <sys/ioctl.h>
+ # include <sys/types.h>
+@@ -76,6 +77,9 @@
+ # include <sys/dkio.h>
+ # include <sys/vtoc.h>
+ #endif /* RT_OS_SOLARIS */
++#ifdef RT_OS_FREEBSD
++# include <sys/disk.h>
++#endif /* RT_OS_FREEBSD */
+ 
+ using namespace com;
+ 
+@@ -1013,6 +1017,28 @@
+         vrc = VERR_INVALID_PARAMETER;
+         goto out;
+     }
++#elif defined(RT_OS_FREEBSD)
++    struct stat DevStat;
++    if (!fstat(RawFile, &DevStat) && S_ISCHR(DevStat.st_mode))
++    {
++        off_t cMediasize = 0;
++        if (!ioctl(RawFile, DIOCGMEDIASIZE, &cMediasize))
++        {
++            cbSize = cMediasize;
++        }
++        else
++        {
++            vrc = RTErrConvertFromErrno(errno);
++            RTPrintf("Cannot get the block count for file '%s': %Rrc", rawdisk.raw(), vrc);
++            goto out;
++        }
++    }
++    else
++    {
++        RTPrintf("File '%s' is no character device\n", rawdisk.raw());
++        vrc = VERR_INVALID_PARAMETER;
++        goto out;
++    }
+ #else /* all unrecognized OSes */
+     /* Hopefully this works on all other hosts. If it doesn't, it'll just fail
+      * creating the VMDK, so no real harm done. */
diff --git a/emulators/virtualbox-ose-legacy/pkg-message b/emulators/virtualbox-ose-legacy/pkg-message
index 053b176a7388..8de6ce2ffe0c 100644
--- a/emulators/virtualbox-ose-legacy/pkg-message
+++ b/emulators/virtualbox-ose-legacy/pkg-message
@@ -14,6 +14,9 @@ You also have to add all users to your vboxusers group in order to use vbox.
 Running VirtualBox as non-root user may fail with a fatal error 
 NS_ERROR_FACTORY_NOT_REGISTERED. In this case delete /tmp/.vbox-*-ipc file.
 
+Check wiki page for known issues and troubleshooting:
+http://wiki.freebsd.org/VirtualBox
+
 Please report any problems to emulation@. Thanks!
 
 =============================================================================
diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist
index db7682a96d30..611a88294b9d 100644
--- a/emulators/virtualbox-ose-legacy/pkg-plist
+++ b/emulators/virtualbox-ose-legacy/pkg-plist
@@ -31,7 +31,6 @@ lib/virtualbox/VBoxRT.so
 lib/virtualbox/VBoxSDL
 lib/virtualbox/VBoxSDL.so
 lib/virtualbox/VBoxSVC
-lib/virtualbox/VBoxSettings.so
 lib/virtualbox/VBoxSharedClipboard.so
 lib/virtualbox/VBoxSharedCrOpenGL.so
 lib/virtualbox/VBoxSharedFolders.so
@@ -48,20 +47,528 @@ lib/virtualbox/tstMicroGC.gc
 lib/virtualbox/VBoxDD2R0.r0
 lib/virtualbox/VBoxDDR0.r0
 %%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso
-%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_2.2.4.iso
+%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_3.0.4.iso
+lib/virtualbox/VBoxPython2_6.so
 lib/virtualbox/VMMR0.r0
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
 lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VBoxSVCM.so
 lib/virtualbox/components/VBoxC.so
 lib/virtualbox/components/VBoxXPCOMBase.xpt
+%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm
+%%NLS%%lib/virtualbox/nls/qt_ar.qm
+%%NLS%%lib/virtualbox/nls/qt_bg.qm
+%%NLS%%lib/virtualbox/nls/qt_ca.qm
+%%NLS%%lib/virtualbox/nls/qt_cs.qm
+%%NLS%%lib/virtualbox/nls/qt_de.qm
+%%NLS%%lib/virtualbox/nls/qt_el.qm
+%%NLS%%lib/virtualbox/nls/qt_es.qm
+%%NLS%%lib/virtualbox/nls/qt_eu.qm
+%%NLS%%lib/virtualbox/nls/qt_fi.qm
+%%NLS%%lib/virtualbox/nls/qt_fr.qm
+%%NLS%%lib/virtualbox/nls/qt_hu.qm
+%%NLS%%lib/virtualbox/nls/qt_id.qm
+%%NLS%%lib/virtualbox/nls/qt_it.qm
+%%NLS%%lib/virtualbox/nls/qt_ja.qm
+%%NLS%%lib/virtualbox/nls/qt_km_KH.qm
+%%NLS%%lib/virtualbox/nls/qt_ko.qm
+%%NLS%%lib/virtualbox/nls/qt_nl.qm
+%%NLS%%lib/virtualbox/nls/qt_pl.qm
+%%NLS%%lib/virtualbox/nls/qt_pt.qm
+%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/qt_ro.qm
+%%NLS%%lib/virtualbox/nls/qt_ru.qm
+%%NLS%%lib/virtualbox/nls/qt_sk.qm
+%%NLS%%lib/virtualbox/nls/qt_sr.qm
+%%NLS%%lib/virtualbox/nls/qt_sv.qm
+%%NLS%%lib/virtualbox/nls/qt_tr.qm
+%%NLS%%lib/virtualbox/nls/qt_uk.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm
 %%QT4%%share/applications/virtualbox.desktop
 %%QT4%%share/icons/hicolor/48x48/apps/VBox.png
+%%DATADIR%%/idl/nsIDebug.idl
+%%DATADIR%%/idl/nsIInterfaceRequestor.idl
+%%DATADIR%%/idl/nsIMemory.idl
+%%DATADIR%%/idl/nsIProgrammingLanguage.idl
+%%DATADIR%%/idl/nsISupports.idl
+%%DATADIR%%/idl/nsITraceRefcnt.idl
+%%DATADIR%%/idl/nsIWeakReference.idl
+%%DATADIR%%/idl/nsIConsoleMessage.idl
+%%DATADIR%%/idl/nsIConsoleService.idl
+%%DATADIR%%/idl/nsIConsoleListener.idl
+%%DATADIR%%/idl/nsIErrorService.idl
+%%DATADIR%%/idl/nsIException.idl
+%%DATADIR%%/idl/nsIExceptionService.idl
+%%DATADIR%%/idl/nsrootidl.idl
+%%DATADIR%%/idl/nsIClassInfo.idl
+%%DATADIR%%/idl/nsIFactory.idl
+%%DATADIR%%/idl/nsIModule.idl
+%%DATADIR%%/idl/nsIComponentRegistrar.idl
+%%DATADIR%%/idl/nsIServiceManager.idl
+%%DATADIR%%/idl/nsIComponentManager.idl
+%%DATADIR%%/idl/nsICategoryManager.idl
+%%DATADIR%%/idl/nsINativeComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentManagerObsolete.idl
+%%DATADIR%%/idl/nsISupportsArray.idl
+%%DATADIR%%/idl/nsIComponentLoaderManager.idl
+%%DATADIR%%/idl/nsICollection.idl
+%%DATADIR%%/idl/nsISerializable.idl
+%%DATADIR%%/idl/nsIEnumerator.idl
+%%DATADIR%%/idl/nsISimpleEnumerator.idl
+%%DATADIR%%/idl/nsIObserverService.idl
+%%DATADIR%%/idl/nsIObserver.idl
+%%DATADIR%%/idl/nsIAtom.idl
+%%DATADIR%%/idl/nsIAtomService.idl
+%%DATADIR%%/idl/nsIProperties.idl
+%%DATADIR%%/idl/nsIPersistentProperties2.idl
+%%DATADIR%%/idl/nsIRecyclingAllocator.idl
+%%DATADIR%%/idl/nsIStringEnumerator.idl
+%%DATADIR%%/idl/nsISupportsPrimitives.idl
+%%DATADIR%%/idl/nsISupportsIterators.idl
+%%DATADIR%%/idl/nsITimelineService.idl
+%%DATADIR%%/idl/nsIVariant.idl
+%%DATADIR%%/idl/nsIArray.idl
+%%DATADIR%%/idl/nsIPropertyBag.idl
+%%DATADIR%%/idl/nsIHashable.idl
+%%DATADIR%%/idl/nsIDirectoryService.idl
+%%DATADIR%%/idl/nsIDirectoryEnumerator.idl
+%%DATADIR%%/idl/nsIFile.idl
+%%DATADIR%%/idl/nsILocalFile.idl
+%%DATADIR%%/idl/nsIInputStream.idl
+%%DATADIR%%/idl/nsILocalFileMac.idl
+%%DATADIR%%/idl/nsIObjectInputStream.idl
+%%DATADIR%%/idl/nsIBinaryInputStream.idl
+%%DATADIR%%/idl/nsIObjectOutputStream.idl
+%%DATADIR%%/idl/nsIBinaryOutputStream.idl
+%%DATADIR%%/idl/nsIStreamBufferAccess.idl
+%%DATADIR%%/idl/nsIOutputStream.idl
+%%DATADIR%%/idl/nsIByteArrayInputStream.idl
+%%DATADIR%%/idl/nsIFastLoadFileControl.idl
+%%DATADIR%%/idl/nsISeekableStream.idl
+%%DATADIR%%/idl/nsIInputStreamTee.idl
+%%DATADIR%%/idl/nsIFastLoadService.idl
+%%DATADIR%%/idl/nsIMultiplexInputStream.idl
+%%DATADIR%%/idl/nsIPipe.idl
+%%DATADIR%%/idl/nsIAsyncInputStream.idl
+%%DATADIR%%/idl/nsIAsyncOutputStream.idl
+%%DATADIR%%/idl/nsIScriptableInputStream.idl
+%%DATADIR%%/idl/nsIStorageStream.idl
+%%DATADIR%%/idl/nsILineInputStream.idl
+%%DATADIR%%/idl/nsIStringStream.idl
+%%DATADIR%%/idl/nsIProxyObjectManager.idl
+%%DATADIR%%/idl/nsIEventQueue.idl
+%%DATADIR%%/idl/nsIEventQueueService.idl
+%%DATADIR%%/idl/nsIRunnable.idl
+%%DATADIR%%/idl/nsIThread.idl
+%%DATADIR%%/idl/nsIEventTarget.idl
+%%DATADIR%%/idl/nsIEnvironment.idl
+%%DATADIR%%/idl/nsITimer.idl
+%%DATADIR%%/idl/nsITimerInternal.idl
+%%DATADIR%%/idl/nsITimerManager.idl
+%%DATADIR%%/idl/nsIInterfaceInfo.idl
+%%DATADIR%%/idl/nsIProcess.idl
+%%DATADIR%%/idl/nsIXPTLoader.idl
+%%DATADIR%%/idl/nsIInterfaceInfoManager.idl
+%%DATADIR%%/idl/ipcIMessageObserver.idl
+%%DATADIR%%/idl/ipcIService.idl
+%%DATADIR%%/idl/ipcIClientObserver.idl
+%%DATADIR%%/idl/ipcILockService.idl
+%%DATADIR%%/idl/ipcIDConnectService.idl
+%%DATADIR%%/idl/ipcITransactionService.idl
+%%DATADIR%%/idl/ipcITransactionObserver.idl
+%%DATADIR%%/idl/VirtualBox_XPCOM.idl
+%%DATADIR%%/samples/tstVBoxAPILinux.cpp
+%%DATADIR%%/samples/Makefile
+include/virtualbox/VBoxCAPI_v2_2.h
+include/virtualbox/VBoxCAPI_v3_0.h
+include/virtualbox/VBoxCAPI_v3_1.h
+include/virtualbox/VirtualBox_XPCOM.h
+include/virtualbox/ipcIClientObserver.h
+include/virtualbox/ipcIDConnectService.h
+include/virtualbox/ipcILockService.h
+include/virtualbox/ipcIMessageObserver.h
+include/virtualbox/ipcIService.h
+include/virtualbox/ipcITransactionObserver.h
+include/virtualbox/ipcITransactionService.h
+include/virtualbox/ipcd/ipcCID.h
+include/virtualbox/ipcd/ipcLockCID.h
+include/virtualbox/ipcd/ipcMessageReader.h
+include/virtualbox/ipcd/ipcMessageWriter.h
+include/virtualbox/ipcd/ipcModule.h
+include/virtualbox/ipcd/ipcModuleUtil.h
+include/virtualbox/ipcd/ipcdclient.h
+include/virtualbox/nsIArray.h
+include/virtualbox/nsIAsyncInputStream.h
+include/virtualbox/nsIAsyncOutputStream.h
+include/virtualbox/nsIAtom.h
+include/virtualbox/nsIAtomService.h
+include/virtualbox/nsIBinaryInputStream.h
+include/virtualbox/nsIBinaryOutputStream.h
+include/virtualbox/nsIByteArrayInputStream.h
+include/virtualbox/nsICategoryManager.h
+include/virtualbox/nsIClassInfo.h
+include/virtualbox/nsICollection.h
+include/virtualbox/nsIComponentLoader.h
+include/virtualbox/nsIComponentLoaderManager.h
+include/virtualbox/nsIComponentManager.h
+include/virtualbox/nsIComponentManagerObsolete.h
+include/virtualbox/nsIComponentRegistrar.h
+include/virtualbox/nsIConsoleListener.h
+include/virtualbox/nsIConsoleMessage.h
+include/virtualbox/nsIConsoleService.h
+include/virtualbox/nsIDebug.h
+include/virtualbox/nsIDirectoryEnumerator.h
+include/virtualbox/nsIDirectoryService.h
+include/virtualbox/nsIEnumerator.h
+include/virtualbox/nsIEnvironment.h
+include/virtualbox/nsIErrorService.h
+include/virtualbox/nsIEventQueue.h
+include/virtualbox/nsIEventQueueService.h
+include/virtualbox/nsIEventTarget.h
+include/virtualbox/nsIException.h
+include/virtualbox/nsIExceptionService.h
+include/virtualbox/nsIFactory.h
+include/virtualbox/nsIFastLoadFileControl.h
+include/virtualbox/nsIFastLoadService.h
+include/virtualbox/nsIFile.h
+include/virtualbox/nsIHashable.h
+include/virtualbox/nsIInputStream.h
+include/virtualbox/nsIInputStreamTee.h
+include/virtualbox/nsIInterfaceInfo.h
+include/virtualbox/nsIInterfaceInfoManager.h
+include/virtualbox/nsIInterfaceRequestor.h
+include/virtualbox/nsILineInputStream.h
+include/virtualbox/nsILocalFile.h
+include/virtualbox/nsILocalFileMac.h
+include/virtualbox/nsIMemory.h
+include/virtualbox/nsIModule.h
+include/virtualbox/nsIMultiplexInputStream.h
+include/virtualbox/nsINativeComponentLoader.h
+include/virtualbox/nsIObjectInputStream.h
+include/virtualbox/nsIObjectOutputStream.h
+include/virtualbox/nsIObserver.h
+include/virtualbox/nsIObserverService.h
+include/virtualbox/nsIOutputStream.h
+include/virtualbox/nsIPersistentProperties2.h
+include/virtualbox/nsIPipe.h
+include/virtualbox/nsIProcess.h
+include/virtualbox/nsIProgrammingLanguage.h
+include/virtualbox/nsIProperties.h
+include/virtualbox/nsIPropertyBag.h
+include/virtualbox/nsIProxyObjectManager.h
+include/virtualbox/nsIRecyclingAllocator.h
+include/virtualbox/nsIRunnable.h
+include/virtualbox/nsIScriptableInputStream.h
+include/virtualbox/nsISeekableStream.h
+include/virtualbox/nsISerializable.h
+include/virtualbox/nsIServiceManager.h
+include/virtualbox/nsISimpleEnumerator.h
+include/virtualbox/nsIStorageStream.h
+include/virtualbox/nsIStreamBufferAccess.h
+include/virtualbox/nsIStringEnumerator.h
+include/virtualbox/nsIStringStream.h
+include/virtualbox/nsISupports.h
+include/virtualbox/nsISupportsArray.h
+include/virtualbox/nsISupportsIterators.h
+include/virtualbox/nsISupportsPrimitives.h
+include/virtualbox/nsIThread.h
+include/virtualbox/nsITimelineService.h
+include/virtualbox/nsITimer.h
+include/virtualbox/nsITimerInternal.h
+include/virtualbox/nsITimerManager.h
+include/virtualbox/nsITraceRefcnt.h
+include/virtualbox/nsIVariant.h
+include/virtualbox/nsIWeakReference.h
+include/virtualbox/nsIXPTLoader.h
+include/virtualbox/nsprpub/nspr.h
+include/virtualbox/nsprpub/plarena.h
+include/virtualbox/nsprpub/plarenas.h
+include/virtualbox/nsprpub/plbase64.h
+include/virtualbox/nsprpub/plerror.h
+include/virtualbox/nsprpub/plgetopt.h
+include/virtualbox/nsprpub/plhash.h
+include/virtualbox/nsprpub/plresolv.h
+include/virtualbox/nsprpub/plstr.h
+include/virtualbox/nsprpub/pratom.h
+include/virtualbox/nsprpub/prbit.h
+include/virtualbox/nsprpub/prclist.h
+include/virtualbox/nsprpub/prcmon.h
+include/virtualbox/nsprpub/prcountr.h
+include/virtualbox/nsprpub/prcvar.h
+include/virtualbox/nsprpub/prdtoa.h
+include/virtualbox/nsprpub/prenv.h
+include/virtualbox/nsprpub/prerr.h
+include/virtualbox/nsprpub/prerror.h
+include/virtualbox/nsprpub/prinet.h
+include/virtualbox/nsprpub/prinit.h
+include/virtualbox/nsprpub/prinrval.h
+include/virtualbox/nsprpub/prio.h
+include/virtualbox/nsprpub/pripcsem.h
+include/virtualbox/nsprpub/prlink.h
+include/virtualbox/nsprpub/md/_iprt_atomic.h
+include/virtualbox/nsprpub/md/_darwin.h
+include/virtualbox/nsprpub/md/_freebsd.h
+include/virtualbox/nsprpub/md/_l4v2.h
+include/virtualbox/nsprpub/md/_linux.h
+include/virtualbox/nsprpub/md/_macos.h
+include/virtualbox/nsprpub/md/_netbsd.h
+include/virtualbox/nsprpub/md/_openbsd.h
+include/virtualbox/nsprpub/md/_os2_errors.h
+include/virtualbox/nsprpub/md/_os2.h
+include/virtualbox/nsprpub/md/_pcos.h
+include/virtualbox/nsprpub/md/_solaris.h
+include/virtualbox/nsprpub/md/_unix_errors.h
+include/virtualbox/nsprpub/md/_unixos.h
+include/virtualbox/nsprpub/md/_pth.h
+include/virtualbox/nsprpub/md/prosdep.h
+include/virtualbox/nsprpub/md/_freebsd.cfg
+include/virtualbox/nsprpub/md/_linux.cfg
+include/virtualbox/nsprpub/md/_darwin.cfg
+include/virtualbox/nsprpub/md/_netbsd.cfg
+include/virtualbox/nsprpub/md/_openbsd.cfg
+include/virtualbox/nsprpub/md/_os2.cfg
+include/virtualbox/nsprpub/md/_solaris32.cfg
+include/virtualbox/nsprpub/md/_l4v2.cfg
+include/virtualbox/nsprpub/md/_solaris64.cfg
+include/virtualbox/nsprpub/prlock.h
+include/virtualbox/nsprpub/prlog.h
+include/virtualbox/nsprpub/prlong.h
+include/virtualbox/nsprpub/prmem.h
+include/virtualbox/nsprpub/prmon.h
+include/virtualbox/nsprpub/prmwait.h
+include/virtualbox/nsprpub/prnetdb.h
+include/virtualbox/nsprpub/prolock.h
+include/virtualbox/nsprpub/prpdce.h
+include/virtualbox/nsprpub/prprf.h
+include/virtualbox/nsprpub/prproces.h
+include/virtualbox/nsprpub/prrng.h
+include/virtualbox/nsprpub/prrwlock.h
+include/virtualbox/nsprpub/prshm.h
+include/virtualbox/nsprpub/prshma.h
+include/virtualbox/nsprpub/prsystem.h
+include/virtualbox/nsprpub/prthread.h
+include/virtualbox/nsprpub/prtime.h
+include/virtualbox/nsprpub/prtpool.h
+include/virtualbox/nsprpub/prtrace.h
+include/virtualbox/nsprpub/prtypes.h
+include/virtualbox/nsprpub/prvrsion.h
+include/virtualbox/nsprpub/prwin16.h
+include/virtualbox/nsprpub/prcpucfg.h
+include/virtualbox/nsprpub/obsolete/pralarm.h
+include/virtualbox/nsprpub/obsolete/probslet.h
+include/virtualbox/nsprpub/obsolete/protypes.h
+include/virtualbox/nsprpub/obsolete/prsem.h
+include/virtualbox/nsprpub/private/pprio.h
+include/virtualbox/nsprpub/private/pprthred.h
+include/virtualbox/nsprpub/private/prpriv.h
+include/virtualbox/nsrootidl.h
+include/virtualbox/string/nsAString.h
+include/virtualbox/string/nsAlgorithm.h
+include/virtualbox/string/nsCharTraits.h
+include/virtualbox/string/nsDependentString.h
+include/virtualbox/string/nsDependentSubstring.h
+include/virtualbox/string/nsEmbedString.h
+include/virtualbox/string/nsLiteralString.h
+include/virtualbox/string/nsObsoleteAString.h
+include/virtualbox/string/nsPrintfCString.h
+include/virtualbox/string/nsPromiseFlatString.h
+include/virtualbox/string/nsReadableUtils.h
+include/virtualbox/string/nsString.h
+include/virtualbox/string/nsStringAPI.h
+include/virtualbox/string/nsStringFwd.h
+include/virtualbox/string/nsStringIterator.h
+include/virtualbox/string/nsSubstring.h
+include/virtualbox/string/nsSubstringTuple.h
+include/virtualbox/string/nsTAString.h
+include/virtualbox/string/nsTString.h
+include/virtualbox/string/nsTDependentString.h
+include/virtualbox/string/nsTDependentSubstring.h
+include/virtualbox/string/nsTObsoleteAString.h
+include/virtualbox/string/nsTPromiseFlatString.h
+include/virtualbox/string/nsTSubstring.h
+include/virtualbox/string/nsTSubstringTuple.h
+include/virtualbox/string/nsUTF8Utils.h
+include/virtualbox/string/nsXPIDLString.h
+include/virtualbox/string/string-template-def-char.h
+include/virtualbox/string/string-template-def-unichar.h
+include/virtualbox/string/string-template-undef.h
+include/virtualbox/xpcom/nsAgg.h
+include/virtualbox/xpcom/nsAppDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsArray.h
+include/virtualbox/xpcom/nsArrayEnumerator.h
+include/virtualbox/xpcom/nsAtomService.h
+include/virtualbox/xpcom/nsAutoBuffer.h
+include/virtualbox/xpcom/nsAutoLock.h
+include/virtualbox/xpcom/nsAutoPtr.h
+include/virtualbox/xpcom/nsBaseHashtable.h
+include/virtualbox/xpcom/nsCOMArray.h
+include/virtualbox/xpcom/nsCRT.h
+include/virtualbox/xpcom/nsCategoryManagerUtils.h
+include/virtualbox/xpcom/nsCheapSets.h
+include/virtualbox/xpcom/nsClassHashtable.h
+include/virtualbox/xpcom/nsCom.h
+include/virtualbox/xpcom/nsComponentManagerObsolete.h
+include/virtualbox/xpcom/nsComponentManagerUtils.h
+include/virtualbox/xpcom/nsCppSharedAllocator.h
+include/virtualbox/xpcom/nsID.h
+include/virtualbox/xpcom/nsDataHashtable.h
+include/virtualbox/xpcom/nsDebugImpl.h
+include/virtualbox/xpcom/nsDeque.h
+include/virtualbox/xpcom/nsDirectoryService.h
+include/virtualbox/xpcom/nsDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsDirectoryServiceUtils.h
+include/virtualbox/xpcom/nsDoubleHashtable.h
+include/virtualbox/xpcom/nsEnumeratorUtils.h
+include/virtualbox/xpcom/nsError.h
+include/virtualbox/xpcom/nsEscape.h
+include/virtualbox/xpcom/nsEventQueueUtils.h
+include/virtualbox/xpcom/nsFastLoadPtr.h
+include/virtualbox/xpcom/nsFastLoadService.h
+include/virtualbox/xpcom/nsFixedSizeAllocator.h
+include/virtualbox/xpcom/nsHashKeys.h
+include/virtualbox/xpcom/nsHashSets.h
+include/virtualbox/xpcom/nsHashtable.h
+include/virtualbox/xpcom/nsIAllocator.h
+include/virtualbox/xpcom/nsIByteBuffer.h
+include/virtualbox/xpcom/nsIID.h
+include/virtualbox/xpcom/nsIServiceManagerObsolete.h
+include/virtualbox/xpcom/nsIServiceManagerUtils.h
+include/virtualbox/xpcom/nsISupportsBase.h
+include/virtualbox/xpcom/nsISupportsObsolete.h
+include/virtualbox/xpcom/nsIUnicharBuffer.h
+include/virtualbox/xpcom/nsIUnicharInputStream.h
+include/virtualbox/xpcom/nsInt64.h
+include/virtualbox/xpcom/nsInterfaceHashtable.h
+include/virtualbox/xpcom/nsLinebreakConverter.h
+include/virtualbox/xpcom/nsLocalFile.h
+include/virtualbox/xpcom/nsLocalFileUnix.h
+include/virtualbox/xpcom/nsLocalFileOS2.h
+include/virtualbox/xpcom/nsLocalFileOSX.h
+include/virtualbox/xpcom/nsModule.h
+include/virtualbox/xpcom/nsMultiplexInputStream.h
+include/virtualbox/xpcom/nsNativeCharsetUtils.h
+include/virtualbox/xpcom/nsProcess.h
+include/virtualbox/xpcom/nsNativeComponentLoader.h
+include/virtualbox/xpcom/nsObserverService.h
+include/virtualbox/xpcom/nsObsoleteModuleLoading.h
+include/virtualbox/xpcom/nsProxiedService.h
+include/virtualbox/xpcom/nsProxyEvent.h
+include/virtualbox/xpcom/nsProxyRelease.h
+include/virtualbox/xpcom/nsQuickSort.h
+include/virtualbox/xpcom/nsRecyclingAllocator.h
+include/virtualbox/xpcom/nsRefPtrHashtable.h
+include/virtualbox/xpcom/nsScriptableInputStream.h
+include/virtualbox/xpcom/nsStaticAtom.h
+include/virtualbox/xpcom/nsStaticComponent.h
+include/virtualbox/xpcom/nsStaticNameTable.h
+include/virtualbox/xpcom/nsStorageStream.h
+include/virtualbox/xpcom/nsStreamUtils.h
+include/virtualbox/xpcom/nsStringEnumerator.h
+include/virtualbox/xpcom/nsStringIO.h
+include/virtualbox/xpcom/nsTHashtable.h
+include/virtualbox/xpcom/nsStringStream.h
+include/virtualbox/xpcom/nsSupportsArray.h
+include/virtualbox/xpcom/nsSupportsPrimitives.h
+include/virtualbox/xpcom/nsTextFormatter.h
+include/virtualbox/xpcom/nsTime.h
+include/virtualbox/xpcom/nsTraceRefcntImpl.h
+include/virtualbox/xpcom/nsUnitConversion.h
+include/virtualbox/xpcom/nsValueArray.h
+include/virtualbox/xpcom/nsVariant.h
+include/virtualbox/xpcom/nsVoidArray.h
+include/virtualbox/xpcom/nsWeakPtr.h
+include/virtualbox/xpcom/nsXPCOM.h
+include/virtualbox/xpcom/nsXPCOMCID.h
+include/virtualbox/xpcom/nscore.h
+include/virtualbox/xpcom/pldhash.h
+include/virtualbox/xpcom/plevent.h
+include/virtualbox/xpcom/xcDll.h
+include/virtualbox/xpcom/xpt_arena.h
+include/virtualbox/xpcom/xpt_struct.h
+include/virtualbox/xpcom/xpt_xdr.h
+include/virtualbox/xpcom/xptcall.h
+include/virtualbox/xpcom/xptcstubsdecl.inc
+include/virtualbox/xpcom/xptcstubsdef.inc
+include/virtualbox/xpcom/xptinfo.h
+include/virtualbox/xpcom/nsIInterfaceRequestorUtils.h
+include/virtualbox/xpcom/nsISupportsImpl.h
+include/virtualbox/xpcom/nsISupportsUtils.h
+include/virtualbox/xpcom/nsIWeakReferenceUtils.h
+include/virtualbox/xpcom/nsCOMPtr.h
+include/virtualbox/xpcom/nsDebug.h
+include/virtualbox/xpcom/nsGenericFactory.h
+include/virtualbox/xpcom/nsIGenericFactory.h
+include/virtualbox/xpcom/nsMemory.h
+include/virtualbox/xpcom/nsTraceRefcnt.h
+include/virtualbox/xpcom/nsWeakReference.h
+include/virtualbox/xpcom/nsXPCOMGlue.h
+include/virtualbox/xpcom/xpcom-config.h
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/vboxxpcom.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/components.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/file.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/nsError.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/primitives.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpcom_consts.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpt.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/enumerator.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/factory.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/loader.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/module.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/policy.py
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox
+@dirrm include/virtualbox/xpcom
+@dirrm include/virtualbox/string
+@dirrm include/virtualbox/nsprpub/private
+@dirrm include/virtualbox/nsprpub/obsolete
+@dirrm include/virtualbox/nsprpub/md
+@dirrm include/virtualbox/nsprpub
+@dirrm include/virtualbox/ipcd
+@dirrm include/virtualbox
+@dirrm %%DATADIR%%/samples
+@dirrm %%DATADIR%%/idl
+@dirrm %%DATADIR%%
 %%QT4%%@dirrmtry share/icons/hicolor/48x48/apps
 %%QT4%%@dirrmtry share/icons/hicolor/48x48
 %%QT4%%@dirrmtry share/icons/hicolor
 %%QT4%%@dirrmtry share/icons
 %%QT4%%@dirrmtry share/applications
+@dirrm lib/virtualbox/nls
 @dirrm lib/virtualbox/components
 @dirrm lib/virtualbox
 @cwd /
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 70c1c1d4b56a..44e56c9856b0 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox
-DISTVERSION=	2.2.51.r20457
-PORTREVISION=	3
+DISTVERSION=	3.0.51r22226
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -26,6 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.5:${PORTSDIR}/ftp/curl
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -35,7 +35,6 @@ USE_SDL=	sdl
 USE_CDRTOOLS=	yes
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-2.2.51r20457
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
@@ -45,7 +44,7 @@ CONFLICTS=	bcc-[0-9]*
 VBOXGROUP?=	vboxusers
 VBOXGID?=	920
 VBOX_FRONTENDS=	VBoxBFE VBoxHeadless VBoxSDL
-VBOX_GUEST_VER=	2.2.4
+VBOX_GUEST_VER=	3.0.4
 
 SUB_FILES=	pkg-install
 
@@ -57,7 +56,8 @@ OPTIONS=	QT4 "Build with QT4 Frontend" on \
 		DEBUG "Build with debugging symbols" off \
 		GUESTADDITIONS "Build with Guest Additions" off \
 		DBUS "Build with D-Bus and HAL support" on \
-		PULSEAUDIO "Build with PulseAudio" off
+		PULSEAUDIO "Build with PulseAudio" off \
+		NLS "Native language support" on
 
 .include <bsd.port.options.mk>
 
@@ -77,6 +77,7 @@ PLIST_SUB+=	QT4=""
 .else
 CONFIGURE_ARGS+=--disable-qt4
 PLIST_SUB+=	QT4="@comment "
+WITHOUT_NLS=	yes
 .endif
 
 .if defined(WITH_GUESTADDITIONS)
@@ -105,6 +106,12 @@ CONFIGURE_ARGS+=--disable-dbus
 CONFIGURE_ARGS+=--disable-pulse
 .endif
 
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if !exists(${SRC_BASE}/sys/kern/bus_if.m)
 IGNORE=		requires kernel sources for the kernel module
 .endif
@@ -154,9 +161,20 @@ do-install:
 	${MKDIR} ${KMODDIR}
 	${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR}
 
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR})
+
+	${MKDIR} ${PREFIX}/include/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${PREFIX}/include/virtualbox)
+
 	${MKDIR} ${PREFIX}/lib/virtualbox
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox)
 
+.if !defined(WITHOUT_NLS)
+	${MKDIR} ${PREFIX}/lib/virtualbox/nls
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls)
+.endif
+
 	${MKDIR} ${PREFIX}/bin
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} VBoxTestOGL
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/
@@ -176,6 +194,9 @@ do-install:
 	${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso
 .endif
 
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${PYTHONPREFIX_SITELIBDIR}/virtualbox)
+
 post-install:
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index 83a43ed1146d..d72ab50597c2 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,6 +1,6 @@
-MD5 (virtualbox-2.2.51.r20457.tar.bz2) = e95b5130a0276224961c792047975531
-SHA256 (virtualbox-2.2.51.r20457.tar.bz2) = f321c04e20c47d7054b885bd70ea5abcab11bc047f2645dec0ca297dbdb3945b
-SIZE (virtualbox-2.2.51.r20457.tar.bz2) = 50707220
-MD5 (VBoxGuestAdditions_2.2.4.iso) = 00e64c25f87155540a3d106c5257530f
-SHA256 (VBoxGuestAdditions_2.2.4.iso) = 98c4323b87461a02ec5efc6803ec05a101dbea301784a9561cbade7b63a62861
-SIZE (VBoxGuestAdditions_2.2.4.iso) = 28747776
+MD5 (virtualbox-3.0.51r22226.tar.bz2) = bb4bbefdc7635a339629ed2ec790d638
+SHA256 (virtualbox-3.0.51r22226.tar.bz2) = 277967c68ddde036d7a8fb47e343dee8f7389002a89c3fd282e59b351dbf7e06
+SIZE (virtualbox-3.0.51r22226.tar.bz2) = 51353921
+MD5 (VBoxGuestAdditions_3.0.4.iso) = f1347c8dd9323c3d4850462abfaafc08
+SHA256 (VBoxGuestAdditions_3.0.4.iso) = 85ea4675c8960940db05799523314c99e8538439404573d97355d1fc3284e0ba
+SIZE (VBoxGuestAdditions_3.0.4.iso) = 32380928
diff --git a/emulators/virtualbox-ose/files/patch-Config.kmk b/emulators/virtualbox-ose/files/patch-Config.kmk
deleted file mode 100644
index 81e5f7062b4e..000000000000
--- a/emulators/virtualbox-ose/files/patch-Config.kmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- Config.kmk.orig	2009-06-04 18:02:20.000000000 +0200
-+++ Config.kmk	2009-06-04 18:21:07.000000000 +0200
-@@ -1850,7 +1850,7 @@
-  VBOX_OPENSSL_ALL=1
- endif
- 
--if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86)
-+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64)
-  VBOX_WITH_LIBCURL = 1
-  SDK_VBOX_LIBCURL       = .
-  SDK_VBOX_LIBCURL_INCS ?= $(PATH_ROOT)/src/libs/curl-7.19.4/include
diff --git a/emulators/virtualbox-ose/files/patch-glloader.py b/emulators/virtualbox-ose/files/patch-glloader.py
deleted file mode 100644
index f57aee697ad8..000000000000
--- a/emulators/virtualbox-ose/files/patch-glloader.py
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: src/VBox/GuestHost/OpenGL/spu_loader/glloader.py
-@@ -149,7 +149,7 @@
- 		}*/
- #endif
- 	}
--#if !defined(__linux__) && !defined(SunOS)
-+#if !defined(__linux__) && !defined(SunOS) && !defined(__FreeBSD__)
- 	crStrcat( system_path, "/" );
- #endif
- 	crStrcat( system_path, lib );
diff --git a/emulators/virtualbox-ose/files/patch-include-iprt-types.h b/emulators/virtualbox-ose/files/patch-include-iprt-types.h
new file mode 100644
index 000000000000..35f253a391e7
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-include-iprt-types.h
@@ -0,0 +1,14 @@
+--- include/iprt/types.h.orig	2009-07-12 21:17:13.000000000 +0200
++++ include/iprt/types.h	2009-08-12 21:38:17.000000000 +0200
+@@ -92,6 +92,11 @@
+ #  undef true
+ #  undef bool
+ 
++# elif defined(RT_OS_FREEBSD)
++#  define _UINT64_T_DECLARED
++#  define _INT64_T_DECLARED
++#  include <stddef.h>
++#  include <sys/types.h>
+ # else
+ #  include <stddef.h>
+ #  include <sys/types.h>
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
index 64ed1b6899f8..670495c87b8c 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
@@ -1,6 +1,6 @@
 --- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.old	2009-05-04 20:29:23.000000000 +0200
 +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c	2009-05-04 20:30:28.000000000 +0200
-@@ -228,7 +228,11 @@
+@@ -162,7 +162,11 @@
      if (rc)
      {
          *ppDev = make_dev(&g_VBoxGuestFreeBSDChrDevSW,
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
new file mode 100644
index 000000000000..0a1f735fb79a
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
@@ -0,0 +1,50 @@
+Index: src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
+@@ -54,7 +54,8 @@
+ #ifdef RT_OS_WINDOWS
+ # include <windows.h>
+ # include <winioctl.h>
+-#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
++#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) \
++    || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+ # include <errno.h>
+ # include <sys/ioctl.h>
+ # include <sys/types.h>
+@@ -76,6 +77,9 @@
+ # include <sys/dkio.h>
+ # include <sys/vtoc.h>
+ #endif /* RT_OS_SOLARIS */
++#ifdef RT_OS_FREEBSD
++# include <sys/disk.h>
++#endif /* RT_OS_FREEBSD */
+ 
+ using namespace com;
+ 
+@@ -1013,6 +1017,28 @@
+         vrc = VERR_INVALID_PARAMETER;
+         goto out;
+     }
++#elif defined(RT_OS_FREEBSD)
++    struct stat DevStat;
++    if (!fstat(RawFile, &DevStat) && S_ISCHR(DevStat.st_mode))
++    {
++        off_t cMediasize = 0;
++        if (!ioctl(RawFile, DIOCGMEDIASIZE, &cMediasize))
++        {
++            cbSize = cMediasize;
++        }
++        else
++        {
++            vrc = RTErrConvertFromErrno(errno);
++            RTPrintf("Cannot get the block count for file '%s': %Rrc", rawdisk.raw(), vrc);
++            goto out;
++        }
++    }
++    else
++    {
++        RTPrintf("File '%s' is no character device\n", rawdisk.raw());
++        vrc = VERR_INVALID_PARAMETER;
++        goto out;
++    }
+ #else /* all unrecognized OSes */
+     /* Hopefully this works on all other hosts. If it doesn't, it'll just fail
+      * creating the VMDK, so no real harm done. */
diff --git a/emulators/virtualbox-ose/pkg-message b/emulators/virtualbox-ose/pkg-message
index 053b176a7388..8de6ce2ffe0c 100644
--- a/emulators/virtualbox-ose/pkg-message
+++ b/emulators/virtualbox-ose/pkg-message
@@ -14,6 +14,9 @@ You also have to add all users to your vboxusers group in order to use vbox.
 Running VirtualBox as non-root user may fail with a fatal error 
 NS_ERROR_FACTORY_NOT_REGISTERED. In this case delete /tmp/.vbox-*-ipc file.
 
+Check wiki page for known issues and troubleshooting:
+http://wiki.freebsd.org/VirtualBox
+
 Please report any problems to emulation@. Thanks!
 
 =============================================================================
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index db7682a96d30..611a88294b9d 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -31,7 +31,6 @@ lib/virtualbox/VBoxRT.so
 lib/virtualbox/VBoxSDL
 lib/virtualbox/VBoxSDL.so
 lib/virtualbox/VBoxSVC
-lib/virtualbox/VBoxSettings.so
 lib/virtualbox/VBoxSharedClipboard.so
 lib/virtualbox/VBoxSharedCrOpenGL.so
 lib/virtualbox/VBoxSharedFolders.so
@@ -48,20 +47,528 @@ lib/virtualbox/tstMicroGC.gc
 lib/virtualbox/VBoxDD2R0.r0
 lib/virtualbox/VBoxDDR0.r0
 %%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso
-%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_2.2.4.iso
+%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_3.0.4.iso
+lib/virtualbox/VBoxPython2_6.so
 lib/virtualbox/VMMR0.r0
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
 lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VBoxSVCM.so
 lib/virtualbox/components/VBoxC.so
 lib/virtualbox/components/VBoxXPCOMBase.xpt
+%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm
+%%NLS%%lib/virtualbox/nls/qt_ar.qm
+%%NLS%%lib/virtualbox/nls/qt_bg.qm
+%%NLS%%lib/virtualbox/nls/qt_ca.qm
+%%NLS%%lib/virtualbox/nls/qt_cs.qm
+%%NLS%%lib/virtualbox/nls/qt_de.qm
+%%NLS%%lib/virtualbox/nls/qt_el.qm
+%%NLS%%lib/virtualbox/nls/qt_es.qm
+%%NLS%%lib/virtualbox/nls/qt_eu.qm
+%%NLS%%lib/virtualbox/nls/qt_fi.qm
+%%NLS%%lib/virtualbox/nls/qt_fr.qm
+%%NLS%%lib/virtualbox/nls/qt_hu.qm
+%%NLS%%lib/virtualbox/nls/qt_id.qm
+%%NLS%%lib/virtualbox/nls/qt_it.qm
+%%NLS%%lib/virtualbox/nls/qt_ja.qm
+%%NLS%%lib/virtualbox/nls/qt_km_KH.qm
+%%NLS%%lib/virtualbox/nls/qt_ko.qm
+%%NLS%%lib/virtualbox/nls/qt_nl.qm
+%%NLS%%lib/virtualbox/nls/qt_pl.qm
+%%NLS%%lib/virtualbox/nls/qt_pt.qm
+%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/qt_ro.qm
+%%NLS%%lib/virtualbox/nls/qt_ru.qm
+%%NLS%%lib/virtualbox/nls/qt_sk.qm
+%%NLS%%lib/virtualbox/nls/qt_sr.qm
+%%NLS%%lib/virtualbox/nls/qt_sv.qm
+%%NLS%%lib/virtualbox/nls/qt_tr.qm
+%%NLS%%lib/virtualbox/nls/qt_uk.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm
 %%QT4%%share/applications/virtualbox.desktop
 %%QT4%%share/icons/hicolor/48x48/apps/VBox.png
+%%DATADIR%%/idl/nsIDebug.idl
+%%DATADIR%%/idl/nsIInterfaceRequestor.idl
+%%DATADIR%%/idl/nsIMemory.idl
+%%DATADIR%%/idl/nsIProgrammingLanguage.idl
+%%DATADIR%%/idl/nsISupports.idl
+%%DATADIR%%/idl/nsITraceRefcnt.idl
+%%DATADIR%%/idl/nsIWeakReference.idl
+%%DATADIR%%/idl/nsIConsoleMessage.idl
+%%DATADIR%%/idl/nsIConsoleService.idl
+%%DATADIR%%/idl/nsIConsoleListener.idl
+%%DATADIR%%/idl/nsIErrorService.idl
+%%DATADIR%%/idl/nsIException.idl
+%%DATADIR%%/idl/nsIExceptionService.idl
+%%DATADIR%%/idl/nsrootidl.idl
+%%DATADIR%%/idl/nsIClassInfo.idl
+%%DATADIR%%/idl/nsIFactory.idl
+%%DATADIR%%/idl/nsIModule.idl
+%%DATADIR%%/idl/nsIComponentRegistrar.idl
+%%DATADIR%%/idl/nsIServiceManager.idl
+%%DATADIR%%/idl/nsIComponentManager.idl
+%%DATADIR%%/idl/nsICategoryManager.idl
+%%DATADIR%%/idl/nsINativeComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentManagerObsolete.idl
+%%DATADIR%%/idl/nsISupportsArray.idl
+%%DATADIR%%/idl/nsIComponentLoaderManager.idl
+%%DATADIR%%/idl/nsICollection.idl
+%%DATADIR%%/idl/nsISerializable.idl
+%%DATADIR%%/idl/nsIEnumerator.idl
+%%DATADIR%%/idl/nsISimpleEnumerator.idl
+%%DATADIR%%/idl/nsIObserverService.idl
+%%DATADIR%%/idl/nsIObserver.idl
+%%DATADIR%%/idl/nsIAtom.idl
+%%DATADIR%%/idl/nsIAtomService.idl
+%%DATADIR%%/idl/nsIProperties.idl
+%%DATADIR%%/idl/nsIPersistentProperties2.idl
+%%DATADIR%%/idl/nsIRecyclingAllocator.idl
+%%DATADIR%%/idl/nsIStringEnumerator.idl
+%%DATADIR%%/idl/nsISupportsPrimitives.idl
+%%DATADIR%%/idl/nsISupportsIterators.idl
+%%DATADIR%%/idl/nsITimelineService.idl
+%%DATADIR%%/idl/nsIVariant.idl
+%%DATADIR%%/idl/nsIArray.idl
+%%DATADIR%%/idl/nsIPropertyBag.idl
+%%DATADIR%%/idl/nsIHashable.idl
+%%DATADIR%%/idl/nsIDirectoryService.idl
+%%DATADIR%%/idl/nsIDirectoryEnumerator.idl
+%%DATADIR%%/idl/nsIFile.idl
+%%DATADIR%%/idl/nsILocalFile.idl
+%%DATADIR%%/idl/nsIInputStream.idl
+%%DATADIR%%/idl/nsILocalFileMac.idl
+%%DATADIR%%/idl/nsIObjectInputStream.idl
+%%DATADIR%%/idl/nsIBinaryInputStream.idl
+%%DATADIR%%/idl/nsIObjectOutputStream.idl
+%%DATADIR%%/idl/nsIBinaryOutputStream.idl
+%%DATADIR%%/idl/nsIStreamBufferAccess.idl
+%%DATADIR%%/idl/nsIOutputStream.idl
+%%DATADIR%%/idl/nsIByteArrayInputStream.idl
+%%DATADIR%%/idl/nsIFastLoadFileControl.idl
+%%DATADIR%%/idl/nsISeekableStream.idl
+%%DATADIR%%/idl/nsIInputStreamTee.idl
+%%DATADIR%%/idl/nsIFastLoadService.idl
+%%DATADIR%%/idl/nsIMultiplexInputStream.idl
+%%DATADIR%%/idl/nsIPipe.idl
+%%DATADIR%%/idl/nsIAsyncInputStream.idl
+%%DATADIR%%/idl/nsIAsyncOutputStream.idl
+%%DATADIR%%/idl/nsIScriptableInputStream.idl
+%%DATADIR%%/idl/nsIStorageStream.idl
+%%DATADIR%%/idl/nsILineInputStream.idl
+%%DATADIR%%/idl/nsIStringStream.idl
+%%DATADIR%%/idl/nsIProxyObjectManager.idl
+%%DATADIR%%/idl/nsIEventQueue.idl
+%%DATADIR%%/idl/nsIEventQueueService.idl
+%%DATADIR%%/idl/nsIRunnable.idl
+%%DATADIR%%/idl/nsIThread.idl
+%%DATADIR%%/idl/nsIEventTarget.idl
+%%DATADIR%%/idl/nsIEnvironment.idl
+%%DATADIR%%/idl/nsITimer.idl
+%%DATADIR%%/idl/nsITimerInternal.idl
+%%DATADIR%%/idl/nsITimerManager.idl
+%%DATADIR%%/idl/nsIInterfaceInfo.idl
+%%DATADIR%%/idl/nsIProcess.idl
+%%DATADIR%%/idl/nsIXPTLoader.idl
+%%DATADIR%%/idl/nsIInterfaceInfoManager.idl
+%%DATADIR%%/idl/ipcIMessageObserver.idl
+%%DATADIR%%/idl/ipcIService.idl
+%%DATADIR%%/idl/ipcIClientObserver.idl
+%%DATADIR%%/idl/ipcILockService.idl
+%%DATADIR%%/idl/ipcIDConnectService.idl
+%%DATADIR%%/idl/ipcITransactionService.idl
+%%DATADIR%%/idl/ipcITransactionObserver.idl
+%%DATADIR%%/idl/VirtualBox_XPCOM.idl
+%%DATADIR%%/samples/tstVBoxAPILinux.cpp
+%%DATADIR%%/samples/Makefile
+include/virtualbox/VBoxCAPI_v2_2.h
+include/virtualbox/VBoxCAPI_v3_0.h
+include/virtualbox/VBoxCAPI_v3_1.h
+include/virtualbox/VirtualBox_XPCOM.h
+include/virtualbox/ipcIClientObserver.h
+include/virtualbox/ipcIDConnectService.h
+include/virtualbox/ipcILockService.h
+include/virtualbox/ipcIMessageObserver.h
+include/virtualbox/ipcIService.h
+include/virtualbox/ipcITransactionObserver.h
+include/virtualbox/ipcITransactionService.h
+include/virtualbox/ipcd/ipcCID.h
+include/virtualbox/ipcd/ipcLockCID.h
+include/virtualbox/ipcd/ipcMessageReader.h
+include/virtualbox/ipcd/ipcMessageWriter.h
+include/virtualbox/ipcd/ipcModule.h
+include/virtualbox/ipcd/ipcModuleUtil.h
+include/virtualbox/ipcd/ipcdclient.h
+include/virtualbox/nsIArray.h
+include/virtualbox/nsIAsyncInputStream.h
+include/virtualbox/nsIAsyncOutputStream.h
+include/virtualbox/nsIAtom.h
+include/virtualbox/nsIAtomService.h
+include/virtualbox/nsIBinaryInputStream.h
+include/virtualbox/nsIBinaryOutputStream.h
+include/virtualbox/nsIByteArrayInputStream.h
+include/virtualbox/nsICategoryManager.h
+include/virtualbox/nsIClassInfo.h
+include/virtualbox/nsICollection.h
+include/virtualbox/nsIComponentLoader.h
+include/virtualbox/nsIComponentLoaderManager.h
+include/virtualbox/nsIComponentManager.h
+include/virtualbox/nsIComponentManagerObsolete.h
+include/virtualbox/nsIComponentRegistrar.h
+include/virtualbox/nsIConsoleListener.h
+include/virtualbox/nsIConsoleMessage.h
+include/virtualbox/nsIConsoleService.h
+include/virtualbox/nsIDebug.h
+include/virtualbox/nsIDirectoryEnumerator.h
+include/virtualbox/nsIDirectoryService.h
+include/virtualbox/nsIEnumerator.h
+include/virtualbox/nsIEnvironment.h
+include/virtualbox/nsIErrorService.h
+include/virtualbox/nsIEventQueue.h
+include/virtualbox/nsIEventQueueService.h
+include/virtualbox/nsIEventTarget.h
+include/virtualbox/nsIException.h
+include/virtualbox/nsIExceptionService.h
+include/virtualbox/nsIFactory.h
+include/virtualbox/nsIFastLoadFileControl.h
+include/virtualbox/nsIFastLoadService.h
+include/virtualbox/nsIFile.h
+include/virtualbox/nsIHashable.h
+include/virtualbox/nsIInputStream.h
+include/virtualbox/nsIInputStreamTee.h
+include/virtualbox/nsIInterfaceInfo.h
+include/virtualbox/nsIInterfaceInfoManager.h
+include/virtualbox/nsIInterfaceRequestor.h
+include/virtualbox/nsILineInputStream.h
+include/virtualbox/nsILocalFile.h
+include/virtualbox/nsILocalFileMac.h
+include/virtualbox/nsIMemory.h
+include/virtualbox/nsIModule.h
+include/virtualbox/nsIMultiplexInputStream.h
+include/virtualbox/nsINativeComponentLoader.h
+include/virtualbox/nsIObjectInputStream.h
+include/virtualbox/nsIObjectOutputStream.h
+include/virtualbox/nsIObserver.h
+include/virtualbox/nsIObserverService.h
+include/virtualbox/nsIOutputStream.h
+include/virtualbox/nsIPersistentProperties2.h
+include/virtualbox/nsIPipe.h
+include/virtualbox/nsIProcess.h
+include/virtualbox/nsIProgrammingLanguage.h
+include/virtualbox/nsIProperties.h
+include/virtualbox/nsIPropertyBag.h
+include/virtualbox/nsIProxyObjectManager.h
+include/virtualbox/nsIRecyclingAllocator.h
+include/virtualbox/nsIRunnable.h
+include/virtualbox/nsIScriptableInputStream.h
+include/virtualbox/nsISeekableStream.h
+include/virtualbox/nsISerializable.h
+include/virtualbox/nsIServiceManager.h
+include/virtualbox/nsISimpleEnumerator.h
+include/virtualbox/nsIStorageStream.h
+include/virtualbox/nsIStreamBufferAccess.h
+include/virtualbox/nsIStringEnumerator.h
+include/virtualbox/nsIStringStream.h
+include/virtualbox/nsISupports.h
+include/virtualbox/nsISupportsArray.h
+include/virtualbox/nsISupportsIterators.h
+include/virtualbox/nsISupportsPrimitives.h
+include/virtualbox/nsIThread.h
+include/virtualbox/nsITimelineService.h
+include/virtualbox/nsITimer.h
+include/virtualbox/nsITimerInternal.h
+include/virtualbox/nsITimerManager.h
+include/virtualbox/nsITraceRefcnt.h
+include/virtualbox/nsIVariant.h
+include/virtualbox/nsIWeakReference.h
+include/virtualbox/nsIXPTLoader.h
+include/virtualbox/nsprpub/nspr.h
+include/virtualbox/nsprpub/plarena.h
+include/virtualbox/nsprpub/plarenas.h
+include/virtualbox/nsprpub/plbase64.h
+include/virtualbox/nsprpub/plerror.h
+include/virtualbox/nsprpub/plgetopt.h
+include/virtualbox/nsprpub/plhash.h
+include/virtualbox/nsprpub/plresolv.h
+include/virtualbox/nsprpub/plstr.h
+include/virtualbox/nsprpub/pratom.h
+include/virtualbox/nsprpub/prbit.h
+include/virtualbox/nsprpub/prclist.h
+include/virtualbox/nsprpub/prcmon.h
+include/virtualbox/nsprpub/prcountr.h
+include/virtualbox/nsprpub/prcvar.h
+include/virtualbox/nsprpub/prdtoa.h
+include/virtualbox/nsprpub/prenv.h
+include/virtualbox/nsprpub/prerr.h
+include/virtualbox/nsprpub/prerror.h
+include/virtualbox/nsprpub/prinet.h
+include/virtualbox/nsprpub/prinit.h
+include/virtualbox/nsprpub/prinrval.h
+include/virtualbox/nsprpub/prio.h
+include/virtualbox/nsprpub/pripcsem.h
+include/virtualbox/nsprpub/prlink.h
+include/virtualbox/nsprpub/md/_iprt_atomic.h
+include/virtualbox/nsprpub/md/_darwin.h
+include/virtualbox/nsprpub/md/_freebsd.h
+include/virtualbox/nsprpub/md/_l4v2.h
+include/virtualbox/nsprpub/md/_linux.h
+include/virtualbox/nsprpub/md/_macos.h
+include/virtualbox/nsprpub/md/_netbsd.h
+include/virtualbox/nsprpub/md/_openbsd.h
+include/virtualbox/nsprpub/md/_os2_errors.h
+include/virtualbox/nsprpub/md/_os2.h
+include/virtualbox/nsprpub/md/_pcos.h
+include/virtualbox/nsprpub/md/_solaris.h
+include/virtualbox/nsprpub/md/_unix_errors.h
+include/virtualbox/nsprpub/md/_unixos.h
+include/virtualbox/nsprpub/md/_pth.h
+include/virtualbox/nsprpub/md/prosdep.h
+include/virtualbox/nsprpub/md/_freebsd.cfg
+include/virtualbox/nsprpub/md/_linux.cfg
+include/virtualbox/nsprpub/md/_darwin.cfg
+include/virtualbox/nsprpub/md/_netbsd.cfg
+include/virtualbox/nsprpub/md/_openbsd.cfg
+include/virtualbox/nsprpub/md/_os2.cfg
+include/virtualbox/nsprpub/md/_solaris32.cfg
+include/virtualbox/nsprpub/md/_l4v2.cfg
+include/virtualbox/nsprpub/md/_solaris64.cfg
+include/virtualbox/nsprpub/prlock.h
+include/virtualbox/nsprpub/prlog.h
+include/virtualbox/nsprpub/prlong.h
+include/virtualbox/nsprpub/prmem.h
+include/virtualbox/nsprpub/prmon.h
+include/virtualbox/nsprpub/prmwait.h
+include/virtualbox/nsprpub/prnetdb.h
+include/virtualbox/nsprpub/prolock.h
+include/virtualbox/nsprpub/prpdce.h
+include/virtualbox/nsprpub/prprf.h
+include/virtualbox/nsprpub/prproces.h
+include/virtualbox/nsprpub/prrng.h
+include/virtualbox/nsprpub/prrwlock.h
+include/virtualbox/nsprpub/prshm.h
+include/virtualbox/nsprpub/prshma.h
+include/virtualbox/nsprpub/prsystem.h
+include/virtualbox/nsprpub/prthread.h
+include/virtualbox/nsprpub/prtime.h
+include/virtualbox/nsprpub/prtpool.h
+include/virtualbox/nsprpub/prtrace.h
+include/virtualbox/nsprpub/prtypes.h
+include/virtualbox/nsprpub/prvrsion.h
+include/virtualbox/nsprpub/prwin16.h
+include/virtualbox/nsprpub/prcpucfg.h
+include/virtualbox/nsprpub/obsolete/pralarm.h
+include/virtualbox/nsprpub/obsolete/probslet.h
+include/virtualbox/nsprpub/obsolete/protypes.h
+include/virtualbox/nsprpub/obsolete/prsem.h
+include/virtualbox/nsprpub/private/pprio.h
+include/virtualbox/nsprpub/private/pprthred.h
+include/virtualbox/nsprpub/private/prpriv.h
+include/virtualbox/nsrootidl.h
+include/virtualbox/string/nsAString.h
+include/virtualbox/string/nsAlgorithm.h
+include/virtualbox/string/nsCharTraits.h
+include/virtualbox/string/nsDependentString.h
+include/virtualbox/string/nsDependentSubstring.h
+include/virtualbox/string/nsEmbedString.h
+include/virtualbox/string/nsLiteralString.h
+include/virtualbox/string/nsObsoleteAString.h
+include/virtualbox/string/nsPrintfCString.h
+include/virtualbox/string/nsPromiseFlatString.h
+include/virtualbox/string/nsReadableUtils.h
+include/virtualbox/string/nsString.h
+include/virtualbox/string/nsStringAPI.h
+include/virtualbox/string/nsStringFwd.h
+include/virtualbox/string/nsStringIterator.h
+include/virtualbox/string/nsSubstring.h
+include/virtualbox/string/nsSubstringTuple.h
+include/virtualbox/string/nsTAString.h
+include/virtualbox/string/nsTString.h
+include/virtualbox/string/nsTDependentString.h
+include/virtualbox/string/nsTDependentSubstring.h
+include/virtualbox/string/nsTObsoleteAString.h
+include/virtualbox/string/nsTPromiseFlatString.h
+include/virtualbox/string/nsTSubstring.h
+include/virtualbox/string/nsTSubstringTuple.h
+include/virtualbox/string/nsUTF8Utils.h
+include/virtualbox/string/nsXPIDLString.h
+include/virtualbox/string/string-template-def-char.h
+include/virtualbox/string/string-template-def-unichar.h
+include/virtualbox/string/string-template-undef.h
+include/virtualbox/xpcom/nsAgg.h
+include/virtualbox/xpcom/nsAppDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsArray.h
+include/virtualbox/xpcom/nsArrayEnumerator.h
+include/virtualbox/xpcom/nsAtomService.h
+include/virtualbox/xpcom/nsAutoBuffer.h
+include/virtualbox/xpcom/nsAutoLock.h
+include/virtualbox/xpcom/nsAutoPtr.h
+include/virtualbox/xpcom/nsBaseHashtable.h
+include/virtualbox/xpcom/nsCOMArray.h
+include/virtualbox/xpcom/nsCRT.h
+include/virtualbox/xpcom/nsCategoryManagerUtils.h
+include/virtualbox/xpcom/nsCheapSets.h
+include/virtualbox/xpcom/nsClassHashtable.h
+include/virtualbox/xpcom/nsCom.h
+include/virtualbox/xpcom/nsComponentManagerObsolete.h
+include/virtualbox/xpcom/nsComponentManagerUtils.h
+include/virtualbox/xpcom/nsCppSharedAllocator.h
+include/virtualbox/xpcom/nsID.h
+include/virtualbox/xpcom/nsDataHashtable.h
+include/virtualbox/xpcom/nsDebugImpl.h
+include/virtualbox/xpcom/nsDeque.h
+include/virtualbox/xpcom/nsDirectoryService.h
+include/virtualbox/xpcom/nsDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsDirectoryServiceUtils.h
+include/virtualbox/xpcom/nsDoubleHashtable.h
+include/virtualbox/xpcom/nsEnumeratorUtils.h
+include/virtualbox/xpcom/nsError.h
+include/virtualbox/xpcom/nsEscape.h
+include/virtualbox/xpcom/nsEventQueueUtils.h
+include/virtualbox/xpcom/nsFastLoadPtr.h
+include/virtualbox/xpcom/nsFastLoadService.h
+include/virtualbox/xpcom/nsFixedSizeAllocator.h
+include/virtualbox/xpcom/nsHashKeys.h
+include/virtualbox/xpcom/nsHashSets.h
+include/virtualbox/xpcom/nsHashtable.h
+include/virtualbox/xpcom/nsIAllocator.h
+include/virtualbox/xpcom/nsIByteBuffer.h
+include/virtualbox/xpcom/nsIID.h
+include/virtualbox/xpcom/nsIServiceManagerObsolete.h
+include/virtualbox/xpcom/nsIServiceManagerUtils.h
+include/virtualbox/xpcom/nsISupportsBase.h
+include/virtualbox/xpcom/nsISupportsObsolete.h
+include/virtualbox/xpcom/nsIUnicharBuffer.h
+include/virtualbox/xpcom/nsIUnicharInputStream.h
+include/virtualbox/xpcom/nsInt64.h
+include/virtualbox/xpcom/nsInterfaceHashtable.h
+include/virtualbox/xpcom/nsLinebreakConverter.h
+include/virtualbox/xpcom/nsLocalFile.h
+include/virtualbox/xpcom/nsLocalFileUnix.h
+include/virtualbox/xpcom/nsLocalFileOS2.h
+include/virtualbox/xpcom/nsLocalFileOSX.h
+include/virtualbox/xpcom/nsModule.h
+include/virtualbox/xpcom/nsMultiplexInputStream.h
+include/virtualbox/xpcom/nsNativeCharsetUtils.h
+include/virtualbox/xpcom/nsProcess.h
+include/virtualbox/xpcom/nsNativeComponentLoader.h
+include/virtualbox/xpcom/nsObserverService.h
+include/virtualbox/xpcom/nsObsoleteModuleLoading.h
+include/virtualbox/xpcom/nsProxiedService.h
+include/virtualbox/xpcom/nsProxyEvent.h
+include/virtualbox/xpcom/nsProxyRelease.h
+include/virtualbox/xpcom/nsQuickSort.h
+include/virtualbox/xpcom/nsRecyclingAllocator.h
+include/virtualbox/xpcom/nsRefPtrHashtable.h
+include/virtualbox/xpcom/nsScriptableInputStream.h
+include/virtualbox/xpcom/nsStaticAtom.h
+include/virtualbox/xpcom/nsStaticComponent.h
+include/virtualbox/xpcom/nsStaticNameTable.h
+include/virtualbox/xpcom/nsStorageStream.h
+include/virtualbox/xpcom/nsStreamUtils.h
+include/virtualbox/xpcom/nsStringEnumerator.h
+include/virtualbox/xpcom/nsStringIO.h
+include/virtualbox/xpcom/nsTHashtable.h
+include/virtualbox/xpcom/nsStringStream.h
+include/virtualbox/xpcom/nsSupportsArray.h
+include/virtualbox/xpcom/nsSupportsPrimitives.h
+include/virtualbox/xpcom/nsTextFormatter.h
+include/virtualbox/xpcom/nsTime.h
+include/virtualbox/xpcom/nsTraceRefcntImpl.h
+include/virtualbox/xpcom/nsUnitConversion.h
+include/virtualbox/xpcom/nsValueArray.h
+include/virtualbox/xpcom/nsVariant.h
+include/virtualbox/xpcom/nsVoidArray.h
+include/virtualbox/xpcom/nsWeakPtr.h
+include/virtualbox/xpcom/nsXPCOM.h
+include/virtualbox/xpcom/nsXPCOMCID.h
+include/virtualbox/xpcom/nscore.h
+include/virtualbox/xpcom/pldhash.h
+include/virtualbox/xpcom/plevent.h
+include/virtualbox/xpcom/xcDll.h
+include/virtualbox/xpcom/xpt_arena.h
+include/virtualbox/xpcom/xpt_struct.h
+include/virtualbox/xpcom/xpt_xdr.h
+include/virtualbox/xpcom/xptcall.h
+include/virtualbox/xpcom/xptcstubsdecl.inc
+include/virtualbox/xpcom/xptcstubsdef.inc
+include/virtualbox/xpcom/xptinfo.h
+include/virtualbox/xpcom/nsIInterfaceRequestorUtils.h
+include/virtualbox/xpcom/nsISupportsImpl.h
+include/virtualbox/xpcom/nsISupportsUtils.h
+include/virtualbox/xpcom/nsIWeakReferenceUtils.h
+include/virtualbox/xpcom/nsCOMPtr.h
+include/virtualbox/xpcom/nsDebug.h
+include/virtualbox/xpcom/nsGenericFactory.h
+include/virtualbox/xpcom/nsIGenericFactory.h
+include/virtualbox/xpcom/nsMemory.h
+include/virtualbox/xpcom/nsTraceRefcnt.h
+include/virtualbox/xpcom/nsWeakReference.h
+include/virtualbox/xpcom/nsXPCOMGlue.h
+include/virtualbox/xpcom/xpcom-config.h
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/vboxxpcom.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/components.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/file.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/nsError.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/primitives.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpcom_consts.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpt.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/enumerator.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/factory.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/loader.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/module.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/policy.py
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox
+@dirrm include/virtualbox/xpcom
+@dirrm include/virtualbox/string
+@dirrm include/virtualbox/nsprpub/private
+@dirrm include/virtualbox/nsprpub/obsolete
+@dirrm include/virtualbox/nsprpub/md
+@dirrm include/virtualbox/nsprpub
+@dirrm include/virtualbox/ipcd
+@dirrm include/virtualbox
+@dirrm %%DATADIR%%/samples
+@dirrm %%DATADIR%%/idl
+@dirrm %%DATADIR%%
 %%QT4%%@dirrmtry share/icons/hicolor/48x48/apps
 %%QT4%%@dirrmtry share/icons/hicolor/48x48
 %%QT4%%@dirrmtry share/icons/hicolor
 %%QT4%%@dirrmtry share/icons
 %%QT4%%@dirrmtry share/applications
+@dirrm lib/virtualbox/nls
 @dirrm lib/virtualbox/components
 @dirrm lib/virtualbox
 @cwd /
diff --git a/emulators/virtualbox/Makefile b/emulators/virtualbox/Makefile
index 70c1c1d4b56a..44e56c9856b0 100644
--- a/emulators/virtualbox/Makefile
+++ b/emulators/virtualbox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox
-DISTVERSION=	2.2.51.r20457
-PORTREVISION=	3
+DISTVERSION=	3.0.51r22226
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -26,6 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.5:${PORTSDIR}/ftp/curl
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -35,7 +35,6 @@ USE_SDL=	sdl
 USE_CDRTOOLS=	yes
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-2.2.51r20457
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
@@ -45,7 +44,7 @@ CONFLICTS=	bcc-[0-9]*
 VBOXGROUP?=	vboxusers
 VBOXGID?=	920
 VBOX_FRONTENDS=	VBoxBFE VBoxHeadless VBoxSDL
-VBOX_GUEST_VER=	2.2.4
+VBOX_GUEST_VER=	3.0.4
 
 SUB_FILES=	pkg-install
 
@@ -57,7 +56,8 @@ OPTIONS=	QT4 "Build with QT4 Frontend" on \
 		DEBUG "Build with debugging symbols" off \
 		GUESTADDITIONS "Build with Guest Additions" off \
 		DBUS "Build with D-Bus and HAL support" on \
-		PULSEAUDIO "Build with PulseAudio" off
+		PULSEAUDIO "Build with PulseAudio" off \
+		NLS "Native language support" on
 
 .include <bsd.port.options.mk>
 
@@ -77,6 +77,7 @@ PLIST_SUB+=	QT4=""
 .else
 CONFIGURE_ARGS+=--disable-qt4
 PLIST_SUB+=	QT4="@comment "
+WITHOUT_NLS=	yes
 .endif
 
 .if defined(WITH_GUESTADDITIONS)
@@ -105,6 +106,12 @@ CONFIGURE_ARGS+=--disable-dbus
 CONFIGURE_ARGS+=--disable-pulse
 .endif
 
+.if !defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if !exists(${SRC_BASE}/sys/kern/bus_if.m)
 IGNORE=		requires kernel sources for the kernel module
 .endif
@@ -154,9 +161,20 @@ do-install:
 	${MKDIR} ${KMODDIR}
 	${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR}
 
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR})
+
+	${MKDIR} ${PREFIX}/include/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${PREFIX}/include/virtualbox)
+
 	${MKDIR} ${PREFIX}/lib/virtualbox
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox)
 
+.if !defined(WITHOUT_NLS)
+	${MKDIR} ${PREFIX}/lib/virtualbox/nls
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls)
+.endif
+
 	${MKDIR} ${PREFIX}/bin
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} VBoxTestOGL
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/
@@ -176,6 +194,9 @@ do-install:
 	${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso
 .endif
 
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/virtualbox
+	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${PYTHONPREFIX_SITELIBDIR}/virtualbox)
+
 post-install:
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/emulators/virtualbox/distinfo b/emulators/virtualbox/distinfo
index 83a43ed1146d..d72ab50597c2 100644
--- a/emulators/virtualbox/distinfo
+++ b/emulators/virtualbox/distinfo
@@ -1,6 +1,6 @@
-MD5 (virtualbox-2.2.51.r20457.tar.bz2) = e95b5130a0276224961c792047975531
-SHA256 (virtualbox-2.2.51.r20457.tar.bz2) = f321c04e20c47d7054b885bd70ea5abcab11bc047f2645dec0ca297dbdb3945b
-SIZE (virtualbox-2.2.51.r20457.tar.bz2) = 50707220
-MD5 (VBoxGuestAdditions_2.2.4.iso) = 00e64c25f87155540a3d106c5257530f
-SHA256 (VBoxGuestAdditions_2.2.4.iso) = 98c4323b87461a02ec5efc6803ec05a101dbea301784a9561cbade7b63a62861
-SIZE (VBoxGuestAdditions_2.2.4.iso) = 28747776
+MD5 (virtualbox-3.0.51r22226.tar.bz2) = bb4bbefdc7635a339629ed2ec790d638
+SHA256 (virtualbox-3.0.51r22226.tar.bz2) = 277967c68ddde036d7a8fb47e343dee8f7389002a89c3fd282e59b351dbf7e06
+SIZE (virtualbox-3.0.51r22226.tar.bz2) = 51353921
+MD5 (VBoxGuestAdditions_3.0.4.iso) = f1347c8dd9323c3d4850462abfaafc08
+SHA256 (VBoxGuestAdditions_3.0.4.iso) = 85ea4675c8960940db05799523314c99e8538439404573d97355d1fc3284e0ba
+SIZE (VBoxGuestAdditions_3.0.4.iso) = 32380928
diff --git a/emulators/virtualbox/files/patch-Config.kmk b/emulators/virtualbox/files/patch-Config.kmk
deleted file mode 100644
index 81e5f7062b4e..000000000000
--- a/emulators/virtualbox/files/patch-Config.kmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- Config.kmk.orig	2009-06-04 18:02:20.000000000 +0200
-+++ Config.kmk	2009-06-04 18:21:07.000000000 +0200
-@@ -1850,7 +1850,7 @@
-  VBOX_OPENSSL_ALL=1
- endif
- 
--if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86)
-+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.x86 linux.amd64 solaris.x86 solaris.amd64 darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64)
-  VBOX_WITH_LIBCURL = 1
-  SDK_VBOX_LIBCURL       = .
-  SDK_VBOX_LIBCURL_INCS ?= $(PATH_ROOT)/src/libs/curl-7.19.4/include
diff --git a/emulators/virtualbox/files/patch-glloader.py b/emulators/virtualbox/files/patch-glloader.py
deleted file mode 100644
index f57aee697ad8..000000000000
--- a/emulators/virtualbox/files/patch-glloader.py
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: src/VBox/GuestHost/OpenGL/spu_loader/glloader.py
-@@ -149,7 +149,7 @@
- 		}*/
- #endif
- 	}
--#if !defined(__linux__) && !defined(SunOS)
-+#if !defined(__linux__) && !defined(SunOS) && !defined(__FreeBSD__)
- 	crStrcat( system_path, "/" );
- #endif
- 	crStrcat( system_path, lib );
diff --git a/emulators/virtualbox/files/patch-include-iprt-types.h b/emulators/virtualbox/files/patch-include-iprt-types.h
new file mode 100644
index 000000000000..35f253a391e7
--- /dev/null
+++ b/emulators/virtualbox/files/patch-include-iprt-types.h
@@ -0,0 +1,14 @@
+--- include/iprt/types.h.orig	2009-07-12 21:17:13.000000000 +0200
++++ include/iprt/types.h	2009-08-12 21:38:17.000000000 +0200
+@@ -92,6 +92,11 @@
+ #  undef true
+ #  undef bool
+ 
++# elif defined(RT_OS_FREEBSD)
++#  define _UINT64_T_DECLARED
++#  define _INT64_T_DECLARED
++#  include <stddef.h>
++#  include <sys/types.h>
+ # else
+ #  include <stddef.h>
+ #  include <sys/types.h>
diff --git a/emulators/virtualbox/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
index 64ed1b6899f8..670495c87b8c 100644
--- a/emulators/virtualbox/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
+++ b/emulators/virtualbox/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
@@ -1,6 +1,6 @@
 --- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.old	2009-05-04 20:29:23.000000000 +0200
 +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c	2009-05-04 20:30:28.000000000 +0200
-@@ -228,7 +228,11 @@
+@@ -162,7 +162,11 @@
      if (rc)
      {
          *ppDev = make_dev(&g_VBoxGuestFreeBSDChrDevSW,
diff --git a/emulators/virtualbox/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp b/emulators/virtualbox/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
new file mode 100644
index 000000000000..0a1f735fb79a
--- /dev/null
+++ b/emulators/virtualbox/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
@@ -0,0 +1,50 @@
+Index: src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
+@@ -54,7 +54,8 @@
+ #ifdef RT_OS_WINDOWS
+ # include <windows.h>
+ # include <winioctl.h>
+-#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
++#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) \
++    || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+ # include <errno.h>
+ # include <sys/ioctl.h>
+ # include <sys/types.h>
+@@ -76,6 +77,9 @@
+ # include <sys/dkio.h>
+ # include <sys/vtoc.h>
+ #endif /* RT_OS_SOLARIS */
++#ifdef RT_OS_FREEBSD
++# include <sys/disk.h>
++#endif /* RT_OS_FREEBSD */
+ 
+ using namespace com;
+ 
+@@ -1013,6 +1017,28 @@
+         vrc = VERR_INVALID_PARAMETER;
+         goto out;
+     }
++#elif defined(RT_OS_FREEBSD)
++    struct stat DevStat;
++    if (!fstat(RawFile, &DevStat) && S_ISCHR(DevStat.st_mode))
++    {
++        off_t cMediasize = 0;
++        if (!ioctl(RawFile, DIOCGMEDIASIZE, &cMediasize))
++        {
++            cbSize = cMediasize;
++        }
++        else
++        {
++            vrc = RTErrConvertFromErrno(errno);
++            RTPrintf("Cannot get the block count for file '%s': %Rrc", rawdisk.raw(), vrc);
++            goto out;
++        }
++    }
++    else
++    {
++        RTPrintf("File '%s' is no character device\n", rawdisk.raw());
++        vrc = VERR_INVALID_PARAMETER;
++        goto out;
++    }
+ #else /* all unrecognized OSes */
+     /* Hopefully this works on all other hosts. If it doesn't, it'll just fail
+      * creating the VMDK, so no real harm done. */
diff --git a/emulators/virtualbox/pkg-message b/emulators/virtualbox/pkg-message
index 053b176a7388..8de6ce2ffe0c 100644
--- a/emulators/virtualbox/pkg-message
+++ b/emulators/virtualbox/pkg-message
@@ -14,6 +14,9 @@ You also have to add all users to your vboxusers group in order to use vbox.
 Running VirtualBox as non-root user may fail with a fatal error 
 NS_ERROR_FACTORY_NOT_REGISTERED. In this case delete /tmp/.vbox-*-ipc file.
 
+Check wiki page for known issues and troubleshooting:
+http://wiki.freebsd.org/VirtualBox
+
 Please report any problems to emulation@. Thanks!
 
 =============================================================================
diff --git a/emulators/virtualbox/pkg-plist b/emulators/virtualbox/pkg-plist
index db7682a96d30..611a88294b9d 100644
--- a/emulators/virtualbox/pkg-plist
+++ b/emulators/virtualbox/pkg-plist
@@ -31,7 +31,6 @@ lib/virtualbox/VBoxRT.so
 lib/virtualbox/VBoxSDL
 lib/virtualbox/VBoxSDL.so
 lib/virtualbox/VBoxSVC
-lib/virtualbox/VBoxSettings.so
 lib/virtualbox/VBoxSharedClipboard.so
 lib/virtualbox/VBoxSharedCrOpenGL.so
 lib/virtualbox/VBoxSharedFolders.so
@@ -48,20 +47,528 @@ lib/virtualbox/tstMicroGC.gc
 lib/virtualbox/VBoxDD2R0.r0
 lib/virtualbox/VBoxDDR0.r0
 %%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso
-%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_2.2.4.iso
+%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_3.0.4.iso
+lib/virtualbox/VBoxPython2_6.so
 lib/virtualbox/VMMR0.r0
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
 lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VBoxSVCM.so
 lib/virtualbox/components/VBoxC.so
 lib/virtualbox/components/VBoxXPCOMBase.xpt
+%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm
+%%NLS%%lib/virtualbox/nls/qt_ar.qm
+%%NLS%%lib/virtualbox/nls/qt_bg.qm
+%%NLS%%lib/virtualbox/nls/qt_ca.qm
+%%NLS%%lib/virtualbox/nls/qt_cs.qm
+%%NLS%%lib/virtualbox/nls/qt_de.qm
+%%NLS%%lib/virtualbox/nls/qt_el.qm
+%%NLS%%lib/virtualbox/nls/qt_es.qm
+%%NLS%%lib/virtualbox/nls/qt_eu.qm
+%%NLS%%lib/virtualbox/nls/qt_fi.qm
+%%NLS%%lib/virtualbox/nls/qt_fr.qm
+%%NLS%%lib/virtualbox/nls/qt_hu.qm
+%%NLS%%lib/virtualbox/nls/qt_id.qm
+%%NLS%%lib/virtualbox/nls/qt_it.qm
+%%NLS%%lib/virtualbox/nls/qt_ja.qm
+%%NLS%%lib/virtualbox/nls/qt_km_KH.qm
+%%NLS%%lib/virtualbox/nls/qt_ko.qm
+%%NLS%%lib/virtualbox/nls/qt_nl.qm
+%%NLS%%lib/virtualbox/nls/qt_pl.qm
+%%NLS%%lib/virtualbox/nls/qt_pt.qm
+%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm
+%%NLS%%lib/virtualbox/nls/qt_ro.qm
+%%NLS%%lib/virtualbox/nls/qt_ru.qm
+%%NLS%%lib/virtualbox/nls/qt_sk.qm
+%%NLS%%lib/virtualbox/nls/qt_sr.qm
+%%NLS%%lib/virtualbox/nls/qt_sv.qm
+%%NLS%%lib/virtualbox/nls/qt_tr.qm
+%%NLS%%lib/virtualbox/nls/qt_uk.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm
+%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm
 %%QT4%%share/applications/virtualbox.desktop
 %%QT4%%share/icons/hicolor/48x48/apps/VBox.png
+%%DATADIR%%/idl/nsIDebug.idl
+%%DATADIR%%/idl/nsIInterfaceRequestor.idl
+%%DATADIR%%/idl/nsIMemory.idl
+%%DATADIR%%/idl/nsIProgrammingLanguage.idl
+%%DATADIR%%/idl/nsISupports.idl
+%%DATADIR%%/idl/nsITraceRefcnt.idl
+%%DATADIR%%/idl/nsIWeakReference.idl
+%%DATADIR%%/idl/nsIConsoleMessage.idl
+%%DATADIR%%/idl/nsIConsoleService.idl
+%%DATADIR%%/idl/nsIConsoleListener.idl
+%%DATADIR%%/idl/nsIErrorService.idl
+%%DATADIR%%/idl/nsIException.idl
+%%DATADIR%%/idl/nsIExceptionService.idl
+%%DATADIR%%/idl/nsrootidl.idl
+%%DATADIR%%/idl/nsIClassInfo.idl
+%%DATADIR%%/idl/nsIFactory.idl
+%%DATADIR%%/idl/nsIModule.idl
+%%DATADIR%%/idl/nsIComponentRegistrar.idl
+%%DATADIR%%/idl/nsIServiceManager.idl
+%%DATADIR%%/idl/nsIComponentManager.idl
+%%DATADIR%%/idl/nsICategoryManager.idl
+%%DATADIR%%/idl/nsINativeComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentManagerObsolete.idl
+%%DATADIR%%/idl/nsISupportsArray.idl
+%%DATADIR%%/idl/nsIComponentLoaderManager.idl
+%%DATADIR%%/idl/nsICollection.idl
+%%DATADIR%%/idl/nsISerializable.idl
+%%DATADIR%%/idl/nsIEnumerator.idl
+%%DATADIR%%/idl/nsISimpleEnumerator.idl
+%%DATADIR%%/idl/nsIObserverService.idl
+%%DATADIR%%/idl/nsIObserver.idl
+%%DATADIR%%/idl/nsIAtom.idl
+%%DATADIR%%/idl/nsIAtomService.idl
+%%DATADIR%%/idl/nsIProperties.idl
+%%DATADIR%%/idl/nsIPersistentProperties2.idl
+%%DATADIR%%/idl/nsIRecyclingAllocator.idl
+%%DATADIR%%/idl/nsIStringEnumerator.idl
+%%DATADIR%%/idl/nsISupportsPrimitives.idl
+%%DATADIR%%/idl/nsISupportsIterators.idl
+%%DATADIR%%/idl/nsITimelineService.idl
+%%DATADIR%%/idl/nsIVariant.idl
+%%DATADIR%%/idl/nsIArray.idl
+%%DATADIR%%/idl/nsIPropertyBag.idl
+%%DATADIR%%/idl/nsIHashable.idl
+%%DATADIR%%/idl/nsIDirectoryService.idl
+%%DATADIR%%/idl/nsIDirectoryEnumerator.idl
+%%DATADIR%%/idl/nsIFile.idl
+%%DATADIR%%/idl/nsILocalFile.idl
+%%DATADIR%%/idl/nsIInputStream.idl
+%%DATADIR%%/idl/nsILocalFileMac.idl
+%%DATADIR%%/idl/nsIObjectInputStream.idl
+%%DATADIR%%/idl/nsIBinaryInputStream.idl
+%%DATADIR%%/idl/nsIObjectOutputStream.idl
+%%DATADIR%%/idl/nsIBinaryOutputStream.idl
+%%DATADIR%%/idl/nsIStreamBufferAccess.idl
+%%DATADIR%%/idl/nsIOutputStream.idl
+%%DATADIR%%/idl/nsIByteArrayInputStream.idl
+%%DATADIR%%/idl/nsIFastLoadFileControl.idl
+%%DATADIR%%/idl/nsISeekableStream.idl
+%%DATADIR%%/idl/nsIInputStreamTee.idl
+%%DATADIR%%/idl/nsIFastLoadService.idl
+%%DATADIR%%/idl/nsIMultiplexInputStream.idl
+%%DATADIR%%/idl/nsIPipe.idl
+%%DATADIR%%/idl/nsIAsyncInputStream.idl
+%%DATADIR%%/idl/nsIAsyncOutputStream.idl
+%%DATADIR%%/idl/nsIScriptableInputStream.idl
+%%DATADIR%%/idl/nsIStorageStream.idl
+%%DATADIR%%/idl/nsILineInputStream.idl
+%%DATADIR%%/idl/nsIStringStream.idl
+%%DATADIR%%/idl/nsIProxyObjectManager.idl
+%%DATADIR%%/idl/nsIEventQueue.idl
+%%DATADIR%%/idl/nsIEventQueueService.idl
+%%DATADIR%%/idl/nsIRunnable.idl
+%%DATADIR%%/idl/nsIThread.idl
+%%DATADIR%%/idl/nsIEventTarget.idl
+%%DATADIR%%/idl/nsIEnvironment.idl
+%%DATADIR%%/idl/nsITimer.idl
+%%DATADIR%%/idl/nsITimerInternal.idl
+%%DATADIR%%/idl/nsITimerManager.idl
+%%DATADIR%%/idl/nsIInterfaceInfo.idl
+%%DATADIR%%/idl/nsIProcess.idl
+%%DATADIR%%/idl/nsIXPTLoader.idl
+%%DATADIR%%/idl/nsIInterfaceInfoManager.idl
+%%DATADIR%%/idl/ipcIMessageObserver.idl
+%%DATADIR%%/idl/ipcIService.idl
+%%DATADIR%%/idl/ipcIClientObserver.idl
+%%DATADIR%%/idl/ipcILockService.idl
+%%DATADIR%%/idl/ipcIDConnectService.idl
+%%DATADIR%%/idl/ipcITransactionService.idl
+%%DATADIR%%/idl/ipcITransactionObserver.idl
+%%DATADIR%%/idl/VirtualBox_XPCOM.idl
+%%DATADIR%%/samples/tstVBoxAPILinux.cpp
+%%DATADIR%%/samples/Makefile
+include/virtualbox/VBoxCAPI_v2_2.h
+include/virtualbox/VBoxCAPI_v3_0.h
+include/virtualbox/VBoxCAPI_v3_1.h
+include/virtualbox/VirtualBox_XPCOM.h
+include/virtualbox/ipcIClientObserver.h
+include/virtualbox/ipcIDConnectService.h
+include/virtualbox/ipcILockService.h
+include/virtualbox/ipcIMessageObserver.h
+include/virtualbox/ipcIService.h
+include/virtualbox/ipcITransactionObserver.h
+include/virtualbox/ipcITransactionService.h
+include/virtualbox/ipcd/ipcCID.h
+include/virtualbox/ipcd/ipcLockCID.h
+include/virtualbox/ipcd/ipcMessageReader.h
+include/virtualbox/ipcd/ipcMessageWriter.h
+include/virtualbox/ipcd/ipcModule.h
+include/virtualbox/ipcd/ipcModuleUtil.h
+include/virtualbox/ipcd/ipcdclient.h
+include/virtualbox/nsIArray.h
+include/virtualbox/nsIAsyncInputStream.h
+include/virtualbox/nsIAsyncOutputStream.h
+include/virtualbox/nsIAtom.h
+include/virtualbox/nsIAtomService.h
+include/virtualbox/nsIBinaryInputStream.h
+include/virtualbox/nsIBinaryOutputStream.h
+include/virtualbox/nsIByteArrayInputStream.h
+include/virtualbox/nsICategoryManager.h
+include/virtualbox/nsIClassInfo.h
+include/virtualbox/nsICollection.h
+include/virtualbox/nsIComponentLoader.h
+include/virtualbox/nsIComponentLoaderManager.h
+include/virtualbox/nsIComponentManager.h
+include/virtualbox/nsIComponentManagerObsolete.h
+include/virtualbox/nsIComponentRegistrar.h
+include/virtualbox/nsIConsoleListener.h
+include/virtualbox/nsIConsoleMessage.h
+include/virtualbox/nsIConsoleService.h
+include/virtualbox/nsIDebug.h
+include/virtualbox/nsIDirectoryEnumerator.h
+include/virtualbox/nsIDirectoryService.h
+include/virtualbox/nsIEnumerator.h
+include/virtualbox/nsIEnvironment.h
+include/virtualbox/nsIErrorService.h
+include/virtualbox/nsIEventQueue.h
+include/virtualbox/nsIEventQueueService.h
+include/virtualbox/nsIEventTarget.h
+include/virtualbox/nsIException.h
+include/virtualbox/nsIExceptionService.h
+include/virtualbox/nsIFactory.h
+include/virtualbox/nsIFastLoadFileControl.h
+include/virtualbox/nsIFastLoadService.h
+include/virtualbox/nsIFile.h
+include/virtualbox/nsIHashable.h
+include/virtualbox/nsIInputStream.h
+include/virtualbox/nsIInputStreamTee.h
+include/virtualbox/nsIInterfaceInfo.h
+include/virtualbox/nsIInterfaceInfoManager.h
+include/virtualbox/nsIInterfaceRequestor.h
+include/virtualbox/nsILineInputStream.h
+include/virtualbox/nsILocalFile.h
+include/virtualbox/nsILocalFileMac.h
+include/virtualbox/nsIMemory.h
+include/virtualbox/nsIModule.h
+include/virtualbox/nsIMultiplexInputStream.h
+include/virtualbox/nsINativeComponentLoader.h
+include/virtualbox/nsIObjectInputStream.h
+include/virtualbox/nsIObjectOutputStream.h
+include/virtualbox/nsIObserver.h
+include/virtualbox/nsIObserverService.h
+include/virtualbox/nsIOutputStream.h
+include/virtualbox/nsIPersistentProperties2.h
+include/virtualbox/nsIPipe.h
+include/virtualbox/nsIProcess.h
+include/virtualbox/nsIProgrammingLanguage.h
+include/virtualbox/nsIProperties.h
+include/virtualbox/nsIPropertyBag.h
+include/virtualbox/nsIProxyObjectManager.h
+include/virtualbox/nsIRecyclingAllocator.h
+include/virtualbox/nsIRunnable.h
+include/virtualbox/nsIScriptableInputStream.h
+include/virtualbox/nsISeekableStream.h
+include/virtualbox/nsISerializable.h
+include/virtualbox/nsIServiceManager.h
+include/virtualbox/nsISimpleEnumerator.h
+include/virtualbox/nsIStorageStream.h
+include/virtualbox/nsIStreamBufferAccess.h
+include/virtualbox/nsIStringEnumerator.h
+include/virtualbox/nsIStringStream.h
+include/virtualbox/nsISupports.h
+include/virtualbox/nsISupportsArray.h
+include/virtualbox/nsISupportsIterators.h
+include/virtualbox/nsISupportsPrimitives.h
+include/virtualbox/nsIThread.h
+include/virtualbox/nsITimelineService.h
+include/virtualbox/nsITimer.h
+include/virtualbox/nsITimerInternal.h
+include/virtualbox/nsITimerManager.h
+include/virtualbox/nsITraceRefcnt.h
+include/virtualbox/nsIVariant.h
+include/virtualbox/nsIWeakReference.h
+include/virtualbox/nsIXPTLoader.h
+include/virtualbox/nsprpub/nspr.h
+include/virtualbox/nsprpub/plarena.h
+include/virtualbox/nsprpub/plarenas.h
+include/virtualbox/nsprpub/plbase64.h
+include/virtualbox/nsprpub/plerror.h
+include/virtualbox/nsprpub/plgetopt.h
+include/virtualbox/nsprpub/plhash.h
+include/virtualbox/nsprpub/plresolv.h
+include/virtualbox/nsprpub/plstr.h
+include/virtualbox/nsprpub/pratom.h
+include/virtualbox/nsprpub/prbit.h
+include/virtualbox/nsprpub/prclist.h
+include/virtualbox/nsprpub/prcmon.h
+include/virtualbox/nsprpub/prcountr.h
+include/virtualbox/nsprpub/prcvar.h
+include/virtualbox/nsprpub/prdtoa.h
+include/virtualbox/nsprpub/prenv.h
+include/virtualbox/nsprpub/prerr.h
+include/virtualbox/nsprpub/prerror.h
+include/virtualbox/nsprpub/prinet.h
+include/virtualbox/nsprpub/prinit.h
+include/virtualbox/nsprpub/prinrval.h
+include/virtualbox/nsprpub/prio.h
+include/virtualbox/nsprpub/pripcsem.h
+include/virtualbox/nsprpub/prlink.h
+include/virtualbox/nsprpub/md/_iprt_atomic.h
+include/virtualbox/nsprpub/md/_darwin.h
+include/virtualbox/nsprpub/md/_freebsd.h
+include/virtualbox/nsprpub/md/_l4v2.h
+include/virtualbox/nsprpub/md/_linux.h
+include/virtualbox/nsprpub/md/_macos.h
+include/virtualbox/nsprpub/md/_netbsd.h
+include/virtualbox/nsprpub/md/_openbsd.h
+include/virtualbox/nsprpub/md/_os2_errors.h
+include/virtualbox/nsprpub/md/_os2.h
+include/virtualbox/nsprpub/md/_pcos.h
+include/virtualbox/nsprpub/md/_solaris.h
+include/virtualbox/nsprpub/md/_unix_errors.h
+include/virtualbox/nsprpub/md/_unixos.h
+include/virtualbox/nsprpub/md/_pth.h
+include/virtualbox/nsprpub/md/prosdep.h
+include/virtualbox/nsprpub/md/_freebsd.cfg
+include/virtualbox/nsprpub/md/_linux.cfg
+include/virtualbox/nsprpub/md/_darwin.cfg
+include/virtualbox/nsprpub/md/_netbsd.cfg
+include/virtualbox/nsprpub/md/_openbsd.cfg
+include/virtualbox/nsprpub/md/_os2.cfg
+include/virtualbox/nsprpub/md/_solaris32.cfg
+include/virtualbox/nsprpub/md/_l4v2.cfg
+include/virtualbox/nsprpub/md/_solaris64.cfg
+include/virtualbox/nsprpub/prlock.h
+include/virtualbox/nsprpub/prlog.h
+include/virtualbox/nsprpub/prlong.h
+include/virtualbox/nsprpub/prmem.h
+include/virtualbox/nsprpub/prmon.h
+include/virtualbox/nsprpub/prmwait.h
+include/virtualbox/nsprpub/prnetdb.h
+include/virtualbox/nsprpub/prolock.h
+include/virtualbox/nsprpub/prpdce.h
+include/virtualbox/nsprpub/prprf.h
+include/virtualbox/nsprpub/prproces.h
+include/virtualbox/nsprpub/prrng.h
+include/virtualbox/nsprpub/prrwlock.h
+include/virtualbox/nsprpub/prshm.h
+include/virtualbox/nsprpub/prshma.h
+include/virtualbox/nsprpub/prsystem.h
+include/virtualbox/nsprpub/prthread.h
+include/virtualbox/nsprpub/prtime.h
+include/virtualbox/nsprpub/prtpool.h
+include/virtualbox/nsprpub/prtrace.h
+include/virtualbox/nsprpub/prtypes.h
+include/virtualbox/nsprpub/prvrsion.h
+include/virtualbox/nsprpub/prwin16.h
+include/virtualbox/nsprpub/prcpucfg.h
+include/virtualbox/nsprpub/obsolete/pralarm.h
+include/virtualbox/nsprpub/obsolete/probslet.h
+include/virtualbox/nsprpub/obsolete/protypes.h
+include/virtualbox/nsprpub/obsolete/prsem.h
+include/virtualbox/nsprpub/private/pprio.h
+include/virtualbox/nsprpub/private/pprthred.h
+include/virtualbox/nsprpub/private/prpriv.h
+include/virtualbox/nsrootidl.h
+include/virtualbox/string/nsAString.h
+include/virtualbox/string/nsAlgorithm.h
+include/virtualbox/string/nsCharTraits.h
+include/virtualbox/string/nsDependentString.h
+include/virtualbox/string/nsDependentSubstring.h
+include/virtualbox/string/nsEmbedString.h
+include/virtualbox/string/nsLiteralString.h
+include/virtualbox/string/nsObsoleteAString.h
+include/virtualbox/string/nsPrintfCString.h
+include/virtualbox/string/nsPromiseFlatString.h
+include/virtualbox/string/nsReadableUtils.h
+include/virtualbox/string/nsString.h
+include/virtualbox/string/nsStringAPI.h
+include/virtualbox/string/nsStringFwd.h
+include/virtualbox/string/nsStringIterator.h
+include/virtualbox/string/nsSubstring.h
+include/virtualbox/string/nsSubstringTuple.h
+include/virtualbox/string/nsTAString.h
+include/virtualbox/string/nsTString.h
+include/virtualbox/string/nsTDependentString.h
+include/virtualbox/string/nsTDependentSubstring.h
+include/virtualbox/string/nsTObsoleteAString.h
+include/virtualbox/string/nsTPromiseFlatString.h
+include/virtualbox/string/nsTSubstring.h
+include/virtualbox/string/nsTSubstringTuple.h
+include/virtualbox/string/nsUTF8Utils.h
+include/virtualbox/string/nsXPIDLString.h
+include/virtualbox/string/string-template-def-char.h
+include/virtualbox/string/string-template-def-unichar.h
+include/virtualbox/string/string-template-undef.h
+include/virtualbox/xpcom/nsAgg.h
+include/virtualbox/xpcom/nsAppDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsArray.h
+include/virtualbox/xpcom/nsArrayEnumerator.h
+include/virtualbox/xpcom/nsAtomService.h
+include/virtualbox/xpcom/nsAutoBuffer.h
+include/virtualbox/xpcom/nsAutoLock.h
+include/virtualbox/xpcom/nsAutoPtr.h
+include/virtualbox/xpcom/nsBaseHashtable.h
+include/virtualbox/xpcom/nsCOMArray.h
+include/virtualbox/xpcom/nsCRT.h
+include/virtualbox/xpcom/nsCategoryManagerUtils.h
+include/virtualbox/xpcom/nsCheapSets.h
+include/virtualbox/xpcom/nsClassHashtable.h
+include/virtualbox/xpcom/nsCom.h
+include/virtualbox/xpcom/nsComponentManagerObsolete.h
+include/virtualbox/xpcom/nsComponentManagerUtils.h
+include/virtualbox/xpcom/nsCppSharedAllocator.h
+include/virtualbox/xpcom/nsID.h
+include/virtualbox/xpcom/nsDataHashtable.h
+include/virtualbox/xpcom/nsDebugImpl.h
+include/virtualbox/xpcom/nsDeque.h
+include/virtualbox/xpcom/nsDirectoryService.h
+include/virtualbox/xpcom/nsDirectoryServiceDefs.h
+include/virtualbox/xpcom/nsDirectoryServiceUtils.h
+include/virtualbox/xpcom/nsDoubleHashtable.h
+include/virtualbox/xpcom/nsEnumeratorUtils.h
+include/virtualbox/xpcom/nsError.h
+include/virtualbox/xpcom/nsEscape.h
+include/virtualbox/xpcom/nsEventQueueUtils.h
+include/virtualbox/xpcom/nsFastLoadPtr.h
+include/virtualbox/xpcom/nsFastLoadService.h
+include/virtualbox/xpcom/nsFixedSizeAllocator.h
+include/virtualbox/xpcom/nsHashKeys.h
+include/virtualbox/xpcom/nsHashSets.h
+include/virtualbox/xpcom/nsHashtable.h
+include/virtualbox/xpcom/nsIAllocator.h
+include/virtualbox/xpcom/nsIByteBuffer.h
+include/virtualbox/xpcom/nsIID.h
+include/virtualbox/xpcom/nsIServiceManagerObsolete.h
+include/virtualbox/xpcom/nsIServiceManagerUtils.h
+include/virtualbox/xpcom/nsISupportsBase.h
+include/virtualbox/xpcom/nsISupportsObsolete.h
+include/virtualbox/xpcom/nsIUnicharBuffer.h
+include/virtualbox/xpcom/nsIUnicharInputStream.h
+include/virtualbox/xpcom/nsInt64.h
+include/virtualbox/xpcom/nsInterfaceHashtable.h
+include/virtualbox/xpcom/nsLinebreakConverter.h
+include/virtualbox/xpcom/nsLocalFile.h
+include/virtualbox/xpcom/nsLocalFileUnix.h
+include/virtualbox/xpcom/nsLocalFileOS2.h
+include/virtualbox/xpcom/nsLocalFileOSX.h
+include/virtualbox/xpcom/nsModule.h
+include/virtualbox/xpcom/nsMultiplexInputStream.h
+include/virtualbox/xpcom/nsNativeCharsetUtils.h
+include/virtualbox/xpcom/nsProcess.h
+include/virtualbox/xpcom/nsNativeComponentLoader.h
+include/virtualbox/xpcom/nsObserverService.h
+include/virtualbox/xpcom/nsObsoleteModuleLoading.h
+include/virtualbox/xpcom/nsProxiedService.h
+include/virtualbox/xpcom/nsProxyEvent.h
+include/virtualbox/xpcom/nsProxyRelease.h
+include/virtualbox/xpcom/nsQuickSort.h
+include/virtualbox/xpcom/nsRecyclingAllocator.h
+include/virtualbox/xpcom/nsRefPtrHashtable.h
+include/virtualbox/xpcom/nsScriptableInputStream.h
+include/virtualbox/xpcom/nsStaticAtom.h
+include/virtualbox/xpcom/nsStaticComponent.h
+include/virtualbox/xpcom/nsStaticNameTable.h
+include/virtualbox/xpcom/nsStorageStream.h
+include/virtualbox/xpcom/nsStreamUtils.h
+include/virtualbox/xpcom/nsStringEnumerator.h
+include/virtualbox/xpcom/nsStringIO.h
+include/virtualbox/xpcom/nsTHashtable.h
+include/virtualbox/xpcom/nsStringStream.h
+include/virtualbox/xpcom/nsSupportsArray.h
+include/virtualbox/xpcom/nsSupportsPrimitives.h
+include/virtualbox/xpcom/nsTextFormatter.h
+include/virtualbox/xpcom/nsTime.h
+include/virtualbox/xpcom/nsTraceRefcntImpl.h
+include/virtualbox/xpcom/nsUnitConversion.h
+include/virtualbox/xpcom/nsValueArray.h
+include/virtualbox/xpcom/nsVariant.h
+include/virtualbox/xpcom/nsVoidArray.h
+include/virtualbox/xpcom/nsWeakPtr.h
+include/virtualbox/xpcom/nsXPCOM.h
+include/virtualbox/xpcom/nsXPCOMCID.h
+include/virtualbox/xpcom/nscore.h
+include/virtualbox/xpcom/pldhash.h
+include/virtualbox/xpcom/plevent.h
+include/virtualbox/xpcom/xcDll.h
+include/virtualbox/xpcom/xpt_arena.h
+include/virtualbox/xpcom/xpt_struct.h
+include/virtualbox/xpcom/xpt_xdr.h
+include/virtualbox/xpcom/xptcall.h
+include/virtualbox/xpcom/xptcstubsdecl.inc
+include/virtualbox/xpcom/xptcstubsdef.inc
+include/virtualbox/xpcom/xptinfo.h
+include/virtualbox/xpcom/nsIInterfaceRequestorUtils.h
+include/virtualbox/xpcom/nsISupportsImpl.h
+include/virtualbox/xpcom/nsISupportsUtils.h
+include/virtualbox/xpcom/nsIWeakReferenceUtils.h
+include/virtualbox/xpcom/nsCOMPtr.h
+include/virtualbox/xpcom/nsDebug.h
+include/virtualbox/xpcom/nsGenericFactory.h
+include/virtualbox/xpcom/nsIGenericFactory.h
+include/virtualbox/xpcom/nsMemory.h
+include/virtualbox/xpcom/nsTraceRefcnt.h
+include/virtualbox/xpcom/nsWeakReference.h
+include/virtualbox/xpcom/nsXPCOMGlue.h
+include/virtualbox/xpcom/xpcom-config.h
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/vboxxpcom.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/components.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/file.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/nsError.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/primitives.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpcom_consts.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/xpt.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/__init__.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/enumerator.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/factory.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/loader.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/module.py
+%%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server/policy.py
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/server
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom/client
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox/xpcom
+@dirrm %%PYTHON_SITELIBDIR%%/virtualbox
+@dirrm include/virtualbox/xpcom
+@dirrm include/virtualbox/string
+@dirrm include/virtualbox/nsprpub/private
+@dirrm include/virtualbox/nsprpub/obsolete
+@dirrm include/virtualbox/nsprpub/md
+@dirrm include/virtualbox/nsprpub
+@dirrm include/virtualbox/ipcd
+@dirrm include/virtualbox
+@dirrm %%DATADIR%%/samples
+@dirrm %%DATADIR%%/idl
+@dirrm %%DATADIR%%
 %%QT4%%@dirrmtry share/icons/hicolor/48x48/apps
 %%QT4%%@dirrmtry share/icons/hicolor/48x48
 %%QT4%%@dirrmtry share/icons/hicolor
 %%QT4%%@dirrmtry share/icons
 %%QT4%%@dirrmtry share/applications
+@dirrm lib/virtualbox/nls
 @dirrm lib/virtualbox/components
 @dirrm lib/virtualbox
 @cwd /