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

Conflicts:
	community/virtualbox/PKGBUILD
	extra/irqbalance/PKGBUILD
	extra/lirc/PKGBUILD
	extra/ruby/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/wine/PKGBUILD

25 files changed, 372 insertions, 172 deletions

diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD
index f775387d1..a109c889c 100644
--- a/community/bacula/PKGBUILD
+++ b/community/bacula/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Matias Hernandez <msdark@archlinux.cl>
 
 pkgname=bacula
-pkgver=5.0.3
-pkgrel=6
+pkgver=5.2.1
+pkgrel=1
 pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)"
 arch=(mips64el)
 url="http://www.${pkgname}.org"
@@ -26,7 +26,7 @@ source=(http://downloads.sourceforge.net/project/bacula/bacula/${pkgver}/${pkgna
         ${pkgname}-sd.rc.d
         ${pkgname}-fd.rc.d
         ${pkgname}-dir.rc.d)
-md5sums=('9de254ae39cab0587fdb2f5d8d90b03b'
+md5sums=('793da9f89fc5e024b6b95eb16a3120e5'
          'e7be4c9fb3c7ce334f9ee24d71652d3e'
          'a9a070a862e9cf39ae4bc374409c721d'
          '55619ae3094c698541a3bfedc87bdb48')
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index 8b79de1f5..e231f2f09 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53785 2011-08-08 08:18:16Z spupykin $
+# $Id: PKGBUILD 58212 2011-11-08 22:41:05Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 
 pkgname=cdfs
 pkgver=2.6.27
-pkgrel=16
+pkgrel=17
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64 'mips64el')
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
@@ -19,10 +19,10 @@ md5sums=('ac64c014a90e3c488394832ea29605b3'
 build() {
   _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
   depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
+  _kernverfull=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
 
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/cdfs-3.0.0.patch
-  make
-  mkdir -p $pkgdir/lib/modules/`uname -r`/extra
-  cp cdfs.ko $pkgdir/lib/modules/`uname -r`/extra
+  make KDIR=/lib/modules/${_kernverfull}/build
+  install -Dm0644 cdfs.ko $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
 }
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index e2f16517a..dfae03e72 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 56335 2011-10-05 19:07:45Z andrea $
+# $Id: PKGBUILD 58181 2011-11-08 11:48:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
 
 pkgname=darktable
-pkgver=0.9.2
+pkgver=0.9.3
 _pkgver=0.9
-pkgrel=2
+pkgrel=1
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
@@ -18,7 +18,7 @@ optdepends=( 'librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
-md5sums=('08377e80ad77c7b11f742f26fddb80f1')
+md5sums=('49253a3a2990a4bf8e0b0a19295f19bd')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD
new file mode 100644
index 000000000..dcf5d2bbf
--- /dev/null
+++ b/community/libuser/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 58190 2011-11-08 15:26:34Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=libuser
+pkgver=0.57.1
+pkgrel=2
+pkgdesc='A standardized interface for manipulating and administering user and group accounts.'
+arch=('i686' 'x86_64')
+license=('LGPL')
+url='https://fedorahosted.org/libuser/'
+depends=('python2' 'glib2' 'popt')
+options=('!libtool')
+source=("https://fedorahosted.org/releases/l/i/libuser/libuser-${pkgver}.tar.xz")
+md5sums=('be82c6941264d0b4bd04f95fb342ec7d')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  export PYTHON=python2
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --disable-gtk-doc-html \
+    --disable-rpath
+  sed -i 's/SUBDIRS = po docs/SUBDIRS = po/' Makefile
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 8e1348240..13090b7bd 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55818 2011-09-22 13:29:51Z spupykin $
+# $Id: PKGBUILD 58183 2011-11-08 12:06:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.9.6
+pkgver=0.9.7
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,6 +24,7 @@ options=('emptydirs' '!libtool')
 backup=('etc/conf.d/libvirtd'
 	'etc/conf.d/libvirtd-guests'
 	'etc/libvirt/libvirtd.conf'
+	'etc/libvirt/libvirt.conf'
 	'etc/libvirt/qemu.conf'
 	'etc/sasl2/libvirt.conf')
 install="libvirt.install"
@@ -35,12 +36,12 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	openbsd-netcat-default.patch
 	unixperms.patch
 	yajl-2.x.patch)
-md5sums=('b74df374b524d00a22a6c89cfc23099f'
+md5sums=('4308b3f4d23f5b0c5196260a9a22a38b'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '6f36bf189ef0e5847038787d13535420'
          'bc2971dacdbac967fc3474e50affc345'
-         '4a2659d0e06a7af742f71a0a36c7cea3'
+         'b0be50eb9dfe4d133decf23b60880f7d'
          'db95aecdf2ccf3693fef5821cdcb7eba'
          '5745bb8d0b254abb7a3528c66e03b0f9')
 
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index c884d2171..a01b4f14e 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,7 +1,7 @@
-diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qemu_migration.c
---- libvirt-0.9.5/src/qemu/qemu_migration.c	2011-09-16 16:37:07.000000000 +0400
-+++ libvirt-0.9.5.my/src/qemu/qemu_migration.c	2011-09-20 20:44:39.000000000 +0400
-@@ -1497,7 +1497,7 @@
+diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c
+--- libvirt-0.9.7/src/qemu/qemu_migration.c	2011-10-31 07:46:04.000000000 +0400
++++ libvirt-0.9.7.my/src/qemu/qemu_migration.c	2011-11-08 15:46:10.000000000 +0400
+@@ -1589,7 +1589,7 @@
                                             spec->dest.unix_socket.file);
          } else {
              const char *args[] = {
@@ -10,10 +10,10 @@ diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qe
              };
              ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
          }
-diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote/remote_driver.c
---- libvirt-0.9.5/src/remote/remote_driver.c	2011-09-20 07:00:44.000000000 +0400
-+++ libvirt-0.9.5.my/src/remote/remote_driver.c	2011-09-20 20:44:43.000000000 +0400
-@@ -596,7 +596,7 @@
+diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c
+--- libvirt-0.9.7/src/remote/remote_driver.c	2011-11-08 07:53:30.000000000 +0400
++++ libvirt-0.9.7.my/src/remote/remote_driver.c	2011-11-08 15:46:10.000000000 +0400
+@@ -614,7 +614,7 @@
                                                  username,
                                                  !tty,
                                                  !verify,
@@ -22,15 +22,15 @@ diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote
                                                  keyfile,
                                                  sockname)))
              goto failed;
-diff -wbBur libvirt-0.9.5/src/rpc/virnetsocket.c libvirt-0.9.5.my/src/rpc/virnetsocket.c
---- libvirt-0.9.5/src/rpc/virnetsocket.c	2011-09-14 06:11:44.000000000 +0400
-+++ libvirt-0.9.5.my/src/rpc/virnetsocket.c	2011-09-20 20:44:33.000000000 +0400
-@@ -633,7 +633,7 @@
-     if (noVerify)
+diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c
+--- libvirt-0.9.7/src/rpc/virnetsocket.c	2011-11-08 07:53:30.000000000 +0400
++++ libvirt-0.9.7.my/src/rpc/virnetsocket.c	2011-11-08 15:46:31.000000000 +0400
+@@ -642,7 +642,7 @@
          virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
-     virCommandAddArgList(cmd, nodename,
--                         netcat ? netcat : "nc",
-+                         netcat ? netcat : "nc.openbsd",
-                          "-U", path, NULL);
  
-     return virNetSocketNewConnectCommand(cmd, retsock);
+     if (!netcat)
+-        netcat = "nc";
++        netcat = "nc.openbsd";
+ 
+     virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
+ 
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index 7dc26edb8..d15a5b7e9 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53640 2011-08-07 04:39:00Z svenstaro $
+# $Id: PKGBUILD 58226 2011-11-09 02:09:13Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Andrew Belitsky <belitsky.a@gmail.com>
 pkgbase=mygui
 pkgname=('mygui' 'mygui-docs')
 pkgver=3.2.0rc1
-pkgrel=8
+pkgrel=9
 pkgdesc="A multilayer and overlappable GUI System for OGRE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mygui.info/"
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 752b13b19..9d348180a 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56484 2011-10-07 10:16:01Z spupykin $
+# $Id: PKGBUILD 58214 2011-11-08 22:41:11Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
 pkgver=2011.09.23
 _pkgsubver=491607
