Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/esmtp/PKGBUILD
	community/geany-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/guichan/PKGBUILD
	community/mxml/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	core/libtool/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/udev/PKGBUILD
	extra/audacious/PKGBUILD
	extra/conky/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/kino/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postfix/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xfburn/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/yelp/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine/wine.install

1 files changed, 45 insertions, 0 deletions

diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch
new file mode 100644
index 000000000..c310dbc8d
--- /dev/null
+++ b/community-testing/virtualbox/vboxdrv-reference.patch
@@ -0,0 +1,45 @@
+diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-07-19 15:11:37.730121727 +0000
++++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-07-19 19:02:15.658471139 +0000
+@@ -75,9 +75,8 @@
+   "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. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
+-  "package first. This package keeps track of Linux kernel changes and "
++  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
++  "as root. This package keeps track of Linux kernel changes and"
+   "recompiles the vboxdrv kernel module if necessary."
+   );
+ 
+@@ -92,7 +91,7 @@
+   "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/>"
++  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
+   "may correct this. Make sure that you do not mix the "
+   "OSE version and the PUEL version of VirtualBox."
+   );
+diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-07-19 15:11:37.603453927 +0000
++++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh	2011-07-19 19:02:15.658471139 +0000
+@@ -34,7 +34,7 @@
+          available for the current kernel (`uname -r`) or it failed to
+          load. Please recompile the kernel module and install it by
+ 
+-           sudo /etc/init.d/vboxdrv setup
++           sudo /usr/bin/vboxbuild
+ 
+          You will not be able to start VMs until this problem is fixed.
+ EOF
+@@ -42,7 +42,7 @@
+     cat << EOF
+ WARNING: The character device /dev/vboxdrv does not exist. Try
+ 
+-           sudo /etc/init.d/vboxdrv restart
++           sudo /usr/bin/vboxbuild
+ 
+          and if that is not successful, try to re-install the package.
+