[Lunar-commits] <moonbase> VirtualBox: version 4

[Paul Bredbury]

commit a6abb84e524fca6ccf1b03220549d9698a3a11b3
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Thu Jan 13 01:13:58 2011 +0700

    VirtualBox: version 4
---
 kernel/virtualbox-module/DETAILS |    4 ++--
 virtual/VirtualBox/BUILD         |   28 +++++++++++++++++-----------
 virtual/VirtualBox/DEPENDS       |    7 +++++--
 virtual/VirtualBox/DETAILS       |    8 ++++----
 virtual/VirtualBox/POST_INSTALL  |    2 +-
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/kernel/virtualbox-module/DETAILS b/kernel/virtualbox-module/DETAILS
index 951f5a7..63b8196 100644
--- a/kernel/virtualbox-module/DETAILS
+++ b/kernel/virtualbox-module/DETAILS
@@ -4,9 +4,9 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/src/
         WEB_SITE=http://virtualbox.org
          ENTERED=20090202
-         UPDATED=20101106
+         UPDATED=20110110
            SHORT="Kernel module for VirtualBox"
 
 cat << EOF
-Sources to the kernel level portion of VirtualBox
+Sources to the kernel-level portion of VirtualBox.
 EOF
diff --git a/virtual/VirtualBox/BUILD b/virtual/VirtualBox/BUILD
index 5e0c344..6d7caa3 100644
--- a/virtual/VirtualBox/BUILD
+++ b/virtual/VirtualBox/BUILD
@@ -2,20 +2,24 @@
 
   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
 
-# Fixes a gcc 4.4 build failure.
+  # Fixes a gcc 4.4 build failure.
   echo "VBOX_WITH_TESTCASES =" > LocalConfig.kmk &&
 
-  # Disable qt3
-  sedit s at WITH_QT3=1 at WITH_QT3=0@ configure &&
+  if in_depends $MODULE sun-jdk ; then
+    # Location of javac
+    . /etc/profile.d/sun-jdk.rc &&
+    export VBOX_JAVA_HOME=$JAVA_HOME
+  fi &&
 
-  # We need the qt4 paths
-  . /etc/profile.d/qt4.rc &&
-  sedit "s:qt4/lib/pkgconfig:qt4/pkgconfig:g" configure &&
+  if in_depends $MODULE qt4 ; then
+    # We need the qt4 paths
+    . /etc/profile.d/qt4.rc &&
+    sedit "s:qt4/lib/pkgconfig:qt4/pkgconfig:g" configure
+  fi &&
 
   # Build VirtualBox
   # Disable hardening, so normal users can run it
   OPTS+=" --disable-hardening"   &&
-#  OPTS+=" --with-qt4-dir=$QTDIR" &&
   ./configure $OPTS              &&
   source ./env.sh                &&
   if !( module_installed Linux-PAM ); then
@@ -49,10 +53,12 @@
   mkdir -p /etc/vbox &&
   echo "INSTALL_DIR=$MODULE_PREFIX" > /etc/vbox/vbox.cfg &&
 
-  # Install .desktop entry and icon, then update the icon cache
-  install -D -m644 /usr/lib/virtualbox/virtualbox.desktop /usr/share/applications/virtualbox.desktop &&
-  install -D -m644 /usr/lib/virtualbox/VBox.png /usr/share/icons/hicolor/32x32/apps/VBox.png &&
-  gtk-update-icon-cache /usr/share/icons/hicolor &&
+  if in_depends $MODULE qt4 ; then
+    # Install .desktop entry and icon, then update the icon cache
+    install -D -m644 /usr/lib/virtualbox/virtualbox.desktop /usr/share/applications/virtualbox.desktop &&
+    install -D -m644 /usr/lib/virtualbox/VBox.png /usr/share/icons/hicolor/32x32/apps/VBox.png &&
+    gtk-update-icon-cache /usr/share/icons/hicolor
+  fi &&
 
   # Create the vboxusers group
   groupadd -f vboxusers
diff --git a/virtual/VirtualBox/DEPENDS b/virtual/VirtualBox/DEPENDS
index b61614a..4e966c5 100644
--- a/virtual/VirtualBox/DEPENDS
+++ b/virtual/VirtualBox/DEPENDS
@@ -3,10 +3,13 @@ depends iasl
 depends dev86
 depends libxslt
 depends libXcursor
-depends qt4
 depends libIDL
 depends SDL_ttf
 depends alsa-lib
 depends libcap
+depends makeself
 
-optional_depends pulseaudio "" "--disable-pulse" "For pulseaudio backend"
+optional_depends qt4 "" "--disable-qt" "for UI (recommended)"
+optional_depends sun-jdk "" "--disable-java" "for Java bindings"
+optional_depends Python "" "--disable-python" "for Python bindings"
+optional_depends pulseaudio "" "--disable-pulse" "for pulseaudio backend"
diff --git a/virtual/VirtualBox/DETAILS b/virtual/VirtualBox/DETAILS
index 6911059..9039e5b 100644
--- a/virtual/VirtualBox/DETAILS
+++ b/virtual/VirtualBox/DETAILS
@@ -1,16 +1,16 @@
           MODULE=VirtualBox
-         VERSION=3.2.12
-          SOURCE=$MODULE-$VERSION-OSE.tar.bz2
+         VERSION=4.0.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-3.2.0-gcc-4.5-warning-workaround.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-${VERSION}_OSE
       SOURCE_URL=http://download.virtualbox.org/virtualbox/$VERSION
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:73ddd9365588ea56a54ff81117719ac818e842f9
+      SOURCE_VFY=sha1:2d0a763d148622569f2a23254b35bce5e112f7e8
      SOURCE2_VFY=sha1:5eae1a7c82d8ebf8161da4ee724052125f2a6ffd
    MODULE_PREFIX=${VIRTUALBOX_PREFIX:-/usr/lib/virtualbox/}
         WEB_SITE=http://virtualbox.org
          ENTERED=20071004
-         UPDATED=20101211
+         UPDATED=20110110
            SHORT="Full virtualizer for x86 hardware"
 
 cat << EOF
diff --git a/virtual/VirtualBox/POST_INSTALL b/virtual/VirtualBox/POST_INSTALL
index 13d4d06..4268aa4 100644
--- a/virtual/VirtualBox/POST_INSTALL
+++ b/virtual/VirtualBox/POST_INSTALL
@@ -1,2 +1,2 @@
-#Install the kernel module
+# Install the kernel module
 lin -c virtualbox-module