author: Beat Gaetzi <beat@FreeBSD.org> 2010-06-07 16:31:58 +0000
committer: Beat Gaetzi <beat@FreeBSD.org> 2010-06-07 16:31:58 +0000
commit: 804cd7e3936996911180e902baea92df713587c7 (patch)
tree: 7f516d4d0c16046bad2d5edaa61399f4a63dfeb9 /emulators
parent: bdbbb7ff83e4c6d435371d2f6f1f7ec5e6589548 (diff)
download: ports-804cd7e3936996911180e902baea92df713587c7.tar.gz
ports-804cd7e3936996911180e902baea92df713587c7.zip
44 files changed, 222 insertions, 858 deletions
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 233bd01ca971..623847119f97 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.1.8
+DISTVERSION=	3.2.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -29,6 +29,9 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 		curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}_OSE
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GNOME=	libidl
@@ -46,22 +49,19 @@ USE_LDCONFIG=	${PREFIX}/lib/virtualbox
 CONFLICTS=	bcc-[0-9]* virtualbox-ose-devel-3* virtualbox-ose-additions-3* virtualbox-ose-additions-devel-3*
 
 VBOXGROUP?=	vboxusers
-VBOXGID?=	920
+GROUPS=		${VBOXGROUP}
 VBOX_FRONTENDS=	VBoxHeadless
 VBOX_GUEST_VER=	${PORTVERSION}
 
-SUB_FILES=	pkg-install
-
-SUB_LIST=	PREFIX=${PREFIX} \
-		VBOXGROUP=${VBOXGROUP} \
-		VBOXGID=${VBOXGID}
-
 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 \
 		X11 "Build with X11 support" on \
+		VDE "Build with VDE support" off \
+		VNC "Build with VNC support" off \
+		WEBSERVICE "Build Webservice" off \
 		NLS "Native language support" on
 
 .include <bsd.port.options.mk>
@@ -84,7 +84,7 @@ BROKEN=		QT4 frontend requires X11 support. Run 'make config' again!
 
 .if !defined(WITHOUT_X11)
 USE_SDL=	sdl
-USE_XORG=	xcursor xmu inputproto
+USE_XORG=	xcursor xmu inputproto xinerama
 VBOX_FRONTENDS+=VBoxBFE VBoxSDL
 PLIST_SUB+=	X11=""
 .else
@@ -132,12 +132,29 @@ CONFIGURE_ARGS+=--disable-pulse
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 .endif
 
+.if defined(WITH_VNC)
+LIB_DEPENDS+=	vncserver.0:${PORTSDIR}/net/libvncserver
+.endif
+
 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if defined(WITH_VDE)
+RUN_DEPENDS+=	vde_switch:${PORTSDIR}/net/vde2
+CONFIGURE_ARGS+=--enable-vde
+.endif
+
+.if defined(WITH_WEBSERVICE)
+BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
+VBOX_WEB=	vboxwebsrv webtest
+PLIST_SUB+=	WEB=""
+.else
+PLIST_SUB+=	WEB="@comment "
+.endif
+
 .if ${OSVERSION} < 700000
 BROKEN=	Does not compile on FreeBSD 6.X
 .endif
@@ -174,8 +191,18 @@ post-patch:
 	@${ECHO} 'VBOX_WITH_TESTCASES=' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
-.if defined(WITHOUT_X11)
+	@${ECHO} 'VBOX_WITH_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
+.if defined(WITH_VNC)
+	@${ECHO} 'VBOX_WITH_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk
+.endif
+.if defined(WITH_WEBSERVICE)
+	@${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Config.kmk ${WRKSRC}/configure \
@@ -207,7 +234,7 @@ do-install:
 .endif
 
 	${MKDIR} ${PREFIX}/bin
-.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS}
+.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} ${VBOX_WEB}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${PREFIX}/lib/virtualbox/
 	${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${PREFIX}/bin/
 .endfor
@@ -220,6 +247,13 @@ do-install:
 	${CHMOD} 0711 ${PREFIX}/lib/virtualbox/${f}
 .endfor
 
+.if defined(WITH_WEBSERVICE)
+	${MKDIR} -p ${DATADIR}/sdk/bindings/webservice
+.for f in vboxweb.wsdl vboxwebService.wsdl
+	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
+.endfor
+.endif
+
 .if defined(WITH_GUESTADDITIONS)
 	${MKDIR} ${PREFIX}/lib/virtualbox/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/
@@ -234,8 +268,6 @@ do-install:
 	${PYTHON_CMD} -mcompileall ${PYTHON_SITELIBDIR}/xpcom/
 
 post-install:
-	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS}
 	${CHOWN} root:${VBOXGROUP} ${PREFIX}/lib/virtualbox/${f}
 .endfor
diff --git a/emulators/virtualbox-ose-legacy/distinfo b/emulators/virtualbox-ose-legacy/distinfo
index d1ef6b9a36e5..c3d8eb05f392 100644
--- a/emulators/virtualbox-ose-legacy/distinfo
+++ b/emulators/virtualbox-ose-legacy/distinfo
@@ -1,6 +1,6 @@
-MD5 (VirtualBox-3.1.8-OSE.tar.bz2) = 93b5caaac8571591c21b679987cbe518
-SHA256 (VirtualBox-3.1.8-OSE.tar.bz2) = b77c8ae7b43401c908a231f8e3b7355f96b351237fd86f1f7416ed99a6081e85
-SIZE (VirtualBox-3.1.8-OSE.tar.bz2) = 56291753
-MD5 (VBoxGuestAdditions_3.1.8.iso) = bfcf00607c6def732365bf83c6a45315
-SHA256 (VBoxGuestAdditions_3.1.8.iso) = b8c8f7c814d42ee810bd9fa1b1dc442e49237f9d8add6471edf6b4da7f22d685
-SIZE (VBoxGuestAdditions_3.1.8.iso) = 30054400
+MD5 (VirtualBox-3.2.2-OSE.tar.bz2) = a00884da2f5dd8dc2fad5e27940446c6
+SHA256 (VirtualBox-3.2.2-OSE.tar.bz2) = e3d26ce4cffef5aa26aef7d387015f6636d03cd8f9d38f6ac1a55e40210c9df2
+SIZE (VirtualBox-3.2.2-OSE.tar.bz2) = 57639895
+MD5 (VBoxGuestAdditions_3.2.2.iso) = 00647d660e3ffcb878617cd5e7f33e4e
+SHA256 (VBoxGuestAdditions_3.2.2.iso) = 4a668132153ff50c616518b53531e007db7920b0f1b9289ad5a247ed6f318073
+SIZE (VBoxGuestAdditions_3.2.2.iso) = 33460224
diff --git a/emulators/virtualbox-ose-legacy/files/patch-configure b/emulators/virtualbox-ose-legacy/files/patch-configure
index ba2a1c428bcd..8b889ef38986 100644
--- a/emulators/virtualbox-ose-legacy/files/patch-configure
+++ b/emulators/virtualbox-ose-legacy/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2010-01-28 16:34:50.000000000 +0100
-+++ configure	2010-01-28 22:16:50.000000000 +0100
+--- configure.orig	2009-12-17 15:23:05.000000000 +0100
++++ configure	2009-12-21 14:25:45.000000000 +0100
 @@ -107,7 +107,7 @@
  GENISOIMAGE="genisoimage"
  MKISOFS="mkisofs"
@@ -9,24 +9,6 @@
  LIBPTHREAD="-lpthread"
  LIBCAP="-lcap"
  GSOAP=""
