[85683] trunk/dports/emulators/virtualbox

[royliu at macports.org]

Revision: 85683
          http://trac.macports.org/changeset/85683
Author:   royliu at macports.org
Date:     2011-10-15 13:21:12 -0700 (Sat, 15 Oct 2011)
Log Message:
-----------
virtualbox: upgrade to 4.1.4

Modified Paths:
--------------
    trunk/dports/emulators/virtualbox/Portfile
    trunk/dports/emulators/virtualbox/files/patch-build.diff

Modified: trunk/dports/emulators/virtualbox/Portfile
===================================================================
--- trunk/dports/emulators/virtualbox/Portfile	2011-10-15 19:36:47 UTC (rev 85682)
+++ trunk/dports/emulators/virtualbox/Portfile	2011-10-15 20:21:12 UTC (rev 85683)
@@ -5,8 +5,7 @@
 PortGroup           qt4 1.0
 
 name                virtualbox
-version             4.1.2
-revision            5
+version             4.1.4
 categories          emulators
 maintainers         nomaintainer
 description         open source virtualization technology from Oracle
@@ -39,9 +38,9 @@
 distname            VirtualBox-${version}
 use_bzip2           yes
 
-checksums           md5     945d2c94c15a4f47280be4b01b67e244 \
-                    sha1    52e35e0400fb12a5277a6e126478bb8f53c3e46d \
-                    rmd160  0004a00c968ee835083416022240e212903f394d
+checksums           md5     dc6e6801b3823332b6ca2e9915221aae \
+                    sha1    6ec0dd31844da91c9773611a6fb553eef575e899 \
+                    rmd160  475a68dc6beebdb588688743b3652bbb9ab3f507
 
 depends_lib-append          port:libidl \
                             port:curl \

Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff	2011-10-15 19:36:47 UTC (rev 85682)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff	2011-10-15 20:21:12 UTC (rev 85683)
@@ -1,6 +1,6 @@
 --- Config.kmk.orig	2011-08-15 19:38:16.000000000 -0500
 +++ Config.kmk	2011-08-15 19:38:16.000000000 -0500
-@@ -1094,7 +1094,7 @@
+@@ -1092,7 +1092,7 @@
  # of VirtualBox binaries.  We request though that you always use something that
  # clearly identifies your build and makes it clear that it is not one done by
  # the VirtualBox team.
@@ -9,7 +9,7 @@
  endif
  
  # Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl and glue-java.xsl
-@@ -2065,22 +2065,22 @@
+@@ -2063,22 +2063,22 @@
  VBOX_GCC32_CHECK_CXX = $(2)
  else
  VBOX_GCC_CHECK_CC = $(shell \
@@ -36,7 +36,7 @@
     then echo "$(1)"; \
     else echo "$(2)"; fi; )
  endif
-@@ -3945,25 +3945,6 @@
+@@ -3947,25 +3947,6 @@
   # be cleaned up properly later some time (not important now).
   #
   ifeq ($(VBOX_PATH_QT4),)
@@ -297,7 +297,7 @@
      # The Unices. Includes and esp. libs are tricky, so override the PATH_SDK_QT4_LIB* stuff if it doesn't work.
      # Try find the general root of thing by looking for the qt3to4 program, if not found, then look for rcc.
      PATH_SDK_QT4 := $(patsubst %/bin/qt3to4,%,$(firstword $(wildcard \
-@@ -163,7 +156,6 @@
+@@ -169,7 +162,6 @@
       endif
  
      endif
@@ -305,7 +305,7 @@
    endif
    # Found it?
    ifeq ($(PATH_SDK_QT4),)
-@@ -178,18 +170,8 @@
+@@ -184,18 +176,8 @@
  
  # Libraries can be in either Frameworks or lib depending on how you
  # build it on the mac. The .dmg installs into Frameworks but builds into lib.
@@ -326,7 +326,7 @@
  
  # The bits that kBuild picks up.
  #  (nothing here)
-@@ -953,23 +935,8 @@
+@@ -959,23 +941,8 @@
   	$($(target)_QT_INFIX.$(bld_trg_cpu)) \
   	$($(target)_QT_INFIX.$(bld_type)) \
   	$($(target)_QT_INFIX))
@@ -352,34 +352,3 @@
  $(eval $(target)_DEFS      += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
  
  
---- src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp.orig	2011-08-15 19:38:17.000000000 -0500
-+++ src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2011-08-15 19:38:17.000000000 -0500
-@@ -1454,7 +1454,7 @@
- 
-     /* Check for the already registered image */
-     CVirtualBox vbox = vboxGlobal().virtualBox();
--    QString name = QString("VBoxGuestAdditions_%1.iso").arg(vbox.GetVersion().remove("_OSE"));
-+    QString name = QString("VBoxGuestAdditions_%1.iso").arg(vbox.GetVersion().remove("_MacPorts"));
- 
-     CMediumVector vec = vbox.GetDVDImages();
-     for (CMediumVector::ConstIterator it = vec.begin(); it != vec.end(); ++ it)
-@@ -1470,7 +1470,7 @@
-     int result = msgCenter().cannotFindGuestAdditions(QDir::toNativeSeparators(strSrc1), QDir::toNativeSeparators(strSrc2));
-     if (result == QIMessageBox::Yes)
-     {
--        QString source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_OSE")) + name;
-+        QString source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_MacPorts")) + name;
-         QString target = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(name);
- 
-         UIDownloaderAdditions *pDl = UIDownloaderAdditions::create();
---- src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp.orig	2011-08-15 19:38:17.000000000 -0500
-+++ src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	2011-08-15 19:38:17.000000000 -0500
-@@ -2833,7 +2833,7 @@
-         UIDownloaderUserManual *pDl = UIDownloaderUserManual::create();
-         /* Configure User Manual downloader: */
-         CVirtualBox vbox = vboxGlobal().virtualBox();
--        pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_OSE")) + strShortFileName);
-+        pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_MacPorts")) + strShortFileName);
-         pDl->addSource(QString("http://download.virtualbox.org/virtualbox/") + strShortFileName);
-         pDl->setTarget(strUserManualFileName2);
-         pDl->setParentWidget(mainWindowShown());
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111015/71202c84/attachment.html>