Fri Mar 16 00:01:21 UTC 2012

3 files changed, 36 insertions, 15 deletions

diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 9359edfb2..a99a9ecaf 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -1,18 +1,22 @@
 # $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
+#Contributor (Parabola): Jorge López <jorginho@adinet.com.uy>
 
 pkgbase=virtualbox-modules
-pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.8
-pkgrel=3
+pkgname=('virtualbox-modules' 'virtualbox-libre-modules')
+pkgver=4.1.10
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
+replaces=('virtualbox-modules')
+conflicts=('virtualbox-modules')
+provides=("virtualbox-modules=$pkgver")
 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=('2092bba46baa62fab5520d67dee2ece8'
+md5sums=('263e495ef3a7ab75943af28d446ee702'
          '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')
 
@@ -23,7 +27,7 @@ export KERN_DIR=/lib/modules/${_kernver}/build
 export KERN_INCL=/usr/src/linux-${_kernver}/include/
 
 build() {
-    cd "$srcdir/VirtualBox-${pkgver}_OSE"
+    cd "$srcdir/VirtualBox-${pkgver}"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -43,22 +47,22 @@ build() {
     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"
+    make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+    make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
 }
 
-package_virtualbox-parabola-modules(){
+package_virtualbox-libre-modules(){
     pkgdesc="Additions only for Parabola guests (kernel modules)"
     license=('GPL')
-    install=virtualbox-parabola-modules.install
+    install=virtualbox-libre-modules.install
     depends=('linux>=3.2' 'linux<3.3')
     replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
     conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
     provides=("virtualbox-archlinux-modules=$pkgver")
 
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
 
     for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
         install -D -m644 ${module} \
@@ -70,7 +74,7 @@ package_virtualbox-parabola-modules(){
 
     find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
 
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install"
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-libre-modules.install"
 }
 
 package_virtualbox-modules(){
@@ -79,10 +83,10 @@ package_virtualbox-modules(){
     install=virtualbox-modules.install
     depends=('linux>=3.2' 'linux<3.3')
 
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+    source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
 
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+    cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
 
     install -D -m644 vboxdrv.ko \
         "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
diff --git a/libre/virtualbox-modules/virtualbox-libre-modules.install b/libre/virtualbox-modules/virtualbox-libre-modules.install
new file mode 100644
index 000000000..b542db1ca
--- /dev/null
+++ b/libre/virtualbox-modules/virtualbox-libre-modules.install
@@ -0,0 +1,17 @@
+post_install() {
+cat << EOF
+===> You may want to load vboxguest, vboxsf and vboxvideo
+EOF
+    EXTRAMODULES='extramodules-3.2-LIBRE'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.2-LIBRE'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-3.2-LIBRE'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index 671c129d6..bc2adbe64 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -10,7 +10,7 @@ EOF
 post_upgrade() {
     EXTRAMODULES='extramodules-3.2-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.'
+    echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {