Update to 4.3.12.

svn path=/head/; revision=354896
2014-05-22 23:10:51 +00:00 · 2014-05-22 23:10:51 +00:00 · f40b7d81d5 · 2021-03-31 03:12:20 +00:00
commit f40b7d81d5
parent 4d8f3d8fb5
11 changed files with 463 additions and 636 deletions
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.10
-PORTREVISION=	2
+DISTVERSION=	4.3.12
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@ -30,17 +29,27 @@ USE_PYTHON_BUILD=	yes
 MAKE_JOBS_UNSAFE=	yes

 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --nofatal
-CONFIGURE_ARGS+=--disable-alsa --disable-dbus --disable-docs \
-		--disable-libvpx --disable-pulse --disable-python \
-		--disable-sdl-ttf --disable-xpcom
+CONFIGURE_ARGS+=	--disable-alsa \
+			--disable-dbus \
+			--disable-docs \
+			--disable-libvpx \
+			--disable-pulse \
+			--disable-python \
+			--disable-sdl-ttf \
+			--disable-xpcom
+CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"

-CONFLICTS_INSTALL=	virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]* virtualbox-ose-legacy-[3,4]*
+CONFLICTS_INSTALL=	virtualbox-ose-[3,4]* \
+			virtualbox-ose-additions-devel-[3,4]* \
+			virtualbox-ose-devel-[3,4]* \
+			virtualbox-ose-legacy-[3,4]*

-OPTIONS_DEFINE=	DEBUG X11 OPENGL
+OPTIONS_DEFINE=	DEBUG OPENGL X11
 OPTIONS_DEFAULT=	X11
 OPTIONS_SUB=	yes

+OPENGL_CONFIGURE_OFF=	--disable-opengl
+
 .include <bsd.port.options.mk>

 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
@ -62,14 +71,6 @@ KMK_BUILDTYPE=	debug
 MAKE_ARGS+=	DEBUG_FLAGS="-O1 -g"
 .endif

-.if ${PORT_OPTIONS:MX11}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/X:${PORTSDIR}/x11-servers/xorg-server
-VBOX_WITH_X11=	1
-USE_XORG=	xcursor xmu inputproto xorg-server xrandr
-.else
-VBOX_WITH_X11=
-.endif
-
 .if ${PORT_OPTIONS:MOPENGL}
 USE_XORG+=	xcomposite xdamage xext xfixes
 USE_GL=		gl
@ -80,8 +81,14 @@ VBOX_LIBS=	VBoxOGL.so \
 		VBoxOGLfeedbackspu.so \
 		VBoxOGLpackspu.so \
 		VBoxOGLpassthroughspu.so
+.endif
+
+.if ${PORT_OPTIONS:MX11}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/X:${PORTSDIR}/x11-servers/xorg-server
+VBOX_WITH_X11=	1
+USE_XORG=	xcursor xmu inputproto xorg-server xrandr
 .else
-CONFIGURE_ARGS+=--disable-opengl
+VBOX_WITH_X11=
 .endif

 .if ${ARCH} == i386
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.3.10.tar.bz2) = 739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b
-SIZE (VirtualBox-4.3.10.tar.bz2) = 90333712
+SHA256 (VirtualBox-4.3.12.tar.bz2) = db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f
+SIZE (VirtualBox-4.3.12.tar.bz2) = 90346010
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.10
+DISTVERSION=	4.3.12
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@ -26,13 +26,19 @@ USE_RC_SUBR=	vboxnet
 ONLY_FOR_ARCHS=	i386 amd64

 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --nofatal
-CONFIGURE_ARGS+=--disable-alsa --disable-dbus --disable-docs \
-		--disable-libvpx --disable-pulse --disable-python \
-		--disable-sdl-ttf --disable-xpcom
-CONFIGURE_ARGS+=--build-headless
+CONFIGURE_ARGS+=	--build-headless
+CONFIGURE_ARGS+=	--disable-alsa \
+			--disable-dbus \
+			--disable-docs \
+			--disable-libvpx \
+			--disable-pulse \
+			--disable-python \
+			--disable-sdl-ttf \
+			--disable-xpcom
+CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"

-CONFLICTS_INSTALL=	virtualbox-ose-kmod-devel-4* virtualbox-ose-kmod-legacy-4*
+CONFLICTS_INSTALL=	virtualbox-ose-kmod-devel-4* \
+			virtualbox-ose-kmod-legacy-4*

 OPTIONS_DEFINE=	DEBUG VIMAGE
 OPTIONS_SUB=	yes
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.3.10.tar.bz2) = 739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b
-SIZE (VirtualBox-4.3.10.tar.bz2) = 90333712
+SHA256 (VirtualBox-4.3.12.tar.bz2) = db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f
+SIZE (VirtualBox-4.3.12.tar.bz2) = 90346010
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.10
-PORTREVISION=	1
+DISTVERSION=	4.3.12
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@ -36,10 +35,14 @@ USE_GNOME=	libidl
 USE_PYTHON_BUILD=	yes

 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --passive-mesa
+CONFIGURE_ARGS+=	--disable-java --passive-mesa
+CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 USE_LDCONFIG=	${PREFIX}/lib/virtualbox

-CONFLICTS_INSTALL=	virtualbox-ose-devel-4* virtualbox-ose-legacy-4* virtualbox-ose-additions-4* virtualbox-ose-additions-devel-4*
+CONFLICTS_INSTALL=	virtualbox-ose-additions-4* \
+			virtualbox-ose-additions-devel-4* \
+			virtualbox-ose-devel-4* \
+			virtualbox-ose-legacy-4*

 VBOXUSER?=	vboxusers
 VBOXWSUSER?=	vboxusers
@ -53,32 +56,34 @@ OPTIONS_DEFINE=	DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO PYTHON \
 		QT4 UDPTUNNEL VDE VNC VPX WEBSERVICE X11
 OPTIONS_DEFAULT=	DBUS PYTHON QT4 UDPTUNNEL VNC WEBSERVICE X11
 OPTIONS_SUB=	yes
+
 DEBUG_DESC=	Debug symbols, additional logs and assertions
+GUESTADDITIONS_DESC=	Build with Guest Additions
 MANUAL_DESC=	Build with user manual
 QT4_DESC=	Build with QT4 Frontend
-GUESTADDITIONS_DESC=	Build with Guest Additions
 UDPTUNNEL_DESC=	Build with UDP tunnel support
 VDE_DESC=	Build with VDE support
 VNC_DESC=	Build with VNC support
-WEBSERVICE_DESC=	Build Webservice
 VPX_DESC=	Use vpx for video capturing
-
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
+WEBSERVICE_DESC=	Build Webservice

 DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-DBUS_CONFIGURE_OFF=	--disable-dbus
-
-MANUAL_CONFIGURE_OFF=	--disable-docs
-
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 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
+
+DBUS_CONFIGURE_OFF=	--disable-dbus
+DEBUG_CONFIGURE_ON=	--build-debug
+MANUAL_CONFIGURE_OFF=	--disable-docs
+PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
+PYTHON_CONFIGURE_OFF=	--disable-python
+QT4_CONFIGURE_OFF=	--disable-qt4
 VDE_CONFIGURE_ON=	--enable-vde
+VNC_CONFIGURE_ON=	--enable-vnc
+VPX_CONFIGURE_OFF=	--disable-libvpx
+X11_CONFIGURE_OFF=	--build-headless

 # bmake doesn't know about unsetenv=true
 .if defined(.PARSEDIR)
@ -88,8 +93,6 @@ ENV=
 .SHELL:		path="/bin/sh" unsetenv=true
 .endif

-.include <bsd.port.options.mk>
-
 PLIST_SUB+=	GUEST_VER=${VBOX_GUEST_VER} \
 		PYTHON_VER=${PYTHON_VER} \
 		PYTHON_VERU=${PYTHON_VER:S/./_/} \
@ -99,9 +102,7 @@ SUB_LIST+=	VBOXUSER=${VBOXUSER} \
 		VBOXWSUSER=${VBOXWSUSER}
 USE_RC_SUBR+=	vboxheadless vboxwatchdog

-KMK_BUILDTYPE=	release
-KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
-KMK_FLAGS=	-j${MAKE_JOBS_NUMBER}
+.include <bsd.port.options.mk>

 .if empty(PORT_OPTIONS:MQT4) && !empty(PORT_OPTIONS:MNLS)
 BROKEN=		NLS support requires QT4 frontend. Run 'make config' again!