-@@ -125,6 +125,8 @@
- if [ "$OS" = "freebsd" ]; then
-   INCCURL="-I/usr/local/include"
-   LIBCURL="-L/usr/local/lib -lcurl"
-+  INCPULSE="-I/usr/local/include"
-+  LIBPULSE="-L/usr/local/lib"
- else
-   INCCURL=""
-   LIBCURL="-lcurl"
-@@ -1181,7 +1183,7 @@
- #endif
- }
- EOF
--  if test_compile "-lpulse" pulse pulse; then
-+  if test_compile "$INCPULSE $LIBPULSE -lpulse" pulse pulse; then
-     test_execute
-   fi
- }
 @@ -1773,7 +1775,7 @@
          cat $ODIR.tmp_src.cc >> $LOG
          echo "using the following command line:" >> $LOG
@@ -36,31 +18,3 @@
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2318,6 +2320,15 @@
- [ $WITH_QT4    -eq 1 ] && check_qt4
- [ $WITH_PYTHON -eq 1 ] && check_python
- 
-+# PulseAudio
-+if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then
-+  if [ $WITH_PULSE -eq 1 ]; then
-+    check_pulse
-+  else
-+    cnf_append "VBOX_WITH_PULSE" ""
-+  fi
-+fi
-+
- # Linux-specific
- if [ "$OS" = "linux" ]; then
-   # don't check for the static libstdc++ in the PUEL version as we build the
-@@ -2335,11 +2346,6 @@
-   else
-     cnf_append "VBOX_WITH_ALSA" ""
-   fi
--  if [ $WITH_PULSE -eq 1 ]; then
--    check_pulse
--  elif [ $WITH_PULSE -eq 0 ]; then
--    cnf_append "VBOX_WITH_PULSE" ""
--  fi
-   if [ $WITH_DBUS -eq 0 ]; then
-     cnf_append "VBOX_WITH_DBUS" ""
-   fi
diff --git a/emulators/virtualbox-ose-legacy/files/patch-include-iprt-file.h b/emulators/virtualbox-ose-legacy/files/patch-include-iprt-file.h
deleted file mode 100644
index bdb10f31e295..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-include-iprt-file.h
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: include/iprt/file.h
-===================================================================
---- include/iprt/file.h	(Revision 25952)
-+++ include/iprt/file.h	(Revision 25953)
-@@ -743,7 +743,7 @@
-  * @param   cbData      Size of the IOCTL data.
-  * @param   piRet       Return value of the IOCTL request.
-  */
--RTR3DECL(int) RTFileIoCtl(RTFILE File, int iRequest, void *pvData, unsigned cbData, int *piRet);
-+RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet);
- 
- /**
-  * Query the sizes of a filesystem.
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp
deleted file mode 100644
index 00b7cc769acd..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig	2010-04-24 12:08:30.000000000 +0200
-+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp	2010-04-24 12:10:35.000000000 +0200
-@@ -32,6 +32,9 @@
- #ifndef RT_OS_WINDOWS
- # include <signal.h>
- #endif
-+#ifdef RT_OS_FREEBSD
-+# include <pthread.h>
-+#endif 
- 
- #include "product-generated.h"
- #include <iprt/asm.h>
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Audio-audio.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Audio-audio.c
deleted file mode 100644
index 16a3f8a69f73..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Audio-audio.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/VBox/Devices/Audio/audio.c.orig	2009-12-15 14:54:13.000000000 +0900
-+++ src/VBox/Devices/Audio/audio.c	2009-12-15 14:53:54.000000000 +0900
-@@ -73,6 +73,11 @@
-     &pulse_audio_driver,
- # endif
- #endif /* RT_OS_LINUX */
-+#ifdef RT_OS_FREEBSD
-+# ifdef VBOX_WITH_PULSE
-+    &pulse_audio_driver,
-+# endif
-+#endif
- #ifdef RT_OS_DARWIN
-     &coreaudio_audio_driver,
- #endif
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk
index f263810ad398..098410d5ff94 100644
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk
@@ -13,14 +13,3 @@
  ifndef VBOX_OSE
   include $(PATH_SUB_CURRENT)/Storage/VBoxHDDFormats/Makefile.kmk
  endif