-pkgrel=1
+pkgrel=2
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://open-vm-tools.sourceforge.net/"
@@ -17,22 +17,25 @@ source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${
 md5sums=('599342eee8d531b35ca1cc948b61868f')
 
 build() {
+  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
+  KERNEL_RELEASE=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
+
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
-#  sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --without-x
+  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \
+	--without-x --with-kernel-release=$KERNEL_RELEASE
   (cd modules && make modules)
 }
 
 package() {
   _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
   depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
-  KERNEL_VERSION=`uname -r`
+  KERNEL_VERSION=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
   msg "Kernel = $KERNEL_VERSION"
 
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
-  mkdir -p $pkgdir/lib/modules/$KERNEL_VERSION/misc/
+  mkdir -p $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/
   for MOD in `find -type f -name '*.ko'`; do
-    install -D -m644 $MOD $pkgdir/lib/modules/$KERNEL_VERSION/misc/
+    install -D -m644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/
   done
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install
 }
diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD
new file mode 100644
index 000000000..a09e3fc73
--- /dev/null
+++ b/community/quilt/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
+
+pkgname=quilt
+pkgver=0.48
+pkgrel=2
+pkgdesc="Manage a series of patches by keeping track of the changes each patch makes."
+arch=('i686' 'x86_64')
+url="http://savannah.nongnu.org/projects/quilt"
+license=('GPL')
+depends=('perl' 'diffstat' 'gawk' 'patch' 'diffutils' 'gettext')
+source=(http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz)
+md5sums=('f77adda60039ffa753f3c584a286f12b')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+  make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+}
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 71195520d..239728d51 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Sebastian Voecking <voeck@web.de>
 
 pkgname=root
-pkgver=5.30.03
-pkgrel=3
+pkgver=5.30.04
+pkgrel=1
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://root.cern.ch'
@@ -16,7 +16,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
         'root.xml')
-md5sums=('da46aac87047acc41a67b24c05fc465f'
+md5sums=('800103f8d5ea5f81c06fda95e057a648'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
          'e2cf69b204192b5889ceb5b4dedc66f7')
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index c71dbff1b..aa3a6c96b 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -4,7 +4,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=4.7.1
+pkgver=4.7.2
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -20,7 +20,7 @@ options=('!makeflags')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
         'SAGE-notebook.desktop')