@ -111,32 +112,10 @@ BROKEN=		NLS support requires QT4 frontend. Run 'make config' again!
 BROKEN=		QT4 frontend requires X11 support. Run 'make config' again!
 .endif

-.if ${PORT_OPTIONS:MX11}
-USE_SDL=	sdl
-USE_XORG=	xcursor xmu inputproto xinerama
-VBOX_FRONTENDS+=VBoxSDL
+.if ${PORT_OPTIONS:MDEBUG}
+KMK_BUILDTYPE=	debug
 .else
-CONFIGURE_ARGS+=--build-headless
-.endif
-
-.if ${PORT_OPTIONS:MQT4}
-QT_NONSTANDARD=	yes
-USE_QT4=	linguist_build moc_build rcc_build uic_build
-USE_QT4+=	gui network opengl
-INSTALLS_ICONS=	yes
-VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
-.else
-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
+KMK_BUILDTYPE=	release
 .endif

 .if ${PORT_OPTIONS:MGUESTADDITIONS}
@ -146,21 +125,38 @@ RESTRICTED=	for personal use only
 RESTRICTED_FILES=	${GUESTADDITIONS}
 .endif

-.if ${PORT_OPTIONS:MDEBUG}
-KMK_BUILDTYPE=	debug
-KMK_FLAGS+=	BUILD_TYPE=debug
-.endif
-
 .if ${PORT_OPTIONS:MMANUAL}
 USE_TEX=	dvipsk:build formats:build texlive
 .endif

+.if ${PORT_OPTIONS:MPYTHON}
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	vboxapi
+PYDISTUTILS_PKGVERSION=	1.0
+PYDISTUTILS_NOEGGINFO=	yes
+.endif
+
+.if ${PORT_OPTIONS:MQT4}
+QT_NONSTANDARD=	yes
+USE_QT4=	linguist_build moc_build rcc_build uic_build
+USE_QT4+=	gui network opengl
+INSTALLS_ICONS=	yes
+VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
+.endif
+
 .if ${PORT_OPTIONS:MWEBSERVICE}
 BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
 VBOX_WEB=	vboxwebsrv webtest
 USE_RC_SUBR+=	vboxwebsrv
 .endif

+.if ${PORT_OPTIONS:MX11}
+USE_SDL=	sdl
+USE_XORG=	xcursor xmu inputproto xinerama
+VBOX_FRONTENDS+=VBoxSDL
+.endif
+
 .if ${ARCH} == i386
 KMK_ARCH=	freebsd.x86
 PLIST_SUB+=	I386=""
@ -171,6 +167,10 @@ PLIST_SUB+=	I386="@comment "

 PLIST_SUB+=	ARCH="${KMK_ARCH}"

+KMK_BUILDDIR=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
+KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
+KMK_FLAGS=	-j${MAKE_JOBS_NUMBER}
+
 .include <bsd.port.pre.mk>

 .if ${OSVERSION} < 900000
@ -254,54 +254,41 @@ do-build:

 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}
+	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}

 	${MKDIR} ${STAGEDIR}${PREFIX}/include/virtualbox
-	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
+	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox

 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/virtualbox
-	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components VBoxExtPackHelperApp" ${STAGEDIR}${PREFIX}/lib/virtualbox
-
-.if ${PORT_OPTIONS:MMANUAL}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/UserManual*.pdf ${STAGEDIR}${DOCSDIR}
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
-.endif
+	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components VBoxExtPackHelperApp" ${STAGEDIR}${PREFIX}/lib/virtualbox

 .for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD VBoxBalloonCtrl ${VBOX_FRONTENDS} ${VBOX_WEB}