-@@ -970,6 +970,10 @@
-  Drivers_SOURCES.linux+= \
- 	Audio/pulseaudio.c \
- 	Audio/pulse_stubs.c
-+ Drivers_DEFS.freebsd += VBOX_WITH_PULSE
-+ Drivers_SOURCES.freebsd+= \
-+	Audio/pulseaudio.c \
-+	Audio/pulse_stubs.c
- endif
- 
- ifdef VBOX_WITH_USB
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp
new file mode 100644
index 000000000000..97f764a71d12
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp
@@ -0,0 +1,14 @@
+
+--- src/VBox/Devices/Storage/DrvHostDVD.cpp.orig	2010-05-20 10:28:06.000000000 +0300
++++ src/VBox/Devices/Storage/DrvHostDVD.cpp	2010-05-20 10:37:47.000000000 +0300
+@@ -224,7 +224,7 @@
+  */
+ static DECLCALLBACK(int) drvHostDvdDoLock(PDRVHOSTBASE pThis, bool fLock)
+ {
+-#ifdef RT_OS_DARWIN
++#if defined(RT_OS_FREEBSD) || defined(RT_OS_DARWIN)
+     uint8_t abCmd[16] =
+     {
+         SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL, 0, 0, 0, fLock, 0,
+
+
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-Makefile.kmk
new file mode 100644
index 000000000000..87ecbfe7212b
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-Makefile.kmk
@@ -0,0 +1,18 @@
+--- src/VBox/Frontends/Makefile.kmk.orig	2010-05-25 14:16:00.000000000 +0200
++++ src/VBox/Frontends/Makefile.kmk	2010-06-04 09:51:37.000000000 +0200
+@@ -24,6 +24,7 @@
+ endif
+ ifndef VBOX_ONLY_DOCS
+  ifdef VBOX_WITH_VBOXSDL
++  include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
+   include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
+  endif
+  ifdef VBOX_WITH_VBOXBFE
+@@ -38,7 +39,6 @@
+  ifdef VBOX_WITH_QTGUI
+   include $(PATH_SUB_CURRENT)/VirtualBox/Makefile.kmk
+  endif
+- include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
+ endif # !VBOX_ONLY_DOCS
+ 
+ ## @todo Include Python shell into binary delivery?
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
deleted file mode 100644
index 0a1f735fb79a..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-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/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp
deleted file mode 100644
index ffe2a20ceb63..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig	2009-12-15 15:16:21.000000000 +0900
-+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	2009-12-15 15:14:01.000000000 +0900
-@@ -41,6 +41,11 @@
- #else
-     bool fSolaris = false;
- #endif
-+#ifdef RT_OS_FREEBSD
-+    bool fFreeBSD = true;
-+#else
-+    bool fFreeBSD = false;
-+#endif
- #ifdef RT_OS_DARWIN
-     bool fDarwin = true;
- #else
-@@ -62,6 +67,7 @@
-         fLinux = true;
-         fWin = true;
-         fSolaris = true;
-+	fFreeBSD = true;
-         fDarwin = true;
-         fVRDP = true;
-         fVBoxSDL = true;
-@@ -227,6 +233,14 @@
- #endif
-                                              );
-         }
-+        if (fFreeBSD)
-+        {
-+            RTPrintf(                        "|oss"
-+#ifdef VBOX_WITH_PULSE
-+                                             "|pulse"
-+#endif
-+                                             );
-+        }
-         if (fDarwin)
-         {
-             RTPrintf(                        "|coreaudio");
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp
deleted file mode 100644
index 38111c6205d4..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp.orig	2009-09-09 23:39:46.000000000 +0900
-+++ src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	2009-12-15 15:22:27.000000000 +0900
-@@ -1478,6 +1478,20 @@
- # endif
- 
- #endif /* !RT_OS_SOLARIS */
-+#ifdef RT_OS_FREEBSD
-+                else if (!strcmp(ValueUnion.psz, "oss"))
-+                {
-+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
-+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-+                }
-+# ifdef VBOX_WITH_PULSE
-+                else if (!strcmp(ValueUnion.psz, "pulse"))
-+                {
-+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse));
-+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-+                }
-+# endif
-+#endif /* !RT_OS_FREEBSD */
- #ifdef RT_OS_DARWIN
-                 else if (!strcmp(ValueUnion.psz, "coreaudio"))
-                 {
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h
new file mode 100644
index 000000000000..6b347df656ca
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h
@@ -0,0 +1,11 @@
+--- src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h.orig	2010-06-04 10:43:02.000000000 +0200
++++ src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h	2010-06-04 10:33:40.000000000 +0200
+@@ -20,7 +20,7 @@
+ #define __VBoxVMSettingsHD_h__
+ 
+ /* Global includes */
+-#include <qglobal.h> /* for Q_WS_MAC */
++#include <QtGlobal> /* for Q_WS_MAC */
+ #ifdef Q_WS_MAC
+ /* Somewhere Carbon.h includes AssertMacros.h which defines the macro "check".
+  * In QItemDelegate a class method is called "check" also. As we not used the
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-Makefile.kmk
index 5e9024588b8a..06c4a71db458 100644
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-Makefile.kmk
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-HostDrivers-Makefile.kmk
@@ -1,5 +1,5 @@
---- src/VBox/HostDrivers/Makefile.kmk.orig	2009-10-05 11:17:45.000000000 +0200
-+++ src/VBox/HostDrivers/Makefile.kmk	2009-10-05 11:18:08.000000000 +0200
+--- src/VBox/HostDrivers/Makefile.kmk.orig	2010-03-04 12:59:54.000000000 +0100
++++ src/VBox/HostDrivers/Makefile.kmk	2010-03-09 12:54:09.000000000 +0100
 @@ -40,7 +40,7 @@
    endif
   endif
@@ -22,6 +22,6 @@
    HostDrivers-sh_SOURCES.freebsd = freebsd/export_modules
   endif
 +endif
- endif # !VBOX_ONLY_DOCS
+ endif # !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_TESTSUITE)
  
  # Let kBuild generate the rules.
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-AudioAdapterImpl.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-AudioAdapterImpl.cpp
deleted file mode 100644
index f47f49c97b0e..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-AudioAdapterImpl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/VBox/Main/AudioAdapterImpl.cpp.orig	2009-12-15 14:45:08.000000000 +0900
-+++ src/VBox/Main/AudioAdapterImpl.cpp	2009-12-15 14:45:42.000000000 +0900
-@@ -261,6 +261,11 @@
- #if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
-             case AudioDriverType_OSS:
- #endif
-+#ifdef RT_OS_FREEBSD
-+# ifdef VBOX_WITH_PULSE
-+            case AudioDriverType_Pulse:
-+# endif
-+#endif
- #ifdef RT_OS_DARWIN
-             case AudioDriverType_CoreAudio:
- #endif
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-ConsoleImpl.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-ConsoleImpl.cpp
deleted file mode 100644
index cb67a48f5a44..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-ConsoleImpl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/VBox/Main/ConsoleImpl.cpp.orig
-+++ src/VBox/Main/ConsoleImpl.cpp
-@@ -6168,7 +6168,7 @@ Console::usbDetachCallback(Console *that
- }
- 
- #endif /* VBOX_WITH_USB */
--#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
-+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
- 
- /**
-  * Helper function to handle host interface device creation and attachment.
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-ConsoleImpl2.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-ConsoleImpl2.cpp
deleted file mode 100644
index 4373abea3487..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-ConsoleImpl2.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
---- src/VBox/Main/ConsoleImpl2.cpp.orig	2009-12-15 14:48:58.000000000 +0900
-+++ src/VBox/Main/ConsoleImpl2.cpp	2009-12-15 14:48:42.000000000 +0900
-@@ -86,6 +86,7 @@
- # include <sys/ioctl.h>
- # include <sys/socket.h>
- # include <net/if.h>
-+# include <net80211/ieee80211_ioctl.h>
- #endif
- 
- #if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-@@ -1605,6 +1605,15 @@
-                 break;
-             }
- #endif
-+#ifdef RT_OS_FREEBSD
-+# ifdef VBOX_WITH_PULSE
-+            case AudioDriverType_Pulse:
-+            {
-+                rc = CFGMR3InsertString(pCfg, "AudioDriver", "pulse");              RC_CHECK();
-+                break;
-+            }
-+# endif
-+#endif
- #ifdef RT_OS_DARWIN
-             case AudioDriverType_CoreAudio:
-             {
-@@ -2394,6 +2394,42 @@ DECLCALLBACK(int) Console::configConstru
-             /* we're not releasing the INetCfg stuff here since we use it later to figure out whether it is wireless */
- 
- # elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
-+#  if defined(RT_OS_FREEBSD)
-+            /*
-+             * If we bridge to a tap interface open it the `old' direct way.
-+             * This works and performs better than bridging a physical
-+             * interface via the current FreeBSD vboxnetflt implementation.
-+             */
-+            if (!strncmp(pszHifName, "tap", sizeof "tap" - 1)) {
-+                hrc = pThis->attachToTapInterface(aNetworkAdapter);
-+                if (FAILED(hrc))
-+                {
-+                    switch (hrc)
-+                    {
-+                        case VERR_ACCESS_DENIED:
-+                            return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,  N_(
-+                                             "Failed to open '/dev/%s' for read/write access.  Please check the "
-+                                             "permissions of that node, and that the net.link.tap.user_open "
-+                                             "sysctl is set.  Either run 'chmod 0666 /dev/%s' or "
-+                                             "change the group of that node to vboxusers and make yourself "
-+                                             "a member of that group.  Make sure that these changes are permanent."), pszHifName, pszHifName);
-+                        default:
-+                            AssertMsgFailed(("Could not attach to tap interface! Bad!\n"));
-+                            return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(
-+                                             "Failed to initialize Host Interface Networking"));
-+                    }
-+                }
-+
-+                Assert ((int)pThis->maTapFD[uInstance] >= 0);
-+                if ((int)pThis->maTapFD[uInstance] >= 0)
-+                {
-+                    rc = CFGMR3InsertString(pLunL0, "Driver", "HostInterface");                 RC_CHECK();
-+                    rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                             RC_CHECK();
-+                    rc = CFGMR3InsertInteger(pCfg, "FileHandle", pThis->maTapFD[uInstance]);    RC_CHECK();
-+                }
-+                break;
-+            }
-+#  endif
-             /** @todo Check for malformed names. */
-             const char *pszTrunk = pszHifName;
- 
-@@ -2495,6 +2496,33 @@ DECLCALLBACK(int) Console::configConstru
-             }
-             else
-                 Log(("Failed to open wireless socket\n"));
-+# elif defined(RT_OS_FREEBSD)
-+            int iSock = socket(AF_INET, SOCK_DGRAM, 0);
-+            if (iSock >= 0)
-+            {
-+                struct ieee80211req ireq;
-+                uint8_t data[32];
-+
-+                (void) memset(&ireq, 0, sizeof(ireq));
-+                (void) strncpy(ireq.i_name, pszHifName, sizeof(ireq.i_name));
-+                ireq.i_type = IEEE80211_IOC_SSID;
-+                ireq.i_val = -1;
-+                ireq.i_data = data;
-+                ireq.i_len = sizeof(data);
-+
-+                bool fSharedMacOnWire = ioctl(iSock, SIOCG80211, &ireq) >= 0;
-+                close(iSock);
-+                if (fSharedMacOnWire)
-+                {
-+                    rc = CFGMR3InsertInteger(pCfg, "SharedMacOnWire", true);
-+                    RC_CHECK();
-+                    Log(("Set SharedMacOnWire\n"));
-+                }
-+                else
-+                    Log(("Failed to get wireless name\n"));
-+            }
-+            else
-+                Log(("Failed to open wireless socket\n"));
- # elif defined(RT_OS_WINDOWS)
- #  define DEVNAME_PREFIX L"\\\\.\\"
-             /* we are getting the medium type via IOCTL_NDIS_QUERY_GLOBAL_STATS Io Control
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-include-ConsoleImpl.h b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-include-ConsoleImpl.h
deleted file mode 100644
index d363775e3da9..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Main-include-ConsoleImpl.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/VBox/Main/include/ConsoleImpl.h.orig	2010-02-12 19:49:27.000000000 +0000
-+++ src/VBox/Main/include/ConsoleImpl.h	2010-02-13 14:26:54.000000000 +0000
-@@ -410,7 +410,7 @@
- 
-     HRESULT callTapSetupApplication(bool isStatic, RTFILE tapFD, Bstr &tapDevice,
-                                     Bstr &tapSetupApplication);
--#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
-+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
-     HRESULT attachToTapInterface(INetworkAdapter *networkAdapter);
-     HRESULT detachFromTapInterface(INetworkAdapter *networkAdapter);
- #endif
-@@ -592,7 +592,7 @@
-     PPDMLED      mapNetworkLeds[SchemaDefs::NetworkAdapterCount];
-     PPDMLED      mapSharedFolderLed;
-     PPDMLED      mapUSBLed[2];
--#if !defined(VBOX_WITH_NETFLT) && (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD))
-+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
-     Utf8Str      maTAPDeviceName[8];
-     RTFILE       maTapFD[8];
- #endif
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp
deleted file mode 100644
index 9dd1452fc6d2..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/VBox/Runtime/r3/posix/fileio-posix.cpp
-===================================================================
---- src/VBox/Runtime/r3/posix/fileio-posix.cpp	(Revision 25952)
-+++ src/VBox/Runtime/r3/posix/fileio-posix.cpp	(Revision 25953)
-@@ -586,9 +586,9 @@
- }
- 
- 
--RTR3DECL(int) RTFileIoCtl(RTFILE File, int iRequest, void *pvData, unsigned cbData, int *piRet)
-+RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet)
- {
--    int rc = ioctl((int)File, iRequest, pvData);
-+    int rc = ioctl((int)File, ulRequest, pvData);
-     if (piRet)
-         *piRet = rc;
-     return rc >= 0 ? VINF_SUCCESS : RTErrConvertFromErrno(errno);
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-settings-vm-VBoxVMSettingsAudio.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-settings-vm-VBoxVMSettingsAudio.cpp
deleted file mode 100644
index 707189e1cac7..000000000000
--- a/emulators/virtualbox-ose-legacy/files/patch-src-settings-vm-VBoxVMSettingsAudio.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsAudio.cpp.orig	2009-12-17 15:28:01.000000000 +0100
-+++ src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsAudio.cpp	2009-12-21 14:14:35.000000000 +0100
-@@ -89,6 +89,9 @@
- #endif
- #if defined Q_OS_LINUX || defined Q_OS_FREEBSD
-     mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_OSS));
-+# ifdef VBOX_WITH_PULSE
-+    mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_Pulse));
-+# endif
- #endif
- #if defined Q_OS_LINUX
- # ifdef VBOX_WITH_ALSA
diff --git a/emulators/virtualbox-ose-legacy/files/pkg-install.in b/emulators/virtualbox-ose-legacy/files/pkg-install.in
deleted file mode 100644
index 5d5268d8e8ce..000000000000
--- a/emulators/virtualbox-ose-legacy/files/pkg-install.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	GROUP=%%VBOXGROUP%%
-	GID=%%VBOXGID%%
-	PW=/usr/sbin/pw
-
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	exit 0
-	;;
-esac
diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist
index ea6fa2682bb5..f60b290476ea 100644
--- a/emulators/virtualbox-ose-legacy/pkg-plist
+++ b/emulators/virtualbox-ose-legacy/pkg-plist
@@ -8,15 +8,18 @@ bin/VBoxSVC
 %%QT4%%bin/VBoxTestOGL
 bin/VBoxXPCOMIPCD
 %%QT4%%bin/VirtualBox
+%%WEB%%bin/vboxwebsrv
+%%WEB%%bin/webtest
 %%X11%%lib/virtualbox/VBoxBFE
 %%X11%%lib/virtualbox/VBoxBFE.so
 lib/virtualbox/VBoxDD.so
 lib/virtualbox/VBoxDD2.so
 lib/virtualbox/VBoxDDU.so
+lib/virtualbox/VBoxGuestControlSvc.so
 lib/virtualbox/VBoxGuestPropSvc.so
 lib/virtualbox/VBoxHeadless
 lib/virtualbox/VBoxHeadless.so
-%%QT4%%lib/virtualbox/VBoxKeyboard.so
+%%X11%%lib/virtualbox/VBoxKeyboard.so
 lib/virtualbox/VBoxManage
 lib/virtualbox/VBoxNetAdpCtl
 lib/virtualbox/VBoxNetDHCP
@@ -51,6 +54,8 @@ lib/virtualbox/VBoxDDR0.r0
 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso
 lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
 lib/virtualbox/VMMR0.r0
+%%WEB%%lib/virtualbox/vboxwebsrv
+%%WEB%%lib/virtualbox/webtest
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
 lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VBoxSVCM.so
@@ -218,9 +223,12 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%DATADIR%%/idl/VirtualBox_XPCOM.idl
 %%DATADIR%%/samples/tstVBoxAPILinux.cpp
 %%DATADIR%%/samples/Makefile
+%%WEB%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl
+%%WEB%%%%DATADIR%%/sdk/bindings/webservice/vboxwebService.wsdl
 include/virtualbox/VBoxCAPI_v2_2.h
 include/virtualbox/VBoxCAPI_v3_0.h
 include/virtualbox/VBoxCAPI_v3_1.h
+include/virtualbox/VBoxCAPI_v3_2.h
 include/virtualbox/VirtualBox_XPCOM.h
 include/virtualbox/ipcIClientObserver.h
 include/virtualbox/ipcIDConnectService.h
@@ -590,6 +598,9 @@ include/virtualbox/xpcom/xpcom-config.h
 @dirrm include/virtualbox/ipcd
 @dirrm include/virtualbox
 %%NLS%%@dirrm %%DATADIR%%/nls
+%%WEB%%@dirrm %%DATADIR%%/sdk/bindings/webservice
+%%WEB%%@dirrm %%DATADIR%%/sdk/bindings
+%%WEB%%@dirrm %%DATADIR%%/sdk
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/idl
 @dirrm %%DATADIR%%
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 233bd01ca971..623847119f97 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.1.8
+DISTVERSION=	3.2.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -29,6 +29,9 @@ LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
 		curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}_OSE
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GNOME=	libidl
@@ -46,22 +49,19 @@ USE_LDCONFIG=	${PREFIX}/lib/virtualbox
 CONFLICTS=	bcc-[0-9]* virtualbox-ose-devel-3* virtualbox-ose-additions-3* virtualbox-ose-additions-devel-3*
 
 VBOXGROUP?=	vboxusers
-VBOXGID?=	920
+GROUPS=		${VBOXGROUP}
 VBOX_FRONTENDS=	VBoxHeadless
 VBOX_GUEST_VER=	${PORTVERSION}
 
-SUB_FILES=	pkg-install
-
-SUB_LIST=	PREFIX=${PREFIX} \
-		VBOXGROUP=${VBOXGROUP} \
-		VBOXGID=${VBOXGID}
-
 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 \
 		X11 "Build with X11 support" on \
+		VDE "Build with VDE support" off \
+		VNC "Build with VNC support" off \
+		WEBSERVICE "Build Webservice" off \
 		NLS "Native language support" on
 
 .include <bsd.port.options.mk>
@@ -84,7 +84,7 @@ BROKEN=		QT4 frontend requires X11 support. Run 'make config' again!
 
 .if !defined(WITHOUT_X11)
 USE_SDL=	sdl
-USE_XORG=	xcursor xmu inputproto
+USE_XORG=	xcursor xmu inputproto xinerama
 VBOX_FRONTENDS+=VBoxBFE VBoxSDL
 PLIST_SUB+=	X11=""
 .else
@@ -132,12 +132,29 @@ CONFIGURE_ARGS+=--disable-pulse
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 .endif
 
+.if defined(WITH_VNC)
+LIB_DEPENDS+=	vncserver.0:${PORTSDIR}/net/libvncserver
+.endif
+
 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if defined(WITH_VDE)
+RUN_DEPENDS+=	vde_switch:${PORTSDIR}/net/vde2
+CONFIGURE_ARGS+=--enable-vde
+.endif
+
+.if defined(WITH_WEBSERVICE)
+BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
+VBOX_WEB=	vboxwebsrv webtest
+PLIST_SUB+=	WEB=""
+.else
+PLIST_SUB+=	WEB="@comment "
+.endif
+
 .if ${OSVERSION} < 700000
 BROKEN=	Does not compile on FreeBSD 6.X
 .endif
@@ -174,8 +191,18 @@ post-patch:
 	@${ECHO} 'VBOX_WITH_TESTCASES=' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
-.if defined(WITHOUT_X11)
+	@${ECHO} 'VBOX_WITH_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk
+.if defined(WITH_VNC)
+	@${ECHO} 'VBOX_WITH_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk
+.endif
+.if defined(WITH_WEBSERVICE)
+	@${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Config.kmk ${WRKSRC}/configure \
@@ -207,7 +234,7 @@ do-install:
 .endif
 
 	${MKDIR} ${PREFIX}/bin
-.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS}
+.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} ${VBOX_WEB}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${PREFIX}/lib/virtualbox/
 	${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${PREFIX}/bin/
 .endfor
@@ -220,6 +247,13 @@ do-install:
 	${CHMOD} 0711 ${PREFIX}/lib/virtualbox/${f}
 .endfor
 
+.if defined(WITH_WEBSERVICE)
+	${MKDIR} -p ${DATADIR}/sdk/bindings/webservice
+.for f in vboxweb.wsdl vboxwebService.wsdl
+	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
+.endfor
+.endif
+
 .if defined(WITH_GUESTADDITIONS)
 	${MKDIR} ${PREFIX}/lib/virtualbox/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/
@@ -234,8 +268,6 @@ do-install:
 	${PYTHON_CMD} -mcompileall ${PYTHON_SITELIBDIR}/xpcom/
 
 post-install:
-	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS}
 	${CHOWN} root:${VBOXGROUP} ${PREFIX}/lib/virtualbox/${f}
 .endfor
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index d1ef6b9a36e5..c3d8eb05f392 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,6 +1,6 @@
-MD5 (VirtualBox-3.1.8-OSE.tar.bz2) = 93b5caaac8571591c21b679987cbe518
-SHA256 (VirtualBox-3.1.8-OSE.tar.bz2) = b77c8ae7b43401c908a231f8e3b7355f96b351237fd86f1f7416ed99a6081e85
-SIZE (VirtualBox-3.1.8-OSE.tar.bz2) = 56291753
-MD5 (VBoxGuestAdditions_3.1.8.iso) = bfcf00607c6def732365bf83c6a45315
-SHA256 (VBoxGuestAdditions_3.1.8.iso) = b8c8f7c814d42ee810bd9fa1b1dc442e49237f9d8add6471edf6b4da7f22d685
-SIZE (VBoxGuestAdditions_3.1.8.iso) = 30054400
+MD5 (VirtualBox-3.2.2-OSE.tar.bz2) = a00884da2f5dd8dc2fad5e27940446c6
+SHA256 (VirtualBox-3.2.2-OSE.tar.bz2) = e3d26ce4cffef5aa26aef7d387015f6636d03cd8f9d38f6ac1a55e40210c9df2
+SIZE (VirtualBox-3.2.2-OSE.tar.bz2) = 57639895
+MD5 (VBoxGuestAdditions_3.2.2.iso) = 00647d660e3ffcb878617cd5e7f33e4e
+SHA256 (VBoxGuestAdditions_3.2.2.iso) = 4a668132153ff50c616518b53531e007db7920b0f1b9289ad5a247ed6f318073
+SIZE (VBoxGuestAdditions_3.2.2.iso) = 33460224
diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure
index ba2a1c428bcd..8b889ef38986 100644
--- a/emulators/virtualbox-ose/files/patch-configure
+++ b/emulators/virtualbox-ose/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2010-01-28 16:34:50.000000000 +0100
-+++ configure	2010-01-28 22:16:50.000000000 +0100
+--- configure.orig	2009-12-17 15:23:05.000000000 +0100
++++ configure	2009-12-21 14:25:45.000000000 +0100
 @@ -107,7 +107,7 @@
  GENISOIMAGE="genisoimage"
  MKISOFS="mkisofs"
@@ -9,24 +9,6 @@
  LIBPTHREAD="-lpthread"
  LIBCAP="-lcap"
  GSOAP=""
-@@ -125,6 +125,8 @@
- if [ "$OS" = "freebsd" ]; then
-   INCCURL="-I/usr/local/include"
-   LIBCURL="-L/usr/local/lib -lcurl"
-+  INCPULSE="-I/usr/local/include"
-+  LIBPULSE="-L/usr/local/lib"
- else
-   INCCURL=""
-   LIBCURL="-lcurl"
-@@ -1181,7 +1183,7 @@
- #endif
- }
- EOF
--  if test_compile "-lpulse" pulse pulse; then
-+  if test_compile "$INCPULSE $LIBPULSE -lpulse" pulse pulse; then
-     test_execute
-   fi
- }
 @@ -1773,7 +1775,7 @@
          cat $ODIR.tmp_src.cc >> $LOG
          echo "using the following command line:" >> $LOG
@@ -36,31 +18,3 @@
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2318,6 +2320,15 @@
- [ $WITH_QT4    -eq 1 ] && check_qt4
- [ $WITH_PYTHON -eq 1 ] && check_python
- 
-+# PulseAudio
-+if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then
-+  if [ $WITH_PULSE -eq 1 ]; then
-+    check_pulse
-+  else
-+    cnf_append "VBOX_WITH_PULSE" ""
-+  fi
-+fi
-+
- # Linux-specific
- if [ "$OS" = "linux" ]; then
-   # don't check for the static libstdc++ in the PUEL version as we build the
-@@ -2335,11 +2346,6 @@
-   else
-     cnf_append "VBOX_WITH_ALSA" ""
-   fi
--  if [ $WITH_PULSE -eq 1 ]; then
--    check_pulse
--  elif [ $WITH_PULSE -eq 0 ]; then
--    cnf_append "VBOX_WITH_PULSE" ""
--  fi
-   if [ $WITH_DBUS -eq 0 ]; then
-     cnf_append "VBOX_WITH_DBUS" ""
-   fi
diff --git a/emulators/virtualbox-ose/files/patch-include-iprt-file.h b/emulators/virtualbox-ose/files/patch-include-iprt-file.h
deleted file mode 100644
index bdb10f31e295..000000000000
--- a/emulators/virtualbox-ose/files/patch-include-iprt-file.h
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: include/iprt/file.h
-===================================================================
---- include/iprt/file.h	(Revision 25952)
-+++ include/iprt/file.h	(Revision 25953)
-@@ -743,7 +743,7 @@
-  * @param   cbData      Size of the IOCTL data.
-  * @param   piRet       Return value of the IOCTL request.
-  */
--RTR3DECL(int) RTFileIoCtl(RTFILE File, int iRequest, void *pvData, unsigned cbData, int *piRet);
-+RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet);
- 
- /**
-  * Query the sizes of a filesystem.
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp
deleted file mode 100644
index 00b7cc769acd..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig	2010-04-24 12:08:30.000000000 +0200
-+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp	2010-04-24 12:10:35.000000000 +0200
-@@ -32,6 +32,9 @@
- #ifndef RT_OS_WINDOWS
- # include <signal.h>
- #endif
-+#ifdef RT_OS_FREEBSD
-+# include <pthread.h>
-+#endif 
- 
- #include "product-generated.h"
- #include <iprt/asm.h>
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-audio.c b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-audio.c
deleted file mode 100644
index 16a3f8a69f73..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-audio.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/VBox/Devices/Audio/audio.c.orig	2009-12-15 14:54:13.000000000 +0900
-+++ src/VBox/Devices/Audio/audio.c	2009-12-15 14:53:54.000000000 +0900
-@@ -73,6 +73,11 @@
-     &pulse_audio_driver,
- # endif
- #endif /* RT_OS_LINUX */
-+#ifdef RT_OS_FREEBSD
-+# ifdef VBOX_WITH_PULSE
-+    &pulse_audio_driver,
-+# endif
-+#endif
- #ifdef RT_OS_DARWIN
-     &coreaudio_audio_driver,
- #endif
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk
index f263810ad398..098410d5ff94 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk
@@ -13,14 +13,3 @@
  ifndef VBOX_OSE
   include $(PATH_SUB_CURRENT)/Storage/VBoxHDDFormats/Makefile.kmk
  endif
