[97829] trunk/dports/emulators/virtualbox
royliu at macports.org
royliu at macports.org
Sun Sep 16 22:42:53 PDT 2012
Revision: 97829
http://trac.macports.org//changeset/97829
Author: royliu at macports.org
Date: 2012-09-16 22:42:53 -0700 (Sun, 16 Sep 2012)
Log Message:
-----------
virtualbox: update to 4.2.0
Modified Paths:
--------------
trunk/dports/emulators/virtualbox/Portfile
trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff
trunk/dports/emulators/virtualbox/files/patch-build.diff
trunk/dports/emulators/virtualbox/files/patch-vde.diff
Removed Paths:
-------------
trunk/dports/emulators/virtualbox/files/patch-glext.h.diff
Modified: trunk/dports/emulators/virtualbox/Portfile
===================================================================
--- trunk/dports/emulators/virtualbox/Portfile 2012-09-17 04:27:36 UTC (rev 97828)
+++ trunk/dports/emulators/virtualbox/Portfile 2012-09-17 05:42:53 UTC (rev 97829)
@@ -4,11 +4,11 @@
PortSystem 1.0
name virtualbox
-version 4.1.20
+version 4.2.0
# Note: On virtualbox version changes please update the checksums of all
# subports, and update extension_pack_build to match the current build
# of the extension pack.
-set extension_pack_build 80170
+set extension_pack_build 80737
categories emulators
platforms darwin
@@ -47,8 +47,8 @@
distname VirtualBox-${version}
use_bzip2 yes
- checksums rmd160 ba91d9284c47bac69d064f9bdf98a152fab7672b \
- sha256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb
+ checksums rmd160 9ed426203e6e01a27ce791ec83a89d1133d20f88 \
+ sha256 895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6
depends_lib-append port:curl \
port:libidl \
@@ -58,7 +58,6 @@
path:lib/pkgconfig/sdl.pc:libsdl
patchfiles patch-build.diff \
- patch-glext.h.diff \
patch-startup.diff
configure.compiler gcc-4.2
@@ -207,8 +206,8 @@
distfiles VBoxGuestAdditions_${version}.iso
- checksums rmd160 52741ca396fb507dcebfb4af04df61e567d2bba3 \
- sha256 04ab744725c17db441077ef471eeb41db5fc6e4569ac54e6c4f52923737b0494
+ checksums rmd160 8bd5fd7f0c96f62fd9a5a328aa285f9bdf89e937 \
+ sha256 ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3
depends_run port:virtualbox
@@ -264,8 +263,8 @@
distname ${name_extpack}-${version}
- checksums rmd160 84c1662501fe7be803f3ab470cfc6b2a3739414c \
- sha256 3aa9a2d65e63b8fcf3fc02070bde23d27f4e061953c8c8f1a1e1d492244bfa2a
+ checksums rmd160 52629c70a7dff3c0d760eee167fe999aea9d049c \
+ sha256 18055795fa95d3a49ac00fd7e5009113d871a0c87a5e0f864f88c4eeb3222218
worksrcdir ${name_extpack}
extract.suffix .vbox-extpack
Modified: trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff 2012-09-17 04:27:36 UTC (rev 97828)
+++ trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff 2012-09-17 05:42:53 UTC (rev 97829)
@@ -1,20 +1,15 @@
--- Config.kmk.orig 2012-08-19 17:42:19.000000000 -0500
+++ Config.kmk 2012-08-19 17:42:19.000000000 -0500
-@@ -1783,7 +1783,7 @@
- if "$(VBOX_XCODE_VERSION_MAJOR)" == "4"
- VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
- VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
-- VBOX_MACOSX_GCC_INFIX ?= -4.2
-+ VBOX_MACOSX_GCC_INFIX ?= -apple-4.2
- else
- VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5
- VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit)
-@@ -1802,7 +1802,7 @@
- $(error 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
+@@ -1913,10 +1913,8 @@
+ $(error VBox: 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
endif
- VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
-- VBOX_MACOSX_GCC_INFIX ?= -4.2
-+ VBOX_MACOSX_GCC_INFIX ?= -apple-4.2
- VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
endif
- TOOL_GCC4MACHO_CC = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE)
+- if $(VBOX_XCODE_VERSION_MAJOR) == 4 && $(VBOX_XCODE_VERSION_MINOR) >= 2
+- TOOL_GXX4MACHO_PREFIX ?= llvm-
+- endif
+- TOOL_GXX4MACHO_SUFFIX ?= -4.2
++ TOOL_GXX4MACHO_PREFIX ?=
++ TOOL_GXX4MACHO_SUFFIX ?= -apple-4.2
+ VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=
+
+ TOOL_GCC4MACHO_SUFFIX ?= $(TOOL_GXX4MACHO_SUFFIX)$(HOSTSUFF_EXE)
Modified: trunk/dports/emulators/virtualbox/files/patch-build.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-build.diff 2012-09-17 04:27:36 UTC (rev 97828)
+++ trunk/dports/emulators/virtualbox/files/patch-build.diff 2012-09-17 05:42:53 UTC (rev 97829)
@@ -1,6 +1,6 @@
--- Config.kmk.orig 2012-06-20 08:07:42.000000000 -0500
+++ Config.kmk 2012-08-19 05:22:48.000000000 -0500
-@@ -1094,7 +1094,7 @@
+@@ -1130,7 +1130,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,46 +9,43 @@
endif
# Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl and glue-java.xsl
-@@ -1828,7 +1828,13 @@
+@@ -1874,7 +1874,11 @@
endif
- VBOX_PATH_MACOSX_SDK ?= /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk
+ VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/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
+- VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).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
- 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
-@@ -1871,7 +1877,13 @@
+
+ ## The Xcode version.
+@@ -1968,6 +1972,13 @@
endif
if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.4 10.5 10.6)
-- VBOX_PATH_MACOSX_SDK_10_6 ?= /Developer/SDKs/MacOSX10.6.sdk
+ ifndef VBOX_PATH_MACOSX_SDK_10_6
-+ ifneq ($(wildcard /Developer/SDKs/MacOSX10.6.sdk),)
-+ VBOX_PATH_MACOSX_SDK_10_6 = /Developer/SDKs/MacOSX10.6.sdk
++ ifneq ($(wildcard $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk),)
++ VBOX_PATH_MACOSX_SDK_10_6 = $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk
+ else
+ VBOX_PATH_MACOSX_SDK_10_6 = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
+ endif
+ endif
+ VBOX_PATH_MACOSX_SDK_10_6 ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk
VBOX_DARWIN_DEF_SDK_10_6_DEFS := MAC_OS_X_VERSION_MIN_REQUIRED=1060 MAC_OS_X_VERSION_MAX_ALLOWED=1060
VBOX_DARWIN_DEF_SDK_10_6_CFLAGS := -mmacosx-version-min=10.6 -isysroot $(VBOX_PATH_MACOSX_SDK_10_6)
- VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS := -mmacosx-version-min=10.6 -isysroot $(VBOX_PATH_MACOSX_SDK_10_6)
-@@ -1889,7 +1901,7 @@
- ifneq ($(wildcard /Developer/SDKs/MacOSX10.7.sdk),)
- VBOX_PATH_MACOSX_SDK_10_7 = /Developer/SDKs/MacOSX10.7.sdk
+@@ -1986,7 +1997,7 @@
+ ifneq ($(wildcard $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.7.sdk),)
+ VBOX_PATH_MACOSX_SDK_10_7 = $(VBOX_PATH_MACOSX_SDK_ROOT)/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
-@@ -2071,22 +2083,22 @@
+@@ -2166,22 +2177,22 @@
VBOX_GCC32_CHECK_CXX = $(2)
else
VBOX_GCC_CHECK_CC = $(shell \
@@ -75,7 +72,7 @@
then echo "$(1)"; \
else echo "$(2)"; fi; )
endif
-@@ -3950,25 +3962,6 @@
+@@ -4214,25 +4225,6 @@
# be cleaned up properly later some time (not important now).
#
ifeq ($(VBOX_PATH_QT4),)
@@ -89,9 +86,9 @@
- endif
- endif
- else if1of ($(KBUILD_TARGET), win)
+- VBOX_PATH_QT4 ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
+- else if1of ($(KBUILD_TARGET), linux solaris)
- VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
-- else if1of ($(KBUILD_TARGET), solaris)
-- VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
- ifneq ($(VBOX_PATH_QT4),)
- VBOX_WITH_QT4_SUN = 1
- endif
@@ -117,10 +114,13 @@
+kBuildGlobalDefaults_LD_DEBUG=
--- Makefile.kmk.orig 2011-08-15 19:38:16.000000000 -0500
+++ Makefile.kmk 2011-08-15 19:38:16.000000000 -0500
-@@ -182,47 +182,6 @@
- # Install our Qt DLLs / Shared Objects / Frameworks.
- # Note: The installer fixes the darwin .dylibs when hardening is enabled.
+@@ -111,53 +111,6 @@
+ endif
+
#
+-# Install our Qt DLLs / Shared Objects / Frameworks.
+-# Note: The installer fixes the darwin .dylibs when hardening is enabled.
+-#
-ifeq ($(KBUILD_TARGET),darwin)
- INSTALLS += qt4-bin
- qt4-bin_MODE = 755
@@ -144,7 +144,7 @@
- Frameworks/QtGui$(VBOX_QT4_INFIX).framework/Resources=>Versions/4/Resources/
- endif
-else
-- ifdef VBOX_WITH_QT4_SUN
+- if defined(VBOX_WITH_QT4_SUN) || defined(VBOX_WITH_QT4_PAYLOAD)
- ifeq ($(KBUILD_TARGET),win)
- INSTALLS += qt4-bin
- qt4-bin_MODE = 755
@@ -162,12 +162,15 @@
- endif
- endif # VBOX_WITH_QT4_SUN
-endif
-
-
- #
+-
+-
+-#
+ # For building the combined package, just get the additions .ISO
+ # once for amd64 to prevent version inconsistences. In all other
+ # cases we get the .ISO per target architecture.
--- configure.orig 2011-08-15 19:38:16.000000000 -0500
+++ configure 2011-08-15 19:38:16.000000000 -0500
-@@ -1017,21 +1017,6 @@
+@@ -1074,21 +1074,6 @@
check_sdl()
{
test_header SDL
@@ -189,7 +192,7 @@
if which_wrapper sdl-config > /dev/null; then
FLGSDL=`sdl-config --cflags`
INCSDL=`strip_I "$FLGSDL"`
-@@ -1040,7 +1025,6 @@
+@@ -1097,7 +1082,6 @@
FLDSDL=
foundsdl=1
fi
@@ -197,7 +200,7 @@
[ "$OS" = "linux" -o "$OS" = "darwin" -o "$OS" = "solaris" ] && LIBSDLMAIN=""
if [ -n "$foundsdl" ]; then
cat > $ODIR.tmp_src.cc << EOF
-@@ -1388,53 +1372,20 @@
+@@ -1445,53 +1429,20 @@
{
foundqt4=
test_header Qt4
@@ -236,22 +239,22 @@
if which_wrapper pkg-config > /dev/null; then
# this braindead path is necessary for mdv2008.1
qt4_ver=`\
-- PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \
+- PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
pkg-config QtCore --modversion 2>> $LOG`
if [ $? -ne 0 ]; then
log_failure "QtCore not found"
fail
else
FLGQT4=`\
-- PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \
+- PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
pkg-config QtCore --cflags`
INCQT4=`strip_I "$FLGQT4"`
LIBQT4=`\
-- PKG_CONFIG_PATH=/usr/lib/qt4/lib/pkgconfig \
+- PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
pkg-config QtCore --libs`
foundqt4=1
-@@ -1476,7 +1427,6 @@
+@@ -1533,7 +1484,6 @@
fi
done
fi
@@ -259,7 +262,7 @@
if [ -n "$foundqt4" ]; then
cat > $ODIR.tmp_src.cc << EOF
#include <cstdio>
-@@ -1496,21 +1446,6 @@
+@@ -1553,21 +1503,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
@@ -281,7 +284,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
-@@ -1556,7 +1491,6 @@
+@@ -1613,7 +1548,6 @@
fi
fi
done
@@ -289,7 +292,7 @@
fi
else
log_failure "qt4 not working"
-@@ -2013,19 +1947,55 @@
+@@ -2071,19 +2005,55 @@
test_header "Darwin version"
darwin_ver=`uname -r`
case "$darwin_ver" in
@@ -349,15 +352,15 @@
CXX_FLAGS="-mmacosx-version-min=10.6 -isysroot $sdk -Wl,-syslibroot,$sdk"
fi
# test "$CC" = "gcc" && CC="gcc-4.0"
-@@ -2220,7 +2152,7 @@
+@@ -2279,7 +2249,7 @@
--with-openssl-dir=*)
OPENSSLDIR=`echo $option | cut -d'=' -f2`
INCCRYPTO="-I${OPENSSLDIR}/include"
- LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a"
+ LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.dylib ${OPENSSLDIR}/lib/libssl.dylib"
;;
- --with-gsoap-dir=*)
- GSOAP=`echo $option | cut -d'=' -f2`
+ --with-ow-dir=*)
+ WATCOM=`echo $option | cut -d'=' -f2`
--- kBuild/units/qt4.kmk.orig 2011-08-15 19:38:16.000000000 -0500
+++ kBuild/units/qt4.kmk 2011-08-15 19:38:16.000000000 -0500
@@ -70,13 +70,6 @@
Deleted: trunk/dports/emulators/virtualbox/files/patch-glext.h.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-glext.h.diff 2012-09-17 04:27:36 UTC (rev 97828)
+++ trunk/dports/emulators/virtualbox/files/patch-glext.h.diff 2012-09-17 05:42:53 UTC (rev 97829)
@@ -1,28 +0,0 @@
---- src/VBox/GuestHost/OpenGL/include/GL/glext.h.orig 2012-08-21 20:52:14.000000000 -0400
-+++ src/VBox/GuestHost/OpenGL/include/GL/glext.h 2012-08-21 20:53:59.000000000 -0400
-@@ -3722,6 +3722,25 @@
- typedef ptrdiff_t GLsizeiptrARB;
- #endif
-
-+/* VBox: HACK ALERT! When building the host side against Mac OS X 10.7 headers,
-+ /Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/OpenGL.framework/Headers/gltypes.h
-+ is included and it typedefs GLhandleARB differently. In 10.6 and earlier,
-+ gl.h was included instead of gltypes.h (new file) avoiding the conflicting
-+ typedef in Headers/glext.h.
-+
-+ Since sizeof the gltypes.h typedef is 64-bit on 64-bit platforms, we're in
-+ trouble if the type is used for anything important. Fortunately, the
-+ conflict only occurs in three files: renderspu_config.c, renderspu_cocoa.c
-+ and renderspu_cocoa_helper.m. */
-+#ifdef RT_OS_DARWIN
-+# ifndef MAC_OS_X_VERSION_MIN_REQUIRED
-+# error "MAC_OS_X_VERSION_MIN_REQUIRED is not defined"
-+# endif
-+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 && defined(__gltypes_h_)
-+# define GLhandleARB VBoxGLhandleARB
-+# endif
-+#endif
-+
- #ifndef GL_ARB_shader_objects
- /* GL types for handling shader object handles and program/shader text */
- typedef char GLcharARB; /* native character */
Modified: trunk/dports/emulators/virtualbox/files/patch-vde.diff
===================================================================
--- trunk/dports/emulators/virtualbox/files/patch-vde.diff 2012-09-17 04:27:36 UTC (rev 97828)
+++ trunk/dports/emulators/virtualbox/files/patch-vde.diff 2012-09-17 05:42:53 UTC (rev 97829)
@@ -1,6 +1,6 @@
--- configure.orig 2011-08-15 19:38:16.000000000 -0500
+++ configure 2011-08-15 19:38:16.000000000 -0500
-@@ -2532,7 +2532,7 @@
+@@ -2602,7 +2602,7 @@
fi
# VDE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120916/9ce2eeeb/attachment-0001.html>
More information about the macports-changes
mailing list