-md5sums=('4d82c6719d14a1c2d403024d989faac7'
+md5sums=('b3073997e6c7ec00a269f84ff2e54973'
          'dc391f12b7d17dd37326343ec0e99bbd')
 
 build() {
@@ -66,12 +66,14 @@ build() {
   make
 }
 
+<< COMMENT
 check() {
   cd sage-${pkgver}
 
   # uncomment if we want to run all the tests (warning: very long)
   #make ptestlong
 }
+COMMENT
 
 package() {
   cd sage-${pkgver}
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 940681ffd..93d546244 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 55901 2011-09-24 16:49:52Z stephane $
+# $Id: PKGBUILD 58224 2011-11-09 01:31:15Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
-pkgver=0.82.7.1
-pkgrel=7
+pkgver=0.83.0
+_pkgver=83.0
+pkgrel=1
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
@@ -14,22 +15,14 @@ depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis')
 makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
-        gcc46.patch
-        awk-java.patch)
-md5sums=('378cf0b18a5dd5b840964e5945778503'
-         'e9586b611db1ed04fe4f0c5982fda7d2'
-         'cd94edf21e49ff6ff7d256442ed9aa3c')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
+md5sums=('05f1c625f2dd81b0d7f30269435ab2f7')
 
 build() {
-  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+  bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
   
-  cd spring_$pkgver
+  cd spring_${_pkgver}
   
-  sed -i '1i\
-	  #include <list>' rts/lib/lobby/Connection.h
-  patch -Np1 < $srcdir/gcc46.patch
-  patch -Np1 < $srcdir/awk-java.patch
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATADIR=share/spring
@@ -37,7 +30,7 @@ build() {
 }
 
 package() {
-  cd spring_$pkgver
+  cd spring_${_pkgver}
 
   make DESTDIR=$pkgdir install
 
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
index 60d53fe11..53211f509 100644
--- a/community/subtle/PKGBUILD
+++ b/community/subtle/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54488 2011-08-18 18:11:38Z angvp $
+# $Id: PKGBUILD 58177 2011-11-08 07:15:39Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: unexist <unexist@dorfelite.net>
 # Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com>
 pkgname=subtle
 pkgver=0.10.3008
-pkgrel=1
+pkgrel=2
 pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel"
 arch=("i686" "x86_64" 'mips64el')
 url="http://subtle.subforge.org"
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 33ea277bb..eb7d8b9fc 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 56766 2011-10-12 01:06:12Z dreisner $
+# $Id: PKGBUILD 58198 2011-11-08 16:54:47Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
 pkgver=37
-pkgrel=1
+pkgrel=2
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -53,13 +53,13 @@ build() {
               --libdir=/usr/lib \
               --localstatedir=/var \
               --with-rootdir= \
-              --with-rootlibdir=/lib \
-              --disable-audit
+              --with-rootlibdir=/lib
 
   make
 
   # fix .so links in manpages
   sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8
+  sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
 }
 
 package() {
diff --git a/community/virtualbox-modules/60-vboxguest.rules b/community/virtualbox-modules/60-vboxguest.rules
new file mode 100644
index 000000000..6285f7249
--- /dev/null
+++ b/community/virtualbox-modules/60-vboxguest.rules
@@ -0,0 +1,2 @@
+ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
+ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/community/virtualbox-modules/LocalConfig.kmk b/community/virtualbox-modules/LocalConfig.kmk
new file mode 100644
index 000000000..af79f90cd
--- /dev/null
+++ b/community/virtualbox-modules/LocalConfig.kmk
@@ -0,0 +1,19 @@
+VBOX_WITH_ADDITION_DRIVERS =
+VBOX_WITH_INSTALLER = 1
+VBOX_WITH_LINUX_ADDITIONS = 1
+VBOX_WITH_X11_ADDITIONS =
+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_WITH_REGISTRATION_REQUEST =
+VBOX_WITH_UPDATE_REQUEST =
+VBOX_WITH_VNC := 1
+VBOX_BLD_PYTHON = python2
+VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+VBOX_GCC_WERR =
+VBOX_GCC_WARN =
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
new file mode 100644
index 000000000..85e9ab987
--- /dev/null
+++ b/community/virtualbox-modules/PKGBUILD
@@ -0,0 +1,101 @@
+# $Id: PKGBUILD 58216 2011-11-08 22:41:23Z ibiru $
+#Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgbase=virtualbox-modules
+pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules')
+pkgver=4.1.6
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://virtualbox.org'
+license=('GPL')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers')
+[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
+source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
+         LocalConfig.kmk 60-vboxguest.rules)
+md5sums=('89b979d1b817242c7cdcb489898f166a'
+         '4c88bd122677a35f68abd76eb01b378b'
+         'ed1341881437455d9735875ddf455fbe')
+
+_extramodules=extramodules-3.1-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
+
+export KERN_DIR=/lib/modules/${_kernver}/build
+export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
+build() {
+    cd "$srcdir/VirtualBox-${pkgver}_OSE"
+
+    cp "$srcdir/LocalConfig.kmk" .
+
+    ./configure \
+        --with-linux=/usr/src/linux-${_kernver} \
+        --disable-java \
+        --disable-docs \
+        --disable-xpcom \
+        --disable-python \
+        --disable-sdl-ttf \
+        --disable-alsa \
+        --disable-pulse \
+        --disable-dbus  \
+        --disable-opengl \
+        --build-headless \
+        --nofatal
+    source ./env.sh
+    kmk all
+
+    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+}
+
+package_virtualbox-archlinux-modules(){
+    pkgdesc="Additions only for Arch Linux guests (kernel modules)"
+    license=('GPL')
+    install=virtualbox-archlinux-modules.install
+    depends=('linux>=3.1' 'linux<3.2')
+    replaces=('virtualbox-guest-modules')
+    conflicts=('virtualbox-guest-modules')
+
+    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+
+    for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
+        install -D -m644 ${module} \
+            "$pkgdir/lib/modules/${_extramodules}/${module}"
+    done
+
+    install -D -m 0644 "$srcdir/60-vboxguest.rules" \
+        "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
+
+    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-archlinux-modules.install"
+}
+
+package_virtualbox-modules(){
+    pkgdesc="Kernel modules for VirtualBox"
+    license=('GPL')
+    install=virtualbox-modules.install
+    depends=('linux>=3.1' 'linux<3.2')
+
+    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+
+    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+
+    install -D -m644 vboxdrv.ko \
+        "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
+
+    install -D -m644 vboxnetadp.ko \
+        "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
+
+    install -D -m644 vboxnetflt.ko \
+        "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
+
+    install -D -m644 vboxpci.ko \
+        "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
+
+    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install"
+}
diff --git a/community/virtualbox-modules/virtualbox-archlinux-modules.install b/community/virtualbox-modules/virtualbox-archlinux-modules.install
new file mode 100644
index 000000000..39a0e4063
--- /dev/null
+++ b/community/virtualbox-modules/virtualbox-archlinux-modules.install
@@ -0,0 +1,17 @@
+post_install() {
+cat << EOF
+===> You may want to load vboxguest, vboxsf and vboxvideo
+EOF
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
diff --git a/community/virtualbox-modules/virtualbox-modules.install b/community/virtualbox-modules/virtualbox-modules.install
new file mode 100644
index 000000000..ec29d3a87
--- /dev/null
+++ b/community/virtualbox-modules/virtualbox-modules.install
@@ -0,0 +1,19 @@
+post_install() {
+/bin/cat << EOF
+===> You must load vboxdrv module before starting VirtualBox:
+===> # modprobe vboxdrv
+EOF
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use the new version, reload all virtualbox modules manually.'
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 57ceb8c7f..fe7e517c9 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 56770 2011-10-12 05:24:02Z ibiru $
+# $Id: PKGBUILD 58218 2011-11-08 22:41:47Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
-pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
-pkgver=4.1.4
+pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source')
+pkgver=4.1.6
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
-'xorg-server-devel' 'xf86driproto' 'libxcomposite')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt=4.7.4-3' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2')
+#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
         UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
-        virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
-        10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
+        10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
         change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
-_kernver=3.0-LIBRE
+
+_extramodules=extramodules-3.1-LIBRE
+_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
 
-    patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch"
-    patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
 
@@ -31,23 +30,23 @@ build() {
     ./configure --disable-docs \
         --enable-webservice \
         --enable-vde \
+        --enable-vnc \
+        --nofatal \
         --with-linux=/usr/src/linux-${_kernver}
     source ./env.sh
     kmk all
-
-    export KERN_DIR=/usr/src/linux-${_kernver}
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo"
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
 }
 
 package_virtualbox() {
     pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
-    depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-libre-headers' 'gcc' 'make')
+    depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
     optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-sdk: developer kit')
+                'virtualbox-sdk: developer kit'
+                'virtualbox-source: host kernel source modules for non-stock kernels')
 
+    backup=('etc/vbox/vbox.cfg')
     replaces=('virtualbox-ose')
     conflicts=('virtualbox-ose')
     install=virtualbox.install
@@ -109,6 +108,20 @@ package_virtualbox() {
         "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
     install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
         "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules"
+}
+
+package_virtualbox-source() {
+    pkgdesc="VirtualBox kernel modules source"
+    depends=(gcc make)
+    provides=(virtualbox-modules)
+    optdepends=('linux-headers'
+                'kernel26-lts-headers')
+    install=virtualbox-source.install
+
+    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    mkdir -p $pkgdir/usr/lib/virtualbox
+
+    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
 
     #sources for modules
     cp -r src ${pkgdir}/usr/lib/virtualbox
@@ -117,7 +130,7 @@ package_virtualbox() {
 }
 
 package_virtualbox-sdk() {
-    pkgdesc=" VirtualBox Software Developer Kit (SDK)"
+    pkgdesc="VirtualBox Software Developer Kit (SDK)"
     depends=('python2')
 
     mkdir -p "$pkgdir/usr/lib/virtualbox"
@@ -165,42 +178,12 @@ package_virtualbox-archlinux-additions(){
     # install sample config
     install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
 }
-
-package_virtualbox-archlinux-modules(){
-    pkgdesc="Additions only for Arch Linux guests (kernel modules)"
-    license=('GPL')
-    install=virtualbox-archlinux-modules.install
-    depends=('linux-libre>=3.0' 'linux-libre<3.1')
-    replaces=('virtualbox-guest-modules')
-    conflicts=('virtualbox-guest-modules')
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
-    install -D -m644 vboxguest.ko \
-        "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko"
-
-    install -D -m644 vboxsf.ko \
-        "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko"
-
-    install -D -m644 vboxvideo.ko \
-        "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko"
-
-    install -D -m 0644 "$srcdir/60-vboxguest.rules" \
-        "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
-
-    sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install"
-}
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
-         'bc048d1e58d84ece4a186199ee48d4c8'
-         '44efb3c4be214daa453a317d527f1f30'
-         '32a232b43852b9a08cb11a7bcd64b347'
+md5sums=('89b979d1b817242c7cdcb489898f166a'
+         'af534f713993eb077df26ff9a44fb080'
          '5f85710e0b8606de967716ded7b2d351'
-         'ed1341881437455d9735875ddf455fbe'
-         'cc3f278bc273011aa95277500a76f677'
+         '6ab2455c391d8cc005e2f4461ae26a3b'
          '78ffa67ff131680f1d2b6f06d4325c5b'
-         'dda3811f7d94ac55f12b4de707a7c2c2'
+         'a82d698e7868315cdf876cfb02fd2268'
          '97e193f050574dd272a38e5ee5ebe62b'
          '3c08ad30b89add47d3f45121200a5360'
-         '778d865e56e31cc592fbfa257fdcfce7')
+         'e7416331d0bc331f3b5aae3e5d104642')
diff --git a/community/virtualbox/vbox-service.rc b/community/virtualbox/vbox-service.rc
index c1af2134d..6f1b8d892 100755
--- a/community/virtualbox/vbox-service.rc
+++ b/community/virtualbox/vbox-service.rc
@@ -11,13 +11,13 @@ case "$1" in
   start)
     stat_busy "Starting $name service"
     [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
-    && { add_daemon $name; stat_done; } \
+    && { add_daemon vbox-service; stat_done; } \
     || { stat_fail; exit 1; }
     ;;
   stop)
     stat_busy "Stopping $name service"
     [[ -n "$PID" ]] && kill $PID &>/dev/null \
-    && { rm_daemon $name; stat_done; } \
+    && { rm_daemon vbox-service; stat_done; } \
     || { stat_fail; exit 1; }
     ;;
   restart)
diff --git a/community/virtualbox/vboxbuild b/community/virtualbox/vboxbuild
index 1058744c5..cfc3c0a66 100755
--- a/community/virtualbox/vboxbuild
+++ b/community/virtualbox/vboxbuild
@@ -29,7 +29,7 @@ if (( ${#MODLIST[*]} )); then
   modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
 fi
 
-for kdir in /lib/modules/*; do
+for kdir in /lib/modules/[2-3]*; do
   if [[ ! -d $kdir/kernel ]]; then
     # found a stale kernel
     mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*)
diff --git a/community/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch
index c310dbc8d..710e2e511 100644
--- a/community/virtualbox/vboxdrv-reference.patch
+++ b/community/virtualbox/vboxdrv-reference.patch
@@ -1,45 +1,57 @@
-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 @@
+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. 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."
+-  "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-modules'</font><br/><br/>"
++  "as root. If you don't use our stock kernel, install virtualbox-source and"
++  "execute /usr/bin/vboxbuild ."
    );
  
-@@ -92,7 +91,7 @@
+ 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/>"
+-  "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>'/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 @@
+ 
+ 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 recompile the kernel module and install it by
++         load. Please reinstall the kernel module virtualbox-modules or
++         if you don't use our stock kernel compile the modules with
  
 -           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 @@
+ 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
++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
  
 -           sudo /etc/init.d/vboxdrv restart
-+           sudo /usr/bin/vboxbuild
++           sudo modprobe vboxdrv
  
           and if that is not successful, try to re-install the package.
  
diff --git a/community/virtualbox/virtualbox-source.install b/community/virtualbox/virtualbox-source.install
new file mode 100644
index 000000000..24d90b1c2
--- /dev/null
+++ b/community/virtualbox/virtualbox-source.install
@@ -0,0 +1,12 @@
+post_install() {
+/bin/cat << EOF
+===> To compile the modules do /usr/bin/vboxbuild
+EOF
+
+}
+
+post_upgrade() {
+/bin/cat << EOF
+===> To recompile the modules do /usr/bin/vboxbuild
+EOF
+}
diff --git a/community/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install
index 0eac014f2..c794b857d 100644
--- a/community/virtualbox/virtualbox.install
+++ b/community/virtualbox/virtualbox.install
@@ -14,35 +14,18 @@ utils() {
 
 post_install() {
     getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
-    /bin/cat << EOF
-
-===> In order to run VirtualBox, you have to  be in the 'vboxusers' group.
-===>
-===> If you want to be able to install guest additions, you have to install
-===> 'virtualbox-additions' package.
-===>
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-===>
-===> For networking you must load vboxnetflt or vboxnetadp.
-===>
-===> For PCI passthrough support load vboxpci module.
-===>
-===> To load it automatically, add vboxdrv module
-===> to the MODULES array in /etc/rc.conf.
-
-*** To compile the modules do /usr/bin/vboxbuild ***
-
-EOF
-  utils
+    utils
 }
 
 post_upgrade() {
     getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
-    /bin/cat << EOF
-*** To recompile the modules do /usr/bin/vboxbuild ***
+    utils
+    if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
+/bin/cat << EOF
+===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
+===> Use virtualbox-source package if you don't use our stock linux package.
 EOF
-   utils
+    fi
 }
 
 post_remove() {