From 95def50238d1fa35819d2f67079ce97dc96cd12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Wed, 8 Jan 2014 04:51:24 -0200
Subject: remove deprecated packages

---
 libre/virtualbox-libre/001-vboxdrv-reference.patch |   57 -
 .../002-change_default_driver_dir.patch            |   18 -
 libre/virtualbox-libre/003-gcc-48.patch            |   39 -
 libre/virtualbox-libre/003-linux-3.8.patch         |   15 -
 libre/virtualbox-libre/004-system-xorg.patch       |  245 ---
 libre/virtualbox-libre/10-vboxdrv.rules            |    5 -
 libre/virtualbox-libre/60-vboxguest.rules          |    2 -
 libre/virtualbox-libre/LocalConfig.kmk             |   20 -
 libre/virtualbox-libre/PKGBUILD                    |  339 ----
 libre/virtualbox-libre/free-distros.patch          | 1803 --------------------
 libre/virtualbox-libre/libre.patch                 | 1085 ------------
 libre/virtualbox-libre/os_blag.png                 |  Bin 1411 -> 0 bytes
 libre/virtualbox-libre/os_blag_64.png              |  Bin 1549 -> 0 bytes
 libre/virtualbox-libre/os_dragora.png              |  Bin 2375 -> 0 bytes
 libre/virtualbox-libre/os_dragora_64.png           |  Bin 2430 -> 0 bytes
 libre/virtualbox-libre/os_dynebolic.png            |  Bin 1621 -> 0 bytes
 libre/virtualbox-libre/os_gnewsense.png            |  Bin 2315 -> 0 bytes
 libre/virtualbox-libre/os_gnewsense_64.png         |  Bin 2470 -> 0 bytes
 libre/virtualbox-libre/os_gnu.png                  |  Bin 2728 -> 0 bytes
 libre/virtualbox-libre/os_gnu_64.png               |  Bin 2705 -> 0 bytes
 libre/virtualbox-libre/os_gnuhurd.png              |  Bin 2728 -> 0 bytes
 libre/virtualbox-libre/os_gnulinux.png             |  Bin 2728 -> 0 bytes
 libre/virtualbox-libre/os_gnulinux_64.png          |  Bin 2705 -> 0 bytes
 libre/virtualbox-libre/os_musix.png                |  Bin 2451 -> 0 bytes
 libre/virtualbox-libre/os_musix_64.png             |  Bin 2581 -> 0 bytes
 libre/virtualbox-libre/os_os64base.png             |  Bin 1300 -> 0 bytes
 libre/virtualbox-libre/os_os64base.xcf             |  Bin 2844 -> 0 bytes
 libre/virtualbox-libre/os_osbase.png               |  Bin 1042 -> 0 bytes
 libre/virtualbox-libre/os_osbase.xcf               |  Bin 2748 -> 0 bytes
 libre/virtualbox-libre/os_parabola.png             |  Bin 1931 -> 0 bytes
 libre/virtualbox-libre/os_parabola_64.png          |  Bin 2096 -> 0 bytes
 libre/virtualbox-libre/os_trisquel.png             |  Bin 2451 -> 0 bytes
 libre/virtualbox-libre/os_trisquel_64.png          |  Bin 2592 -> 0 bytes
 libre/virtualbox-libre/os_ututo.png                |  Bin 2615 -> 0 bytes
 libre/virtualbox-libre/os_ututo_64.png             |  Bin 2751 -> 0 bytes
 libre/virtualbox-libre/os_venenux.png              |  Bin 1653 -> 0 bytes
 libre/virtualbox-libre/vboxservice.service         |    9 -
 libre/virtualbox-libre/vboxweb.service             |   11 -
 .../virtualbox-libre-guest-dkms.install            |   30 -
 .../virtualbox-libre-guest-utils.install           |   31 -
 .../virtualbox-libre-host-dkms.install             |   30 -
 libre/virtualbox-libre/virtualbox-libre.install    |   39 -
 42 files changed, 3778 deletions(-)
 delete mode 100644 libre/virtualbox-libre/001-vboxdrv-reference.patch
 delete mode 100644 libre/virtualbox-libre/002-change_default_driver_dir.patch
 delete mode 100644 libre/virtualbox-libre/003-gcc-48.patch
 delete mode 100644 libre/virtualbox-libre/003-linux-3.8.patch
 delete mode 100644 libre/virtualbox-libre/004-system-xorg.patch
 delete mode 100644 libre/virtualbox-libre/10-vboxdrv.rules
 delete mode 100644 libre/virtualbox-libre/60-vboxguest.rules
 delete mode 100644 libre/virtualbox-libre/LocalConfig.kmk
 delete mode 100644 libre/virtualbox-libre/PKGBUILD
 delete mode 100644 libre/virtualbox-libre/free-distros.patch
 delete mode 100644 libre/virtualbox-libre/libre.patch
 delete mode 100644 libre/virtualbox-libre/os_blag.png
 delete mode 100644 libre/virtualbox-libre/os_blag_64.png
 delete mode 100644 libre/virtualbox-libre/os_dragora.png
 delete mode 100644 libre/virtualbox-libre/os_dragora_64.png
 delete mode 100644 libre/virtualbox-libre/os_dynebolic.png
 delete mode 100644 libre/virtualbox-libre/os_gnewsense.png
 delete mode 100644 libre/virtualbox-libre/os_gnewsense_64.png
 delete mode 100644 libre/virtualbox-libre/os_gnu.png
 delete mode 100644 libre/virtualbox-libre/os_gnu_64.png
 delete mode 100644 libre/virtualbox-libre/os_gnuhurd.png
 delete mode 100644 libre/virtualbox-libre/os_gnulinux.png
 delete mode 100644 libre/virtualbox-libre/os_gnulinux_64.png
 delete mode 100644 libre/virtualbox-libre/os_musix.png
 delete mode 100644 libre/virtualbox-libre/os_musix_64.png
 delete mode 100644 libre/virtualbox-libre/os_os64base.png
 delete mode 100644 libre/virtualbox-libre/os_os64base.xcf
 delete mode 100644 libre/virtualbox-libre/os_osbase.png
 delete mode 100644 libre/virtualbox-libre/os_osbase.xcf
 delete mode 100644 libre/virtualbox-libre/os_parabola.png
 delete mode 100644 libre/virtualbox-libre/os_parabola_64.png
 delete mode 100644 libre/virtualbox-libre/os_trisquel.png
 delete mode 100644 libre/virtualbox-libre/os_trisquel_64.png
 delete mode 100644 libre/virtualbox-libre/os_ututo.png
 delete mode 100644 libre/virtualbox-libre/os_ututo_64.png
 delete mode 100644 libre/virtualbox-libre/os_venenux.png
 delete mode 100644 libre/virtualbox-libre/vboxservice.service
 delete mode 100644 libre/virtualbox-libre/vboxweb.service
 delete mode 100644 libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
 delete mode 100644 libre/virtualbox-libre/virtualbox-libre-guest-utils.install
 delete mode 100644 libre/virtualbox-libre/virtualbox-libre-host-dkms.install
 delete mode 100644 libre/virtualbox-libre/virtualbox-libre.install

(limited to 'libre/virtualbox-libre')

diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch
deleted file mode 100644
index b75c3c565..000000000
--- a/libre/virtualbox-libre/001-vboxdrv-reference.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
-@@ -75,10 +75,9 @@
-   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-   "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-   "module by executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "as root. If it is available in your distribution, you should install the "
--  "DKMS package first. This package keeps track of Linux kernel changes and "
--  "recompiles the vboxdrv kernel module if necessary."
-+  "  <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and "
-+  "execute dkms autoinstall ."
-   );
- 
- QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
- 
- QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
-   "The VirtualBox kernel modules do not match this version of "
--  "VirtualBox. The installation of VirtualBox was apparently not "
--  "successful. Executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "may correct this. Make sure that you do not mix the "
--  "OSE version and the PUEL version of VirtualBox."
-+  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+  "  <font color=blue>'dkms autoinstall'</font><br/><br/>"
-   );
- 
- QString g_QStrHintOtherNoDriver = QApplication::tr(
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -32,17 +32,18 @@
-     cat << EOF
- WARNING: The vboxdrv kernel module is not loaded. Either there is no module
-          available for the current kernel (`uname -r`) or it failed to
--         load. Please recompile the kernel module and install it by
-+         load. Please reinstall the kernel module virtualbox-libre-host-modules or
-+         if you don't use our stock kernel compile the modules with
- 
--           sudo /etc/init.d/vboxdrv setup
-+           sudo dkms autoinstall
- 
-          You will not be able to start VMs until this problem is fixed.
- EOF
- elif [ ! -c /dev/vboxdrv ]; then
-     cat << EOF
--WARNING: The character device /dev/vboxdrv does not exist. Try
-+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
- 
--           sudo /etc/init.d/vboxdrv restart
-+           sudo modprobe vboxdrv
- 
-          and if that is not successful, try to re-install the package.
- 
diff --git a/libre/virtualbox-libre/002-change_default_driver_dir.patch b/libre/virtualbox-libre/002-change_default_driver_dir.patch
deleted file mode 100644
index d8531499d..000000000
--- a/libre/virtualbox-libre/002-change_default_driver_dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:11:37.903456612 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:12:41.024021274 +0000
-@@ -36,13 +36,8 @@
- //#define DEBUG_DRI_CALLS
- 
- //@todo this could be different...
--#ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#endif
- 
- #ifdef DEBUG_DRI_CALLS
-  #define SWDRI_SHOWNAME(pext, func) \
diff --git a/libre/virtualbox-libre/003-gcc-48.patch b/libre/virtualbox-libre/003-gcc-48.patch
deleted file mode 100644
index 3039ea2c6..000000000
--- a/libre/virtualbox-libre/003-gcc-48.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: configure
-===================================================================
---- a/configure	(revision 45449)
-+++ a/configure	(revision 45450)
-@@ -416,7 +416,7 @@
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
--             -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
-+             -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
-              -o $cc_maj -gt 4 ]; then
-         log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
-         fail really
-Index: Config.kmk
-===================================================================
---- a/Config.kmk	(revision 45449)
-+++ a/Config.kmk	(revision 45450)
-@@ -1503,7 +1503,7 @@
- #
- # Compiler optimization flags.
- #
--VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option)
-+VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_no-unused-parameter)
- VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
- ifdef VBOX_WITH_MASOCHISTIC_WARNINGS
-  VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter
-@@ -2285,6 +2285,12 @@
- 	$(QUIET)$(APPEND) '$@' ' endif'
- 	$(QUIET)$(APPEND) '$@' 'endif'
- endif
-+# Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose
-+	$(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
-+	$(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
-+	$(QUIET)$(APPEND) '$@' '  VBOX_GCC_no-unused-parameter ?= -Wno-unused-parameter'
-+	$(QUIET)$(APPEND) '$@' ' endif'
-+	$(QUIET)$(APPEND) '$@' 'endif'
- ifeq ($(KBUILD_TARGET),solaris)
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args            ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
- # Detect the solaris assembler. It is used by the the 4.x gcc compilers,
diff --git a/libre/virtualbox-libre/003-linux-3.8.patch b/libre/virtualbox-libre/003-linux-3.8.patch
deleted file mode 100644
index 0c6d9fbbf..000000000
--- a/libre/virtualbox-libre/003-linux-3.8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 43343)
-+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 44317)
-@@ -196,7 +196,11 @@
- 
- 
- /** PCI hotplug structure. */
--static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] =
-+static const struct pci_device_id
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-+__devinitdata
-+#endif
-+g_VBoxGuestPciId[] =
- {
-     {
-         vendor:     VMMDEV_VENDORID,
diff --git a/libre/virtualbox-libre/004-system-xorg.patch b/libre/virtualbox-libre/004-system-xorg.patch
deleted file mode 100644
index c527f7f20..000000000
--- a/libre/virtualbox-libre/004-system-xorg.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
-@@ -63,18 +63,12 @@
- VBoxOGL_INCS           = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_INCS     += \
--	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
--	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
--	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
--	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
--	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
--	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
--	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
--	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
--	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
--	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+	/usr/include/x11 \
-+	/usr/include/xorg \
-+	/usr/include/pixman-1 \
- 	$(VBOX_MESA_INCS) \
--	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+	/usr/include/drm \
-+	/usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
- 
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:55:28.778284533 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -40,8 +40,8 @@
- 	VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
--  LIBRARIES += \
--  	VBoxGuestR3LibXFree86
-+#  LIBRARIES += \
-+#  	VBoxGuestR3LibXFree86
-  endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
- 
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
-  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:55:28.818284256 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -29,7 +29,6 @@
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
-  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
-  vboxmouse_drv_DEFS.linux = linux
-  vboxmouse_drv_DEFS.x86 += __i386__
-@@ -69,7 +68,6 @@
- #
- # vboxmouse_drv_70
- #
--DLLS += vboxmouse_drv_70
- vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_70_DEFS = \
- 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
-@@ -85,7 +83,6 @@
- #
- # vboxmouse_drv_71
- #
--DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_71_INCS := \
-@@ -100,7 +97,6 @@
- #
- # vboxmouse_drv_13
- #
--DLLS += vboxmouse_drv_13
- vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_13_INCS := \
-@@ -114,7 +110,6 @@
- #
- # vboxmouse_drv_14
- #
--DLLS += vboxmouse_drv_14
- vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_14_INCS := \
-@@ -128,7 +123,6 @@
- #
- # vboxmouse_drv_15
- #
--DLLS += vboxmouse_drv_15
- vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_15_INCS := \
-@@ -142,7 +136,6 @@
- #
- # vboxmouse_drv_16
- #
--DLLS += vboxmouse_drv_16
- vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_16_INCS := \
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -53,7 +53,6 @@
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif   # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -128,7 +127,6 @@
- #         base keywords instead of using .solaris or .linux.
- #         Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
-  vboxvideo_drv_70_CFLAGS += \
-@@ -149,7 +147,6 @@
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
-@@ -164,7 +161,6 @@
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
-@@ -178,7 +174,6 @@
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
-@@ -192,7 +187,6 @@
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
-@@ -213,7 +207,6 @@
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
-@@ -227,7 +220,6 @@
- #
- # vboxvideo_drv_17
- #
--DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
-@@ -241,7 +233,6 @@
- #
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
-@@ -255,7 +246,6 @@
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
-@@ -269,7 +259,6 @@
- #
- # vboxvideo_drv_110
- #
--DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
-@@ -283,7 +272,6 @@
- #
- # vboxvideo_drv_111
- #
--DLLS += vboxvideo_drv_111
- vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
-@@ -297,7 +285,6 @@
- #
- # vboxvideo_drv_112
- #
--DLLS += vboxvideo_drv_112
- vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
-@@ -341,6 +328,23 @@
- endif
- 
- 
-+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
-+	/usr/include/xorg \
-+	/usr/include/x11 \
-+	/usr/include/pixman-1 \
-+	/usr/include/X11/dri \
-+	/usr/include/drm \
-+	/usr/include/libdrm
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
-+
-+# required for lenny backports
-+ifeq ($(XSERVER_VERSION),14)
-+	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
-+endif
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols.  Not very elegant, but it will catch problems early.
- 
diff --git a/libre/virtualbox-libre/10-vboxdrv.rules b/libre/virtualbox-libre/10-vboxdrv.rules
deleted file mode 100644
index 37403ae2f..000000000
--- a/libre/virtualbox-libre/10-vboxdrv.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/libre/virtualbox-libre/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/libre/virtualbox-libre/60-vboxguest.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk
deleted file mode 100644
index 6eca06d9b..000000000
--- a/libre/virtualbox-libre/LocalConfig.kmk
+++ /dev/null
@@ -1,20 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
deleted file mode 100644
index b53a9f61e..000000000
--- a/libre/virtualbox-libre/PKGBUILD
+++ /dev/null
@@ -1,339 +0,0 @@
-# $Id: PKGBUILD 93521 2013-07-05 00:32:42Z seblu $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
-# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
-# Contributor (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
-
-pkgbase=virtualbox-libre
-pkgname=('virtualbox-libre'
-         'virtualbox-libre-host-dkms'
-         'virtualbox-libre-guest-dkms'
-         'virtualbox-libre-sdk'
-         'virtualbox-libre-guest-utils')
-pkgver=4.2.16
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL' 'custom')
-makedepends=('alsa-lib'
-             'bin86'
-             'cdrkit'
-             'curl'
-             'dev86'
-             'device-mapper'
-             'glu'
-             'gsoap-legacy'
-             'iasl'
-             'jdk7-openjdk'
-             'libidl2'
-             'libpulse'
-             'libstdc++5'
-             'libxcomposite'
-             'libxcursor'
-             'libxinerama'
-             'libxml2'
-             'libxmu'
-             'libxrandr'
-             'libxslt'
-             'libxtst'
-             'linux-libre-headers'
-             'mesa'
-             'python2'
-             'qt4'
-             'sdl'
-             'sdl_ttf'
-             'vde2'
-             'xalan-c'
-             'xf86driproto'
-             'xorg-server-devel')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
-        '10-vboxdrv.rules'
-        '60-vboxguest.rules'
-        'LocalConfig.kmk'
-        'vboxservice.service'
-        'vboxweb.service'
-        '001-vboxdrv-reference.patch'
-        '002-change_default_driver_dir.patch'
-        '004-system-xorg.patch'
-        'os_blag_64.png'
-        'os_blag.png'
-        'os_dragora_64.png'
-        'os_dragora.png'
-        'os_dynebolic.png'
-        'os_gnewsense_64.png'
-        'os_gnewsense.png'
-        'os_gnu_64.png'
-        'os_gnu.png'
-        'os_musix_64.png'
-        'os_musix.png' 
-        'os_parabola_64.png'
-        'os_parabola.png'
-        'os_trisquel_64.png'
-        'os_trisquel.png'
-        'os_ututo_64.png'
-        'os_ututo.png'
-        'os_venenux.png'
-        'libre.patch'
-        'free-distros.patch')
-md5sums=('c4a36e2099a317f4715cd3861cdae238'
-         '5f85710e0b8606de967716ded7b2d351'
-         'ed1341881437455d9735875ddf455fbe'
-         '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
-         '07c5f6d86c4b7839d719c8ee0c53653b'
-         'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         'f4e4c7895ede9c524109589bf16ae660'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '4da461f8c90caa123b47c62479f426b4'
-         '8538dba8686d7449cb481c9bae9d722a'
-         '545c925b46f2ac95e5f8ae407fad101a'
-         'f6416f509c2e5460e4dc624e0a57f3c1'
-         'bbfb59dd517c020a23701b480187a355'
-         'efacfdb61918286ea9bc89866b8fd239'
-         '7c3eb09995e8bafeef414374e44ad4ce'
-         'a49ed3ab6bd0fb084de0ab3dd97ae93e'
-         '6b432b3305ed446125eef052c38355a6'
-         'a70022a468bd3e9daf01818d2d74ac3c'
-         '380eb2ab6cad3da198094585853c129c'
-         'a60bb9a98abcc3c34156f9051d00df9a'
-         '3a908ef6952bcf987e63ef2fe4e98d24'
-         '02e87c39c353634cecacf98f1707fa15'
-         '0cf41a41e7a415d404d5584e047fd450'
-         '449cde3b58390284b59c5d663de3edc9'
-         'c7951fe6888d939f3a7d0dafe477e82b'
-         '4da8eeb2ece7e475fc7a0d1003da26c6'
-         '5e4187af59726d71c5be48d0cd816c34'
-         '9e0b199059faa3f99def5b0ba6e74009'
-         '1e2274facace125e6c2c8fcd7966fca7')
-
-prepare() {
-    cd "VirtualBox-$pkgver"
-    # Apply patches
-    for _p in "$srcdir"/*.patch; do
-        [[ -e $_p ]] || continue
-        msg2 "Apply patch ${_p##*/}"
-        patch -Np1 -i "$_p"
-    done
-
- ## Removing Nonfree directories and Nonfree files
-    rm -rv "./include/VBox/ExtPack"
-    rm -rv "./src/VBox/ExtPacks"
-    rm -rv "./src/VBox/Main/src-helper-apps"
-    rm -rv "./src/VBox/Main/include/ExtPackManagerImpl.h"
-    rm -rv "./src/VBox/Main/include/ExtPackUtil.h"
-    rm -rv "./src/VBox/Main/src-all/ExtPackManagerImpl.cpp"
-    rm -rv "./src/VBox/Main/src-all/ExtPackUtil.cpp"
-
- ## Removing Oracle VM VirtualBox Extension Pack icons
-    rm -v "./src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns"
-    rm -v "./src/VBox/Resources/other/virtualbox-vbox-extpack-"{16px,20px,24px,32px,40px,48px,64px,72px,80px,96px,128px,256px,512px}.png
-    rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico"
-    rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png
-
- ## Adding distros icons
-    for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
-      cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
-    done
-}
-
-build() {
-    cd "VirtualBox-$pkgver"
-    cp "$srcdir/LocalConfig.kmk" .
-    # fake makeself binary to compile without nofatal
-    ln -s /bin/echo makeself
-    export PATH="$CWD:$PATH"
-
-    ./configure --disable-docs \
-        --enable-webservice \
-        --enable-vde \
-        --disable-kmods
-    source ./env.sh
-    kmk all
-
-    # fix python2
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
-
-    # build rdesktop-vrdp (broken from LocalConfig.kmk)
-    pushd src/VBox/RDP/client
-    cp "$srcdir/LocalConfig.kmk" .
-    # fix keymap path FS#32548
-    sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
-    kmk all
-    popd
-}
-
-package_virtualbox-libre() {
-    pkgdesc='Powerful x86 virtualization for enterprise as well as home use, with free distros presets (nonfree Extension Pack and Guest Additions ISO image support removed)'
-    depends=('curl'
-             'libpng'
-             'libxcursor'
-             'libxinerama'
-             'libxml2'
-             'libxmu'
-             'sdl'
-             'shared-mime-info'
-             'virtualbox-libre-host-modules')
-    optdepends=('qt4: VirtualBox GUI support'
-                'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-libre-sdk: Developer kit'
-                'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
-                'net-tools: Host-only or bridged networking support')
-    backup=('etc/vbox/vbox.cfg')
-    replaces=('virtualbox' 'virtualbox-ose')
-    conflicts=('virtualbox' 'virtualbox-ose')
-    provides=("virtualbox=$pkgver")
-    install=virtualbox-libre.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
-
-    #Binaries and Wrapper with Launchers
-    install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
-
-    for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
-        ln -sf VBox "$pkgdir/usr/bin/$i"
-        ln -sf VBox "$pkgdir/usr/bin/${i,,}"
-    done
-    install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
-    install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin"
-
-    #components
-    install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
-    #lib
-    install -m 0755 *.so "$pkgdir/usr/lib/virtualbox"
-    install -m 0644 *.gc *.r0  VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
-
-    #setuid root binaries
-    install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
-    #other binaries
-    install -m 0755 VBoxManage VBoxSVC VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
-
-    #language
-    install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
-
-    #rdesktop keymaps
-    install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
-
-    #useless scripts
-    install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
-
-    #icons
-    install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
-
-    pushd icons
-    for i in *; do
-        install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-        cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-    done
-    popd
-
-    #desktop
-    install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
-    install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
-
-    #install configuration
-    mkdir -p "$pkgdir/etc/vbox"
-    echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
-
-    #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \
-        "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
-    install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
-        "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
-
-    # install systemd service
-    install -D -m644 "$srcdir/vboxweb.service" \
-        "$pkgdir/usr/lib/systemd/system/vboxweb.service"
-}
-
-package_virtualbox-libre-sdk() {
-    pkgdesc='VirtualBox Software Developer Kit (SDK)'
-    depends=('python2')
-    replaces=('virtualbox-sdk')
-    conflicts=('virtualbox-sdk')
-    provides=("virtualbox-sdk=$pkgver")
-
-    install -dm755 "$pkgdir/usr/lib/virtualbox"
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
-    #python sdk
-    pushd sdk/installer
-    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
-    popd
-    rm -rf sdk/installer
-    mv sdk "$pkgdir/usr/lib/virtualbox"
-}
-
-package_virtualbox-libre-host-dkms() {
-    pkgdesc='VirtualBox Host kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules')
-    replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
-    conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
-    optdepends=('linux-libre-headers'
-                'linux-libre-lts-headers')
-    install=virtualbox-libre-host-dkms.install
-
-    install -dm755 "$pkgdir/usr/src"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
-}
-
-package_virtualbox-libre-guest-dkms() {
-    pkgdesc='VirtualBox Guest kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules')
-    replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source')
-    conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source'  'virtualbox-guest-source' 'virtualbox-libre-guest-source')
-    optdepends=('linux-libre-headers'
-                'linux-libre-lts-headers')
-    install=virtualbox-libre-guest-dkms.install
-
-    install -dm755 "$pkgdir/usr/src"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
-}
-
-package_virtualbox-libre-guest-utils(){
-    pkgdesc='VirtualBox Guest userspace utilities'
-    depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels')
-    provides=("virtualbox-guest-utils=$pkgver")
-    replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
-    conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
-    install=virtualbox-libre-guest-utils.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    install -d "$pkgdir/usr/bin"
-    install -m755 VBoxClient VBoxControl VBoxService mount.vboxsf "$pkgdir/usr/bin"
-    install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-        "$pkgdir"/usr/bin/VBoxClient-all
-    install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-        "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv.so \
-        "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
-    install -d "$pkgdir/usr/lib/xorg/modules/dri"
-    install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
-    ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
-    install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
-    popd
-    # install udev rules
-    install -D -m 0644 60-vboxguest.rules \
-        "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-    # install systemd service file
-    install -D -m644 vboxservice.service \
-        "$pkgdir/usr/lib/systemd/system/vboxservice.service"
-}
-
-# vim:set ts=4 sw=4 et:
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
deleted file mode 100644
index 025a2b9f4..000000000
--- a/libre/virtualbox-libre/free-distros.patch
+++ /dev/null
@@ -1,1803 +0,0 @@
-diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
-index 2cd5a81..f234d58 100644
---- a/src/VBox/Main/src-all/Global.cpp
-+++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,293 +33,369 @@ const Global::OSType Global::sOSTypes[] =
-       VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
--    { "Windows", "Microsoft Windows", "Windows31",          "Windows 3.1",
--      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
--        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows95",          "Windows 95",
--      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows98",          "Windows 98",
--      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "WindowsMe",          "Windows ME",
--      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
--        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsNT4",         "Windows NT 4",
--      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
--       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows2000",        "Windows 2000",
--      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
--       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsXP",          "Windows XP",
--      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
--       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsXP_64",       "Windows XP (64 bit)",
--      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "Windows2003",        "Windows 2003",
--      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
--       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "Windows2003_64",     "Windows 2003 (64 bit)",
--      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsVista",       "Windows Vista",
--      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsVista_64",    "Windows Vista (64 bit)",
--      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2008",        "Windows 2008",
--      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2008_64",     "Windows 2008 (64 bit)",
--      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows7",           "Windows 7",
--      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows7_64",        "Windows 7 (64 bit)",
--      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows8",           "Windows 8",
--      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
--       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows8_64",        "Windows 8 (64 bit)",
--      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows81",          "Windows 8.1",
--      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
--       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows81_64",       "Windows 8.1 (64 bit)",
--      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2012_64",     "Windows 2012 (64 bit)",
--      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsNT",          "Other Windows",
--      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
--       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux22",            "Linux 2.2",
-+    { "GNU",       "GNU",             "GNU",                "GNU",
-+      VBOXOSTYPE_GNU,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU",       "GNU",             "GNU_64",             "GNU (64 bit)",
-+      VBOXOSTYPE_GNU_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU-Hurd",  "GNU-Hurd",        "GNUHurd",            "GNU-Hurd",
-+      VBOXOSTYPE_GNUHurd,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU/Linux",   "GNU/Linux",             "Linux22",            "GNU/Linux with kernel v2.2",
-       VBOXOSTYPE_Linux22,         VBOXOSHINT_RTCUTC,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux24",            "Linux 2.4",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux24",            "GNU/Linux with kernel v2.4",
-       VBOXOSTYPE_Linux24,         VBOXOSHINT_RTCUTC,
-        128,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux24_64",         "Linux 2.4 (64 bit)",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux24_64",         "GNU/Linux with kernel v2.4 (64 bit)",
-       VBOXOSTYPE_Linux24_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        128,   4,  4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux26",            "Linux 2.6",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux26",            "GNU/Linux with kernel v2.6",
-       VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux26_64",         "Linux 2.6 (64 bit)",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux26_64",         "GNU/Linux with kernel v2.6 (64 bit)",
-       VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "ArchLinux",          "Arch Linux",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux",              "Other GNU/Linux",
-+      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Parabola",           "Parabola GNU/Linux-libre",
-+      VBOXOSTYPE_Parabola,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Parabola_64",        "Parabola GNU/Linux-libre (64 bit)",
-+      VBOXOSTYPE_Parabola_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "gNewSense",          "gNewSense",
-+      VBOXOSTYPE_gNewSense,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "gNewSense_64",       "gNewSense (64 bit)",
-+      VBOXOSTYPE_gNewSense_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+    { "Free Distros", "Free GNU/Linux Distros",       "Blag",               "Blag Linux and GNU",
-+      VBOXOSTYPE_Blag,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Blag_64",            "Blag Linux and GNU (64 bit)",
-+      VBOXOSTYPE_Blag_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dragora",            "Dragora",
-+      VBOXOSTYPE_Dragora,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dragora_64",         "Dragora (64 bit)",
-+      VBOXOSTYPE_Dragora_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Ututo",              "Ututo XS",
-+      VBOXOSTYPE_Ututo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Ututo_64",           "Ututo XS (64 bit)",
-+      VBOXOSTYPE_Ututo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Musix",              "Musix",
-+      VBOXOSTYPE_Musix,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Musix_64",           "Musix (64 bit)",
-+      VBOXOSTYPE_Musix_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+    { "Free Distros", "Free GNU/Linux Distros",       "Trisquel",           "Trisquel",
-+      VBOXOSTYPE_Trisquel,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
-+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Trisquel_64",        "Trisquel (64 bit)",
-+      VBOXOSTYPE_Trisquel_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dynebolic",          "Dyne:bolic",
-+      VBOXOSTYPE_Dynebolic,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux",          "Arch Linux",
-       VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "ArchLinux_64",       "Arch Linux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux_64",       "Arch Linux (64 bit)",
-       VBOXOSTYPE_ArchLinux_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Debian",             "Debian",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian",             "Debian",
-       VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Debian_64",          "Debian (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian_64",          "Debian (64 bit)",
-       VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
--    { "Linux",   "Linux",             "OpenSUSE",           "openSUSE",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE",           "openSUSE",
-       VBOXOSTYPE_OpenSUSE,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "OpenSUSE_64",        "openSUSE (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE_64",        "openSUSE (64 bit)",
-       VBOXOSTYPE_OpenSUSE_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Fedora",             "Fedora",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora",             "Fedora",
-       VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Fedora_64",          "Fedora (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora_64",          "Fedora (64 bit)",
-       VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Gentoo",             "Gentoo",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo",             "Gentoo",
-       VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Gentoo_64",          "Gentoo (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo_64",          "Gentoo (64 bit)",
-       VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Mandriva",           "Mandriva",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva",           "Mandriva",
-       VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Mandriva_64",        "Mandriva (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva_64",        "Mandriva (64 bit)",
-       VBOXOSTYPE_Mandriva_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "RedHat",             "Red Hat",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat",             "Red Hat",
-       VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "RedHat_64",          "Red Hat (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat_64",          "Red Hat (64 bit)",
-       VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux",         "Turbolinux",
-       VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Turbolinux_64",      "Turbolinux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux_64",      "Turbolinux (64 bit)",
-       VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Ubuntu",             "Ubuntu",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu",             "Ubuntu",
-       VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Ubuntu_64",          "Ubuntu (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu_64",          "Ubuntu (64 bit)",
-       VBOXOSTYPE_Ubuntu_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Xandros",            "Xandros",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros",            "Xandros",
-       VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Xandros_64",         "Xandros (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros_64",         "Xandros (64 bit)",
-       VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Oracle",             "Oracle",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle",             "Oracle",
-       VBOXOSTYPE_Oracle,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
-        512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Oracle_64",          "Oracle (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle_64",          "Oracle (64 bit)",
-       VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux",              "Other Linux",
--      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
--       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",       "Venenux",            "Venenux",
-+      VBOXOSTYPE_Venenux,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows31",          "Windows 3.1",
-+      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
-+        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows95",          "Windows 95",
-+      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
-+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows98",          "Windows 98",
-+      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
-+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsMe",          "Windows ME",
-+      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
-+        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4",         "Windows NT 4",
-+      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
-+       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2000",        "Windows 2000",
-+      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
-+       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP",          "Windows XP",
-+      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
-+       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64",       "Windows XP (64 bit)",
-+      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2003",        "Windows 2003",
-+      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
-+       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64",     "Windows 2003 (64 bit)",
-+      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista",       "Windows Vista",
-+      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64",    "Windows Vista (64 bit)",
-+      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2008",        "Windows 2008",
-+      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64",     "Windows 2008 (64 bit)",
-+      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows7",           "Windows 7",
-+      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows7_64",        "Windows 7 (64 bit)",
-+      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows8",           "Windows 8",
-+      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
-+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows8_64",        "Windows 8 (64 bit)",
-+      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows81",          "Windows 8.1",
-+      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
-+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows81_64",       "Windows 8.1 (64 bit)",
-+      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64",     "Windows 2012 (64 bit)",
-+      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT",          "Other Windows",
-+      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
-+       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
-       VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
-        768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
-       VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
-+    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
-       VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
-        768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
-       VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
-       VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "FreeBSD",            "FreeBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "FreeBSD",            "FreeBSD",
-       VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
-        128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "FreeBSD_64",         "FreeBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "FreeBSD_64",         "FreeBSD (64 bit)",
-       VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-        128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "OpenBSD",            "OpenBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "OpenBSD",            "OpenBSD",
-       VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "OpenBSD_64",         "OpenBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "OpenBSD_64",         "OpenBSD (64 bit)",
-       VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "NetBSD",             "NetBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "NetBSD",             "NetBSD",
-       VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "NetBSD_64",          "NetBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "NetBSD_64",          "NetBSD (64 bit)",
-       VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "OS2",     "IBM OS/2",          "OS2Warp3",           "OS/2 Warp 3",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp3",           "OS/2 Warp 3",
-       VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         48,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2Warp4",           "OS/2 Warp 4",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp4",           "OS/2 Warp 4",
-       VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2Warp45",          "OS/2 Warp 4.5",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp45",          "OS/2 Warp 4.5",
-       VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         128,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2eCS",             "eComStation",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2eCS",             "eComStation",
-       VBOXOSTYPE_ECS,             VBOXOSHINT_HWVIRTEX,
-         256,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "OS2",     "IBM OS/2",          "OS2",                "Other OS/2",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2",                "Other OS/2",
-       VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
-         96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "MacOS",   "Mac OS X",          "MacOS",              "Mac OS X",
-+    { "Non-free OSs", "Non-free Operating Systems",          "MacOS",              "Mac OS X",
-       VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-       2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
-        StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
-       ChipsetType_ICH9, AudioControllerType_HDA  },
--    { "MacOS",   "Mac OS X",          "MacOS_64",           "Mac OS X (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",          "MacOS_64",           "Mac OS X (64 bit)",
-       VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-       2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
-       StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
-       ChipsetType_ICH9, AudioControllerType_HDA  },
--    { "Other",   "Other",             "DOS",                "DOS",
-+    { "Non-free OSs", "Non-free Operating Systems",             "DOS",                "DOS",
-       VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
-         32,   4,  500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Other",   "Other",             "Netware",            "Netware",
-+    { "Non-free OSs", "Non-free Operating Systems",             "Netware",            "Netware",
-       VBOXOSTYPE_Netware,         VBOXOSHINT_HWVIRTEX,
-        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "L4",                 "L4",
-+    { "Non-free OSs", "Non-free Operating Systems",             "L4",                 "L4",
-       VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "QNX",                "QNX",
-+    { "Non-free OSs", "Non-free Operating Systems",             "QNX",                "QNX",
- #ifdef VBOX_WITH_RAW_RING1
-       VBOXOSTYPE_QNX,             VBOXOSHINT_NONE,
- #else
-@@ -327,7 +403,7 @@ const Global::OSType Global::sOSTypes[] =
- #endif
-        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "JRockitVE",          "JRockitVE",
-+    { "Non-free OSs", "Non-free Operating Systems",             "JRockitVE",          "JRockitVE",
-         VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
-         1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
-diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index bd5bd86..c7a8c87 100644
---- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,10 +44,80 @@ struct osTypePattern
- 
- static const osTypePattern gs_OSTypePattern[] =
- {
--    /* DOS: */
--    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-+    /* Code names for free GNU/Linux distributions */
-+    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
-+    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
-+    { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+    { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
-+    { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
-+    { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
-+
-+    /* Regular names of free GNU/Linux distributions */
-+    { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
-+    { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
-+    { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+    { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
-+    { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
-+    { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
-+    { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
-+    { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
-+    { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
-+    { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
-+    { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
-+    { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
-+    { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
-+    { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
-+    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
-+
-+    /* Code names for non-free GNU/Linux distributions: */
-+    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
-+    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
-+    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-+    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
-+    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
-+    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
- 
--    /* Windows: */
-+    /* Regular names of non-free GNU/Linux distributions: */
-+    { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
-+    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
-+    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-+    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
-+    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
-+    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
-+    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
-+    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
-+    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
-+    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
-+    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
-+    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
-+    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
-+    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
-+    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
-+    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
-+    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-+    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
-+    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
-+    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
-+    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
-+    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
-+    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
-+    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
-+
-+    /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
-+    { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+    { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+    { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
-+    { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
-+    { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
-+
-+    /* Regular names of non-free operating systems: */
-+    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-     { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
-     { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
-     { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
-@@ -70,63 +140,16 @@ static const osTypePattern gs_OSTypePattern[] =
-     { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
-     { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
-     { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
--
--    /* Solaris: */
-     { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
-     { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
-     { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
-     { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
-     { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
--
--    /* OS/2: */
-     { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
-     { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
-     { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
-     { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
-     { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
--
--    /* Code names for Linux distributions: */
--    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
--    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
--    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
--    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
--    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
--    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
--
--    /* Regular names of Linux distributions: */
--    { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
--    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
--    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
--    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
--    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
--    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
--    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
--    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
--    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
--    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
--    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
--    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
--    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
--    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
--    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
--    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
--    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
--    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
--    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
--    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
--    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
--    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
--    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
--    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
--    { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
--    { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
--    { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
--
--    /* Other: */
-     { QRegExp("L4", Qt::CaseInsensitive), "L4" },
-     { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
-     { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -139,6 +162,8 @@ static const osTypePattern gs_OSTypePattern[] =
-     { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
-     { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
-     { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
-+
-+    /* Other: */
-     { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
- };
- 
-@@ -233,11 +258,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
-     /* Create widgets: */
-     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-     {
-+        pMainLayout->setContentsMargins(8, 6, 8, 6);
-         m_pLabel = new QIRichTextLabel(this);
-+        m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-         m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
--        pMainLayout->addWidget(m_pLabel);
--        pMainLayout->addWidget(m_pNameAndSystemEditor);
--        pMainLayout->addStretch();
-+        m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
-+        pMainLayout->addWidget(m_pLabel, 1);
-+        pMainLayout->addWidget(m_pNameAndSystemEditor, 1);
-     }
- 
-     /* Setup connections: */
-diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp
-index 8cb1e12..20e3eda 100644
---- a/src/VBox/Main/xml/Settings.cpp
-+++ b/src/VBox/Main/xml/Settings.cpp
-@@ -3405,7 +3405,18 @@ const struct {
-     { "netware", "Netware" },
-     { "solaris", "Solaris" },
-     { "opensolaris", "OpenSolaris" },
--    { "l4", "L4" }
-+    { "l4", "L4" },
-+    { "gnu", "GNU" },
-+    { "gnuhurd", "GNUHurd" },
-+    { "parabola", "Parabola" },
-+    { "gnewsense", "gNewSense" },
-+    { "blag", "Blag" },
-+    { "dragora", "Dragora" },
-+    { "ututo", "Ututo" },
-+    { "musix", "Musix" },
-+    { "trisquel", "Trisquel" },
-+    { "dynebolic", "Dynebolic" },
-+    { "venenux", "Venenux" }
- };
- 
- void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
-diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl
-index 9a31a4c..7db11ad 100644
---- a/src/VBox/Main/xml/SettingsConverter.xsl
-+++ b/src/VBox/Main/xml/SettingsConverter.xsl
-@@ -763,6 +763,17 @@ Value '<xsl:value-of select="@type"/>' of 'HardDisk::type' attribute is invalid.
-         <xsl:when test="@OSType='solaris'">Solaris</xsl:when>
-         <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when>
-         <xsl:when test="@OSType='l4'">L4</xsl:when>
-+        <xsl:when test="@OSType='gnu'">GNU</xsl:when>
-+        <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when>
-+        <xsl:when test="@OSType='parabola'">Parabola</xsl:when>
-+        <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when>
-+        <xsl:when test="@OSType='blag'">Blag</xsl:when>
-+        <xsl:when test="@OSType='dragora'">Dragora</xsl:when>
-+        <xsl:when test="@OSType='ututo'">Ututo</xsl:when>
-+        <xsl:when test="@OSType='musix'">Musix</xsl:when>
-+        <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when>
-+        <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when>
-+        <xsl:when test="@OSType='venenux'">Venenux</xsl:when>
-       </xsl:choose>
-     </xsl:attribute>
-     <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
-diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-index 4523dad..38ae21a 100644
---- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-+++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-@@ -71,6 +71,24 @@
-         <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
-         <file alias="os_macosx.png">images/os_macosx.png</file>
-         <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
-+        <file alias="os_parabola.png">images/os_parabola.png</file>
-+        <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
-+        <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
-+        <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
-+        <file alias="os_blag.png">images/os_blag.png</file>
-+        <file alias="os_blag_64.png">images/os_blag_64.png</file>
-+        <file alias="os_ututo.png">images/os_ututo.png</file>
-+        <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
-+        <file alias="os_gnu.png">images/os_gnu.png</file>
-+        <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
-+        <file alias="os_musix.png">images/os_musix.png</file>
-+        <file alias="os_musix_64.png">images/os_musix_64.png</file>
-+        <file alias="os_dragora.png">images/os_dragora.png</file>
-+        <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
-+        <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
-+        <file alias="os_venenux.png">images/os_venenux.png</file>
-+        <file alias="os_trisquel.png">images/os_trisquel.png</file>
-+        <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
-         <file alias="hd_16px.png">images/hd_16px.png</file>
-         <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
-         <file alias="hd_32px.png">images/hd_32px.png</file>
-diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-index 8af9597..39a8d39 100644
---- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-@@ -4336,11 +4336,11 @@ void VBoxGlobal::init()
-         {"OS2Warp45",       ":/os_os2warp45.png"},
-         {"OS2eCS",          ":/os_os2ecs.png"},
-         {"OS2",             ":/os_os2_other.png"},
--        {"Linux22",         ":/os_linux22.png"},
--        {"Linux24",         ":/os_linux24.png"},
--        {"Linux24_64",      ":/os_linux24_64.png"},
--        {"Linux26",         ":/os_linux26.png"},
--        {"Linux26_64",      ":/os_linux26_64.png"},
-+        {"Linux22",         ":/os_gnu.png"},
-+        {"Linux24",         ":/os_gnu.png"},
-+        {"Linux24_64",      ":/os_gnu_64.png"},
-+        {"Linux26",         ":/os_gnu.png"},
-+        {"Linux26_64",      ":/os_gnu_64.png"},
-         {"ArchLinux",       ":/os_archlinux.png"},
-         {"ArchLinux_64",    ":/os_archlinux_64.png"},
-         {"Debian",          ":/os_debian.png"},
-@@ -4363,7 +4363,7 @@ void VBoxGlobal::init()
-         {"Xandros_64",      ":/os_xandros_64.png"},
-         {"Oracle",          ":/os_oracle.png"},
-         {"Oracle_64",       ":/os_oracle_64.png"},
--        {"Linux",           ":/os_linux_other.png"},
-+        {"Linux",           ":/os_gnu.png"},
-         {"FreeBSD",         ":/os_freebsd.png"},
-         {"FreeBSD_64",      ":/os_freebsd_64.png"},
-         {"OpenBSD",         ":/os_openbsd.png"},
-@@ -4379,6 +4379,25 @@ void VBoxGlobal::init()
-         {"MacOS",           ":/os_macosx.png"},
-         {"MacOS_64",        ":/os_macosx_64.png"},
-         {"JRockitVE",       ":/os_jrockitve.png"},
-+        {"GNU",             ":/os_gnu.png"},
-+        {"GNU_64",          ":/os_gnu_64.png"},
-+        {"GNUHurd",         ":/os_gnu.png"},
-+        {"Parabola",        ":/os_parabola.png"},
-+        {"Parabola_64",     ":/os_parabola_64.png"},
-+        {"gNewSense",       ":/os_gnewsense.png"},
-+        {"gNewSense_64",    ":/os_gnewsense_64.png"},
-+        {"Blag",            ":/os_blag.png"},
-+        {"Blag_64",         ":/os_blag_64.png"},
-+        {"Dragora",         ":/os_dragora.png"},
-+        {"Dragora_64",      ":/os_dragora_64.png"},
-+        {"Ututo",           ":/os_ututo.png"},
-+        {"Ututo_64",        ":/os_ututo_64.png"},
-+        {"Musix",           ":/os_musix.png"},
-+        {"Musix_64",        ":/os_musix_64.png"},
-+        {"Trisquel",        ":/os_trisquel.png"},
-+        {"Trisquel_64",     ":/os_trisquel_64.png"},
-+        {"Dynebolic",       ":/os_dynebolic.png"},
-+        {"Venenux",         ":/os_venenux.png"},
-     };
-     for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
-     {
-diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h
-index cbc0b73..31516cd 100644
---- a/include/VBox/ostypes.h
-+++ b/include/VBox/ostypes.h
-@@ -116,6 +116,25 @@ typedef enum VBOXOSTYPE
-     VBOXOSTYPE_MacOS            = 0xB0000,
-     VBOXOSTYPE_MacOS_x64        = 0xB0100,
-     VBOXOSTYPE_JRockitVE        = 0xC0000,
-+    VBOXOSTYPE_GNU              = 0xD0000,
-+    VBOXOSTYPE_GNU_x64          = 0xD0100,
-+    VBOXOSTYPE_GNUHurd          = 0xE0000,
-+    VBOXOSTYPE_Parabola         = 0xF0000,
-+    VBOXOSTYPE_Parabola_x64     = 0xF0100,
-+    VBOXOSTYPE_gNewSense        = 0xF1000,
-+    VBOXOSTYPE_gNewSense_x64    = 0xF1100,
-+    VBOXOSTYPE_Blag             = 0xF2000,
-+    VBOXOSTYPE_Blag_x64         = 0xF2100,
-+    VBOXOSTYPE_Dragora          = 0xF3000,
-+    VBOXOSTYPE_Dragora_x64      = 0xF3100,
-+    VBOXOSTYPE_Ututo            = 0xF4000,
-+    VBOXOSTYPE_Ututo_x64        = 0xF4100,
-+    VBOXOSTYPE_Musix            = 0xF5000,
-+    VBOXOSTYPE_Musix_x64        = 0xF5100,
-+    VBOXOSTYPE_Trisquel         = 0xF6000,
-+    VBOXOSTYPE_Trisquel_x64     = 0xF6100,
-+    VBOXOSTYPE_Dynebolic        = 0xF7000,
-+    VBOXOSTYPE_Venenux          = 0xF8000,
- /** The bit number which indicates 64-bit or 32-bit. */
- #define VBOXOSTYPE_x64_BIT       8
-     /** The mask which indicates 64-bit. */
-diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp
-index 05fc3b6..dc06073 100644
---- a/src/VBox/Main/src-server/ApplianceImpl.cpp
-+++ b/src/VBox/Main/src-server/ApplianceImpl.cpp
-@@ -84,7 +84,31 @@ g_osTypes[] =
-     { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS },
-     { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS_x64 },            // there is no CIM 64-bit type for this
- 
--    // Linuxes
-+    // Custom GNU and GNU-Hurd OS
-+    { ovf::CIMOSType_CIMOS_GNU,                                  VBOXOSTYPE_GNU },
-+    { ovf::CIMOSType_CIMOS_GNU_64,                               VBOXOSTYPE_GNU_x64 },
-+    { ovf::CIMOSType_CIMOS_GNUHurd,                              VBOXOSTYPE_GNUHurd },
-+    
-+    // Free GNU/Linux distros
-+    { ovf::CIMOSType_CIMOS_gNewSense,                            VBOXOSTYPE_gNewSense },
-+    { ovf::CIMOSType_CIMOS_gNewSense_64,                         VBOXOSTYPE_gNewSense_x64 },
-+    { ovf::CIMOSType_CIMOS_Dragora,                              VBOXOSTYPE_Dragora },
-+    { ovf::CIMOSType_CIMOS_Dragora_64,                           VBOXOSTYPE_Dragora_x64 },
-+    { ovf::CIMOSType_CIMOS_Musix,                                VBOXOSTYPE_Musix },
-+    { ovf::CIMOSType_CIMOS_Musix_64,                             VBOXOSTYPE_Musix_x64 },
-+    { ovf::CIMOSType_CIMOS_Trisquel,                             VBOXOSTYPE_Trisquel },
-+    { ovf::CIMOSType_CIMOS_Trisquel_64,                          VBOXOSTYPE_Trisquel_x64 },
-+    { ovf::CIMOSType_CIMOS_Dynebolic,                            VBOXOSTYPE_Dynebolic },
-+    
-+    // Free GNU/Linux distros that we have support for but CIM doesn't
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Parabola },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Parabola_x64 },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Blag },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Blag_x64 },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Ututo },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Ututo_x64 },
-+
-+    // Non-free GNU/Linux distros
-     { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux,                VBOXOSTYPE_RedHat },
-     { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat_x64 },
-     { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
-@@ -104,13 +128,14 @@ g_osTypes[] =
-     { ovf::CIMOSType_CIMOS_Ubuntu_64,                            VBOXOSTYPE_Ubuntu_x64 },
-     { ovf::CIMOSType_CIMOS_Debian,                               VBOXOSTYPE_Debian },
-     { ovf::CIMOSType_CIMOS_Debian_64,                            VBOXOSTYPE_Debian_x64 },
-+    { ovf::CIMOSType_CIMOS_Venenux,                              VBOXOSTYPE_Venenux },
-     { ovf::CIMOSType_CIMOS_Linux_2_4_x,                          VBOXOSTYPE_Linux24 },
-     { ovf::CIMOSType_CIMOS_Linux_2_4_x_64,                       VBOXOSTYPE_Linux24_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Linux26 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Linux26_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_64,                             VBOXOSTYPE_Linux26_x64 },
- 
--    // types that we have support for but CIM doesn't
-+    // Non-free GNU/Linux distros and non-free operating systems types that we have support for but CIM doesn't
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_ArchLinux },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_ArchLinux_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_FedoraCore },
-@@ -151,53 +176,72 @@ struct osTypePattern
- /* These are the 32-Bit ones. They are sorted by priority. */
- static const osTypePattern g_osTypesPattern[] =
- {
--    {"Windows NT",    VBOXOSTYPE_WinNT4},
--    {"Windows XP",    VBOXOSTYPE_WinXP},
--    {"Windows 2000",  VBOXOSTYPE_Win2k},
--    {"Windows 2003",  VBOXOSTYPE_Win2k3},
--    {"Windows Vista", VBOXOSTYPE_WinVista},
--    {"Windows 2008",  VBOXOSTYPE_Win2k8},
--    {"SUSE",          VBOXOSTYPE_OpenSUSE},
--    {"Novell",        VBOXOSTYPE_OpenSUSE},
--    {"Red Hat",       VBOXOSTYPE_RedHat},
--    {"Mandriva",      VBOXOSTYPE_Mandriva},
--    {"Ubuntu",        VBOXOSTYPE_Ubuntu},
--    {"Debian",        VBOXOSTYPE_Debian},
--    {"QNX",           VBOXOSTYPE_QNX},
--    {"Linux 2.4",     VBOXOSTYPE_Linux24},
--    {"Linux 2.6",     VBOXOSTYPE_Linux26},
--    {"Linux",         VBOXOSTYPE_Linux},
--    {"OpenSolaris",   VBOXOSTYPE_OpenSolaris},
--    {"Solaris",       VBOXOSTYPE_OpenSolaris},
--    {"FreeBSD",       VBOXOSTYPE_FreeBSD},
--    {"NetBSD",        VBOXOSTYPE_NetBSD},
--    {"Windows 95",    VBOXOSTYPE_Win95},
--    {"Windows 98",    VBOXOSTYPE_Win98},
--    {"Windows Me",    VBOXOSTYPE_WinMe},
--    {"Windows 3.",    VBOXOSTYPE_Win31},
--    {"DOS",           VBOXOSTYPE_DOS},
--    {"OS2",           VBOXOSTYPE_OS2}
-+    {"Windows NT",         VBOXOSTYPE_WinNT4},
-+    {"Windows XP",         VBOXOSTYPE_WinXP},
-+    {"Windows 2000",       VBOXOSTYPE_Win2k},
-+    {"Windows 2003",       VBOXOSTYPE_Win2k3},
-+    {"Windows Vista",      VBOXOSTYPE_WinVista},
-+    {"Windows 2008",       VBOXOSTYPE_Win2k8},
-+    {"SUSE",               VBOXOSTYPE_OpenSUSE},
-+    {"Novell",             VBOXOSTYPE_OpenSUSE},
-+    {"Red Hat",            VBOXOSTYPE_RedHat},
-+    {"Mandriva",           VBOXOSTYPE_Mandriva},
-+    {"Ubuntu",             VBOXOSTYPE_Ubuntu},
-+    {"Debian",             VBOXOSTYPE_Debian},
-+    {"QNX",                VBOXOSTYPE_QNX},
-+    {"GNU/Linux 2.4",      VBOXOSTYPE_Linux24},
-+    {"GNU/Linux 2.6",      VBOXOSTYPE_Linux26},
-+    {"GNU/Linux",          VBOXOSTYPE_Linux},
-+    {"OpenSolaris",        VBOXOSTYPE_OpenSolaris},
-+    {"Solaris",            VBOXOSTYPE_OpenSolaris},
-+    {"FreeBSD",            VBOXOSTYPE_FreeBSD},
-+    {"NetBSD",             VBOXOSTYPE_NetBSD},
-+    {"Windows 95",         VBOXOSTYPE_Win95},
-+    {"Windows 98",         VBOXOSTYPE_Win98},
-+    {"Windows Me",         VBOXOSTYPE_WinMe},
-+    {"Windows 3.",         VBOXOSTYPE_Win31},
-+    {"DOS",                VBOXOSTYPE_DOS},
-+    {"OS2",                VBOXOSTYPE_OS2},
-+    {"Parabola",           VBOXOSTYPE_Parabola},
-+    {"gNewSense",          VBOXOSTYPE_gNewSense},
-+    {"Blag",               VBOXOSTYPE_Blag},
-+    {"Dragora",            VBOXOSTYPE_Dragora},
-+    {"Ututo XS",           VBOXOSTYPE_Ututo},
-+    {"Musix",              VBOXOSTYPE_Musix},
-+    {"Trisquel",           VBOXOSTYPE_Trisquel},
-+    {"Dyne:bolic",         VBOXOSTYPE_Dynebolic},
-+    {"Venenux",            VBOXOSTYPE_Venenux},
-+    {"GNU",                VBOXOSTYPE_GNU},
-+    {"GNU-Hurd",           VBOXOSTYPE_GNUHurd},
- };
- 
- /* These are the 64-Bit ones. They are sorted by priority. */
- static const osTypePattern g_osTypesPattern64[] =
- {
--    {"Windows XP",    VBOXOSTYPE_WinXP_x64},
--    {"Windows 2003",  VBOXOSTYPE_Win2k3_x64},
--    {"Windows Vista", VBOXOSTYPE_WinVista_x64},
--    {"Windows 2008",  VBOXOSTYPE_Win2k8_x64},
--    {"SUSE",          VBOXOSTYPE_OpenSUSE_x64},
--    {"Novell",        VBOXOSTYPE_OpenSUSE_x64},
--    {"Red Hat",       VBOXOSTYPE_RedHat_x64},
--    {"Mandriva",      VBOXOSTYPE_Mandriva_x64},
--    {"Ubuntu",        VBOXOSTYPE_Ubuntu_x64},
--    {"Debian",        VBOXOSTYPE_Debian_x64},
--    {"Linux 2.4",     VBOXOSTYPE_Linux24_x64},
--    {"Linux 2.6",     VBOXOSTYPE_Linux26_x64},
--    {"Linux",         VBOXOSTYPE_Linux26_x64},
--    {"OpenSolaris",   VBOXOSTYPE_OpenSolaris_x64},
--    {"Solaris",       VBOXOSTYPE_OpenSolaris_x64},
--    {"FreeBSD",       VBOXOSTYPE_FreeBSD_x64},
-+    {"Windows XP",         VBOXOSTYPE_WinXP_x64},
-+    {"Windows 2003",       VBOXOSTYPE_Win2k3_x64},
-+    {"Windows Vista",      VBOXOSTYPE_WinVista_x64},
-+    {"Windows 2008",       VBOXOSTYPE_Win2k8_x64},
-+    {"SUSE",               VBOXOSTYPE_OpenSUSE_x64},
-+    {"Novell",             VBOXOSTYPE_OpenSUSE_x64},
-+    {"Red Hat",            VBOXOSTYPE_RedHat_x64},
-+    {"Mandriva",           VBOXOSTYPE_Mandriva_x64},
-+    {"Ubuntu",             VBOXOSTYPE_Ubuntu_x64},
-+    {"Debian",             VBOXOSTYPE_Debian_x64},
-+    {"GNU/Linux 2.4",      VBOXOSTYPE_Linux24_x64},
-+    {"GNU/Linux 2.6",      VBOXOSTYPE_Linux26_x64},
-+    {"GNU/Linux",          VBOXOSTYPE_Linux26_x64},
-+    {"OpenSolaris",        VBOXOSTYPE_OpenSolaris_x64},
-+    {"Solaris",            VBOXOSTYPE_OpenSolaris_x64},
-+    {"FreeBSD",            VBOXOSTYPE_FreeBSD_x64},
-+    {"Parabola",           VBOXOSTYPE_Parabola_x64},
-+    {"gNewSense",          VBOXOSTYPE_gNewSense_x64},
-+    {"Blag",               VBOXOSTYPE_Blag_x64},
-+    {"Dragora",            VBOXOSTYPE_Dragora_x64},
-+    {"Ututo XS",           VBOXOSTYPE_Ututo_x64},
-+    {"Musix",              VBOXOSTYPE_Musix_x64},
-+    {"Trisquel",           VBOXOSTYPE_Trisquel_x64},
-+    {"GNU",                VBOXOSTYPE_GNU_x64},
- };
- 
- /**
-diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h
-index e1e21d5..6d2da12 100644
---- a/src/VBox/Main/include/ovfreader.h
-+++ b/src/VBox/Main/include/ovfreader.h
-@@ -145,8 +145,20 @@ enum CIMOSType_T
-     CIMOSType_CIMOS_CentOS_64 = 107,
-     CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
-     CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
--    CIMOSType_CIMOS_eComStation = 110
-+    CIMOSType_CIMOS_eComStation = 110,
-     // no new types added with CIM 2.26.0
-+    CIMOSType_CIMOS_gNewSense = 111,
-+    CIMOSType_CIMOS_gNewSense_64 = 112,
-+    CIMOSType_CIMOS_Dragora = 113,
-+    CIMOSType_CIMOS_Dragora_64 = 114,
-+    CIMOSType_CIMOS_Musix = 115,
-+    CIMOSType_CIMOS_Musix_64 = 116,
-+    CIMOSType_CIMOS_Trisquel = 117,
-+    CIMOSType_CIMOS_Trisquel_64 = 118,
-+    CIMOSType_CIMOS_Dynebolic = 119,
-+    CIMOSType_CIMOS_Venenux = 120,
-+    CIMOSType_CIMOS_GNU = 121,
-+    CIMOSType_CIMOS_GNU_64 = 122
- };
- 
- 
-diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-index 59749be..8e2b425 100644
---- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-@@ -141,7 +141,7 @@ void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType)
- #ifdef VBOX_WITH_VIDEOHWACCEL
-     /* Check if 2D video acceleration supported by the guest OS type: */
-     QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
--    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows";
-+    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Non-free OSs";
- #endif /* VBOX_WITH_VIDEOHWACCEL */
- #ifdef VBOX_WITH_CRHGSMI
-     /* Check if WDDM mode supported by the guest OS type: */
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-index f67cfc2..438ffee 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-@@ -32,6 +32,11 @@ enum
-     TypeID = Qt::UserRole + 1
- };
- 
-+const char* FreedomLabel = "We hope you don't use non-free "
-+                           "GNU/Linux distros and non-free operating "
-+                           "systems, since to use them is to surrender "
-+                           "your freedom.";
-+
- UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
-     : QIWithRetranslateUI<QWidget>(pParent)
- {
-@@ -39,55 +44,91 @@ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
-     qRegisterMetaType<CGuestOSType>();
- 
-     /* Create widgets: */
--    QGridLayout *pMainLayout = new QGridLayout(this);
-+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-     {
-         pMainLayout->setContentsMargins(0, 0, 0, 0);
--        m_pNameLabel = new QLabel(this);
--        {
--            m_pNameLabel->setAlignment(Qt::AlignRight);
--            m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pNameEditor = new QLineEdit(this);
--        {
--            m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
--            m_pNameLabel->setBuddy(m_pNameEditor);
--        }
--        m_pFamilyLabel = new QLabel(this);
--        {
--            m_pFamilyLabel->setAlignment(Qt::AlignRight);
--            m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pFamilyCombo = new QComboBox(this);
--        {
--            m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            m_pFamilyLabel->setBuddy(m_pFamilyCombo);
--        }
--        m_pTypeLabel = new QLabel(this);
--        {
--            m_pTypeLabel->setAlignment(Qt::AlignRight);
--            m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pTypeCombo = new QComboBox(this);
--        {
--            m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            m_pTypeLabel->setBuddy(m_pTypeCombo);
--        }
--        QVBoxLayout *pIconLayout = new QVBoxLayout;
--        {
--            m_pTypeIcon = new QLabel(this);
-+
-+	/* Top QWidget */
-+	m_pGlobalCnt = new QFrame;
-+        m_pGlobalCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+
-+	QVBoxLayout *pGlobalLayout = new QVBoxLayout(m_pGlobalCnt);
-+	{
-+	    m_pGridCnt = new QFrame;
-+            m_pGridCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+	    m_pGridCnt->setMinimumWidth(500);
-+
-+	    QGridLayout *pGridLayout = new QGridLayout(m_pGridCnt);
-             {
--                m_pTypeIcon->setFixedSize(32, 32);
--            }
--            pIconLayout->addWidget(m_pTypeIcon);
--            pIconLayout->addStretch();
--        }
--        pMainLayout->addWidget(m_pNameLabel, 0, 0);
--        pMainLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
--        pMainLayout->addWidget(m_pFamilyLabel, 1, 0);
--        pMainLayout->addWidget(m_pFamilyCombo, 1, 1);
--        pMainLayout->addWidget(m_pTypeLabel, 2, 0);
--        pMainLayout->addWidget(m_pTypeCombo, 2, 1);
--        pMainLayout->addLayout(pIconLayout, 1, 2, 2, 1);
-+	        pGridLayout->setContentsMargins(4, 4, 4, 4);
-+	        m_pNameLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pNameLabel->setAlignment(Qt::AlignRight);
-+	            m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pNameEditor = new QLineEdit(m_pGridCnt);
-+	        {
-+	            m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-+	            m_pNameLabel->setBuddy(m_pNameEditor);
-+	        }
-+	        m_pFamilyLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pFamilyLabel->setAlignment(Qt::AlignRight);
-+	            m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pFamilyCombo = new QComboBox(m_pGridCnt);
-+	        {
-+	            m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-+	            m_pFamilyLabel->setBuddy(m_pFamilyCombo);
-+	        }
-+	        m_pTypeLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pTypeLabel->setAlignment(Qt::AlignRight);
-+	            m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pTypeCombo = new QComboBox(m_pGridCnt);
-+	        {
-+	            m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-+	            m_pTypeLabel->setBuddy(m_pTypeCombo);
-+	        }
-+	        QVBoxLayout *pIconLayout = new QVBoxLayout;
-+                {
-+	            m_pTypeIcon = new QLabel;
-+	            {
-+	                m_pTypeIcon->setFixedSize(32, 32);
-+	            }
-+	            pIconLayout->addWidget(m_pTypeIcon);
-+	            pIconLayout->addStretch();
-+	        }
-+
-+	        pGridLayout->addWidget(m_pNameLabel, 0, 0);
-+	        pGridLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
-+	        pGridLayout->addWidget(m_pFamilyLabel, 1, 0);
-+	        pGridLayout->addWidget(m_pFamilyCombo, 1, 1);
-+	        pGridLayout->addWidget(m_pTypeLabel, 2, 0);
-+	        pGridLayout->addWidget(m_pTypeCombo, 2, 1);
-+	        pGridLayout->addLayout(pIconLayout, 1, 2, 2, 1);
-+	    }
-+
-+	    m_pFreedomLabel = new QLabel(m_pGlobalCnt);
-+	    {
-+                m_pFreedomLabel->setStyleSheet("color: red;"
-+                                               "border-radius: 4px;"
-+                                               "padding: 2px;"
-+                                               "background-color: #DDDDDD;");
-+	        m_pFreedomLabel->setWordWrap(true);
-+		m_pFreedomLabel->setAlignment(Qt::AlignCenter);
-+	        m_pFreedomLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+		m_pFreedomLabel->hide();
-+	    }
-+
-+	    pGlobalLayout->addStretch();
-+	    pGlobalLayout->addWidget(m_pGridCnt, 0, Qt::AlignCenter);
-+	    pGlobalLayout->addWidget(m_pFreedomLabel);
-+	    pGlobalLayout->addStretch();
-+	}
-+
-+        pMainLayout->addWidget(m_pGlobalCnt);
-     }
- 
-     /* Check if host supports (AMD-V or VT-x) and long mode: */
-@@ -165,6 +206,7 @@ void UINameAndSystemEditor::retranslateUi()
-     m_pTypeCombo->setWhatsThis(tr("Displays the operating system type that "
-                                   "you plan to install into this virtual machine "
-                                   "(called a guest operating system)."));
-+    m_pFreedomLabel->setText(tr(FreedomLabel));
- }
- 
- void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
-@@ -210,6 +252,20 @@ void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
-     /* Else simply select the first one present: */
-     else m_pTypeCombo->setCurrentIndex(0);
- 
-+    /* Hide or show the freedom label if it is translated to the active language */
-+    int isEnglish = QLocale::system().language();
-+    if (m_pFreedomLabel->text() != FreedomLabel || isEnglish == 1 || isEnglish == 31)
-+    {
-+        if (strFamilyId == "Non-free OSs" || strFamilyId == "Non-free Distros")
-+        {
-+	    m_pFreedomLabel->show();
-+        }
-+        else
-+        {
-+            m_pFreedomLabel->hide();
-+        }
-+    }
-+
-     /* Update all the stuff: */
-     sltTypeChanged(m_pTypeCombo->currentIndex());
- 
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-index 6a698c0..3c23845 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-@@ -30,6 +30,7 @@
- class QLabel;
- class QLineEdit;
- class QComboBox;
-+class QFrame;
- 
- /* QWidget reimplementation providing editor for basic VM parameters: */
- class UINameAndSystemEditor : public QIWithRetranslateUI<QWidget>
-@@ -76,6 +77,8 @@ private slots:
- private:
- 
-     /* Widgets: */
-+    QFrame *m_pGlobalCnt;
-+    QFrame *m_pGridCnt;
-     QLabel *m_pNameLabel;
-     QLabel *m_pFamilyLabel;
-     QLabel *m_pTypeLabel;
-@@ -83,6 +86,7 @@ private:
-     QLineEdit *m_pNameEditor;
-     QComboBox *m_pFamilyCombo;
-     QComboBox *m_pTypeCombo;
-+    QLabel *m_pFreedomLabel;
- 
-     /* Variables: */
-     CGuestOSType m_type;
-diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-index 100cb8c..5ab98ad 100644
---- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-@@ -19,7 +19,7 @@
- 
- /* Global includes: */
- #include <QVBoxLayout>
--#include <QHBoxLayout>
-+#include <QVBoxLayout>
- #include <QGroupBox>
- #include <QGridLayout>
- #include <QSpacerItem>
-@@ -47,8 +47,11 @@ UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
-         m_pNameAndSystemCnt = new QGroupBox(this);
-         {
-             m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
-+	    m_pNameAndSystemCnt->setFixedHeight(170);
-+
-+            QVBoxLayout *pNameAndSystemCntLayout = new QVBoxLayout(m_pNameAndSystemCnt);
-             {
-+                pNameAndSystemCntLayout->setContentsMargins(8, 2, 8, 2);
-                 m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt);
-                 pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
-             }
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-index cea825b..7ade350 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-@@ -7235,6 +7235,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Показва вида на операционната система, която планирате да инсталирате на виртуалната машина (наричана виртуална операционна система).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Надяваме се, че не ползвате несвободни дистрибуции на GNU/Линукс и несвободни операционни системи, тъй като използването им означава, че се отказвате от свободата си.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-index e41d97d..f449069 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d&apos;aquesta màquina virtual (anomenat sistema operatiu client).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-index e82fc7c..a98be2c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d&apos;esta màquina virtual (anomenat sistema operatiu client).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-index 176f417..bb58906 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-@@ -7659,6 +7659,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Zobrazuje typ operačního systému, který se chystáte instalovat na tento virtuální počítač (nazývaný hostovaný operační systém).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-index 3f88de8..1d48468 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-@@ -7085,6 +7085,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Viser typen af operativsystem som du planlægger at installere i denne virtuelle maskine (kaldet gæsteoperativsystemet).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-index 14a3721..945d554 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-@@ -4838,6 +4838,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Zeigt den Typ des Betriebssystems, das Sie in der virtuellen Maschine installieren wollen (auch als Gast bezeichnet).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Wir hoffen, dass keine unfreie GNU/Linux-Distributionen und unfreie Betriebssysteme genutzt werden, da deren Nutzung bedeutet, die Freiheit aufzugeben.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-index 4e52534..3d7dba6 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-@@ -7518,6 +7518,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Muestra el tipo de sistema operativo que planea instalar en esta máquina virtual (llamado sistema operativo invitado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-index 275e1e6..34171eb 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-@@ -5951,6 +5951,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-index f902373..625da36 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-@@ -4850,6 +4850,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-index 3f31f8f..9248344 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-@@ -6717,6 +6717,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Näyttää virtuaalikoneeseen asennettavan käyttöjärjestelmän tyypin.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-index b918edb..a6868a4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-@@ -6432,6 +6432,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Affiche le type du système d&apos;exploitation (dit système d&apos;exploitation invité) que vous allez installer dans cette machine virtuelle.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Nous espérons que vous n&apos;utilisez pas de distribution GNU/Linux non libre ni de système d&apos;exploitation non libre car, si vous le faites, vous abdiquez votre liberté.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-index b04f31b..77a389f 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-@@ -6508,6 +6508,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostrar o tipo do sistema operativo  que planeas instalar nesta máquina virtual (chamado un sistema operativo convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-index 76d4371..c1aff65 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-@@ -7486,6 +7486,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>A tervezett vendég operációs rendszer típusa.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-index 349d776..fb81c2c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-@@ -6768,6 +6768,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-index 61f6a37..70e66b9 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-@@ -8063,6 +8063,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Visualizza il tipo di sistema operativo che intendi installare nella macchina virtuale (chiamato sistema operativo Guest).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Sconsigliamo di utilizzare distribuzioni GNU/Linux non libere e sistemi operativi non liberi, poiché usarli equivale a cedere la propria libertà.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-index 9ab3823..40006f9 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-@@ -8727,6 +8727,11 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>仮想マシンで実行するOS(ゲストOSと呼びます)のタイプを表示します。</translation>
-     </message>
-+    <message>
-+        <location filename="../src/widgets/UINameAndSystemEditor.cpp" line="180"/>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">わたしたちは、あなたが不自由なGNU/Linuxディストロや不自由なオペレーティング・システムを使わないことを願います。それを使うことは、あなた自身の自由を放棄することだからです。</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-index be82aab..7d73e23 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-@@ -6451,6 +6451,10 @@ medium</comment>
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">បង្ហាញ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិត​នេះ (បាន​ហៅ​ប្រព័ន្ធ​ប្រតិបត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-index 05ccf51..3fb2a07 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-@@ -7351,6 +7351,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>이 가상 머신에 설치할 운영 체제(게스트 운영 체제라고도 함) 종류를 표시합니다.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">자유롭지 못한 GNU/Linux 배포판과 독점 운영체제를 사용하는 것은 우 리의 자유를 포기하는 것과 마찬가지 이므로,  사용하지 않을 것을 권유합니다.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-index 3e06e93..cadd54b 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-@@ -6767,6 +6767,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Rodo operacinės sistemos tipą, kurį ketinate įdiegti šioje virtualioje mašinoje (pastaroji dar vadinama svečio operacine sistema).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-index 2b81abd..610dad8 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-@@ -5894,6 +5894,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Toont het type besturingssysteem dat u van plan bent op deze virtuele machine te installeren (dit wordt het gastbesturingssysteem genoemd).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Hopelijk gebruik je geen niet-vrije GNU/Linux distributies of gesloten besturingssystemen want daarmee geef je je vrijheid op.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-index 7122389..ca0b4b2 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-@@ -7311,6 +7311,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Mamy nadzieję, że nie używasz niewolnych dystrybucji GNU/Linuksa aniniewolnych systemów operacyjnych, gdyż używanie ich to oddanie Twojej wolności.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-index ebcba39..0bb693b 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-@@ -6816,6 +6816,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra o tipo de sistema operativo que planeia instalar nesta máquina virtual (chamado de sistema operativo convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-index 6a82c7e..c866fa4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-@@ -8029,6 +8029,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Exibe o tipo de sistema operacional que você planeja instalar nesta máquina virtual (chamado de sistema operacional convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Esperamos que não se usem distros não-livres de GNU/Linux e sistemas operacionais não-livres, pois ao usá-los abre-se mão de sua liberdade.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-index 3b79282..345725c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-@@ -6919,6 +6919,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Afișează tipul sistemului de operare pe care plănuiți să îl instalați în această mașină virtuală (denumit sistem de operare musafir).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-index c2230a2..653f436 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-@@ -7406,6 +7406,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется &quot;гостевая ОС&quot;).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Мы надеемся, что вы не пользуетесь несвободными дистрибутивами GNU/Linux и несвободными операционными системами, поскольку пользование ими означает, что вы отказываетесь от своей свободы.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-index 40eec9d..dcecd31 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-@@ -6762,6 +6762,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Zobrazí typ operačného systému, ktorý sa chystáte nainštalovať na tento virtuálny stroj (nazýva sa hosťovský operačný systém).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-index 9eeef05..649c108 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-@@ -7171,6 +7171,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Показује тип система који планирате да инсталирате на машину (позвано гост систем).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-index 800d10b..239a8d4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-@@ -7768,6 +7768,10 @@ serial ports</comment>
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Vi hoppas att du inte använder en begränsad, icke fri GNU/Linux distribution eller annat kommersiellt operativsystem, eftersom att du ger bort din frihet genom att göra detta.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-index cdb888e..4c8d86c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-@@ -6312,6 +6312,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Bu sanal makine içerisine kurmayı planladığınız işletim sistemi türünü gösterir (misafir işletim sistemi olarak adlandırılır).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-index 8b51e82..2557231 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-@@ -7179,6 +7179,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-index 2690322..0ea229a 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-@@ -4810,6 +4810,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-index 5b567f7..8709191 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-@@ -5858,6 +5858,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>显示你要安装到虚拟电脑的操作系统类型.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">我们真心希望您能拒绝使用非自由的操作系统，包括非自由的GNU/Linux发 行版。因为使用非自由的软件将会损害您的权利。</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-index 5d1d136..095c169 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-@@ -4834,6 +4834,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>顯示計畫安裝到此虛擬機器的作業系統類型 (稱為客體作業系統)。</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
deleted file mode 100644
index 7f236a678..000000000
--- a/libre/virtualbox-libre/libre.patch
+++ /dev/null
@@ -1,1085 +0,0 @@
---- VirtualBox-4.2.12.orig/Config.kmk	2013-04-12 07:33:55.000000000 -0300
-+++ VirtualBox-4.2.12/Config.kmk	2013-05-23 18:48:57.560690206 -0300
-@@ -56,9 +56,6 @@
- PROPS_SYSMODS_ACCUMULATE_L   += INTERMEDIATES
- PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
- 
--# Misc names used bye the install paths below.
--VBOX_PUEL_MANGLED_NAME := Oracle_VM_VirtualBox_Extension_Pack
--
- # Install paths
- ## @todo This will change after 4.1 is branched off!
- # What is now 'bin' and 'lib' will be moved down under 'staged/', except on
-@@ -129,9 +126,6 @@
- endif
- 
- INST_DOC              = doc/
--INST_EXTPACK          = $(INST_BIN)ExtensionPacks/
--INST_EXTPACK_CERTS    = $(INST_BIN)ExtPackCertificates/
--INST_EXTPACK_PUEL     = $(INST_EXTPACK)$(VBOX_PUEL_MANGLED_NAME)/
- INST_PACKAGES         = packages/
- 
- VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
-@@ -140,7 +134,6 @@
- VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
- VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
- VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
--VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
- VBOX_PATH_PACKAGES    = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
- 
- 
-@@ -215,7 +208,6 @@
-  export VBOX_ADDITIONS_SH_MODE     = release
-  export VBOX_DOCUMENTATION_SH_MODE = release
-  export VBOX_EFI_SH_MODE           = release
-- export VBOX_EXTPACKS_SH_MODE      = release
- endif
- 
- # Some info on the vendor
-@@ -368,8 +360,6 @@
- VBOX_WITH_USB = 1
- # Enable the USB 1.1 controller plus virtual USB HID devices.
- VBOX_WITH_VUSB = 1
--# Enable the USB 2.0 controller.
--VBOX_WITH_EHCI = 1
- # Enable the ISCSI feature.
- VBOX_WITH_ISCSI = 1
- # Enable INIP support in the ISCSI feature.
-@@ -441,9 +431,6 @@
- ifdef VBOX_WITH_USB
-  VBOX_WITH_VUSB = 1
- endif
--ifdef VBOX_WITH_EHCI
-- VBOX_WITH_EHCI_IMPL = 1
--endif
- ifdef VBOX_WITH_PCI_PASSTHROUGH
-  VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
- endif
-@@ -584,8 +571,6 @@
- if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
-  VBOX_WITH_CROGL = 1
- endif
--# Enable the VNC server extension pack (GPL only).
--#VBOX_WITH_EXTPACK_VNC = 1
- # Enable S3 support (requires libcurl)
- VBOX_WITH_S3 = 1
- # Enable Host=>Guest Drag'n'Drop
-@@ -625,17 +610,6 @@
- endif
- ## @}
- 
--
--## @name Extension pack
--## @{
--# Enables the extension pack feature.
--VBOX_WITH_EXTPACK = 1
--# Enables separating code into the Oracle VM VirtualBox Extension Pack, dubbed PUEL.
--VBOX_WITH_EXTPACK_PUEL = 1
--# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL
--VBOX_WITH_EXTPACK_PUEL_BUILD = 1
--## @}
--
- ## @name Misc
- ## @{
- # Enable Seamless mode
-@@ -826,14 +800,6 @@
- # Skip stuff.
- #
- 
--ifdef VBOX_ONLY_EXTPACKS
-- # Clear some VBOX_WITH_XXX variables instead of adding ifdefs all over the place.
-- VBOX_WITH_DEBUGGER =
-- VBOX_WITH_ADDITIONS =
-- VBOX_WITH_VBOXDRV =
-- VBOX_WITH_TESTCASES =
--endif
--
- # VBOX_QUICK can be used by core developers to speed to the build
- ifdef VBOX_QUICK
-  # undefine variables by assigning blank.
-@@ -888,7 +854,6 @@
-  VBOX_WITH_TESTSUITE=
-  VBOX_WITH_QTGUI=
-  VBOX_WITH_USB=
-- VBOX_WITH_EHCI=
-  VBOX_WITH_DOCS=
-  VBOX_WITH_PDM_ASYNC_COMPLETION=
-  VBOX_WITH_KCHMVIEWER=
-@@ -910,7 +875,6 @@
-  VBOX_WITH_CROGL=
-  VBOX_WITH_DEBUGGER=
-  VBOX_WITH_DOCS=
-- VBOX_WITH_EHCI=
-  VBOX_WITH_HARDENING=
-  VBOX_WITH_HEADLESS=
-  VBOX_WITH_HGCM=
-@@ -983,7 +947,7 @@
- #
- # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
- #
--VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\
-+VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\
- 	, $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
- if $(words $(VBOX_ONLY_BUILD)) > 1
-  $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD))
-@@ -1001,9 +965,6 @@
- #
- ifdef VBOX_OSE
-  VBOX_WITH_VRDP=
-- VBOX_WITH_EHCI_IMPL=
-- VBOX_WITH_EXTPACK_PUEL=
-- VBOX_WITH_EXTPACK_PUEL_BUILD=
-  VBOX_WITH_PCI_PASSTHROUGH_IMPL=
-  VBOX_WITH_OS2_ADDITIONS_BIN=
-  VBOX_WITH_SECURELABEL=
-@@ -1135,10 +1096,6 @@
-  VBOX_WITH_KCHMVIEWER=
- endif
- 
--ifdef VBOX_WITH_EXTPACK_PUEL_BUILD
-- VBOX_WITH_EXTPACK_PUEL = 1
--endif
--
- #
- # Mark OSE builds clearly, helps figuring out limitations more easily.
- #
-@@ -1743,9 +1700,6 @@
- # bin2c (convert binary files into C arrays)
- VBOX_BIN2C      ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
- 
--# RTManifest (extension pack manifest utility)
--VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
--
- # VBoxCmp (simple /bin/cmp with more sensible output)
- VBOX_VBOXCMP    ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
- 
-@@ -2633,13 +2587,6 @@
-  SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
- endif
- 
--SDK_VBoxOpenSslExtPack                 = Internal use only.
--SDK_VBoxOpenSslExtPack_INCS            = $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
--SDK_VBoxOpenSslExtPack_ORDERDEPS       = $(crypto-headers_1_TARGET)
--SDK_VBoxOpenSslExtPack_LIBS    = \
--	$(PATH_STAGE_LIB)/VBoxExtPack-libssl$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/VBoxExtPack-libcrypto$(VBOX_SUFF_LIB)
--
- SDK_VBOX_BLD_OPENSSL      = .
- SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
- SDK_VBOX_BLD_OPENSSL_LIBS ?= \
-@@ -4100,99 +4047,6 @@
- TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
- 
- 
--
--#
--# Templates used for building the extension packs.
--#
--ifdef VBOX_WITH_EXTPACK
-- # Base templates (native or portable).
-- TEMPLATE_VBoxR3ExtPack = For the ring-3 context extension pack modules.
-- if 1 # Native for now.
--  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXR3DLLNOXCPT
--  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXR3DLLNOXCPT_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3
-- else
--  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXNOCRTGCC
--  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXNOCRTGCC_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3 IPRT_NO_CRT IN_RING3
--  TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBOXR3DLLNOXCPT_INCS)
-- endif
-- ifneq ($(KBUILD_TARGET),win)
--  TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS) -fno-rtti
-- endif
-- TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- ifeq ($(KBUILD_TARGET),linux)
--  TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
-- else
--  if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
--   TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
--  endif
-- endif
-- ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
--  if1of ($(KBUILD_TARGET), win os2)
--   TEMPLATE_VBoxR3ExtPack_LIBS = \
--   	$(TEMPLATE_LIBS_VBOXR3) \
--   	$(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
--   	$(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
--  else
--   TEMPLATE_VBoxR3ExtPack_LIBS = \
--   	$(TEMPLATE_LIBS_VBOXR3) \
--   	$(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \
--   	$(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_DLL)
--  endif
-- else
--  TEMPLATE_VBoxR3ExtPack_LIBS = \
--  	$(TEMPLATE_LIBS_VBOXR3) \
--  	$(LIB_RUNTIME) \
--  	$(LIB_VMM)
-- endif
--
-- TEMPLATE_VBoxR0ExtPack = For the ring-0 context extension pack modules.
-- TEMPLATE_VBoxR0ExtPack_EXTENDS = VBoxR0
-- TEMPLATE_VBoxR0ExtPack_EXTENDS_BY = appending
-- TEMPLATE_VBoxR0ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- TEMPLATE_VBoxR0ExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R0
-- if1of ($(VBOX_LDR_FMT), pe lx)
--  TEMPLATE_VBoxR0ExtPack_LIBS = \
--	$(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-- endif
--
-- TEMPLATE_VBoxRcExtPack = For the raw-mode context extension pack modules.
-- TEMPLATE_VBoxRcExtPack_EXTENDS = VBoxRc
-- TEMPLATE_VBoxRcExtPack_EXTENDS_BY = appending
-- TEMPLATE_VBoxRcExtPack_SYSSUFF = .rc
-- TEMPLATE_VBoxRcExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- TEMPLATE_VBoxRcExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_RC
-- if1of ($(VBOX_LDR_FMT32), pe lx)
--  TEMPLATE_VBoxRcExtPack_LIBS = \
--	$(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
-- endif
--
-- TEMPLATE_VBoxInsExtPack = For the install targets of an extension pack.
-- TEMPLATE_VBoxInsExtPack_MODE = 0644
-- TEMPLATE_VBoxInsExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
--
-- # For each individual extension pack
-- ifdef VBOX_WITH_EXTPACK_PUEL
--  TEMPLATE_VBoxR3ExtPackPuel = For the ring-3 context modules in the PUEL extension pack.
--  TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
--  TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
--  TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
--  TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
--  TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
--  TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxInsExtPackPuel = For the install targets of an extension pack.
--  TEMPLATE_VBoxInsExtPackPuel_EXTENDS = VBoxR0ExtPack
--  TEMPLATE_VBoxInsExtPackPuel_INST = $(INST_EXTPACK_PUEL)
--endif
--endif # VBOX_WITH_EXTPACK
--
--
- #
- # Qt 4
- # Qt 4
---- VirtualBox-4.2.6.orig/configure	2012-12-19 16:24:34.000000000 -0200
-+++ VirtualBox-4.2.6/configure		2012-12-27 14:26:25.743442978 -0200
-@@ -90,8 +90,6 @@
- WITH_HARDENING=1
- WITH_UDPTUNNEL=1
- WITH_VDE=0
--WITH_VNC=0
--WITH_EXTPACK=1
- WITH_DOCS=1
- BUILD_LIBXML2=
- BUILD_LIBCURL=
-@@ -124,8 +122,6 @@
- MESA="-lGL"
- INCZ=""
- LIBZ="-lz"
--INCVNCSERVER=""
--LIBVNCSERVER="-lvncserver"
- INCDEVMAPPER=""
- LIBDEVMAPPER="-ldevmapper"
- CXX_FLAGS=""
-@@ -930,47 +926,6 @@
- }
- 
- #
--# Check for libvncserver, needed for VNC in OSE
--#
--check_vncserver()
--{
--  test_header libvncserver
--  cat > $ODIR.tmp_src.cc <<EOF
--#include <cstdio>
--#include <rfb/rfbconfig.h>
--
--extern "C" int main()
--{
--  const char* v=LIBVNCSERVER_VERSION;
--  unsigned int major = 0, minor = 0, micro = 0;
--
--  for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0';
--  if (*v == '.') v++;
--  for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0';
--  if (*v == '.') v++;
--  for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0';
--
--  printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION);
--  if (major*10000 + minor*100 + micro >= 900)
--  {
--    printf(", OK.\n");
--    return 0;
--  }
--  else
--  {
--    printf(", expected version 0.9 or higher\n");
--    return 1;
--  }
--}
--EOF
--  if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then
--    if test_execute; then
--      cnf_append "VBOX_WITH_EXTPACK_VNC" "1"
--    fi
--  fi
--}
--
--#
- # Check for libcurl, needed by S3
- #
- check_curl()
-@@ -2173,8 +2128,6 @@
- [ $WITH_KMODS   -eq 1 ] && echo "  --disable-kmods          don't build Linux kernel modules (host and guest)"
- [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
- [ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
--[ $OSE          -eq 1 ] && echo "  --enable-vnc             enable the VNC server"
--[ $OSE          -eq 0 ] && echo "  --disable-extpack        don't build the extpack"
- [ $WITH_DOCS    -eq 1 ] && echo "  --disable-docs           don't build the documentation"
- [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
- cat << EOF
-@@ -2346,15 +2299,9 @@
-     --enable-webservice)
-       [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
-       ;;
--    --enable-vnc)
--      WITH_VNC=1
--      ;;
-     --disable-hardening)
-       WITH_HARDENING=0
-       ;;
--    --disable-extpack)
--      WITH_EXTPACK=0
--      ;;
-     --disable-docs)
-       WITH_DOCS=0
-       ;;
-@@ -2512,15 +2459,6 @@
-   echo >> $CNF
- fi
- 
--# extpack
--if [ $OSE -eq 0 ]; then
--  if [ $WITH_EXTPACK -eq 1 ]; then
--    BUILD_LIBSSL=1
--  else
--    cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" ""
--  fi
--fi
--
- # headless
- if [ -n "$HEADLESS" ]; then
-   cnf_append "VBOX_HEADLESS" "1"
-@@ -2646,15 +2584,6 @@
-   cnf_append "VBOX_WITH_DOCS_PACKING" ""
- fi
- 
--# VNC server support
--if [ $OSE -ge 1 ]; then
--  if [ $WITH_VNC = 1 ]; then
--    check_vncserver
--  else
--    cnf_append "VBOX_WITH_EXTPACK_VNC" ""
--  fi
--fi
--
- # success!
- echo
- echo "Successfully generated '$CNF' and '$ENV'."
---- VirtualBox-4.2.12.orig/Makefile.kmk	2013-04-12 07:33:55.000000000 -0300
-+++ VirtualBox-4.2.12/Makefile.kmk	2013-05-10 15:04:21.967970195 -0300
-@@ -388,7 +388,6 @@
- 	include/VBox \
- 	include/VBox/vmm \
- 	include/VBox/com \
--	include/VBox/ExtPack \
- 	include/VBox/HostServices \
- 	include/VBox/GuestHost \
- 	include/VBox/HGSMI \
-@@ -1010,200 +1009,6 @@
- 
- 
- #
--# Build the extension packs, all of them.
--#
--# This is tailored (hardcoded) for the extension pack build box.
--#
--# The fetching must be done in serial fashion, while the building should be
--# more flexible wrt to -jN.
--#
--extpacks-fetch:
--	+ $(KMK) -C tools fetch VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   BUILD_TARGET_ARCH=x86   BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     BUILD_TARGET_ARCH=x86   BUILD_TARGET=os2      VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86   BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win	     VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     BUILD_TARGET_ARCH=x86   BUILD_TARGET=win	     VBOX_ONLY_EXTPACKS=1
--
--
--extpacks-build: \
--	extpacks-build-win.amd64 \
--	extpacks-build-win.x86 \
--	extpacks-build-solaris.amd64 \
--	extpacks-build-solaris.x86 \
--	extpacks-build-os2.x86 \
--	extpacks-build-linux.amd64 \
--	extpacks-build-linux.x86 \
--	extpacks-build-darwin.amd64 \
--	extpacks-build-darwin.x86 \
--	extpacks-build-freebsd.amd64 \
--	extpacks-build-freebsd.x86
--
--VBOX_EXTPACKS_BUILD.amd64 = VBOX_ONLY_EXTPACKS=1 \
--	KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
--	KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
--	VBOX_SVN_REV=$(VBOX_SVN_REV)
--
--VBOX_EXTPACKS_BUILD.x86 = VBOX_ONLY_EXTPACKS=1 \
--	KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
--	KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
--	VBOX_SVN_REV=$(VBOX_SVN_REV)
--
--# Automatically determine the extpack build subdir name. Used for figuring out
--# directory names inside the extension pack building VMs.
--VBOX_EXTPACKS_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
--
--# When building in parallel on a Windows host, make sure we finish the host
--# bit before kicking off any UNIX guest or we'll run into file sharing issues.
--ifeq ($(KBUILD_TARGET),win)
--VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
--else
--VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
--endif
--
--extpacks-build-win.amd64:
--ifeq ($(KBUILD_TARGET),win)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs)
--endif
--
--extpacks-build-win.x86:
--ifeq ($(KBUILD_TARGET),win)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
--endif
--
--ifeq ($(KBUILD_TARGET),solaris)
--extpacks-build-solaris.amd64:
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--
--extpacks-build-solaris.x86: extpacks-build-solaris.amd64
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--
--else
--# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
--extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--
--extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
--	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
--	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs)
--
--extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
--	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
--	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
--
--.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm
--.PHONY:       extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
--
--extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
--extpacks-build-solaris.x86: extpacks-build-solaris.rsync-out-of-vm
--endif
--
--extpacks-build-os2.x86:
--#ifeq ($(KBUILD_TARGET),os2)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
--#endif
--
--extpacks-build-linux.amd64:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
--endif
--
--extpacks-build-linux.x86:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
--endif
--
--extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs)
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs)
--#endif
--
--extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs)
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs)
--#endif
--
--extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
--	$(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs)
--endif
--
--extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 extension packs)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
--	$(call VBOX_BLD_VM_MSG_END__,Darwin/x86 extension packs)
--endif
--
--
--extpacks-packing:
--	+ $(KMK) VBOX_ONLY_EXTPACKS=1 \
--		VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 darwin.x86 linux.amd64 linux.x86 solaris.amd64 solaris.x86 win.amd64 win.x86" \
--		packing
--# +++ freebsd.amd64 freebsd.x86 os2.x86 ^^^
--
--.PHONY: \
--	extpacks-build-win.x86 \
--	extpacks-build-win.amd64 \
--	extpacks-build-solaris.amd64 \
--	extpacks-build-solaris.x86 \
--	extpacks-build-os2.x86 \
--	extpacks-build-linux.amd64 \
--	extpacks-build-linux.x86 \
--	extpacks-build-freebsd.amd64 \
--	extpacks-build-freebsd.x86 \
--	extpacks-build-darwin.amd64 \
--	extpacks-build-darwin.x86 \
--	extpacks-packing
--
--
--#
- # Build the test suite, all of it.
- #
- # This is currently tailored (hardcoded) for the additions build box just like
---- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp		2012-06-20 10:15:51.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp			2012-07-24 16:18:03.964493454 -0300
-@@ -132,11 +132,6 @@
-     if (RT_FAILURE(rc))
-         return rc;
- #endif
--#ifdef VBOX_WITH_EHCI_IMPL
--    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
--    if (RT_FAILURE(rc))
--        return rc;
--#endif
- #ifdef VBOX_ACPI
-     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);
-     if (RT_FAILURE(rc))
---- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.h		2012-06-20 10:15:51.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.h			2012-07-24 16:20:35.939205389 -0300
-@@ -62,7 +62,6 @@
- extern const PDMDEVREG g_DeviceICH6_HDA;
- extern const PDMDEVREG g_DeviceAudioSniffer;
- extern const PDMDEVREG g_DeviceOHCI;
--extern const PDMDEVREG g_DeviceEHCI;
- extern const PDMDEVREG g_DeviceACPI;
- extern const PDMDEVREG g_DeviceDMA;
- extern const PDMDEVREG g_DeviceFloppyController;
---- VirtualBox-4.1.18.orig/include/Makefile.kmk		2012-06-20 10:07:49.000000000 -0300
-+++ VirtualBox-4.1.18/include/Makefile.kmk		2012-07-24 21:11:57.007068865 -0300
-@@ -51,7 +51,6 @@
- 	VBox/vd-cache-plugin.h \
- 	VBox/vmm/uvm.h \
- 	VBox/vscsi.h \
--	$(wildcard VBox/ExtPack/*.h ) \
- 	iprt/alloca.h \
- 	iprt/tcp.h \
- 	iprt/localipc.h \
---- VirtualBox-4.2.0.orig/src/Makefile.kmk	2012-08-03 09:28:25.000000000 -0300
-+++ VirtualBox-4.2.0/src/Makefile.kmk		2012-09-19 03:01:57.588337894 -0300
-@@ -23,10 +23,8 @@
- if !defined(VBOX_ONLY_ADDITIONS)
-  include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
- endif
--if defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && defined(VBOX_WITH_REM)
-- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
- 
--else if !defined(VBOX_ONLY_BUILD)
-+if !defined(VBOX_ONLY_BUILD)
-  # Normal build.
-  if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
-   ifdef VBOX_WITH_REM
---- VirtualBox-4.2.0.orig/src/VBox/Makefile.kmk		2012-05-30 07:39:32.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Makefile.kmk		2012-09-19 00:03:08.577726965 -0300
-@@ -33,19 +33,6 @@
-  include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
-  include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
- 
--else ifdef VBOX_ONLY_EXTPACKS
-- include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/Devices/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
-- ifdef VBOX_WITH_VRDP
--  include $(PATH_SUB_CURRENT)/RDP/Makefile.kmk
-- endif
-- include $(PATH_SUB_CURRENT)/VMM/Makefile.kmk
-- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
--  include $(PATH_SUB_CURRENT)/Disassembler/Makefile.kmk
-- endif
--
- else ifdef VBOX_ONLY_SDK
-  include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
-  ifdef VBOX_WITH_VRDP
-@@ -92,7 +79,6 @@
-  if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
-   include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
-  endif
-- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
-  ifdef VBOX_WITH_INSTALLER
-   include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk 		        # Keep this last.
-  endif
---- VirtualBox-4.2.12.orig/src/libs/Makefile.kmk	2013-04-12 07:39:14.000000000 -0300
-+++ VirtualBox-4.2.12/src/libs/Makefile.kmk		2013-04-13 02:00:29.294392443 -0300
-@@ -48,13 +48,6 @@
-  include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
- endif
- 
--# OpenSSL.
--if !defined(VBOX_ONLY_SDK) \
-- && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
--     || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
-- include $(PATH_SUB_CURRENT)/openssl-0.9.8y/Makefile.kmk
--endif
--
- # libjpeg for VRDP video redirection
- if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL)
-  include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk
---- VirtualBox-4.2.0.orig/src/VBox/Devices/Makefile.kmk		2012-08-03 09:28:25.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Devices/Makefile.kmk		2012-09-19 02:54:35.912748288 -0300
-@@ -25,9 +25,7 @@
- 
- # Include sub-makefiles.
- include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
--if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
-- include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
--else if defined(VBOX_WITH_PXE_ROM)
-+if defined(VBOX_WITH_PXE_ROM)
-  if !defined(VBOX_WITHOUT_ETHERBOOT)
-   include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
-  endif
-@@ -71,9 +69,6 @@
-  ifdef VBOX_WITH_USB
-   VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
-   VBoxDDU_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDDU_DEFS          += VBOX_WITH_EHCI_IMPL
--  endif
-   ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    VBoxDDU_DEFS.darwin   += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-   endif
-@@ -326,15 +321,7 @@
-    	Storage/UsbMsd.cpp
-   endif
- 
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
--  endif
-   VBoxDD_DEFS           += VBOX_WITH_USB
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
--   VBoxDD_SOURCES       += \
-- 	USB/DevEHCI.cpp
--  endif
- 
-  endif # VBOX_WITH_USB
- 
-@@ -869,11 +856,6 @@
- 
-   ifdef VBOX_WITH_USB
-    VBoxDDGC_DEFS        += VBOX_WITH_USB
--   if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--    VBoxDDGC_DEFS       += VBOX_WITH_EHCI_IMPL
--    VBoxDDGC_SOURCES    += \
--  	USB/DevEHCI.cpp
--   endif
-   endif
- 
-   ifdef VBOX_WITH_VIDEOHWACCEL
-@@ -1020,11 +1002,6 @@
-  endif
-  ifdef VBOX_WITH_USB
-  VBoxDDR0_DEFS          += VBOX_WITH_USB
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDDR0_DEFS        += VBOX_WITH_EHCI_IMPL
--   VBoxDDR0_SOURCES     += \
-- 	USB/DevEHCI.cpp
--  endif
-  endif
- 
-  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-@@ -1163,50 +1140,5 @@
- endif # !VBOX_ONLY_EXTPACKS
- 
- 
--if defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD)
-- #
-- # The EHCI (USB 2.0) Extension Pack Modules.
-- #
-- if defined(VBOX_WITH_USB)
--  DLLS += VBoxEhciR3
--  VBoxEhciR3_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxEhciR3_SOURCES  = USB/DevEHCI.cpp
--
--  SYSMODS += VBoxEhciR0
--  VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
--  VBoxEhciR0_SOURCES  = USB/DevEHCI.cpp
--
--  ifdef VBOX_WITH_RAW_MODE
--   SYSMODS += VBoxEhciRC
--   VBoxEhciRC_TEMPLATE = VBoxRcExtPackPuel
--   VBoxEhciRC_SOURCES  = USB/DevEHCI.cpp
--  endif
-- endif
--
-- if defined(VBOX_WITH_PCI_PASSTHROUGH)
--  DLLS += VBoxPciRawR3
--  VBoxPciRawR3_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxPciRawR3_SOURCES  = Bus/DevPciRaw.cpp
--
--  DLLS += VBoxPciRawDrv
--  VBoxPciRawDrv_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxPciRawDrv_SOURCES = Bus/DrvPciRaw.cpp
--
--  SYSMODS += VBoxPciRawR0
--  VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel
--  VBoxPciRawR0_SOURCES  = Bus/DevPciRaw.cpp
--
--  Bus/DevPciRaw.cpp_INCS   = Bus
-- endif
--
--
-- #
-- # The Intel PXE rom.
-- #
-- INSTALLS += VBoxExtPackPuelInsRoms
-- VBoxExtPackPuelInsRoms_TEMPLATE = VBoxInsExtPackPuel
-- VBoxExtPackPuelInsRoms_SOURCES = PC/PXE/PXE-Intel.rom=>PXE-Intel.rom
--endif # VBOX_WITH_EXTPACK_PUEL
--
- include $(FILE_KBUILD_SUB_FOOTER)
- 
---- VirtualBox-4.2.0.orig/src/VBox/Main/Makefile.kmk	2012-09-04 09:48:44.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/Makefile.kmk		2012-09-19 00:46:39.251763337 -0300
-@@ -233,14 +233,12 @@
- 	$(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
- 	$(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
- 	$(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
--	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
- 	$(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
- 	$(if $(VBOX_WITH_S3),VBOX_WITH_S3,) \
- 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
- ifdef VBOX_WITH_USB
-  VBoxSVC_DEFS += \
- 	VBOX_WITH_USB \
--	$(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
- 	$(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
- endif
- VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
-@@ -293,7 +291,6 @@
- 	src-all/SharedFolderImpl.cpp \
- 	src-all/VirtualBoxBase.cpp \
- 	src-all/VirtualBoxErrorInfoImpl.cpp \
--	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
- 	src-server/ApplianceImpl.cpp \
- 	src-server/ApplianceImplExport.cpp \
- 	src-server/ApplianceImplImport.cpp \
-@@ -538,8 +535,6 @@
- 	$(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \
- 	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \
- 	$(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
--	$(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
--	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
- 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
- 	$(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
- 
-@@ -605,7 +600,6 @@
- 	src-all/SharedFolderImpl.cpp \
- 	src-all/VirtualBoxBase.cpp \
- 	src-all/VirtualBoxErrorInfoImpl.cpp \
--	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
- 	$(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \
- 	$(if $(VBOX_WITH_USB_CARDREADER),src-client/UsbCardReader.cpp,) \
- 	src-client/Nvram.cpp \
-@@ -733,22 +727,6 @@
- 	$(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
- 
- 
--#
--# The VBoxExtPackHelperApp.
--#
--ifdef VBOX_WITH_EXTPACK
-- PROGRAMS += VBoxExtPackHelperApp
-- VBoxExtPackHelperApp_TEMPLATE = VBoxR3SetUidToRoot
-- VBoxExtPackHelperApp_LDFLAGS.darwin = -framework Security
-- VBoxExtPackHelperApp_LDFLAGS.win = /SUBSYSTEM:windows
-- VBoxExtPackHelperApp_SOURCES = \
--	src-helper-apps/VBoxExtPackHelperApp.cpp \
--	src-all/ExtPackUtil.cpp
-- VBoxExtPackHelperApp_LIBS = \
--	$(LIB_RUNTIME)
--endif # VBOX_WITH_EXTPACK
--
--
- endif # !VBOX_ONLY_SDK (the ifndef is far above)
- 
- 
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk		2012-07-24 23:25:04.575825175 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/Makefile.kmk		2012-07-24 23:25:04.619156084 -0300
-@@ -888,7 +888,6 @@
- 	$(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
- 	$(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox.icns=>Resources/virtualbox-vbox.icns \
--	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns=>Resources/virtualbox-vbox-extpack.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-05-30 07:39:18.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-09-19 00:51:25.413310527 -0300
-@@ -169,18 +169,6 @@
-         <file alias="status_check_32px.png">images/status_check_32px.png</file>
-         <file alias="status_error_16px.png">images/status_error_16px.png</file>
-         <file alias="status_error_32px.png">images/status_error_32px.png</file>
--        <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
--        <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
--        <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
--        <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
--        <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
--        <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
--        <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
--        <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
--        <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
--        <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
--        <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
--        <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
-         <file alias="proxy_16px.png">images/proxy_16px.png</file>
-         <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
-         <file alias="proxy_32px.png">images/proxy_32px.png</file>
---- VirtualBox-4.1.18.orig/src/VBox/Installer/linux/Makefile.kmk	2012-07-25 00:32:00.780012664 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/linux/Makefile.kmk		2012-07-25 00:32:00.806677728 -0300
-@@ -170,11 +170,6 @@
- 	VBox.sh \
- 	VBox.png
- 
--ifdef VBOX_WITH_EXTPACK
-- VBOX_LNX_STRIP_BIN += \
--	VBoxExtPackHelperApp
--endif
--
- # Qt4 GUI
- ifdef VBOX_WITH_QTGUI
-  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-@@ -286,7 +281,7 @@
- 
- VBOX_MIME_ICONS = \
- 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
--	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	    $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 		    virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
- 
---- VirtualBox-4.1.18.orig/src/VBox/Installer/win/Makefile.kmk		2012-07-25 00:34:52.253398525 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/win/Makefile.kmk		2012-07-25 00:34:52.300062531 -0300
-@@ -435,7 +435,6 @@
- 		-E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
- 		-E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
- 		-E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
--		-E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \
- 		-E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \
- 		-E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
- 		-E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
---- VirtualBox-4.2.0.orig/src/VBox/Installer/darwin/Makefile.kmk	2012-09-08 06:36:03.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Installer/darwin/Makefile.kmk		2012-09-19 00:55:08.991167973 -0300
-@@ -497,7 +497,6 @@
- 	MacOS/VirtualBoxVM \
- 	MacOS/VBoxNetAdpCtl \
- 	MacOS/VBoxNetDHCP \
--	MacOS/VBoxExtPackHelperApp \
- 	MacOS/VBoxBalloonCtrl \
- 	MacOS/VBoxAutostart
- ifdef VBOX_WITH_WEBSERVICES
-@@ -522,7 +521,6 @@
- 	Resources/virtualbox.icns \
- 	Resources/virtualbox.png \
- 	Resources/virtualbox-vbox.icns \
--	Resources/virtualbox-vbox-extpack.icns \
- 	Resources/virtualbox-ovf.icns \
- 	Resources/virtualbox-ova.icns \
- 	Resources/virtualbox-vdi.icns \
---- VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk.orig	2012-07-25 00:38:48.476398293 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk		2012-07-25 00:38:48.516396159 -0300
-@@ -185,12 +185,12 @@
- 
- VBOX_MIME_ICONS = \
- 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
--	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	    $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 	            virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
- 
- SOLARIS_COMMON_ICONS = \
--	$(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	$(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	    $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 	        $(s)x$(s)/mimetypes/virtualbox-$(f).png))
- 
-@@ -210,7 +210,6 @@
- 	$(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
- 	$(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \
- 	VBoxNetDHCP \
--	$(if $(VBOX_WITH_EXTPACK),VBoxExtPackHelperApp,) \
- 	VBoxSVC \
- 	$(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
- 	VBoxXPCOMIPCD \
---- VirtualBox-4.1.18.orig/src/VBox/Runtime/Makefile.kmk	2012-07-25 00:40:58.745522450 -0300
-+++ VirtualBox-4.1.18/src/VBox/Runtime/Makefile.kmk		2012-07-25 00:40:58.782186960 -0300
-@@ -53,15 +53,6 @@
-  #
-  LIBRARIES += RuntimeR3 RuntimeBldProg
- 
--else ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
-- #
-- # Build docs only - need just regular R3 runtime.
-- #
-- LIBRARIES += RuntimeBldProg
-- LIBRARIES.solaris += RuntimeR0Stub
-- LIBRARIES.win += RuntimeR0Stub RuntimeRCStub
-- include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
--
- else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
- 
-  #
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp		2013-05-23 18:59:56.434051894 -0300
-@@ -650,27 +650,6 @@
-     }
- };
- 
--class PerformInstallGuestToolsAction : public UIActionSimple
--{
--    Q_OBJECT;
--
--public:
--
--    PerformInstallGuestToolsAction(QObject *pParent)
--        : UIActionSimple(pParent, ":/guesttools_16px.png", ":/guesttools_disabled_16px.png")
--    {
--        retranslateUi();
--    }
--
--protected:
--
--    void retranslateUi()
--    {
--        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Install Guest Additions...")), gMS->shortcut(UIMachineShortcuts::InstallGuestAdditionsShortcut)));
--        setStatusTip(QApplication::translate("UIActionPool", "Mount the Guest Additions installation image"));
--    }
--};
--
- #ifdef VBOX_WITH_DEBUGGER_GUI
- class MenuDebugAction : public UIActionMenu
- {
-@@ -889,7 +868,6 @@
-     m_pool[UIActionIndexRuntime_Simple_NetworkAdaptersDialog] = new ShowNetworkAdaptersDialogAction(this);
-     m_pool[UIActionIndexRuntime_Simple_SharedFoldersDialog] = new ShowSharedFoldersDialogAction(this);
-     m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new ToggleVRDEServerAction(this);
--    m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new PerformInstallGuestToolsAction(this);
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* 'Debug' actions: */
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h		2013-05-24 11:26:13.789861574 -0300
-@@ -62,7 +62,6 @@
-     UIActionIndexRuntime_Menu_SharedFolders,
-     UIActionIndexRuntime_Simple_SharedFoldersDialog,
-     UIActionIndexRuntime_Toggle_VRDEServer,
--    UIActionIndexRuntime_Simple_InstallGuestTools,
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* 'Debugger' menu actions: */
-diff -Nur VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
---- VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-06-21 09:26:42.000000000 -0300
-+++ VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-06-24 18:08:12.915719347 -0300
-@@ -704,7 +704,6 @@
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders));
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
--    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
- 
-     /* Move actions into running-n-paused-n-stuck actions group: */
-     m_pRunningOrPausedOrStuckActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff));
-@@ -765,8 +764,6 @@
-             this, SLOT(sltOpenSharedFoldersDialog()));
-     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
-             this, SLOT(sltSwitchVrde(bool)));
--    connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()),
--            this, SLOT(sltInstallGuestAdditions()));
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* "Debug" actions connections: */
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp		2013-05-24 11:28:03.193841501 -0300
-@@ -244,8 +244,6 @@
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog));
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
--    pMenu->addSeparator();
--    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
- }
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
diff --git a/libre/virtualbox-libre/os_blag.png b/libre/virtualbox-libre/os_blag.png
deleted file mode 100644
index 61995ca10..000000000
Binary files a/libre/virtualbox-libre/os_blag.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_blag_64.png b/libre/virtualbox-libre/os_blag_64.png
deleted file mode 100644
index aa4463a97..000000000
Binary files a/libre/virtualbox-libre/os_blag_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_dragora.png b/libre/virtualbox-libre/os_dragora.png
deleted file mode 100644
index d1df45880..000000000
Binary files a/libre/virtualbox-libre/os_dragora.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_dragora_64.png b/libre/virtualbox-libre/os_dragora_64.png
deleted file mode 100644
index 64bcecf20..000000000
Binary files a/libre/virtualbox-libre/os_dragora_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_dynebolic.png b/libre/virtualbox-libre/os_dynebolic.png
deleted file mode 100644
index 67b07d4c0..000000000
Binary files a/libre/virtualbox-libre/os_dynebolic.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_gnewsense.png b/libre/virtualbox-libre/os_gnewsense.png
deleted file mode 100644
index 76d9e38b3..000000000
Binary files a/libre/virtualbox-libre/os_gnewsense.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_gnewsense_64.png b/libre/virtualbox-libre/os_gnewsense_64.png
deleted file mode 100644
index 8859c34e8..000000000
Binary files a/libre/virtualbox-libre/os_gnewsense_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_gnu.png b/libre/virtualbox-libre/os_gnu.png
deleted file mode 100644
index 26c4550f9..000000000
Binary files a/libre/virtualbox-libre/os_gnu.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_gnu_64.png b/libre/virtualbox-libre/os_gnu_64.png
deleted file mode 100644
index 4161634e9..000000000
Binary files a/libre/virtualbox-libre/os_gnu_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_gnuhurd.png b/libre/virtualbox-libre/os_gnuhurd.png
deleted file mode 100644
index 26c4550f9..000000000
Binary files a/libre/virtualbox-libre/os_gnuhurd.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_gnulinux.png b/libre/virtualbox-libre/os_gnulinux.png
deleted file mode 100644
index 26c4550f9..000000000
Binary files a/libre/virtualbox-libre/os_gnulinux.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_gnulinux_64.png b/libre/virtualbox-libre/os_gnulinux_64.png
deleted file mode 100644
index 4161634e9..000000000
Binary files a/libre/virtualbox-libre/os_gnulinux_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_musix.png b/libre/virtualbox-libre/os_musix.png
deleted file mode 100644
index fb7b94577..000000000
Binary files a/libre/virtualbox-libre/os_musix.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_musix_64.png b/libre/virtualbox-libre/os_musix_64.png
deleted file mode 100644
index a1bbbbf3a..000000000
Binary files a/libre/virtualbox-libre/os_musix_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_os64base.png b/libre/virtualbox-libre/os_os64base.png
deleted file mode 100644
index 7aec20314..000000000
Binary files a/libre/virtualbox-libre/os_os64base.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_os64base.xcf b/libre/virtualbox-libre/os_os64base.xcf
deleted file mode 100644
index d8e28e35e..000000000
Binary files a/libre/virtualbox-libre/os_os64base.xcf and /dev/null differ
diff --git a/libre/virtualbox-libre/os_osbase.png b/libre/virtualbox-libre/os_osbase.png
deleted file mode 100644
index 00f197fca..000000000
Binary files a/libre/virtualbox-libre/os_osbase.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_osbase.xcf b/libre/virtualbox-libre/os_osbase.xcf
deleted file mode 100644
index c4463c857..000000000
Binary files a/libre/virtualbox-libre/os_osbase.xcf and /dev/null differ
diff --git a/libre/virtualbox-libre/os_parabola.png b/libre/virtualbox-libre/os_parabola.png
deleted file mode 100644
index 757abc484..000000000
Binary files a/libre/virtualbox-libre/os_parabola.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_parabola_64.png b/libre/virtualbox-libre/os_parabola_64.png
deleted file mode 100644
index 5ac7c2767..000000000
Binary files a/libre/virtualbox-libre/os_parabola_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_trisquel.png b/libre/virtualbox-libre/os_trisquel.png
deleted file mode 100644
index c6f0d3d7a..000000000
Binary files a/libre/virtualbox-libre/os_trisquel.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_trisquel_64.png b/libre/virtualbox-libre/os_trisquel_64.png
deleted file mode 100644
index ebca3dd43..000000000
Binary files a/libre/virtualbox-libre/os_trisquel_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_ututo.png b/libre/virtualbox-libre/os_ututo.png
deleted file mode 100644
index e1dffb575..000000000
Binary files a/libre/virtualbox-libre/os_ututo.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_ututo_64.png b/libre/virtualbox-libre/os_ututo_64.png
deleted file mode 100644
index 158468e0a..000000000
Binary files a/libre/virtualbox-libre/os_ututo_64.png and /dev/null differ
diff --git a/libre/virtualbox-libre/os_venenux.png b/libre/virtualbox-libre/os_venenux.png
deleted file mode 100644
index 5e0c1585d..000000000
Binary files a/libre/virtualbox-libre/os_venenux.png and /dev/null differ
diff --git a/libre/virtualbox-libre/vboxservice.service b/libre/virtualbox-libre/vboxservice.service
deleted file mode 100644
index bbd61617d..000000000
--- a/libre/virtualbox-libre/vboxservice.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=VirtualBox Guest Service
-ConditionVirtualization=oracle
-
-[Service]
-ExecStart=/usr/bin/VBoxService -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/vboxweb.service b/libre/virtualbox-libre/vboxweb.service
deleted file mode 100644
index 303381597..000000000
--- a/libre/virtualbox-libre/vboxweb.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=VirtualBox Web Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/vboxweb.pid
-ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid  --background
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
deleted file mode 100644
index 067c5b35e..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  dkms add vboxguest/${1%-*}
-  cat << EOF
-==> To build and install your modules run: dkms install vboxguest/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  # Remove modules using dkms
-  [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
deleted file mode 100644
index 38bbe807d..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  getent group vboxsf > /dev/null || groupadd -g 109 vboxsf
-  true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-  # rename /etc/rc.d/vboxservice
-  if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then
-    cat << EOF
-==> rc.d vbox-service script was renamed to vboxservice.
-EOF
-  fi
-  # fix gid of vboxsf
-  if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then
-    groupmod -g 109 vboxsf
-  fi
-  true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  groupdel vboxsf >/dev/null 2>&1 || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
deleted file mode 100644
index 8bc316e49..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
+++ /dev/null
@@ -1,30 +0,0 @@
-#/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  dkms add vboxhost/${1%-*}
-  cat << EOF
-==> To build and install your modules run: dkms install vboxhost/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  # Remove modules using dkms
-  [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
deleted file mode 100644
index ad4f70f76..000000000
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-utils() {
-  if [ -x usr/bin/update-mime-database ]; then
-    update-mime-database usr/share/mime > /dev/null 2>&1
-  fi
-
-  if [ -x usr/bin/xdg-icon-resource ]; then
-    xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
-  fi
-
-  if [ -x usr/bin/update-desktop-database ]; then
-    usr/bin/update-desktop-database -q
-  fi
-
-  if [ -x usr/bin/udevadm ]; then
-    usr/bin/udevadm control --reload
-  fi
-}
-
-# arg 1:  the new package version
-post_install() {
-  getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers
-  utils
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-post_remove() {
-  groupdel vboxusers >/dev/null 2>&1 || true
-  utils
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
-- 
cgit v1.2.3-2-g168b