-@@ -970,6 +970,10 @@
-  Drivers_SOURCES.linux+= \
- 	Audio/pulseaudio.c \
- 	Audio/pulse_stubs.c
-+ Drivers_DEFS.freebsd += VBOX_WITH_PULSE
-+ Drivers_SOURCES.freebsd+= \
-+	Audio/pulseaudio.c \
-+	Audio/pulse_stubs.c
- endif
- 
- ifdef VBOX_WITH_USB
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp
new file mode 100644
index 000000000000..97f764a71d12
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DrvHostDVD.cpp
@@ -0,0 +1,14 @@
+
+--- src/VBox/Devices/Storage/DrvHostDVD.cpp.orig	2010-05-20 10:28:06.000000000 +0300
++++ src/VBox/Devices/Storage/DrvHostDVD.cpp	2010-05-20 10:37:47.000000000 +0300
+@@ -224,7 +224,7 @@
+  */
+ static DECLCALLBACK(int) drvHostDvdDoLock(PDRVHOSTBASE pThis, bool fLock)
+ {
+-#ifdef RT_OS_DARWIN
++#if defined(RT_OS_FREEBSD) || defined(RT_OS_DARWIN)
+     uint8_t abCmd[16] =
+     {
+         SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL, 0, 0, 0, fLock, 0,
+
+
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-Makefile.kmk
new file mode 100644
index 000000000000..87ecbfe7212b
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-Makefile.kmk
@@ -0,0 +1,18 @@
+--- src/VBox/Frontends/Makefile.kmk.orig	2010-05-25 14:16:00.000000000 +0200
++++ src/VBox/Frontends/Makefile.kmk	2010-06-04 09:51:37.000000000 +0200
+@@ -24,6 +24,7 @@
+ endif
+ ifndef VBOX_ONLY_DOCS
+  ifdef VBOX_WITH_VBOXSDL
++  include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
+   include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
+  endif
+  ifdef VBOX_WITH_VBOXBFE
+@@ -38,7 +39,6 @@
+  ifdef VBOX_WITH_QTGUI
+   include $(PATH_SUB_CURRENT)/VirtualBox/Makefile.kmk
+  endif
+- include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
+ endif # !VBOX_ONLY_DOCS
+ 
+ ## @todo Include Python shell into binary delivery?
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
deleted file mode 100644
index 0a1f735fb79a..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-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/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp
deleted file mode 100644
index ffe2a20ceb63..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig	2009-12-15 15:16:21.000000000 +0900
-+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	2009-12-15 15:14:01.000000000 +0900
-@@ -41,6 +41,11 @@
- #else
-     bool fSolaris = false;
- #endif
-+#ifdef RT_OS_FREEBSD
-+    bool fFreeBSD = true;
-+#else
-+    bool fFreeBSD = false;
-+#endif
- #ifdef RT_OS_DARWIN
-     bool fDarwin = true;
- #else
-@@ -62,6 +67,7 @@
-         fLinux = true;
-         fWin = true;
-         fSolaris = true;
-+	fFreeBSD = true;
-         fDarwin = true;
-         fVRDP = true;
-         fVBoxSDL = true;
-@@ -227,6 +233,14 @@
- #endif
-                                              );
-         }
-+        if (fFreeBSD)
-+        {
-+            RTPrintf(                        "|oss"
-+#ifdef VBOX_WITH_PULSE
-+                                             "|pulse"
-+#endif
-+                                             );
-+        }
-         if (fDarwin)
-         {
-             RTPrintf(                        "|coreaudio");
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp
deleted file mode 100644
index 38111c6205d4..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp.orig	2009-09-09 23:39:46.000000000 +0900
-+++ src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	2009-12-15 15:22:27.000000000 +0900
-@@ -1478,6 +1478,20 @@
- # endif
- 
- #endif /* !RT_OS_SOLARIS */
-+#ifdef RT_OS_FREEBSD
-+                else if (!strcmp(ValueUnion.psz, "oss"))
-+                {
-+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
-+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-+                }
-+# ifdef VBOX_WITH_PULSE
-+                else if (!strcmp(ValueUnion.psz, "pulse"))
-+                {
-+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse));
-+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-+                }
-+# endif
-+#endif /* !RT_OS_FREEBSD */
- #ifdef RT_OS_DARWIN
-                 else if (!strcmp(ValueUnion.psz, "coreaudio"))
-                 {
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h
new file mode 100644
index 000000000000..6b347df656ca
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-settings-vm-VBoxVMSettingsHD.h
@@ -0,0 +1,11 @@
+--- src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h.orig	2010-06-04 10:43:02.000000000 +0200
++++ src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h	2010-06-04 10:33:40.000000000 +0200
+@@ -20,7 +20,7 @@
+ #define __VBoxVMSettingsHD_h__
+ 
+ /* Global includes */
+-#include <qglobal.h> /* for Q_WS_MAC */
++#include <QtGlobal> /* for Q_WS_MAC */
+ #ifdef Q_WS_MAC
+ /* Somewhere Carbon.h includes AssertMacros.h which defines the macro "check".
+  * In QItemDelegate a class method is called "check" also. As we not used the
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Makefile.kmk
index 5e9024588b8a..06c4a71db458 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Makefile.kmk
@@ -1,5 +1,5 @@
---- src/VBox/HostDrivers/Makefile.kmk.orig	2009-10-05 11:17:45.000000000 +0200
-+++ src/VBox/HostDrivers/Makefile.kmk	2009-10-05 11:18:08.000000000 +0200
+--- src/VBox/HostDrivers/Makefile.kmk.orig	2010-03-04 12:59:54.000000000 +0100
++++ src/VBox/HostDrivers/Makefile.kmk	2010-03-09 12:54:09.000000000 +0100
 @@ -40,7 +40,7 @@
    endif
   endif
@@ -22,6 +22,6 @@
    HostDrivers-sh_SOURCES.freebsd = freebsd/export_modules
   endif
 +endif
- endif # !VBOX_ONLY_DOCS
+ endif # !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_TESTSUITE)
  
  # Let kBuild generate the rules.
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-AudioAdapterImpl.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Main-AudioAdapterImpl.cpp
deleted file mode 100644
index f47f49c97b0e..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-AudioAdapterImpl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/VBox/Main/AudioAdapterImpl.cpp.orig	2009-12-15 14:45:08.000000000 +0900
-+++ src/VBox/Main/AudioAdapterImpl.cpp	2009-12-15 14:45:42.000000000 +0900
-@@ -261,6 +261,11 @@
- #if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
-             case AudioDriverType_OSS:
- #endif
-+#ifdef RT_OS_FREEBSD
-+# ifdef VBOX_WITH_PULSE
-+            case AudioDriverType_Pulse:
-+# endif
-+#endif
- #ifdef RT_OS_DARWIN
-             case AudioDriverType_CoreAudio:
- #endif
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-ConsoleImpl.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Main-ConsoleImpl.cpp
deleted file mode 100644
index cb67a48f5a44..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-ConsoleImpl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/VBox/Main/ConsoleImpl.cpp.orig
-+++ src/VBox/Main/ConsoleImpl.cpp
-@@ -6168,7 +6168,7 @@ Console::usbDetachCallback(Console *that
- }
- 
- #endif /* VBOX_WITH_USB */
--#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
-+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
- 
- /**
-  * Helper function to handle host interface device creation and attachment.
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-ConsoleImpl2.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Main-ConsoleImpl2.cpp
deleted file mode 100644
index 4373abea3487..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-ConsoleImpl2.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
---- src/VBox/Main/ConsoleImpl2.cpp.orig	2009-12-15 14:48:58.000000000 +0900
-+++ src/VBox/Main/ConsoleImpl2.cpp	2009-12-15 14:48:42.000000000 +0900
-@@ -86,6 +86,7 @@
- # include <sys/ioctl.h>
- # include <sys/socket.h>
- # include <net/if.h>
-+# include <net80211/ieee80211_ioctl.h>
- #endif
- 
- #if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-@@ -1605,6 +1605,15 @@
-                 break;
-             }
- #endif
-+#ifdef RT_OS_FREEBSD
-+# ifdef VBOX_WITH_PULSE
-+            case AudioDriverType_Pulse:
-+            {
-+                rc = CFGMR3InsertString(pCfg, "AudioDriver", "pulse");              RC_CHECK();
-+                break;
-+            }
-+# endif
-+#endif
- #ifdef RT_OS_DARWIN
-             case AudioDriverType_CoreAudio:
-             {
-@@ -2394,6 +2394,42 @@ DECLCALLBACK(int) Console::configConstru
-             /* we're not releasing the INetCfg stuff here since we use it later to figure out whether it is wireless */
- 
- # elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
-+#  if defined(RT_OS_FREEBSD)
-+            /*
-+             * If we bridge to a tap interface open it the `old' direct way.
-+             * This works and performs better than bridging a physical
-+             * interface via the current FreeBSD vboxnetflt implementation.
-+             */
-+            if (!strncmp(pszHifName, "tap", sizeof "tap" - 1)) {
-+                hrc = pThis->attachToTapInterface(aNetworkAdapter);
-+                if (FAILED(hrc))
-+                {
-+                    switch (hrc)
-+                    {
-+                        case VERR_ACCESS_DENIED:
-+                            return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,  N_(
-+                                             "Failed to open '/dev/%s' for read/write access.  Please check the "
-+                                             "permissions of that node, and that the net.link.tap.user_open "
-+                                             "sysctl is set.  Either run 'chmod 0666 /dev/%s' or "
-+                                             "change the group of that node to vboxusers and make yourself "
-+                                             "a member of that group.  Make sure that these changes are permanent."), pszHifName, pszHifName);
-+                        default:
-+                            AssertMsgFailed(("Could not attach to tap interface! Bad!\n"));
-+                            return VMSetError(pVM, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(
-+                                             "Failed to initialize Host Interface Networking"));
-+                    }
-+                }
-+
-+                Assert ((int)pThis->maTapFD[uInstance] >= 0);
-+                if ((int)pThis->maTapFD[uInstance] >= 0)
-+                {
-+                    rc = CFGMR3InsertString(pLunL0, "Driver", "HostInterface");                 RC_CHECK();
-+                    rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                             RC_CHECK();
-+                    rc = CFGMR3InsertInteger(pCfg, "FileHandle", pThis->maTapFD[uInstance]);    RC_CHECK();
-+                }
-+                break;
-+            }
-+#  endif
-             /** @todo Check for malformed names. */
-             const char *pszTrunk = pszHifName;
- 
-@@ -2495,6 +2496,33 @@ DECLCALLBACK(int) Console::configConstru
-             }
-             else
-                 Log(("Failed to open wireless socket\n"));
-+# elif defined(RT_OS_FREEBSD)
-+            int iSock = socket(AF_INET, SOCK_DGRAM, 0);
-+            if (iSock >= 0)
-+            {
-+                struct ieee80211req ireq;
-+                uint8_t data[32];
-+
-+                (void) memset(&ireq, 0, sizeof(ireq));
-+                (void) strncpy(ireq.i_name, pszHifName, sizeof(ireq.i_name));
-+                ireq.i_type = IEEE80211_IOC_SSID;
-+                ireq.i_val = -1;
-+                ireq.i_data = data;
-+                ireq.i_len = sizeof(data);
-+
-+                bool fSharedMacOnWire = ioctl(iSock, SIOCG80211, &ireq) >= 0;
-+                close(iSock);
-+                if (fSharedMacOnWire)
-+                {
-+                    rc = CFGMR3InsertInteger(pCfg, "SharedMacOnWire", true);
-+                    RC_CHECK();
-+                    Log(("Set SharedMacOnWire\n"));
-+                }
-+                else
-+                    Log(("Failed to get wireless name\n"));
-+            }
-+            else
-+                Log(("Failed to open wireless socket\n"));
- # elif defined(RT_OS_WINDOWS)
- #  define DEVNAME_PREFIX L"\\\\.\\"
-             /* we are getting the medium type via IOCTL_NDIS_QUERY_GLOBAL_STATS Io Control
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-include-ConsoleImpl.h b/emulators/virtualbox-ose/files/patch-src-VBox-Main-include-ConsoleImpl.h
deleted file mode 100644
index d363775e3da9..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-include-ConsoleImpl.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/VBox/Main/include/ConsoleImpl.h.orig	2010-02-12 19:49:27.000000000 +0000
-+++ src/VBox/Main/include/ConsoleImpl.h	2010-02-13 14:26:54.000000000 +0000
-@@ -410,7 +410,7 @@
- 
-     HRESULT callTapSetupApplication(bool isStatic, RTFILE tapFD, Bstr &tapDevice,
-                                     Bstr &tapSetupApplication);
--#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
-+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
-     HRESULT attachToTapInterface(INetworkAdapter *networkAdapter);
-     HRESULT detachFromTapInterface(INetworkAdapter *networkAdapter);
- #endif
-@@ -592,7 +592,7 @@
-     PPDMLED      mapNetworkLeds[SchemaDefs::NetworkAdapterCount];
-     PPDMLED      mapSharedFolderLed;
-     PPDMLED      mapUSBLed[2];
--#if !defined(VBOX_WITH_NETFLT) && (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD))
-+#if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD))
-     Utf8Str      maTAPDeviceName[8];
-     RTFILE       maTapFD[8];
- #endif
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp
deleted file mode 100644
index 9dd1452fc6d2..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/VBox/Runtime/r3/posix/fileio-posix.cpp
-===================================================================
---- src/VBox/Runtime/r3/posix/fileio-posix.cpp	(Revision 25952)
-+++ src/VBox/Runtime/r3/posix/fileio-posix.cpp	(Revision 25953)
-@@ -586,9 +586,9 @@
- }
- 
- 
--RTR3DECL(int) RTFileIoCtl(RTFILE File, int iRequest, void *pvData, unsigned cbData, int *piRet)
-+RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet)
- {
--    int rc = ioctl((int)File, iRequest, pvData);
-+    int rc = ioctl((int)File, ulRequest, pvData);
-     if (piRet)
-         *piRet = rc;
-     return rc >= 0 ? VINF_SUCCESS : RTErrConvertFromErrno(errno);
diff --git a/emulators/virtualbox-ose/files/patch-src-settings-vm-VBoxVMSettingsAudio.cpp b/emulators/virtualbox-ose/files/patch-src-settings-vm-VBoxVMSettingsAudio.cpp
deleted file mode 100644
index 707189e1cac7..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-settings-vm-VBoxVMSettingsAudio.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsAudio.cpp.orig	2009-12-17 15:28:01.000000000 +0100
-+++ src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsAudio.cpp	2009-12-21 14:14:35.000000000 +0100
-@@ -89,6 +89,9 @@
- #endif
- #if defined Q_OS_LINUX || defined Q_OS_FREEBSD
-     mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_OSS));
-+# ifdef VBOX_WITH_PULSE
-+    mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_Pulse));
-+# endif
- #endif
- #if defined Q_OS_LINUX
- # ifdef VBOX_WITH_ALSA
diff --git a/emulators/virtualbox-ose/files/pkg-install.in b/emulators/virtualbox-ose/files/pkg-install.in
deleted file mode 100644
index 5d5268d8e8ce..000000000000
--- a/emulators/virtualbox-ose/files/pkg-install.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	GROUP=%%VBOXGROUP%%
-	GID=%%VBOXGID%%
-	PW=/usr/sbin/pw
-
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	exit 0
-	;;
-esac
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index ea6fa2682bb5..f60b290476ea 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -8,15 +8,18 @@ bin/VBoxSVC
 %%QT4%%bin/VBoxTestOGL
 bin/VBoxXPCOMIPCD
 %%QT4%%bin/VirtualBox
+%%WEB%%bin/vboxwebsrv
+%%WEB%%bin/webtest
 %%X11%%lib/virtualbox/VBoxBFE
 %%X11%%lib/virtualbox/VBoxBFE.so
 lib/virtualbox/VBoxDD.so
 lib/virtualbox/VBoxDD2.so
 lib/virtualbox/VBoxDDU.so
+lib/virtualbox/VBoxGuestControlSvc.so
 lib/virtualbox/VBoxGuestPropSvc.so
 lib/virtualbox/VBoxHeadless
 lib/virtualbox/VBoxHeadless.so
-%%QT4%%lib/virtualbox/VBoxKeyboard.so
+%%X11%%lib/virtualbox/VBoxKeyboard.so
 lib/virtualbox/VBoxManage
 lib/virtualbox/VBoxNetAdpCtl
 lib/virtualbox/VBoxNetDHCP
@@ -51,6 +54,8 @@ lib/virtualbox/VBoxDDR0.r0
 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso
 lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
 lib/virtualbox/VMMR0.r0
+%%WEB%%lib/virtualbox/vboxwebsrv
+%%WEB%%lib/virtualbox/webtest
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
 lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VBoxSVCM.so
@@ -218,9 +223,12 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%DATADIR%%/idl/VirtualBox_XPCOM.idl
 %%DATADIR%%/samples/tstVBoxAPILinux.cpp
 %%DATADIR%%/samples/Makefile
+%%WEB%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl
+%%WEB%%%%DATADIR%%/sdk/bindings/webservice/vboxwebService.wsdl
 include/virtualbox/VBoxCAPI_v2_2.h
 include/virtualbox/VBoxCAPI_v3_0.h
 include/virtualbox/VBoxCAPI_v3_1.h
+include/virtualbox/VBoxCAPI_v3_2.h
 include/virtualbox/VirtualBox_XPCOM.h
 include/virtualbox/ipcIClientObserver.h
 include/virtualbox/ipcIDConnectService.h
@@ -590,6 +598,9 @@ include/virtualbox/xpcom/xpcom-config.h
 @dirrm include/virtualbox/ipcd
 @dirrm include/virtualbox
 %%NLS%%@dirrm %%DATADIR%%/nls
+%%WEB%%@dirrm %%DATADIR%%/sdk/bindings/webservice
+%%WEB%%@dirrm %%DATADIR%%/sdk/bindings
+%%WEB%%@dirrm %%DATADIR%%/sdk
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/idl
 @dirrm %%DATADIR%%
author	Beat Gaetzi <beat@FreeBSD.org>	2010-06-07 16:31:58 +0000
committer	Beat Gaetzi <beat@FreeBSD.org>	2010-06-07 16:31:58 +0000
commit	804cd7e3936996911180e902baea92df713587c7 (patch)
tree	7f516d4d0c16046bad2d5edaa61399f4a63dfeb9 /emulators
parent	bdbbb7ff83e4c6d435371d2f6f1f7ec5e6589548 (diff)
download	ports-804cd7e3936996911180e902baea92df713587c7.tar.gz ports-804cd7e3936996911180e902baea92df713587c7.zip