[90868] trunk/dports/emulators/virtualbox
royliu at macports.org
royliu at macports.org
Fri Mar 16 11:06:36 PDT 2012
Revision: 90868
https://trac.macports.org/changeset/90868
Author: royliu at macports.org
Date: 2012-03-16 11:06:35 -0700 (Fri, 16 Mar 2012)
Log Message:
-----------
virtualbox: upgrade to 4.1.10
Modified Paths:
--------------
trunk/dports/emulators/virtualbox/Portfile
trunk/dports/emulators/virtualbox/files/patch-build.diff
trunk/dports/emulators/virtualbox/files/patch-vde.diff
Removed Paths:
-------------
trunk/dports/emulators/virtualbox/files/patch-sdk.diff
Modified: trunk/dports/emulators/virtualbox/Portfile
===================================================================
--- trunk/dports/emulators/virtualbox/Portfile 2012-03-16 17:56:48 UTC (rev 90867)
+++ trunk/dports/emulators/virtualbox/Portfile 2012-03-16 18:06:35 UTC (rev 90868)
@@ -5,7 +5,7 @@
PortGroup qt4 1.0
name virtualbox
-version 4.1.8
+version 4.1.10
categories emulators
maintainers nomaintainer
description open source virtualization technology from Oracle
@@ -38,9 +38,9 @@
distname VirtualBox-${version}
use_bzip2 yes
-checksums md5 2092bba46baa62fab5520d67dee2ece8 \
- sha1 4683e30aa32d0d6ca764e5ce366d7216705cf0f2 \
- rmd160 f8ae296406fe370eded166d0772be7e4558ecc3a
+checksums md5 263e495ef3a7ab75943af28d446ee702 \
+ sha1 bb95253fd574648298bd56f13586f5a510a55863 \
+ rmd160 b5eedd1235db74bfaa4e061193528696058923e7
depends_lib-append port:curl \
port:libidl \
@@ -50,7 +50,6 @@
path:lib/pkgconfig/sdl.pc:libsdl
patchfiles patch-build.diff \
- patch-sdk.diff \
patch-startup.diff
configure.compiler gcc-4.2
@@ -76,7 +75,7 @@
build.cmd ". env.sh && kmk"
# This is the open source edition of VirtualBox.
-worksrcdir VirtualBox-${version}_OSE
+worksrcdir VirtualBox-${version}
set kext_dir /Library/Extensions
set startup_items_dir /Library/StartupItems
Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff 2012-03-16 17:56:48 UTC (rev 90867)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff 2012-03-16 18:06:35 UTC (rev 90868)
@@ -9,7 +9,31 @@
endif
# Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl and glue-java.xsl
-@@ -2063,22 +2063,22 @@
+@@ -1826,7 +1826,13 @@
+ endif
+ VBOX_PATH_MACOSX_SDK ?= /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk
+ else
+- VBOX_PATH_MACOSX_SDK ?= /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
++ ifndef VBOX_PATH_MACOSX_SDK
++ ifneq ($(wildcard /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk),)
++ VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
++ else
++ VBOX_PATH_MACOSX_SDK = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk
++ endif
++ endif
+ endif
+ VBOX_DARWIN_DEF_SDK_DEFS := MAC_OS_X_VERSION_MIN_REQUIRED=$(subst .,,$(VBOX_DEF_MACOSX_VERSION_MIN))0 \
+ MAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(VBOX_DEF_MACOSX_VERSION_MIN))0
+@@ -1887,7 +1899,7 @@
+ ifneq ($(wildcard /Developer/SDKs/MacOSX10.7.sdk),)
+ VBOX_PATH_MACOSX_SDK_10_7 = /Developer/SDKs/MacOSX10.7.sdk
+ else
+- VBOX_PATH_MACOSX_SDK_10_7 = $(PATH_DEVTOOLS)/darwin.x86/SDKs/MacOSX10.7.sdk
++ VBOX_PATH_MACOSX_SDK_10_7 = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+ endif
+ endif
+ VBOX_DARWIN_DEF_SDK_10_7_DEFS := MAC_OS_X_VERSION_MIN_REQUIRED=1070 MAC_OS_X_VERSION_MAX_ALLOWED=1070
+@@ -2069,22 +2069,22 @@
VBOX_GCC32_CHECK_CXX = $(2)
else
VBOX_GCC_CHECK_CC = $(shell \
@@ -36,7 +60,7 @@
then echo "$(1)"; \
else echo "$(2)"; fi; )
endif
-@@ -3947,25 +3947,6 @@
+@@ -3937,25 +3937,6 @@
# be cleaned up properly later some time (not important now).
#
ifeq ($(VBOX_PATH_QT4),)
@@ -128,7 +152,7 @@
#
--- configure.orig 2011-08-15 19:38:16.000000000 -0500
+++ configure 2011-08-15 19:38:16.000000000 -0500
-@@ -1100,21 +1100,6 @@
+@@ -1017,21 +1017,6 @@
check_sdl()
{
test_header SDL
@@ -150,7 +174,7 @@
if which_wrapper sdl-config > /dev/null; then
FLGSDL=`sdl-config --cflags`
INCSDL=`strip_I "$FLGSDL"`
-@@ -1123,7 +1108,6 @@
+@@ -1040,7 +1025,6 @@
FLDSDL=
foundsdl=1
fi
@@ -158,7 +182,7 @@
[ "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""
if [ -n "$foundsdl" ]; then
cat > $ODIR.tmp_src.cc << EOF
-@@ -1471,53 +1455,20 @@
+@@ -1388,53 +1372,20 @@
{
foundqt4=
test_header Qt4
@@ -212,7 +236,7 @@
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
pkg-config QtCore --libs`
foundqt4=1
-@@ -1559,7 +1510,6 @@
+@@ -1476,7 +1427,6 @@
fi
done
fi
@@ -220,7 +244,7 @@
if [ -n "$foundqt4" ]; then
cat > $ODIR.tmp_src.cc << EOF
#include <cstdio>
-@@ -1579,21 +1529,6 @@
+@@ -1496,21 +1446,6 @@
[ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"`
if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
if test_execute_path "`strip_L "$LIBQT4"`"; then
@@ -242,7 +266,7 @@
# strip .../QtCore as we add components ourself
INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'`
# store only the first path, remove all other pathes
-@@ -1639,7 +1574,6 @@
+@@ -1556,7 +1491,6 @@
fi
fi
done
@@ -250,16 +274,7 @@
fi
else
log_failure "qt4 not working"
-@@ -2242,8 +2176,6 @@
- WITH_PULSE=0
- WITH_DBUS=0
- WITH_KMODS=0
-- BUILD_LIBXSLT=1
-- BUILD_LIBXML2=1
- [ $OSE -eq 1 ] || BUILD_LIBCURL=1
- [ $OSE -eq 1 ] || BUILD_LIBSSL=1
- fi
-@@ -2281,7 +2213,7 @@
+@@ -2196,7 +2128,7 @@
--with-openssl-dir=*)
OPENSSLDIR=`echo $option | cut -d'=' -f2`
INCCRYPTO="-I${OPENSSLDIR}/include"
Deleted: trunk/dports/emulators/virtualbox/files/patch-sdk.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-sdk.diff 2012-03-16 17:56:48 UTC (rev 90867)
+++ trunk/dports/emulators/virtualbox/files/patch-sdk.diff 2012-03-16 18:06:35 UTC (rev 90868)
@@ -1,42 +0,0 @@
---- src/libs/xpcom18a4/Config.kmk.orig 2011-09-18 13:23:09.000000000 +0200
-+++ src/libs/xpcom18a4/Config.kmk 2011-09-18 13:25:01.000000000 +0200
-@@ -251,6 +251,17 @@
- TEMPLATE_XPCOMOSX106_DEFS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
- TEMPLATE_XPCOMOSX106_INCS.darwin = $(VBOX_PATH_MACOSX_SDK_10_6)/Developer/Headers/FlatCarbon
-
-+# Template for building VBoxPython against the Mac OS X 10.7 SDK.
-+# ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
-+#
-+TEMPLATE_XPCOMOSX107 = XPCOM libraries (shared) built against the Mac OS X 10.6 SDK
-+TEMPLATE_XPCOMOSX107_EXTENDS = XPCOM
-+TEMPLATE_XPCOMOSX107_CXXFLAGS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPCOM_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS)
-+TEMPLATE_XPCOMOSX107_CFLAGS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPCOM_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_CFLAGS)
-+TEMPLATE_XPCOMOSX107_LDFLAGS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
-+TEMPLATE_XPCOMOSX107_DEFS.darwin = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
-+TEMPLATE_XPCOMOSX107_INCS.darwin = $(VBOX_PATH_MACOSX_SDK_10_7)/Developer/Headers/FlatCarbon
-+
-
- #
- # The list of XPCOM's IDL files.
---- src/libs/xpcom18a4/python/Makefile.kmk.orig 2011-09-18 12:18:06.000000000 +0200
-+++ src/libs/xpcom18a4/python/Makefile.kmk 2011-09-18 13:21:53.000000000 +0200
-@@ -126,7 +126,7 @@
- VBoxPython2_6_LIBS = $(VBOX_PYTHON26_LIB)
- endif
-
--if defined(VBOX_PYTHON27_INC) && "$(KBUILD_TARGET)" != "darwin"
-+if defined(VBOX_PYTHON27_INC) && ("$(KBUILD_TARGET)" != "darwin" || "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7")
- #
- # Python 2.7 version
- #
---- src/libs/xpcom18a4/python/gen_python_deps.py.orig 2011-09-18 13:04:36.000000000 +0200
-+++ src/libs/xpcom18a4/python/gen_python_deps.py 2011-09-18 13:05:02.000000000 +0200
-@@ -74,7 +74,7 @@
-
- if target == 'darwin':
- ## @todo Pick up the locations from VBOX_PATH_MACOSX_SDK_10_*.
-- prefixes = ['/Developer/SDKs/MacOSX10.4u.sdk/usr', '/Developer/SDKs/MacOSX10.5.sdk/usr', '/Developer/SDKs/MacOSX10.6.sdk/usr']
-+ prefixes = ['/Developer/SDKs/MacOSX10.4u.sdk/usr', '/Developer/SDKs/MacOSX10.5.sdk/usr', '/Developer/SDKs/MacOSX10.6.sdk/usr', '/Developer/SDKs/MacOSX10.7.sdk/usr']
- dllsuff = '.dylib'
-
- if target == 'solaris' and arch == 'amd64':
Modified: trunk/dports/emulators/virtualbox/files/patch-vde.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-vde.diff 2012-03-16 17:56:48 UTC (rev 90867)
+++ trunk/dports/emulators/virtualbox/files/patch-vde.diff 2012-03-16 18:06:35 UTC (rev 90868)
@@ -1,6 +1,6 @@
--- configure.orig 2011-08-15 19:38:16.000000000 -0500
+++ configure 2011-08-15 19:38:16.000000000 -0500
-@@ -2553,7 +2553,7 @@
+@@ -2478,7 +2478,7 @@
fi
# VDE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120316/1d7dcf24/attachment-0001.html>
More information about the macports-changes
mailing list