-	${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${STAGEDIR}${PREFIX}/lib/virtualbox/
+	${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} ${STAGEDIR}${PREFIX}/lib/virtualbox/
 	${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor

-.if ${PORT_OPTIONS:MVNC}
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/virtualbox/ExtensionPacks/VNC/${KMK_ARCH}
-	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/ExtensionPacks/VNC/ExtPack* ${STAGEDIR}${PREFIX}/lib/virtualbox/ExtensionPacks/VNC/
-	${INSTALL_LIB} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/ExtensionPacks/VNC/${KMK_ARCH}/* ${STAGEDIR}${PREFIX}/lib/virtualbox/ExtensionPacks/VNC/${KMK_ARCH}/
-.endif
-
-.if ${PORT_OPTIONS:MWEBSERVICE}
-	${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice
-.for f in vboxweb.wsdl
-	${INSTALL_DATA} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/webservice/${f} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
-.endfor
-.endif
-
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/virtualbox/additions
 	${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${STAGEDIR}${PREFIX}/lib/virtualbox/additions/
 	${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${STAGEDIR}${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso
 .endif

+.if ${PORT_OPTIONS:MMANUAL}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/UserManual*.pdf ${STAGEDIR}${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+	cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
+.endif
+
 .if ${PORT_OPTIONS:MPYTHON}
-	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/installer && \
+	cd ${KMK_BUILDDIR}/bin/sdk/installer && \
 	    ${SETENV} VBOX_INSTALL_PATH="${PREFIX}/lib/virtualbox" \
 	    ${PYTHON_CMD} vboxapisetup.py install --root=${STAGEDIR}

 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-	cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}
+	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${PYTHON_CMD} -mcompileall ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom/
 .endif

@ -310,4 +297,17 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop ${STAGEDIR}${PREFIX}/share/applications/virtualbox.desktop
 .endif

+.if ${PORT_OPTIONS:MVNC}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/virtualbox/ExtensionPacks/VNC/${KMK_ARCH}
+	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/ExtPack* ${STAGEDIR}${PREFIX}/lib/virtualbox/ExtensionPacks/VNC/
+	${INSTALL_LIB} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/${KMK_ARCH}/* ${STAGEDIR}${PREFIX}/lib/virtualbox/ExtensionPacks/VNC/${KMK_ARCH}/
+.endif
+
+.if ${PORT_OPTIONS:MWEBSERVICE}
+	${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice
+.for f in vboxweb.wsdl
+	${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/${f} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
+.endfor
+.endif
+
 .include <bsd.port.post.mk>
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.3.10.tar.bz2) = 739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b
-SIZE (VirtualBox-4.3.10.tar.bz2) = 90333712
-SHA256 (VBoxGuestAdditions_4.3.10.iso) = 247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae
-SIZE (VBoxGuestAdditions_4.3.10.iso) = 64647168
+SHA256 (VirtualBox-4.3.12.tar.bz2) = db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f
+SIZE (VirtualBox-4.3.12.tar.bz2) = 90346010
+SHA256 (VBoxGuestAdditions_4.3.12.iso) = c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d
+SIZE (VBoxGuestAdditions_4.3.12.iso) = 64770048
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.cpp
@ -1,86 +0,0 @@
--- src/VBox/Devices/Graphics/DevVGA.cpp.orig	2014-03-26 15:17:10.000000000 -0400
-+++ src/VBox/Devices/Graphics/DevVGA.cpp	2014-04-02 16:41:47.000000000 -0400
-@@ -5196,10 +5196,12 @@
-     PVGASTATE pThis = (PVGASTATE)pvUser;
-     NOREF(pDevIns);
- 
-+#ifdef VBOX_WITH_WDDM
-     if (pThis->fScanLineCfg & VBVASCANLINECFG_ENABLE_VSYNC_IRQ)
-     {
-         VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_VSYNC);
-     }
-+#endif
- 
-     if (pThis->pDrv)
-         pThis->pDrv->pfnRefresh(pThis->pDrv);
-@@ -5211,7 +5213,9 @@
-     vbvaTimerCb(pThis);
- #endif
- 
-+#ifdef VBOX_WITH_VDMA
-     vboxCmdVBVACmdTimer(pThis);
-+#endif
- }
- 
- #ifdef VBOX_WITH_VMSVGA
-@@ -5365,26 +5369,30 @@
- static DECLCALLBACK(int) vgaR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
- {
-     PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
-+
- #ifdef VBOX_WITH_VDMA
-     vboxVDMASaveStateExecPrep(pThis->pVdma, pSSM);
- #endif
-+
-     vgaR3SaveConfig(pThis, pSSM);
-     vga_save(pSSM, PDMINS_2_DATA(pDevIns, PVGASTATE));
-+
- #ifdef VBOX_WITH_HGSMI
-     SSMR3PutBool(pSSM, true);
-     int rc = vboxVBVASaveStateExec(pDevIns, pSSM);
- # ifdef VBOX_WITH_VDMA
-     vboxVDMASaveStateExecDone(pThis->pVdma, pSSM);
- # endif
-    return rc;
- #else
-    SSMR3PutBool(pSSM, false);
-+    int rc = SSMR3PutBool(pSSM, false);
- #endif
-+
- #ifdef VBOX_WITH_VMSVGA
-     if (    rc == VINF_SUCCESS
-         &&  pThis->fVMSVGAEnabled)
-         rc = vmsvgaSaveExec(pDevIns, pSSM);
- #endif
-+
-     return rc;
- }
- 
-@@ -5476,8 +5484,10 @@
-     char           *pchEnd;
-     LogFlow(("vgaReset\n"));
- 
-+#ifdef VBOX_WITH_VDMA
-     if (pThis->pVdma)
-         vboxVDMAReset(pThis->pVdma);
-+#endif
- 
- #ifdef VBOX_WITH_HGSMI
-     VBVAReset(pThis);
-@@ -5924,12 +5934,14 @@
- # if defined(VBOX_WITH_VIDEOHWACCEL)
-     pThis->IVBVACallbacks.pfnVHWACommandCompleteAsynch = vbvaVHWACommandCompleteAsynch;
- # endif
-#if defined(VBOX_WITH_CRHGSMI)
-+# if defined(VBOX_WITH_CRHGSMI)
-     pThis->IVBVACallbacks.pfnCrHgsmiCommandCompleteAsync = vboxVDMACrHgsmiCommandCompleteAsync;
-     pThis->IVBVACallbacks.pfnCrHgsmiControlCompleteAsync = vboxVDMACrHgsmiControlCompleteAsync;
- # endif
-#endif
-+# if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)
-     pThis->IVBVACallbacks.pfnCrCtlSubmit = vboxCmdVBVACmdHostCtl;
-+# endif
-+#endif
- 
-     /*
-      * We use our own critical section to avoid unncessary pointer indirections
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA_VBVA.cpp
@ -1,34 +0,0 @@
--- src/VBox/Devices/Graphics/DevVGA_VBVA.cpp.orig	2014-03-26 15:17:10.000000000 -0400
-+++ src/VBox/Devices/Graphics/DevVGA_VBVA.cpp	2014-04-03 14:58:41.000000000 -0400
-@@ -1939,6 +1939,7 @@
- 
-     switch (u16ChannelInfo)
-     {
-+#ifdef VBOX_WITH_VDMA
-         case VBVA_CMDVBVA_SUBMIT:
-         {
-             rc = vboxCmdVBVACmdSubmit(pVGAState);
-@@ -1965,7 +1966,6 @@
-             rc = vboxCmdVBVACmdCtl(pVGAState, pCtl, cbBuffer - VBoxSHGSMIBufferHeaderSize());
-             break;
-         }
-#ifdef VBOX_WITH_VDMA
-         case VBVA_VDMA_CMD:
-         {
-             if (cbBuffer < VBoxSHGSMIBufferHeaderSize() + sizeof (VBOXVDMACBUF_DR))
-@@ -2277,7 +2277,6 @@
-             pVGAState->fGuestCaps = pCaps->fCaps;
-             pCaps->rc = VINF_SUCCESS;
-         } break;
-#endif
-         case VBVA_SCANLINE_CFG:
-         {
-             if (cbBuffer < sizeof (VBVASCANLINECFG))
-@@ -2290,6 +2289,7 @@
-             pVGAState->fScanLineCfg = pCfg->fFlags;
-             pCfg->rc = VINF_SUCCESS;
-         } break;
-+#endif
-         default:
-             Log(("Unsupported VBVA guest command %d!!!\n",
-                  u16ChannelInfo));
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-HGSMI-HGSMIHost.cpp
@ -1,38 +0,0 @@
--- src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp.orig	2014-03-26 15:17:10.000000000 -0400
-+++ src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp	2014-04-02 16:26:50.000000000 -0400
-@@ -1185,6 +1185,8 @@
-     return rc;
- }
- 
-+#ifdef VBOX_WITH_WDDM
-+
- static int hgsmiHostSaveGuestCmdCompletedFifoEntryLocked (HGSMIGUESTCOMPLENTRY *pEntry, PSSMHANDLE pSSM)
- {
-     return SSMR3PutU32 (pSSM, pEntry->offBuffer);
-@@ -1211,6 +1213,8 @@
-     return rc;
- }
- 
-+#endif
-+
- static int hgsmiHostLoadFifoEntryLocked (PHGSMIINSTANCE pIns, HGSMIHOSTFIFOENTRY **ppEntry, PSSMHANDLE pSSM)
- {
-     HGSMIHOSTFIFOENTRY *pEntry;
-@@ -1253,6 +1257,8 @@
-     return rc;
- }
- 
-+#ifdef VBOX_WITH_WDDM
-+
- static int hgsmiHostLoadGuestCmdCompletedFifoEntryLocked (PHGSMIINSTANCE pIns, HGSMIGUESTCOMPLENTRY **ppEntry, PSSMHANDLE pSSM)
- {
-     HGSMIGUESTCOMPLENTRY *pEntry;
-@@ -1306,6 +1312,8 @@
-     return rc;
- }
- 
-+#endif
-+
- int HGSMIHostSaveStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM)
- {
-     VBOXHGSMI_SAVE_START(pSSM);
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-DisplayImpl.cpp
@ -1,28 +0,0 @@
--- src/VBox/Main/src-client/DisplayImpl.cpp.orig	2014-03-26 15:19:05.000000000 -0400
-+++ src/VBox/Main/src-client/DisplayImpl.cpp	2014-04-02 17:42:48.000000000 -0400
-@@ -4382,6 +4382,7 @@
- }
- #endif
- 
-+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
- DECLCALLBACK(void)  Display::displayCrHgcmCtlSubmitCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext)
- {
-     VBOXCRCMDCTL *pCmd = (VBOXCRCMDCTL*)pParam->u.pointer.addr;
-@@ -4424,7 +4425,6 @@
-     return pThis->handleCrHgcmCtlSubmit(pCmd, cbCmd, pfnCompletion, pvCompletion);
- }
- 
-#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
- DECLCALLBACK(void)  Display::displayCrAsyncCmdCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext)
- {
-     Display *pDisplay = (Display *)pvContext;
-@@ -5050,7 +5050,9 @@
-     pThis->IConnector.pfnCrHgsmiCommandProcess = Display::displayCrHgsmiCommandProcess;
-     pThis->IConnector.pfnCrHgsmiControlProcess = Display::displayCrHgsmiControlProcess;
- #endif
-+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
-     pThis->IConnector.pfnCrHgcmCtlSubmit       = Display::displayCrHgcmCtlSubmit;
-+#endif
- #ifdef VBOX_WITH_HGSMI
-     pThis->IConnector.pfnVBVAEnable            = Display::displayVBVAEnable;
-     pThis->IConnector.pfnVBVADisable           = Display::displayVBVADisable;
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@ -11,282 +11,6 @@ bin/VBoxXPCOMIPCD
 %%QT4%%bin/VirtualBox
 %%WEBSERVICE%%bin/vboxwebsrv
 %%WEBSERVICE%%bin/webtest
-lib/virtualbox/DBGCPlugInDiggers.so
-lib/virtualbox/VBoxAuth.so
-@group %%VBOXGROUP%%
-@mode 4511
-lib/virtualbox/VBoxAutostart
-@group
-@mode
-lib/virtualbox/VBoxAuthSimple.so
-@group %%VBOXGROUP%%
-@mode 0711
-lib/virtualbox/VBoxBalloonCtrl
-@group
-@mode
-%%QT4%%lib/virtualbox/VBoxDbg.so
-lib/virtualbox/VBoxDD.so
-lib/virtualbox/VBoxDD2.so
-lib/virtualbox/VBoxDDU.so
-lib/virtualbox/VBoxEFI32.fd
-lib/virtualbox/VBoxEFI64.fd
-@group %%VBOXGROUP%%
-@mode 0711
-lib/virtualbox/VBoxExtPackHelperApp
-@group
-@mode
-lib/virtualbox/VBoxGuestControlSvc.so
-lib/virtualbox/VBoxGuestPropSvc.so
-@group %%VBOXGROUP%%
-@mode 4511
-lib/virtualbox/VBoxHeadless
-@group
-@mode
-lib/virtualbox/VBoxHeadless.so
-%%X11%%lib/virtualbox/VBoxKeyboard.so
-@group %%VBOXGROUP%%
-@mode 0711
-lib/virtualbox/VBoxManage
-@group
-@mode
-@mode 4511
-lib/virtualbox/VBoxNetAdpCtl
-@group %%VBOXGROUP%%
-lib/virtualbox/VBoxNetDHCP
-@group
-@mode
-lib/virtualbox/VBoxNetDHCP.so
-lib/virtualbox/VBoxNetNAT.so
-%%X11%%lib/virtualbox/VBoxOGLhostcrutil.so
-%%X11%%lib/virtualbox/VBoxOGLhosterrorspu.so
-%%X11%%lib/virtualbox/VBoxOGLrenderspu.so
-%%PYTHON%%lib/virtualbox/VBoxPython.so
-lib/virtualbox/VBoxREM.so
-@group %%VBOXGROUP%%
-@mode 4511
-%%QT4%%lib/virtualbox/VBoxTestOGL
-@group
-@mode
-%%I386%%lib/virtualbox/VBoxREM32.so
-%%I386%%lib/virtualbox/VBoxREM64.so
-lib/virtualbox/VBoxRT.so
-@group %%VBOXGROUP%%
-@mode 4511
-%%X11%%lib/virtualbox/VBoxSDL
-@group
-@mode
-%%X11%%lib/virtualbox/VBoxSDL.so
-@group %%VBOXGROUP%%
-@mode 0711
-lib/virtualbox/VBoxSVC
-@group
-@mode
-lib/virtualbox/VBoxSharedClipboard.so
-%%X11%%lib/virtualbox/VBoxSharedCrOpenGL.so
-lib/virtualbox/VBoxSharedFolders.so
-lib/virtualbox/VBoxVMM.so
-lib/virtualbox/VBoxVMMPreload.so
-lib/virtualbox/VBoxXPCOM.so
-lib/virtualbox/VBoxXPCOMC.so
-@group %%VBOXGROUP%%
-@mode 0711
-lib/virtualbox/VBoxXPCOMIPCD
-@group
-@mode
-@group %%VBOXGROUP%%
-@mode 4511
-%%QT4%%lib/virtualbox/VirtualBox
-@group
-@mode
-%%QT4%%lib/virtualbox/VirtualBox.so
-lib/virtualbox/VBoxDD2GC.gc
-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
-%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
-lib/virtualbox/VMMR0.r0
-%%WEBSERVICE%%lib/virtualbox/vboxwebsrv
-%%WEBSERVICE%%lib/virtualbox/webtest
-lib/virtualbox/components/VirtualBox_XPCOM.xpt
-lib/virtualbox/components/VBoxXPCOMIPCC.so
-lib/virtualbox/components/VBoxSVCM.so
-lib/virtualbox/components/VBoxC.so
-lib/virtualbox/components/VBoxXPCOMBase.xpt
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNC.so
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNCMain.so
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack.xml
-%%MANUAL%%%%DOCSDIR%%/UserManual.pdf
-%%MANUAL%%%%DOCSDIR%%/UserManual_fr_FR.pdf
-%%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_ca_VA.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_da.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_en.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_fa_IR.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_fr.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_gl_ES.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_hu.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_id.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_it.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_ja.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_km_KH.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_ko.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_lt.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_nl.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_pl.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_pt.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_pt_BR.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_ro.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_ru.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_sk.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_sr.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_sv.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_tr.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_uk.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_zh_CN.qm
-%%NLS%%%%DATADIR%%/nls/VirtualBox_zh_TW.qm
-%%NLS%%%%DATADIR%%/nls/qt_bg.qm
-%%NLS%%%%DATADIR%%/nls/qt_ca.qm
-%%NLS%%%%DATADIR%%/nls/qt_ca_VA.qm
-%%NLS%%%%DATADIR%%/nls/qt_cs.qm
-%%NLS%%%%DATADIR%%/nls/qt_da.qm
-%%NLS%%%%DATADIR%%/nls/qt_de.qm
-%%NLS%%%%DATADIR%%/nls/qt_en.qm
-%%NLS%%%%DATADIR%%/nls/qt_es.qm
-%%NLS%%%%DATADIR%%/nls/qt_eu.qm
-%%NLS%%%%DATADIR%%/nls/qt_fa_IR.qm
-%%NLS%%%%DATADIR%%/nls/qt_fi.qm
-%%NLS%%%%DATADIR%%/nls/qt_fr.qm
-%%NLS%%%%DATADIR%%/nls/qt_gl_ES.qm
-%%NLS%%%%DATADIR%%/nls/qt_hu.qm
-%%NLS%%%%DATADIR%%/nls/qt_id.qm
-%%NLS%%%%DATADIR%%/nls/qt_it.qm
-%%NLS%%%%DATADIR%%/nls/qt_ja.qm
-%%NLS%%%%DATADIR%%/nls/qt_km_KH.qm
-%%NLS%%%%DATADIR%%/nls/qt_ko.qm
-%%NLS%%%%DATADIR%%/nls/qt_lt.qm
-%%NLS%%%%DATADIR%%/nls/qt_nl.qm
-%%NLS%%%%DATADIR%%/nls/qt_pl.qm
-%%NLS%%%%DATADIR%%/nls/qt_pt.qm
-%%NLS%%%%DATADIR%%/nls/qt_pt_BR.qm
-%%NLS%%%%DATADIR%%/nls/qt_ro.qm
-%%NLS%%%%DATADIR%%/nls/qt_ru.qm
-%%NLS%%%%DATADIR%%/nls/qt_sk.qm
-%%NLS%%%%DATADIR%%/nls/qt_sr.qm
-%%NLS%%%%DATADIR%%/nls/qt_sv.qm
-%%NLS%%%%DATADIR%%/nls/qt_tr.qm
-%%NLS%%%%DATADIR%%/nls/qt_uk.qm
-%%NLS%%%%DATADIR%%/nls/qt_zh_CN.qm
-%%NLS%%%%DATADIR%%/nls/qt_zh_TW.qm
-%%QT4%%share/applications/virtualbox.desktop
-%%QT4%%share/pixmaps/VBox.png
-%%DATADIR%%/idl/nsIDebug.idl
-%%DATADIR%%/idl/nsIInterfaceRequestor.idl
-%%DATADIR%%/idl/nsIMemory.idl
-%%DATADIR%%/idl/nsIProgrammingLanguage.idl
-%%DATADIR%%/idl/nsISupports.idl
-%%DATADIR%%/idl/nsITraceRefcnt.idl
-%%DATADIR%%/idl/nsIWeakReference.idl
-%%DATADIR%%/idl/nsIConsoleMessage.idl
-%%DATADIR%%/idl/nsIConsoleService.idl
-%%DATADIR%%/idl/nsIConsoleListener.idl
-%%DATADIR%%/idl/nsIErrorService.idl
-%%DATADIR%%/idl/nsIException.idl
-%%DATADIR%%/idl/nsIExceptionService.idl
-%%DATADIR%%/idl/nsrootidl.idl
-%%DATADIR%%/idl/nsIClassInfo.idl
-%%DATADIR%%/idl/nsIFactory.idl
-%%DATADIR%%/idl/nsIModule.idl
-%%DATADIR%%/idl/nsIComponentRegistrar.idl
-%%DATADIR%%/idl/nsIServiceManager.idl
-%%DATADIR%%/idl/nsIComponentManager.idl
-%%DATADIR%%/idl/nsICategoryManager.idl
-%%DATADIR%%/idl/nsINativeComponentLoader.idl
-%%DATADIR%%/idl/nsIComponentLoader.idl
-%%DATADIR%%/idl/nsIComponentManagerObsolete.idl
-%%DATADIR%%/idl/nsISupportsArray.idl
-%%DATADIR%%/idl/nsIComponentLoaderManager.idl
-%%DATADIR%%/idl/nsICollection.idl
-%%DATADIR%%/idl/nsISerializable.idl
-%%DATADIR%%/idl/nsIEnumerator.idl
-%%DATADIR%%/idl/nsISimpleEnumerator.idl
-%%DATADIR%%/idl/nsIObserverService.idl
-%%DATADIR%%/idl/nsIObserver.idl
-%%DATADIR%%/idl/nsIAtom.idl
-%%DATADIR%%/idl/nsIAtomService.idl
-%%DATADIR%%/idl/nsIProperties.idl
-%%DATADIR%%/idl/nsIPersistentProperties2.idl
-%%DATADIR%%/idl/nsIRecyclingAllocator.idl
-%%DATADIR%%/idl/nsIStringEnumerator.idl
-%%DATADIR%%/idl/nsISupportsPrimitives.idl
-%%DATADIR%%/idl/nsISupportsIterators.idl
-%%DATADIR%%/idl/nsITimelineService.idl
-%%DATADIR%%/idl/nsIVariant.idl
-%%DATADIR%%/idl/nsIArray.idl
-%%DATADIR%%/idl/nsIPropertyBag.idl
-%%DATADIR%%/idl/nsIHashable.idl
-%%DATADIR%%/idl/nsIDirectoryService.idl
-%%DATADIR%%/idl/nsIDirectoryEnumerator.idl
-%%DATADIR%%/idl/nsIFile.idl
-%%DATADIR%%/idl/nsILocalFile.idl
-%%DATADIR%%/idl/nsIInputStream.idl
-%%DATADIR%%/idl/nsILocalFileMac.idl
-%%DATADIR%%/idl/nsIObjectInputStream.idl
-%%DATADIR%%/idl/nsIBinaryInputStream.idl
-%%DATADIR%%/idl/nsIObjectOutputStream.idl
-%%DATADIR%%/idl/nsIBinaryOutputStream.idl
-%%DATADIR%%/idl/nsIStreamBufferAccess.idl
-%%DATADIR%%/idl/nsIOutputStream.idl
-%%DATADIR%%/idl/nsIByteArrayInputStream.idl
-%%DATADIR%%/idl/nsIFastLoadFileControl.idl
-%%DATADIR%%/idl/nsISeekableStream.idl
-%%DATADIR%%/idl/nsIInputStreamTee.idl
-%%DATADIR%%/idl/nsIFastLoadService.idl
-%%DATADIR%%/idl/nsIMultiplexInputStream.idl
-%%DATADIR%%/idl/nsIPipe.idl
-%%DATADIR%%/idl/nsIAsyncInputStream.idl
-%%DATADIR%%/idl/nsIAsyncOutputStream.idl
-%%DATADIR%%/idl/nsIScriptableInputStream.idl
-%%DATADIR%%/idl/nsIStorageStream.idl
-%%DATADIR%%/idl/nsILineInputStream.idl
-%%DATADIR%%/idl/nsIStringStream.idl
-%%DATADIR%%/idl/nsIProxyObjectManager.idl
-%%DATADIR%%/idl/nsIEventQueue.idl
-%%DATADIR%%/idl/nsIEventQueueService.idl
-%%DATADIR%%/idl/nsIRunnable.idl
-%%DATADIR%%/idl/nsIThread.idl
-%%DATADIR%%/idl/nsIEventTarget.idl
-%%DATADIR%%/idl/nsIEnvironment.idl
-%%DATADIR%%/idl/nsITimer.idl
-%%DATADIR%%/idl/nsITimerInternal.idl
-%%DATADIR%%/idl/nsITimerManager.idl
-%%DATADIR%%/idl/nsIInterfaceInfo.idl
-%%DATADIR%%/idl/nsIProcess.idl
-%%DATADIR%%/idl/nsIXPTLoader.idl
-%%DATADIR%%/idl/nsIInterfaceInfoManager.idl
-%%DATADIR%%/idl/ipcIMessageObserver.idl
-%%DATADIR%%/idl/ipcIService.idl
-%%DATADIR%%/idl/ipcIClientObserver.idl
-%%DATADIR%%/idl/ipcILockService.idl
-%%DATADIR%%/idl/ipcIDConnectService.idl
-%%DATADIR%%/idl/ipcITransactionService.idl
-%%DATADIR%%/idl/ipcITransactionObserver.idl
-%%DATADIR%%/idl/VirtualBox_XPCOM.idl
-%%DATADIR%%/samples/tstVBoxAPIXPCOM.cpp
-%%DATADIR%%/samples/Makefile
-%%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl
 include/virtualbox/VBoxCAPI_v2_2.h
 include/virtualbox/VBoxCAPI_v3_0.h
 include/virtualbox/VBoxCAPI_v3_1.h
@ -393,7 +117,34 @@ include/virtualbox/nsITraceRefcnt.h
 include/virtualbox/nsIVariant.h
 include/virtualbox/nsIWeakReference.h
 include/virtualbox/nsIXPTLoader.h
+include/virtualbox/nsprpub/md/_darwin.cfg
+include/virtualbox/nsprpub/md/_darwin.h
+include/virtualbox/nsprpub/md/_freebsd.cfg
+include/virtualbox/nsprpub/md/_freebsd.h
+include/virtualbox/nsprpub/md/_iprt_atomic.h
+include/virtualbox/nsprpub/md/_linux.cfg
+include/virtualbox/nsprpub/md/_linux.h
+include/virtualbox/nsprpub/md/_macos.h
+include/virtualbox/nsprpub/md/_netbsd.cfg
+include/virtualbox/nsprpub/md/_netbsd.h
+include/virtualbox/nsprpub/md/_openbsd.cfg
+include/virtualbox/nsprpub/md/_openbsd.h
+include/virtualbox/nsprpub/md/_os2.cfg
+include/virtualbox/nsprpub/md/_os2.h
+include/virtualbox/nsprpub/md/_os2_errors.h
+include/virtualbox/nsprpub/md/_pcos.h
+include/virtualbox/nsprpub/md/_pth.h
+include/virtualbox/nsprpub/md/_solaris.h
+include/virtualbox/nsprpub/md/_solaris32.cfg
+include/virtualbox/nsprpub/md/_solaris64.cfg
+include/virtualbox/nsprpub/md/_unix_errors.h
+include/virtualbox/nsprpub/md/_unixos.h
+include/virtualbox/nsprpub/md/prosdep.h
 include/virtualbox/nsprpub/nspr.h
+include/virtualbox/nsprpub/obsolete/pralarm.h
+include/virtualbox/nsprpub/obsolete/probslet.h
+include/virtualbox/nsprpub/obsolete/protypes.h
+include/virtualbox/nsprpub/obsolete/prsem.h
 include/virtualbox/nsprpub/plarena.h
 include/virtualbox/nsprpub/plarenas.h
 include/virtualbox/nsprpub/plbase64.h
@ -407,6 +158,7 @@ include/virtualbox/nsprpub/prbit.h
 include/virtualbox/nsprpub/prclist.h
 include/virtualbox/nsprpub/prcmon.h
 include/virtualbox/nsprpub/prcountr.h
+include/virtualbox/nsprpub/prcpucfg.h
 include/virtualbox/nsprpub/prcvar.h
 include/virtualbox/nsprpub/prdtoa.h
 include/virtualbox/nsprpub/prenv.h
@ -417,30 +169,10 @@ include/virtualbox/nsprpub/prinit.h
 include/virtualbox/nsprpub/prinrval.h
 include/virtualbox/nsprpub/prio.h
 include/virtualbox/nsprpub/pripcsem.h
+include/virtualbox/nsprpub/private/pprio.h
+include/virtualbox/nsprpub/private/pprthred.h
+include/virtualbox/nsprpub/private/prpriv.h
 include/virtualbox/nsprpub/prlink.h
-include/virtualbox/nsprpub/md/_iprt_atomic.h
-include/virtualbox/nsprpub/md/_darwin.h
-include/virtualbox/nsprpub/md/_freebsd.h
-include/virtualbox/nsprpub/md/_linux.h
-include/virtualbox/nsprpub/md/_macos.h
-include/virtualbox/nsprpub/md/_netbsd.h
-include/virtualbox/nsprpub/md/_openbsd.h
-include/virtualbox/nsprpub/md/_os2_errors.h
-include/virtualbox/nsprpub/md/_os2.h
-include/virtualbox/nsprpub/md/_pcos.h
-include/virtualbox/nsprpub/md/_solaris.h
-include/virtualbox/nsprpub/md/_unix_errors.h
-include/virtualbox/nsprpub/md/_unixos.h
-include/virtualbox/nsprpub/md/_pth.h
-include/virtualbox/nsprpub/md/prosdep.h
-include/virtualbox/nsprpub/md/_freebsd.cfg
-include/virtualbox/nsprpub/md/_linux.cfg
-include/virtualbox/nsprpub/md/_darwin.cfg
-include/virtualbox/nsprpub/md/_netbsd.cfg
-include/virtualbox/nsprpub/md/_openbsd.cfg
-include/virtualbox/nsprpub/md/_os2.cfg
-include/virtualbox/nsprpub/md/_solaris32.cfg
-include/virtualbox/nsprpub/md/_solaris64.cfg
 include/virtualbox/nsprpub/prlock.h
 include/virtualbox/nsprpub/prlog.h
 include/virtualbox/nsprpub/prlong.h
@ -464,14 +196,6 @@ include/virtualbox/nsprpub/prtrace.h
 include/virtualbox/nsprpub/prtypes.h
 include/virtualbox/nsprpub/prvrsion.h
 include/virtualbox/nsprpub/prwin16.h
-include/virtualbox/nsprpub/prcpucfg.h
-include/virtualbox/nsprpub/obsolete/pralarm.h
-include/virtualbox/nsprpub/obsolete/probslet.h
-include/virtualbox/nsprpub/obsolete/protypes.h
-include/virtualbox/nsprpub/obsolete/prsem.h
-include/virtualbox/nsprpub/private/pprio.h
-include/virtualbox/nsprpub/private/pprthred.h
-include/virtualbox/nsprpub/private/prpriv.h
 include/virtualbox/nsrootidl.h
 include/virtualbox/string/nsAString.h
 include/virtualbox/string/nsAlgorithm.h
@ -491,11 +215,11 @@ include/virtualbox/string/nsStringIterator.h
 include/virtualbox/string/nsSubstring.h
 include/virtualbox/string/nsSubstringTuple.h
 include/virtualbox/string/nsTAString.h
-include/virtualbox/string/nsTString.h
 include/virtualbox/string/nsTDependentString.h
 include/virtualbox/string/nsTDependentSubstring.h
 include/virtualbox/string/nsTObsoleteAString.h
 include/virtualbox/string/nsTPromiseFlatString.h
+include/virtualbox/string/nsTString.h
 include/virtualbox/string/nsTSubstring.h
 include/virtualbox/string/nsTSubstringTuple.h
 include/virtualbox/string/nsUTF8Utils.h
@ -513,6 +237,7 @@ include/virtualbox/xpcom/nsAutoLock.h
 include/virtualbox/xpcom/nsAutoPtr.h
 include/virtualbox/xpcom/nsBaseHashtable.h
 include/virtualbox/xpcom/nsCOMArray.h
+include/virtualbox/xpcom/nsCOMPtr.h
 include/virtualbox/xpcom/nsCRT.h
 include/virtualbox/xpcom/nsCategoryManagerUtils.h
 include/virtualbox/xpcom/nsCheapSets.h
@ -521,8 +246,8 @@ include/virtualbox/xpcom/nsCom.h
 include/virtualbox/xpcom/nsComponentManagerObsolete.h
 include/virtualbox/xpcom/nsComponentManagerUtils.h
 include/virtualbox/xpcom/nsCppSharedAllocator.h
-include/virtualbox/xpcom/nsID.h
 include/virtualbox/xpcom/nsDataHashtable.h
+include/virtualbox/xpcom/nsDebug.h
 include/virtualbox/xpcom/nsDebugImpl.h
 include/virtualbox/xpcom/nsDeque.h
 include/virtualbox/xpcom/nsDirectoryService.h
@ -536,32 +261,40 @@ include/virtualbox/xpcom/nsEventQueueUtils.h
 include/virtualbox/xpcom/nsFastLoadPtr.h
 include/virtualbox/xpcom/nsFastLoadService.h
 include/virtualbox/xpcom/nsFixedSizeAllocator.h
+include/virtualbox/xpcom/nsGenericFactory.h
 include/virtualbox/xpcom/nsHashKeys.h
 include/virtualbox/xpcom/nsHashSets.h
 include/virtualbox/xpcom/nsHashtable.h
 include/virtualbox/xpcom/nsIAllocator.h
 include/virtualbox/xpcom/nsIByteBuffer.h
+include/virtualbox/xpcom/nsID.h
+include/virtualbox/xpcom/nsIGenericFactory.h
 include/virtualbox/xpcom/nsIID.h
+include/virtualbox/xpcom/nsIInterfaceRequestorUtils.h
 include/virtualbox/xpcom/nsIServiceManagerObsolete.h
 include/virtualbox/xpcom/nsIServiceManagerUtils.h
 include/virtualbox/xpcom/nsISupportsBase.h
+include/virtualbox/xpcom/nsISupportsImpl.h
 include/virtualbox/xpcom/nsISupportsObsolete.h
+include/virtualbox/xpcom/nsISupportsUtils.h
 include/virtualbox/xpcom/nsIUnicharBuffer.h
 include/virtualbox/xpcom/nsIUnicharInputStream.h
+include/virtualbox/xpcom/nsIWeakReferenceUtils.h
 include/virtualbox/xpcom/nsInt64.h
 include/virtualbox/xpcom/nsInterfaceHashtable.h
 include/virtualbox/xpcom/nsLinebreakConverter.h
 include/virtualbox/xpcom/nsLocalFile.h
-include/virtualbox/xpcom/nsLocalFileUnix.h
 include/virtualbox/xpcom/nsLocalFileOS2.h
 include/virtualbox/xpcom/nsLocalFileOSX.h
+include/virtualbox/xpcom/nsLocalFileUnix.h
+include/virtualbox/xpcom/nsMemory.h
 include/virtualbox/xpcom/nsModule.h
 include/virtualbox/xpcom/nsMultiplexInputStream.h
 include/virtualbox/xpcom/nsNativeCharsetUtils.h
-include/virtualbox/xpcom/nsProcess.h
 include/virtualbox/xpcom/nsNativeComponentLoader.h
 include/virtualbox/xpcom/nsObserverService.h
 include/virtualbox/xpcom/nsObsoleteModuleLoading.h
+include/virtualbox/xpcom/nsProcess.h
 include/virtualbox/xpcom/nsProxiedService.h
 include/virtualbox/xpcom/nsProxyEvent.h
 include/virtualbox/xpcom/nsProxyRelease.h
@ -576,24 +309,28 @@ include/virtualbox/xpcom/nsStorageStream.h
 include/virtualbox/xpcom/nsStreamUtils.h
 include/virtualbox/xpcom/nsStringEnumerator.h
 include/virtualbox/xpcom/nsStringIO.h
-include/virtualbox/xpcom/nsTHashtable.h
 include/virtualbox/xpcom/nsStringStream.h
 include/virtualbox/xpcom/nsSupportsArray.h
 include/virtualbox/xpcom/nsSupportsPrimitives.h
+include/virtualbox/xpcom/nsTHashtable.h
 include/virtualbox/xpcom/nsTextFormatter.h
 include/virtualbox/xpcom/nsTime.h
+include/virtualbox/xpcom/nsTraceRefcnt.h
 include/virtualbox/xpcom/nsTraceRefcntImpl.h
 include/virtualbox/xpcom/nsUnitConversion.h
 include/virtualbox/xpcom/nsValueArray.h
 include/virtualbox/xpcom/nsVariant.h
 include/virtualbox/xpcom/nsVoidArray.h
 include/virtualbox/xpcom/nsWeakPtr.h
+include/virtualbox/xpcom/nsWeakReference.h
 include/virtualbox/xpcom/nsXPCOM.h
 include/virtualbox/xpcom/nsXPCOMCID.h
+include/virtualbox/xpcom/nsXPCOMGlue.h
 include/virtualbox/xpcom/nscore.h
 include/virtualbox/xpcom/pldhash.h
 include/virtualbox/xpcom/plevent.h
 include/virtualbox/xpcom/xcDll.h
+include/virtualbox/xpcom/xpcom-config.h
 include/virtualbox/xpcom/xpt_arena.h
 include/virtualbox/xpcom/xpt_struct.h
 include/virtualbox/xpcom/xpt_xdr.h
@ -601,19 +338,282 @@ include/virtualbox/xpcom/xptcall.h
 include/virtualbox/xpcom/xptcstubsdecl.inc
 include/virtualbox/xpcom/xptcstubsdef.inc
 include/virtualbox/xpcom/xptinfo.h
-include/virtualbox/xpcom/nsIInterfaceRequestorUtils.h
-include/virtualbox/xpcom/nsISupportsImpl.h
-include/virtualbox/xpcom/nsISupportsUtils.h
-include/virtualbox/xpcom/nsIWeakReferenceUtils.h
-include/virtualbox/xpcom/nsCOMPtr.h
-include/virtualbox/xpcom/nsDebug.h
-include/virtualbox/xpcom/nsGenericFactory.h
-include/virtualbox/xpcom/nsIGenericFactory.h
-include/virtualbox/xpcom/nsMemory.h
-include/virtualbox/xpcom/nsTraceRefcnt.h
-include/virtualbox/xpcom/nsWeakReference.h
-include/virtualbox/xpcom/nsXPCOMGlue.h
-include/virtualbox/xpcom/xpcom-config.h
+lib/virtualbox/DBGCPlugInDiggers.so
+lib/virtualbox/VBoxAuth.so
+lib/virtualbox/VBoxAuthSimple.so
+@group %%VBOXGROUP%%
+@mode 4511
+lib/virtualbox/VBoxAutostart
+@group
+@mode
+@group %%VBOXGROUP%%
+@mode 0711
+lib/virtualbox/VBoxBalloonCtrl
+@group
+@mode
+lib/virtualbox/VBoxDD.so
+lib/virtualbox/VBoxDD2.so
+lib/virtualbox/VBoxDD2GC.gc
+lib/virtualbox/VBoxDD2R0.r0
+lib/virtualbox/VBoxDDGC.gc
+lib/virtualbox/VBoxDDR0.r0
+lib/virtualbox/VBoxDDU.so
+%%QT4%%lib/virtualbox/VBoxDbg.so
+lib/virtualbox/VBoxEFI32.fd
+lib/virtualbox/VBoxEFI64.fd
+@group %%VBOXGROUP%%
+@mode 0711
+lib/virtualbox/VBoxExtPackHelperApp
+@group
+@mode
+lib/virtualbox/VBoxGuestControlSvc.so
+lib/virtualbox/VBoxGuestPropSvc.so
+@group %%VBOXGROUP%%
+@mode 4511
+lib/virtualbox/VBoxHeadless
+@group
+@mode
+lib/virtualbox/VBoxHeadless.so
+lib/virtualbox/VBoxHostChannel.so
+%%X11%%lib/virtualbox/VBoxKeyboard.so
+@group %%VBOXGROUP%%
+@mode 0711
+lib/virtualbox/VBoxManage
+@group
+@mode
+@mode 4511
+lib/virtualbox/VBoxNetAdpCtl
+@group %%VBOXGROUP%%
+lib/virtualbox/VBoxNetDHCP
+@group
+@mode
+lib/virtualbox/VBoxNetDHCP.so
+lib/virtualbox/VBoxNetNAT.so
+%%X11%%lib/virtualbox/VBoxOGLhostcrutil.so
+%%X11%%lib/virtualbox/VBoxOGLhosterrorspu.so
+%%X11%%lib/virtualbox/VBoxOGLrenderspu.so
+%%PYTHON%%lib/virtualbox/VBoxPython.so
+lib/virtualbox/VBoxREM.so
+%%I386%%lib/virtualbox/VBoxREM32.so
+%%I386%%lib/virtualbox/VBoxREM64.so
+lib/virtualbox/VBoxRT.so
+@group %%VBOXGROUP%%
+@mode 4511
+%%X11%%lib/virtualbox/VBoxSDL
+@group
+@mode
+%%X11%%lib/virtualbox/VBoxSDL.so
+@group %%VBOXGROUP%%
+@mode 0711
+lib/virtualbox/VBoxSVC
+@group
+@mode
+lib/virtualbox/VBoxSharedClipboard.so
+%%X11%%lib/virtualbox/VBoxSharedCrOpenGL.so
+lib/virtualbox/VBoxSharedFolders.so
+@group %%VBOXGROUP%%
+@mode 4511
+%%QT4%%lib/virtualbox/VBoxTestOGL
+@group
+@mode
+lib/virtualbox/VBoxVMM.so
+lib/virtualbox/VBoxVMMPreload.so
+lib/virtualbox/VBoxXPCOM.so
+lib/virtualbox/VBoxXPCOMC.so
+@group %%VBOXGROUP%%
+@mode 0711
+lib/virtualbox/VBoxXPCOMIPCD
+@group
+@mode
+@group %%VBOXGROUP%%
+@mode 4511
+%%QT4%%lib/virtualbox/VirtualBox
+@group
+@mode
+%%QT4%%lib/virtualbox/VirtualBox.so
+%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso
+%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso
+%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
+lib/virtualbox/VMMGC.gc
+lib/virtualbox/VMMR0.r0
+%%WEBSERVICE%%lib/virtualbox/vboxwebsrv
+%%WEBSERVICE%%lib/virtualbox/webtest
+lib/virtualbox/components/VBoxC.so
+lib/virtualbox/components/VBoxSVCM.so
+lib/virtualbox/components/VBoxXPCOMBase.xpt
+lib/virtualbox/components/VBoxXPCOMIPCC.so
+lib/virtualbox/components/VirtualBox_XPCOM.xpt
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack.xml
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNC.so
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNCMain.so
+%%QT4%%share/applications/virtualbox.desktop
+%%MANUAL%%%%DOCSDIR%%/UserManual.pdf
+%%MANUAL%%%%DOCSDIR%%/UserManual_fr_FR.pdf
+%%QT4%%share/pixmaps/VBox.png
+%%DATADIR%%/idl/VirtualBox_XPCOM.idl
+%%DATADIR%%/idl/ipcIClientObserver.idl
+%%DATADIR%%/idl/ipcIDConnectService.idl
+%%DATADIR%%/idl/ipcILockService.idl
+%%DATADIR%%/idl/ipcIMessageObserver.idl
+%%DATADIR%%/idl/ipcIService.idl
+%%DATADIR%%/idl/ipcITransactionObserver.idl
+%%DATADIR%%/idl/ipcITransactionService.idl
+%%DATADIR%%/idl/nsIArray.idl
+%%DATADIR%%/idl/nsIAsyncInputStream.idl
+%%DATADIR%%/idl/nsIAsyncOutputStream.idl
+%%DATADIR%%/idl/nsIAtom.idl
+%%DATADIR%%/idl/nsIAtomService.idl
+%%DATADIR%%/idl/nsIBinaryInputStream.idl
+%%DATADIR%%/idl/nsIBinaryOutputStream.idl
+%%DATADIR%%/idl/nsIByteArrayInputStream.idl
+%%DATADIR%%/idl/nsICategoryManager.idl
+%%DATADIR%%/idl/nsIClassInfo.idl
+%%DATADIR%%/idl/nsICollection.idl
+%%DATADIR%%/idl/nsIComponentLoader.idl
+%%DATADIR%%/idl/nsIComponentLoaderManager.idl
+%%DATADIR%%/idl/nsIComponentManager.idl
+%%DATADIR%%/idl/nsIComponentManagerObsolete.idl
+%%DATADIR%%/idl/nsIComponentRegistrar.idl
+%%DATADIR%%/idl/nsIConsoleListener.idl
+%%DATADIR%%/idl/nsIConsoleMessage.idl
+%%DATADIR%%/idl/nsIConsoleService.idl
+%%DATADIR%%/idl/nsIDebug.idl
+%%DATADIR%%/idl/nsIDirectoryEnumerator.idl
+%%DATADIR%%/idl/nsIDirectoryService.idl
+%%DATADIR%%/idl/nsIEnumerator.idl
+%%DATADIR%%/idl/nsIEnvironment.idl
+%%DATADIR%%/idl/nsIErrorService.idl
+%%DATADIR%%/idl/nsIEventQueue.idl
+%%DATADIR%%/idl/nsIEventQueueService.idl
+%%DATADIR%%/idl/nsIEventTarget.idl
+%%DATADIR%%/idl/nsIException.idl
+%%DATADIR%%/idl/nsIExceptionService.idl
+%%DATADIR%%/idl/nsIFactory.idl
+%%DATADIR%%/idl/nsIFastLoadFileControl.idl
+%%DATADIR%%/idl/nsIFastLoadService.idl
+%%DATADIR%%/idl/nsIFile.idl
+%%DATADIR%%/idl/nsIHashable.idl
+%%DATADIR%%/idl/nsIInputStream.idl
+%%DATADIR%%/idl/nsIInputStreamTee.idl
+%%DATADIR%%/idl/nsIInterfaceInfo.idl
+%%DATADIR%%/idl/nsIInterfaceInfoManager.idl
+%%DATADIR%%/idl/nsIInterfaceRequestor.idl
+%%DATADIR%%/idl/nsILineInputStream.idl
+%%DATADIR%%/idl/nsILocalFile.idl
+%%DATADIR%%/idl/nsILocalFileMac.idl
+%%DATADIR%%/idl/nsIMemory.idl
+%%DATADIR%%/idl/nsIModule.idl
+%%DATADIR%%/idl/nsIMultiplexInputStream.idl
+%%DATADIR%%/idl/nsINativeComponentLoader.idl
+%%DATADIR%%/idl/nsIObjectInputStream.idl
+%%DATADIR%%/idl/nsIObjectOutputStream.idl
+%%DATADIR%%/idl/nsIObserver.idl
+%%DATADIR%%/idl/nsIObserverService.idl
+%%DATADIR%%/idl/nsIOutputStream.idl
+%%DATADIR%%/idl/nsIPersistentProperties2.idl
+%%DATADIR%%/idl/nsIPipe.idl
+%%DATADIR%%/idl/nsIProcess.idl
+%%DATADIR%%/idl/nsIProgrammingLanguage.idl
+%%DATADIR%%/idl/nsIProperties.idl
+%%DATADIR%%/idl/nsIPropertyBag.idl
+%%DATADIR%%/idl/nsIProxyObjectManager.idl
+%%DATADIR%%/idl/nsIRecyclingAllocator.idl
+%%DATADIR%%/idl/nsIRunnable.idl
+%%DATADIR%%/idl/nsIScriptableInputStream.idl
+%%DATADIR%%/idl/nsISeekableStream.idl
+%%DATADIR%%/idl/nsISerializable.idl
+%%DATADIR%%/idl/nsIServiceManager.idl
+%%DATADIR%%/idl/nsISimpleEnumerator.idl
+%%DATADIR%%/idl/nsIStorageStream.idl
+%%DATADIR%%/idl/nsIStreamBufferAccess.idl
+%%DATADIR%%/idl/nsIStringEnumerator.idl
+%%DATADIR%%/idl/nsIStringStream.idl
+%%DATADIR%%/idl/nsISupports.idl
+%%DATADIR%%/idl/nsISupportsArray.idl
+%%DATADIR%%/idl/nsISupportsIterators.idl
+%%DATADIR%%/idl/nsISupportsPrimitives.idl
+%%DATADIR%%/idl/nsIThread.idl
+%%DATADIR%%/idl/nsITimelineService.idl
+%%DATADIR%%/idl/nsITimer.idl
+%%DATADIR%%/idl/nsITimerInternal.idl
+%%DATADIR%%/idl/nsITimerManager.idl
+%%DATADIR%%/idl/nsITraceRefcnt.idl
+%%DATADIR%%/idl/nsIVariant.idl
+%%DATADIR%%/idl/nsIWeakReference.idl
+%%DATADIR%%/idl/nsIXPTLoader.idl
+%%DATADIR%%/idl/nsrootidl.idl
+%%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_ca_VA.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_da.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_en.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_fa_IR.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_fr.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_gl_ES.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_hu.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_id.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_it.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_ja.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_km_KH.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_ko.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_lt.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_nl.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_pl.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_pt.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_pt_BR.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_ro.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_ru.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_sk.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_sr.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_sv.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_tr.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_uk.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_zh_CN.qm
+%%NLS%%%%DATADIR%%/nls/VirtualBox_zh_TW.qm
+%%NLS%%%%DATADIR%%/nls/qt_bg.qm
+%%NLS%%%%DATADIR%%/nls/qt_ca.qm
+%%NLS%%%%DATADIR%%/nls/qt_ca_VA.qm
+%%NLS%%%%DATADIR%%/nls/qt_cs.qm
+%%NLS%%%%DATADIR%%/nls/qt_da.qm
+%%NLS%%%%DATADIR%%/nls/qt_de.qm
+%%NLS%%%%DATADIR%%/nls/qt_en.qm
+%%NLS%%%%DATADIR%%/nls/qt_es.qm
+%%NLS%%%%DATADIR%%/nls/qt_eu.qm
+%%NLS%%%%DATADIR%%/nls/qt_fa_IR.qm
+%%NLS%%%%DATADIR%%/nls/qt_fi.qm
+%%NLS%%%%DATADIR%%/nls/qt_fr.qm
+%%NLS%%%%DATADIR%%/nls/qt_gl_ES.qm
+%%NLS%%%%DATADIR%%/nls/qt_hu.qm
+%%NLS%%%%DATADIR%%/nls/qt_id.qm
+%%NLS%%%%DATADIR%%/nls/qt_it.qm
+%%NLS%%%%DATADIR%%/nls/qt_ja.qm
+%%NLS%%%%DATADIR%%/nls/qt_km_KH.qm
+%%NLS%%%%DATADIR%%/nls/qt_ko.qm
+%%NLS%%%%DATADIR%%/nls/qt_lt.qm
+%%NLS%%%%DATADIR%%/nls/qt_nl.qm
+%%NLS%%%%DATADIR%%/nls/qt_pl.qm
+%%NLS%%%%DATADIR%%/nls/qt_pt.qm
+%%NLS%%%%DATADIR%%/nls/qt_pt_BR.qm
+%%NLS%%%%DATADIR%%/nls/qt_ro.qm
+%%NLS%%%%DATADIR%%/nls/qt_ru.qm
+%%NLS%%%%DATADIR%%/nls/qt_sk.qm
+%%NLS%%%%DATADIR%%/nls/qt_sr.qm
+%%NLS%%%%DATADIR%%/nls/qt_sv.qm
+%%NLS%%%%DATADIR%%/nls/qt_tr.qm
+%%NLS%%%%DATADIR%%/nls/qt_uk.qm
+%%NLS%%%%DATADIR%%/nls/qt_zh_CN.qm
+%%NLS%%%%DATADIR%%/nls/qt_zh_TW.qm
+%%DATADIR%%/samples/Makefile
+%%DATADIR%%/samples/tstVBoxAPIXPCOM.cpp
+%%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py
@ -653,6 +653,20 @@ include/virtualbox/xpcom/xpcom-config.h
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom/client
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vboxapi
+%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings/webservice
+%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings
+%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk
+@dirrm %%DATADIR%%/samples
+%%NLS%%@dirrm %%DATADIR%%/nls
+@dirrm %%DATADIR%%/idl
+@dirrm %%DATADIR%%
+%%MANUAL%%@dirrm %%DOCSDIR%%
+@dirrm lib/virtualbox/components
+%%GUESTADDITIONS%%@dirrm lib/virtualbox/additions
+%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%
+%%VNC%%@dirrm lib/virtualbox/ExtensionPacks/VNC
+%%VNC%%@dirrmtry lib/virtualbox/ExtensionPacks
+@dirrmtry lib/virtualbox
@dirrm include/virtualbox/xpcom
@dirrm include/virtualbox/string
@dirrm include/virtualbox/nsprpub/private
@ -661,17 +675,3 @@ include/virtualbox/xpcom/xpcom-config.h
@dirrm include/virtualbox/nsprpub
@dirrm include/virtualbox/ipcd
@dirrm include/virtualbox
-%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings/webservice
-%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings
-%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk
-@dirrm %%DATADIR%%/samples
-%%NLS%%@dirrm %%DATADIR%%/nls
-%%MANUAL%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/idl
-@dirrm %%DATADIR%%
-@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