Wed Jul 20 23:12:48 UTC 2011

1 files changed, 27 insertions, 40 deletions

diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 4d2916ec1..589b5b720 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 51807 2011-07-15 20:01:05Z ibiru $
+# $Id: PKGBUILD 52077 2011-07-19 22:16:29Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
-pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk')
-pkgver=4.0.12
-pkgrel=1
+pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
+pkgver=4.1.0
+pkgrel=2
 arch=('i686' 'x86_64')
 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' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2'
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' '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
         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 vboxdrv.sh
-        18-system-xorg.patch
         change_default_driver_dir.patch)
 _kernver=2.6.39-ARCH
 
@@ -25,7 +24,6 @@ build() {
     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/18-system-xorg.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
@@ -64,18 +62,10 @@ package_virtualbox() {
 
     #Binaries and Wrapper with Launchers
     install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
-    ln -sf VBox "$pkgdir/usr/bin/VBoxHeadless"
-    ln -sf VBox "$pkgdir/usr/bin/vboxheadless"
-    ln -sf VBox "$pkgdir/usr/bin/VBoxManage"
-    ln -sf VBox "$pkgdir/usr/bin/vboxmanage"
-    ln -sf VBox "$pkgdir/usr/bin/VBoxSDL"
-    ln -sf VBox "$pkgdir/usr/bin/vboxsdl"
-    ln -sf VBox "$pkgdir/usr/bin/VirtualBox"
-    ln -sf VBox "$pkgdir/usr/bin/virtualbox"
-    ln -sf VBox "$pkgdir/usr/bin/vboxwebsrv"
-    ln -sf VBox "$pkgdir/usr/bin/VBoxBalloonCtrl"
-    ln -sf VBox "$pkgdir/usr/bin/vboxballoonctrl"
 
+    for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do
+        ln -sf VBox "$pkgdir/usr/bin/$i"
+    done
     install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
 
     #components
@@ -143,18 +133,18 @@ package_virtualbox-sdk() {
     rm -rf sdk/installer
     mv sdk "$pkgdir/usr/lib/virtualbox"
 }
-package_virtualbox-guest-additions(){
-    pkgdesc="VirtualBox user-space tools for Linux guests"
-    depends=("virtualbox-guest-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
-    replaces=('virtualbox-ose-additions')
-    conflicts=('virtualbox-ose-additions')
+
+package_virtualbox-archlinux-additions(){
+    pkgdesc="Additions only for Arch Linux guests (userspace tools)"
+    depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
+    replaces=('virtualbox-guest-additions')
+    conflicts=('virtualbox-guest-additions')
 
     source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
 
     cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
 
-    install -d "$pkgdir/usr/bin"
-    install -d "$pkgdir/sbin"
+    install -d "$pkgdir"/{usr/bin,sbin}
     install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
     install -m755 mount.vboxsf "$pkgdir/sbin"
 
@@ -176,43 +166,40 @@ package_virtualbox-guest-additions(){
     install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so"
 
 }
-package_virtualbox-guest-modules(){
-    pkgdesc="VirtualBox kernel modules for Linux guests"
+
+package_virtualbox-archlinux-modules(){
+    pkgdesc="Additions only for Arch Linux guests (kernel modules)"
     license=('GPL')
-    install=virtualbox-guest-modules.install
+    install=virtualbox-archlinux-modules.install
     depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
-    replaces=('virtualbox-ose-additions-modules')
-    conflicts=('virtualbox-ose-additions-modules')
+    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"
 
-    cd vboxguest
     install -D -m644 vboxguest.ko \
         "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko"
 
-    cd ../vboxsf
     install -D -m644 vboxsf.ko \
         "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko"
 
-    cd ../vboxvideo
     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-guest-modules.install"
+    sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install"
 }
-md5sums=('5b39b99c2a36c96a062913e8ac67c60f'
-         '34cfb9a430a231a274aba3550c3d0e00'
+md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
+         '24056c13ddbe2c9b5d135e8c96a53a11'
          '44efb3c4be214daa453a317d527f1f30'
          '32a232b43852b9a08cb11a7bcd64b347'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
-         '9bde5b7dfba5abcd49768052c5409800'
+         '4cf75d9c091199a47a7a1bc2f4e347d9'
          'c1a07f044c476a190af8486fe78bee0f'
-         '47da2e88de582bb2bab14580a3aa47b1'
-         '8a22b33c9dfaf8fb79bb2d26304e650b'
-         'ac43f7cf44b934d8dbdbc3bb6f7879ad')
+         '838c4c4ebe11b34ae2168df5cd06f694'
+         '97e193f050574dd272a38e5ee5ebe62b')