Changeset 97829
- Timestamp:
- Sep 17, 2012, 5:42:53 AM (12 years ago)
- Location:
- trunk/dports/emulators/virtualbox
- Files:
-
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dports/emulators/virtualbox/Portfile
r97826 r97829 5 5 6 6 name virtualbox 7 version 4. 1.207 version 4.2.0 8 8 # Note: On virtualbox version changes please update the checksums of all 9 9 # subports, and update extension_pack_build to match the current build 10 10 # of the extension pack. 11 set extension_pack_build 80 17011 set extension_pack_build 80737 12 12 13 13 categories emulators … … 48 48 use_bzip2 yes 49 49 50 checksums rmd160 ba91d9284c47bac69d064f9bdf98a152fab7672b\51 sha256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb50 checksums rmd160 9ed426203e6e01a27ce791ec83a89d1133d20f88 \ 51 sha256 895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6 52 52 53 53 depends_lib-append port:curl \ … … 59 59 60 60 patchfiles patch-build.diff \ 61 patch-glext.h.diff \62 61 patch-startup.diff 63 62 … … 208 207 distfiles VBoxGuestAdditions_${version}.iso 209 208 210 checksums rmd160 52741ca396fb507dcebfb4af04df61e567d2bba3\211 sha256 04ab744725c17db441077ef471eeb41db5fc6e4569ac54e6c4f52923737b0494209 checksums rmd160 8bd5fd7f0c96f62fd9a5a328aa285f9bdf89e937 \ 210 sha256 ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3 212 211 213 212 depends_run port:virtualbox … … 265 264 distname ${name_extpack}-${version} 266 265 267 checksums rmd160 84c1662501fe7be803f3ab470cfc6b2a3739414c \268 sha256 3aa9a2d65e63b8fcf3fc02070bde23d27f4e061953c8c8f1a1e1d492244bfa2a266 checksums rmd160 52629c70a7dff3c0d760eee167fe999aea9d049c \ 267 sha256 18055795fa95d3a49ac00fd7e5009113d871a0c87a5e0f864f88c4eeb3222218 269 268 270 269 worksrcdir ${name_extpack} -
trunk/dports/emulators/virtualbox/files/patch-apple-gcc42.diff
r96841 r97829 1 1 --- Config.kmk.orig 2012-08-19 17:42:19.000000000 -0500 2 2 +++ Config.kmk 2012-08-19 17:42:19.000000000 -0500 3 @@ -1783,7 +1783,7 @@ 4 if "$(VBOX_XCODE_VERSION_MAJOR)" == "4" 5 VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6 6 VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= 7 - VBOX_MACOSX_GCC_INFIX ?= -4.2 8 + VBOX_MACOSX_GCC_INFIX ?= -apple-4.2 9 else 10 VBOX_DEF_MACOSX_VERSION_MIN ?= 10.5 11 VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= $(VBOX_LD_no_compact_linkedit) 12 @@ -1802,7 +1802,7 @@ 13 $(error 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION)) 3 @@ -1913,10 +1913,8 @@ 4 $(error VBox: 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION)) 14 5 endif 15 VBOX_DEF_MACOSX_VERSION_MIN ?= 10.616 - VBOX_MACOSX_GCC_INFIX ?= -4.217 + VBOX_MACOSX_GCC_INFIX ?= -apple-4.218 VBOX_DARWIN_NO_COMPACT_LINKEDIT ?=19 6 endif 20 TOOL_GCC4MACHO_CC = gcc$(VBOX_MACOSX_GCC_INFIX)$(HOSTSUFF_EXE) 7 - if $(VBOX_XCODE_VERSION_MAJOR) == 4 && $(VBOX_XCODE_VERSION_MINOR) >= 2 8 - TOOL_GXX4MACHO_PREFIX ?= llvm- 9 - endif 10 - TOOL_GXX4MACHO_SUFFIX ?= -4.2 11 + TOOL_GXX4MACHO_PREFIX ?= 12 + TOOL_GXX4MACHO_SUFFIX ?= -apple-4.2 13 VBOX_DARWIN_NO_COMPACT_LINKEDIT ?= 14 15 TOOL_GCC4MACHO_SUFFIX ?= $(TOOL_GXX4MACHO_SUFFIX)$(HOSTSUFF_EXE) -
trunk/dports/emulators/virtualbox/files/patch-build.diff
r97826 r97829 1 1 --- Config.kmk.orig 2012-06-20 08:07:42.000000000 -0500 2 2 +++ Config.kmk 2012-08-19 05:22:48.000000000 -0500 3 @@ -1 094,7 +1094,7 @@3 @@ -1130,7 +1130,7 @@ 4 4 # of VirtualBox binaries. We request though that you always use something that 5 5 # clearly identifies your build and makes it clear that it is not one done by … … 10 10 11 11 # Keep in sync with G_virtualBoxPackage in glue-jaxws.xsl and glue-java.xsl 12 @@ -18 28,7 +1828,13@@12 @@ -1874,7 +1874,11 @@ 13 13 endif 14 VBOX_PATH_MACOSX_SDK ?= /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk14 VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN)u.sdk 15 15 else 16 - VBOX_PATH_MACOSX_SDK ?= /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk 17 + ifndef VBOX_PATH_MACOSX_SDK 18 + ifneq ($(wildcard /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk),) 19 + VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk 20 + else 21 + VBOX_PATH_MACOSX_SDK = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk 22 + endif 16 - VBOX_PATH_MACOSX_SDK ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk 17 + ifneq ($(wildcard /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk),) 18 + VBOX_PATH_MACOSX_SDK = /Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk 19 + else 20 + VBOX_PATH_MACOSX_SDK = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(VBOX_DEF_MACOSX_VERSION_MIN).sdk 23 21 + endif 24 22 endif 25 VBOX_DARWIN_DEF_SDK_DEFS := MAC_OS_X_VERSION_MIN_REQUIRED=$(subst .,,$(VBOX_DEF_MACOSX_VERSION_MIN))0 \26 MAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(VBOX_DEF_MACOSX_VERSION_MIN))027 @@ -1 871,7 +1877,13 @@23 24 ## The Xcode version. 25 @@ -1968,6 +1972,13 @@ 28 26 endif 29 27 30 28 if1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.4 10.5 10.6) 31 - VBOX_PATH_MACOSX_SDK_10_6 ?= /Developer/SDKs/MacOSX10.6.sdk32 29 + ifndef VBOX_PATH_MACOSX_SDK_10_6 33 + ifneq ($(wildcard /Developer/SDKs/MacOSX10.6.sdk),)34 + VBOX_PATH_MACOSX_SDK_10_6 = /Developer/SDKs/MacOSX10.6.sdk30 + ifneq ($(wildcard $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk),) 31 + VBOX_PATH_MACOSX_SDK_10_6 = $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk 35 32 + else 36 33 + VBOX_PATH_MACOSX_SDK_10_6 = $(shell xcode-select -print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk 37 34 + endif 38 35 + endif 36 VBOX_PATH_MACOSX_SDK_10_6 ?= $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.6.sdk 39 37 VBOX_DARWIN_DEF_SDK_10_6_DEFS := MAC_OS_X_VERSION_MIN_REQUIRED=1060 MAC_OS_X_VERSION_MAX_ALLOWED=1060 40 38 VBOX_DARWIN_DEF_SDK_10_6_CFLAGS := -mmacosx-version-min=10.6 -isysroot $(VBOX_PATH_MACOSX_SDK_10_6) 41 VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS := -mmacosx-version-min=10.6 -isysroot $(VBOX_PATH_MACOSX_SDK_10_6) 42 @@ -1889,7 +1901,7 @@ 43 ifneq ($(wildcard /Developer/SDKs/MacOSX10.7.sdk),) 44 VBOX_PATH_MACOSX_SDK_10_7 = /Developer/SDKs/MacOSX10.7.sdk 39 @@ -1986,7 +1997,7 @@ 40 ifneq ($(wildcard $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.7.sdk),) 41 VBOX_PATH_MACOSX_SDK_10_7 = $(VBOX_PATH_MACOSX_SDK_ROOT)/MacOSX10.7.sdk 45 42 else 46 43 - VBOX_PATH_MACOSX_SDK_10_7 = $(PATH_DEVTOOLS)/darwin.x86/SDKs/MacOSX10.7.sdk … … 49 46 endif 50 47 VBOX_DARWIN_DEF_SDK_10_7_DEFS := MAC_OS_X_VERSION_MIN_REQUIRED=1070 MAC_OS_X_VERSION_MAX_ALLOWED=1070 51 @@ -2 071,22 +2083,22 @@48 @@ -2166,22 +2177,22 @@ 52 49 VBOX_GCC32_CHECK_CXX = $(2) 53 50 else … … 76 73 else echo "$(2)"; fi; ) 77 74 endif 78 @@ - 3950,25 +3962,6 @@75 @@ -4214,25 +4225,6 @@ 79 76 # be cleaned up properly later some time (not important now). 80 77 # … … 90 87 - endif 91 88 - else if1of ($(KBUILD_TARGET), win) 92 - VBOX_PATH_QT4 ?= $(lastword $( sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))93 - else if1of ($(KBUILD_TARGET), solaris)89 - VBOX_PATH_QT4 ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))) 90 - else if1of ($(KBUILD_TARGET), linux solaris) 94 91 - VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))) 95 92 - ifneq ($(VBOX_PATH_QT4),) … … 118 115 --- Makefile.kmk.orig 2011-08-15 19:38:16.000000000 -0500 119 116 +++ Makefile.kmk 2011-08-15 19:38:16.000000000 -0500 120 @@ -1 82,47 +182,6 @@121 # Install our Qt DLLs / Shared Objects / Frameworks.122 # Note: The installer fixes the darwin .dylibs when hardening is enabled.117 @@ -111,53 +111,6 @@ 118 endif 119 123 120 # 121 -# Install our Qt DLLs / Shared Objects / Frameworks. 122 -# Note: The installer fixes the darwin .dylibs when hardening is enabled. 123 -# 124 124 -ifeq ($(KBUILD_TARGET),darwin) 125 125 - INSTALLS += qt4-bin … … 145 145 - endif 146 146 -else 147 - if def VBOX_WITH_QT4_SUN147 - if defined(VBOX_WITH_QT4_SUN) || defined(VBOX_WITH_QT4_PAYLOAD) 148 148 - ifeq ($(KBUILD_TARGET),win) 149 149 - INSTALLS += qt4-bin … … 163 163 - endif # VBOX_WITH_QT4_SUN 164 164 -endif 165 166 167 # 165 - 166 - 167 -# 168 # For building the combined package, just get the additions .ISO 169 # once for amd64 to prevent version inconsistences. In all other 170 # cases we get the .ISO per target architecture. 168 171 --- configure.orig 2011-08-15 19:38:16.000000000 -0500 169 172 +++ configure 2011-08-15 19:38:16.000000000 -0500 170 @@ -10 17,21 +1017,6 @@173 @@ -1074,21 +1074,6 @@ 171 174 check_sdl() 172 175 { … … 190 193 FLGSDL=`sdl-config --cflags` 191 194 INCSDL=`strip_I "$FLGSDL"` 192 @@ -10 40,7 +1025,6 @@195 @@ -1097,7 +1082,6 @@ 193 196 FLDSDL= 194 197 foundsdl=1 … … 198 201 if [ -n "$foundsdl" ]; then 199 202 cat > $ODIR.tmp_src.cc << EOF 200 @@ -1 388,53 +1372,20 @@203 @@ -1445,53 +1429,20 @@ 201 204 { 202 205 foundqt4= … … 237 240 # this braindead path is necessary for mdv2008.1 238 241 qt4_ver=`\ 239 - PKG_CONFIG_PATH= /usr/lib/qt4/lib/pkgconfig \242 - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \ 240 243 pkg-config QtCore --modversion 2>> $LOG` 241 244 if [ $? -ne 0 ]; then … … 244 247 else 245 248 FLGQT4=`\ 246 - PKG_CONFIG_PATH= /usr/lib/qt4/lib/pkgconfig \249 - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \ 247 250 pkg-config QtCore --cflags` 248 251 INCQT4=`strip_I "$FLGQT4"` 249 252 LIBQT4=`\ 250 - PKG_CONFIG_PATH= /usr/lib/qt4/lib/pkgconfig \253 - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/qt4/lib/pkgconfig \ 251 254 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ 252 255 pkg-config QtCore --libs` 253 256 foundqt4=1 254 @@ -1 476,7 +1427,6 @@257 @@ -1533,7 +1484,6 @@ 255 258 fi 256 259 done … … 260 263 cat > $ODIR.tmp_src.cc << EOF 261 264 #include <cstdio> 262 @@ -1 496,21 +1446,6 @@265 @@ -1553,21 +1503,6 @@ 263 266 [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"` 264 267 if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then … … 282 285 INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'` 283 286 # store only the first path, remove all other pathes 284 @@ -1 556,7 +1491,6 @@287 @@ -1613,7 +1548,6 @@ 285 288 fi 286 289 fi … … 290 293 else 291 294 log_failure "qt4 not working" 292 @@ -20 13,19 +1947,55 @@295 @@ -2071,19 +2005,55 @@ 293 296 test_header "Darwin version" 294 297 darwin_ver=`uname -r` … … 350 353 fi 351 354 # test "$CC" = "gcc" && CC="gcc-4.0" 352 @@ -22 20,7 +2152,7 @@355 @@ -2279,7 +2249,7 @@ 353 356 --with-openssl-dir=*) 354 357 OPENSSLDIR=`echo $option | cut -d'=' -f2` … … 357 360 + LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.dylib ${OPENSSLDIR}/lib/libssl.dylib" 358 361 ;; 359 --with- gsoap-dir=*)360 GSOAP=`echo $option | cut -d'=' -f2`362 --with-ow-dir=*) 363 WATCOM=`echo $option | cut -d'=' -f2` 361 364 --- kBuild/units/qt4.kmk.orig 2011-08-15 19:38:16.000000000 -0500 362 365 +++ kBuild/units/qt4.kmk 2011-08-15 19:38:16.000000000 -0500 -
trunk/dports/emulators/virtualbox/files/patch-vde.diff
r96944 r97829 1 1 --- configure.orig 2011-08-15 19:38:16.000000000 -0500 2 2 +++ configure 2011-08-15 19:38:16.000000000 -0500 3 @@ -2 532,7 +2532,7 @@3 @@ -2602,7 +2602,7 @@ 4 4 fi 5 5
Note: See TracChangeset
for help on using the changeset viewer.