svn commit: r340840 - in head/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-additions/files virtualbox-ose-kmod virtualbox-ose-kmod/files virtualbox-ose/files

Bernhard Froehlich decke at FreeBSD.org
Thu Jan 23 17:18:47 UTC 2014 

Author: decke
Date: Thu Jan 23 17:18:42 2014
New Revision: 340840
URL: http://svnweb.freebsd.org/changeset/ports/340840
QAT: https://qat.redports.org/buildarchive/r340840/

Log:
  - Update to 4.3.6
  
  Obtained from:	svn.redports.org/virtualbox
  Thanks to:	all testers of the 3 CFTs

Added:
  head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile   (contents, props changed)
  head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest   (contents, props changed)
  head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile   (contents, props changed)
  head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp   (contents, props changed)
  head/emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk   (contents, props changed)
Deleted:
  head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
  head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
  head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c
  head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
  head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
  head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
  head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c
  head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h
  head/emulators/virtualbox-ose/files/patch-src-VBox-Main-scr-server-freebsd-PerformanceFreeBSD.cpp
  head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp
  head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-alloc-r0drv-freebsd.c
  head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_MAP_FIND.c
Modified:
  head/emulators/virtualbox-ose-additions/Makefile
  head/emulators/virtualbox-ose-additions/distinfo
  head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
  head/emulators/virtualbox-ose-kmod/Makefile
  head/emulators/virtualbox-ose-kmod/distinfo
  head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
  head/emulators/virtualbox-ose-kmod/files/vboxnet.in
  head/emulators/virtualbox-ose/Makefile
  head/emulators/virtualbox-ose/distinfo
  head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
  head/emulators/virtualbox-ose/pkg-plist

Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose-additions/Makefile	Thu Jan 23 17:18:42 2014	(r340840)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.22
+DISTVERSION=	4.3.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -27,6 +27,7 @@ USES=		iconv kmod
 USE_GCC=	any
 ONLY_FOR_ARCHS=	i386 amd64
 USE_BZIP2=	yes
+USE_PYTHON_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 HAS_CONFIGURE=	yes

Modified: head/emulators/virtualbox-ose-additions/distinfo
==============================================================================
--- head/emulators/virtualbox-ose-additions/distinfo	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose-additions/distinfo	Thu Jan 23 17:18:42 2014	(r340840)
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
-SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
+SHA256 (VirtualBox-4.3.6.tar.bz2) = c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27
+SIZE (VirtualBox-4.3.6.tar.bz2) = 89609199

Added: head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile	Thu Jan 23 17:18:42 2014	(r340840)
@@ -0,0 +1,10 @@
+--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig	2013-11-29 14:20:37.000000000 -0500
++++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile	2013-12-15 00:12:59.000000000 -0500
+@@ -155,6 +155,7 @@
+ SRCS += \
+ 	semspinmutex-r0drv-generic.c \
+ 	mpnotification-r0drv-generic.c \
++	threadctxhooks-r0drv-generic.c \
+ 	RTMpIsCpuWorkPending-r0drv-generic.c
+ 
+ .PATH:	${.CURDIR}/VBox

Added: head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest	Thu Jan 23 17:18:42 2014	(r340840)
@@ -0,0 +1,10 @@
+--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig	2014-01-04 05:34:34.000000000 +0000
++++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest	2014-01-04 05:34:41.000000000 +0000
+@@ -185,6 +185,7 @@
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h=>r0drv/freebsd/sleepqueue-r0drv-freebsd.h \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c=>r0drv/generic/semspinmutex-r0drv-generic.c \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp=>r0drv/generic/mpnotification-r0drv-generic.c \
++    ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/threadctxhooks-r0drv-generic.cpp=>r0drv/generic/threadctxhooks-r0drv-generic.c \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp=>r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.c \
+     ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \
+     ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \

Modified: head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
==============================================================================
--- head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c	Thu Jan 23 17:18:42 2014	(r340840)
@@ -7,17 +7,11 @@ From Alan L. Cox on FreeBSD-current:
     answer that question.
 
 [1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html
----
- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-index 5c90cf3..1176b51 100644
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-@@ -164,14 +164,19 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-         {
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-11-29 12:04:53.000000000 +0100
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-11-29 12:37:29.000000000 +0100
+@@ -168,14 +168,19 @@
              VM_OBJECT_LOCK(pMemFreeBSD->pObject);
+ #endif
              vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
 +#if __FreeBSD_version < 900000
 +            /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
@@ -32,10 +26,10 @@ index 5c90cf3..1176b51 100644
 +#if __FreeBSD_version < 900000
              vm_page_unlock_queues();
 +#endif
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-@@ -263,11 +268,15 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
+ #else
+@@ -291,11 +296,15 @@
              while (iPage-- > 0)
              {
                  pPage = vm_page_lookup(pObject, iPage);
@@ -49,8 +43,5 @@ index 5c90cf3..1176b51 100644
                  vm_page_unlock_queues();
 +#endif
              }
-             VM_OBJECT_UNLOCK(pObject);
-             return rcNoMem;
--- 
-1.7.11.5
-
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pObject);

Modified: head/emulators/virtualbox-ose-kmod/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-kmod/Makefile	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose-kmod/Makefile	Thu Jan 23 17:18:42 2014	(r340840)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.22
+DISTVERSION=	4.3.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
 		as86:${PORTSDIR}/devel/dev86 \
 		kmk:${PORTSDIR}/devel/kBuild
 
+USES=		kmod
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxnet
@@ -33,15 +34,13 @@ CONFIGURE_ARGS+=--with-gcc="${CC}" --wit
 		--build-headless
 
 CONFLICTS=	bcc-[0-9]*
-CONFLICTS_INSTALL=	virtualbox-ose-kmod-devel-[3,4]* virtualbox-ose-kmod-legacy-[3,4]*
+CONFLICTS_INSTALL=	virtualbox-ose-kmod-devel-4* virtualbox-ose-kmod-legacy-4*
 
 OPTIONS_DEFINE=	DEBUG VIMAGE
 DEBUG_DESC=	Debug symbols, additional logs and assertions
 VIMAGE_DESC=	VIMAGE virtual networking support
 
 NO_STAGE=	yes
-
-USES=		kmod
 .include <bsd.port.options.mk>
 
 VBOX_BIN=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/src

Modified: head/emulators/virtualbox-ose-kmod/distinfo
==============================================================================
--- head/emulators/virtualbox-ose-kmod/distinfo	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose-kmod/distinfo	Thu Jan 23 17:18:42 2014	(r340840)
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
-SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
+SHA256 (VirtualBox-4.3.6.tar.bz2) = c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27
+SIZE (VirtualBox-4.3.6.tar.bz2) = 89609199

Added: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile	Thu Jan 23 17:18:42 2014	(r340840)
@@ -0,0 +1,10 @@
+--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig	2013-10-17 00:51:57.724397794 +0400
++++ src/VBox/HostDrivers/Support/freebsd/Makefile	2013-10-17 00:52:05.491398026 +0400
+@@ -170,6 +170,7 @@
+ SRCS += \
+ 	semspinmutex-r0drv-generic.c \
+ 	mpnotification-r0drv-generic.c \
++	threadctxhooks-r0drv-generic.c \
+ 	RTMpIsCpuWorkPending-r0drv-generic.c
+ 
+ .PATH:	${.CURDIR}/VBox

Modified: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
==============================================================================
--- head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c	Thu Jan 23 17:18:42 2014	(r340840)
@@ -7,17 +7,11 @@ From Alan L. Cox on FreeBSD-current:
     answer that question.
 
 [1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html
----
- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-index 5c90cf3..1176b51 100644
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-@@ -164,14 +164,19 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-         {
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-11-29 12:04:53.000000000 +0100
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-11-29 12:37:29.000000000 +0100
+@@ -168,14 +168,19 @@
              VM_OBJECT_LOCK(pMemFreeBSD->pObject);
+ #endif
              vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
 +#if __FreeBSD_version < 900000
 +            /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
@@ -32,10 +26,10 @@ index 5c90cf3..1176b51 100644
 +#if __FreeBSD_version < 900000
              vm_page_unlock_queues();
 +#endif
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-@@ -263,11 +268,15 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
+ #else
+@@ -291,11 +296,15 @@
              while (iPage-- > 0)
              {
                  pPage = vm_page_lookup(pObject, iPage);
@@ -49,8 +43,5 @@ index 5c90cf3..1176b51 100644
                  vm_page_unlock_queues();
 +#endif
              }
-             VM_OBJECT_UNLOCK(pObject);
-             return rcNoMem;
--- 
-1.7.11.5
-
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pObject);

Modified: head/emulators/virtualbox-ose-kmod/files/vboxnet.in
==============================================================================
--- head/emulators/virtualbox-ose-kmod/files/vboxnet.in	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose-kmod/files/vboxnet.in	Thu Jan 23 17:18:42 2014	(r340840)
@@ -4,7 +4,8 @@
 #
 
 # PROVIDE:	vboxnet
-# REQUIRE:	FILESYSTEMS NETWORKING ldconfig
+# BEFORE:	NETWORKING
+# REQUIRE:	FILESYSTEMS ldconfig
 # KEYWORD:	nojail
 
 #

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose/Makefile	Thu Jan 23 17:18:42 2014	(r340840)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.2.22
+DISTVERSION=	4.3.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -22,8 +22,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild \
 		gtar:${PORTSDIR}/archivers/gtar \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools \
-		python:${PORTSDIR}/lang/python
+		cdrecord:${PORTSDIR}/sysutils/cdrtools
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libcurl.so:${PORTSDIR}/ftp/curl
@@ -36,18 +35,14 @@ USES=		iconv pkgconfig
 USE_GCC=	any
 USE_GNOME=	libidl
 USE_BZIP2=	yes
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	vboxapi
-PYDISTUTILS_PKGVERSION=	1.0
-PYDISTUTILS_NOEGGINFO=	yes
+USE_PYTHON_BUILD=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --passive-mesa
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox
 
 CONFLICTS=	bcc-[0-9]*
-CONFLICTS_INSTALL=	virtualbox-ose-devel-[3,4]* virtualbox-ose-legacy-[3,4]* virtualbox-ose-additions-[3,4]* virtualbox-ose-additions-devel-[3,4]*
+CONFLICTS_INSTALL=	virtualbox-ose-devel-4* virtualbox-ose-legacy-4* virtualbox-ose-additions-4* virtualbox-ose-additions-devel-4*
 
 VBOXUSER?=	vboxusers
 VBOXWSUSER?=	vboxusers
@@ -57,9 +52,9 @@ GROUPS=		${VBOXGROUP}
 VBOX_FRONTENDS=	VBoxAutostart VBoxHeadless
 VBOX_GUEST_VER=	${PORTVERSION}
 
-OPTIONS_DEFINE=	QT4 DEBUG GUESTADDITIONS DBUS PULSEAUDIO UDPTUNNEL VDE VNC WEBSERVICE NLS X11
-OPTIONS_DEFAULT=	QT4 DBUS X11 UDPTUNNEL VNC
-OPTIONS_SUB=	X11 QT4 GUESTADDITIONS VNC NLS WEBSERVICE
+OPTIONS_DEFINE=	QT4 DEBUG GUESTADDITIONS DBUS PULSEAUDIO UDPTUNNEL VDE VNC WEBSERVICE NLS X11 VPX PYTHON
+OPTIONS_DEFAULT=	QT4 DBUS X11 UDPTUNNEL VNC WEBSERVICE PYTHON
+OPTIONS_SUB=	X11 QT4 GUESTADDITIONS VNC NLS WEBSERVICE PYTHON
 DEBUG_DESC=	Debug symbols, additional logs and assertions
 QT4_DESC=	Build with QT4 Frontend
 GUESTADDITIONS_DESC=	Build with Guest Additions
@@ -67,6 +62,7 @@ UDPTUNNEL_DESC=	Build with UDP tunnel su
 VDE_DESC=	Build with VDE support
 VNC_DESC=	Build with VNC support
 WEBSERVICE_DESC=	Build Webservice
+VPX_DESC=	Use vpx for video capturing
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
@@ -77,6 +73,9 @@ DBUS_CONFIGURE_OFF=	--disable-dbus
 VNC_LIB_DEPENDS=	libvncserver.so:${PORTSDIR}/net/libvncserver
 VNC_CONFIGURE_ON=	--enable-vnc
 
+VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_CONFIGURE_OFF=	--disable-libvpx
+
 VDE_RUN_DEPENDS=	vde_switch:${PORTSDIR}/net/vde2
 VDE_CONFIGURE_ON=	--enable-vde
 
@@ -116,7 +115,7 @@ BROKEN=		QT4 frontend requires X11 suppo
 .if ${PORT_OPTIONS:MX11}
 USE_SDL=	sdl
 USE_XORG=	xcursor xmu inputproto xinerama
-VBOX_FRONTENDS+=VBoxBFE VBoxSDL
+VBOX_FRONTENDS+=VBoxSDL
 .else
 CONFIGURE_ARGS+=--build-headless
 .endif
@@ -130,6 +129,16 @@ VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
 CONFIGURE_ARGS+=--disable-qt4
 .endif
 
+.if ${PORT_OPTIONS:MPYTHON}
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	vboxapi
+PYDISTUTILS_PKGVERSION=	1.0
+PYDISTUTILS_NOEGGINFO=	yes
+.else
+CONFIGURE_ARGS+=--disable-python
+.endif
+
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 GUESTADDITIONS=	VBoxGuestAdditions_${VBOX_GUEST_VER}.iso
 GADISTFILES=	${GUESTADDITIONS}:guestadditions
@@ -160,8 +169,9 @@ PLIST_SUB+=	ARCH="${KMK_ARCH}"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 900000 && ${OSVERSION} > 801500
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-src-VBox-Devices-PC-vbox.dsl
+.if ${OSVERSION} < 900000
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp \
+		${FILESDIR}/extrapatch-src-VBox-Devices-PC-vbox.dsl
 .endif
 
 pre-everything::
@@ -256,8 +266,8 @@ do-install:
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${DATADIR}/sdk/bindings/webservice
-.for f in vboxweb.wsdl vboxwebService.wsdl
-	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
+.for f in vboxweb.wsdl
+	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/webservice/${f} ${DATADIR}/sdk/bindings/webservice/
 .endfor
 .endif
 
@@ -267,12 +277,14 @@ do-install:
 	${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso
 .endif
 
+.if ${PORT_OPTIONS:MPYTHON}
 	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/installer && \
 	VBOX_INSTALL_PATH="${PREFIX}/lib/virtualbox" ${PYTHON_CMD} vboxapisetup.py install
 
 	@${MKDIR} ${PYTHON_SITELIBDIR}
 	(cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${PYTHON_SITELIBDIR})
 	${PYTHON_CMD} -mcompileall ${PYTHON_SITELIBDIR}/xpcom/
+.endif
 
 post-install:
 .for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD VBoxExtPackHelperApp VBoxBalloonCtrl ${VBOX_FRONTENDS}

Modified: head/emulators/virtualbox-ose/distinfo
==============================================================================
--- head/emulators/virtualbox-ose/distinfo	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose/distinfo	Thu Jan 23 17:18:42 2014	(r340840)
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.2.22.tar.bz2) = 4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1
-SIZE (VirtualBox-4.2.22.tar.bz2) = 77039185
-SHA256 (VBoxGuestAdditions_4.2.22.iso) = 222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76
-SIZE (VBoxGuestAdditions_4.2.22.iso) = 59686912
+SHA256 (VirtualBox-4.3.6.tar.bz2) = c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27
+SIZE (VirtualBox-4.3.6.tar.bz2) = 89609199
+SHA256 (VBoxGuestAdditions_4.3.6.iso) = 95648fcdb5d028e64145a2fe2f2f28c946d219da366389295a61fed296ca79f0
+SIZE (VBoxGuestAdditions_4.3.6.iso) = 64161792

Added: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp	Thu Jan 23 17:18:42 2014	(r340840)
@@ -0,0 +1,10 @@
+--- src/VBox/Main/src-server/generic/NetIf-generic.cpp.orig	2013-08-21 13:05:31.000000000 +0400
++++ src/VBox/Main/src-server/generic/NetIf-generic.cpp	2013-08-27 18:17:51.598216723 +0400
+@@ -22,6 +22,7 @@
+ #include <iprt/path.h>
+ #include <iprt/param.h>
+ #include <sys/ioctl.h>
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
+ #include <errno.h>

Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk	Thu Jan 23 17:18:42 2014	(r340840)
@@ -0,0 +1,12 @@
+--- src/VBox/Main/Makefile.kmk.orig	2013-11-09 02:27:38.919839981 +0400
++++ src/VBox/Main/Makefile.kmk	2013-11-09 02:19:21.868873439 +0400
+@@ -404,7 +404,8 @@
+ 	src-server/HostDnsServiceResolvConf.cpp
+ 
+ VBoxSVC_SOURCES.freebsd = \
+-	src-server/freebsd/HostHardwareFreeBSD.cpp
++	src-server/freebsd/HostHardwareFreeBSD.cpp \
++	src-server/HostDnsServiceResolvConf.cpp
+ 
+ 
+ ifdef VBOX_WITH_USB

Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
==============================================================================
--- head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c	Thu Jan 23 17:18:42 2014	(r340840)
@@ -7,17 +7,11 @@ From Alan L. Cox on FreeBSD-current:
     answer that question.
 
 [1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html
----
- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-index 5c90cf3..1176b51 100644
---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
-@@ -164,14 +164,19 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
-         {
+--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2013-11-29 12:04:53.000000000 +0100
++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2013-11-29 12:37:29.000000000 +0100
+@@ -168,14 +168,19 @@
              VM_OBJECT_LOCK(pMemFreeBSD->pObject);
+ #endif
              vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
 +#if __FreeBSD_version < 900000
 +            /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */
@@ -32,10 +26,10 @@ index 5c90cf3..1176b51 100644
 +#if __FreeBSD_version < 900000
              vm_page_unlock_queues();
 +#endif
-             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-             vm_object_deallocate(pMemFreeBSD->pObject);
-             break;
-@@ -263,11 +268,15 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
+ #else
+@@ -291,11 +296,15 @@
              while (iPage-- > 0)
              {
                  pPage = vm_page_lookup(pObject, iPage);
@@ -49,8 +43,5 @@ index 5c90cf3..1176b51 100644
                  vm_page_unlock_queues();
 +#endif
              }
-             VM_OBJECT_UNLOCK(pObject);
-             return rcNoMem;
--- 
-1.7.11.5
-
+ #if __FreeBSD_version >= 1000030
+             VM_OBJECT_WUNLOCK(pObject);

Modified: head/emulators/virtualbox-ose/pkg-plist
==============================================================================
--- head/emulators/virtualbox-ose/pkg-plist	Thu Jan 23 16:40:35 2014	(r340839)
+++ head/emulators/virtualbox-ose/pkg-plist	Thu Jan 23 17:18:42 2014	(r340840)
@@ -1,6 +1,5 @@
 bin/VBoxAutostart
 bin/VBoxBalloonCtrl
-%%X11%%bin/VBoxBFE
 bin/VBoxHeadless
 bin/VBoxManage
 bin/VBoxNetAdpCtl
@@ -12,8 +11,6 @@ bin/VBoxXPCOMIPCD
 %%QT4%%bin/VirtualBox
 %%WEBSERVICE%%bin/vboxwebsrv
 %%WEBSERVICE%%bin/webtest
-%%X11%%lib/virtualbox/VBoxBFE
-%%X11%%lib/virtualbox/VBoxBFE.so
 lib/virtualbox/DBGCPlugInDiggers.so
 lib/virtualbox/VBoxAuth.so
 lib/virtualbox/VBoxAutostart
@@ -30,16 +27,16 @@ lib/virtualbox/VBoxGuestControlSvc.so
 lib/virtualbox/VBoxGuestPropSvc.so
 lib/virtualbox/VBoxHeadless
 lib/virtualbox/VBoxHeadless.so
-lib/virtualbox/VBoxHostChannel.so
 %%X11%%lib/virtualbox/VBoxKeyboard.so
 lib/virtualbox/VBoxManage
 lib/virtualbox/VBoxNetAdpCtl
 lib/virtualbox/VBoxNetDHCP
 lib/virtualbox/VBoxNetDHCP.so
+lib/virtualbox/VBoxNetNAT.so
 %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so
 %%X11%%lib/virtualbox/VBoxOGLhosterrorspu.so
 %%X11%%lib/virtualbox/VBoxOGLrenderspu.so
-lib/virtualbox/VBoxPython.so
+%%PYTHON%%lib/virtualbox/VBoxPython.so
 lib/virtualbox/VBoxREM.so
 %%QT4%%lib/virtualbox/VBoxTestOGL
 %%I386%%lib/virtualbox/VBoxREM32.so
@@ -63,9 +60,10 @@ lib/virtualbox/VBoxDDGC.gc
 lib/virtualbox/VMMGC.gc
 lib/virtualbox/VBoxDD2R0.r0
 lib/virtualbox/VBoxDDR0.r0
+lib/virtualbox/VBoxHostChannel.so
 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso
 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso
-lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
+%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
 lib/virtualbox/VMMR0.r0
 %%WEBSERVICE%%lib/virtualbox/vboxwebsrv
 %%WEBSERVICE%%lib/virtualbox/webtest
@@ -240,10 +238,9 @@ lib/virtualbox/components/VBoxXPCOMBase.
 %%DATADIR%%/idl/ipcITransactionService.idl
 %%DATADIR%%/idl/ipcITransactionObserver.idl
 %%DATADIR%%/idl/VirtualBox_XPCOM.idl
-%%DATADIR%%/samples/tstVBoxAPILinux.cpp
+%%DATADIR%%/samples/tstVBoxAPIXPCOM.cpp
 %%DATADIR%%/samples/Makefile
 %%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl
-%%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxwebService.wsdl
 include/virtualbox/VBoxCAPI_v2_2.h
 include/virtualbox/VBoxCAPI_v3_0.h
 include/virtualbox/VBoxCAPI_v3_1.h
@@ -251,6 +248,7 @@ include/virtualbox/VBoxCAPI_v3_2.h
 include/virtualbox/VBoxCAPI_v4_0.h
 include/virtualbox/VBoxCAPI_v4_1.h
 include/virtualbox/VBoxCAPI_v4_2.h
+include/virtualbox/VBoxCAPI_v4_3.h
 include/virtualbox/VirtualBox_XPCOM.h
 include/virtualbox/ipcIClientObserver.h
 include/virtualbox/ipcIDConnectService.h
@@ -377,7 +375,6 @@ include/virtualbox/nsprpub/prlink.h
 include/virtualbox/nsprpub/md/_iprt_atomic.h
 include/virtualbox/nsprpub/md/_darwin.h
 include/virtualbox/nsprpub/md/_freebsd.h
-include/virtualbox/nsprpub/md/_l4v2.h
 include/virtualbox/nsprpub/md/_linux.h
 include/virtualbox/nsprpub/md/_macos.h
 include/virtualbox/nsprpub/md/_netbsd.h
@@ -397,7 +394,6 @@ include/virtualbox/nsprpub/md/_netbsd.cf
 include/virtualbox/nsprpub/md/_openbsd.cfg
 include/virtualbox/nsprpub/md/_os2.cfg
 include/virtualbox/nsprpub/md/_solaris32.cfg
-include/virtualbox/nsprpub/md/_l4v2.cfg
 include/virtualbox/nsprpub/md/_solaris64.cfg
 include/virtualbox/nsprpub/prlock.h
 include/virtualbox/nsprpub/prlog.h
@@ -572,45 +568,45 @@ include/virtualbox/xpcom/nsTraceRefcnt.h
 include/virtualbox/xpcom/nsWeakReference.h
 include/virtualbox/xpcom/nsXPCOMGlue.h
 include/virtualbox/xpcom/xpcom-config.h
-%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py
-%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py
-%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.pyc
-%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info
-%%PYTHON_SITELIBDIR%%/xpcom/__init__.py
-%%PYTHON_SITELIBDIR%%/xpcom/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/components.py
-%%PYTHON_SITELIBDIR%%/xpcom/components.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/file.py
-%%PYTHON_SITELIBDIR%%/xpcom/file.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/nsError.py
-%%PYTHON_SITELIBDIR%%/xpcom/nsError.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/primitives.py
-%%PYTHON_SITELIBDIR%%/xpcom/primitives.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.py
-%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.py
-%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/xpt.py
-%%PYTHON_SITELIBDIR%%/xpcom/xpt.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.py
-%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/factory.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/factory.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/loader.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/loader.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/module.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/module.pyc
-%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py
-%%PYTHON_SITELIBDIR%%/xpcom/server/policy.pyc
- at dirrm %%PYTHON_SITELIBDIR%%/xpcom/server
- at dirrm %%PYTHON_SITELIBDIR%%/xpcom/client
- at dirrm %%PYTHON_SITELIBDIR%%/xpcom
- at dirrm %%PYTHON_SITELIBDIR%%/vboxapi
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.pyc
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom/server
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom/client
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vboxapi
 @dirrm include/virtualbox/xpcom
 @dirrm include/virtualbox/string
 @dirrm include/virtualbox/nsprpub/private
@@ -619,17 +615,17 @@ include/virtualbox/xpcom/xpcom-config.h
 @dirrm include/virtualbox/nsprpub
 @dirrm include/virtualbox/ipcd
 @dirrm include/virtualbox
-%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%
-%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC
-%%VNC%%@dirrmtry lib/virtualbox/ExtensionPacks
 %%NLS%%@dirrm %%DATADIR%%/nls
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings/webservice
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/idl
- at dirrmtry %%DATADIR%%
+ at dirrm %%DATADIR%%
 %%QT4%%@dirrmtry share/applications
 @dirrm lib/virtualbox/components
+%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%
+%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC
+%%VNC%%@dirrmtry lib/virtualbox/ExtensionPacks
 %%GUESTADDITIONS%%@dirrm lib/virtualbox/additions
 @dirrmtry lib/virtualbox

More information about the svn-ports-all mailing list