Changeset 96944


Ignore:
Timestamp:
Aug 22, 2012, 4:19:39 PM (8 years ago)
Author:
royliu@…
Message:

virtualbox: update to 4.1.20 and enable building for Mountain Lion

Location:
trunk/dports/emulators/virtualbox
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/emulators/virtualbox/Portfile

    r96841 r96944  
    55
    66name                virtualbox
    7 version             4.1.18
     7version             4.1.20
    88# Note: On virtualbox version changes please update the checksums of all
    99# subports, and update extension_pack_build to match the current build
    1010# of the extension pack.
    11 set extension_pack_build   78361
     11set extension_pack_build   80170
    1212
    1313categories          emulators
     
    4848    use_bzip2           yes
    4949
    50     checksums           rmd160  d3681745fdda27d884efe2faf1258a1fa0058a78 \
    51                         sha256  e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7
     50    checksums           rmd160  ba91d9284c47bac69d064f9bdf98a152fab7672b \
     51                        sha256  b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb
    5252
    5353    depends_lib-append          port:curl \
     
    5959
    6060    patchfiles                  patch-build.diff \
     61                                patch-glext.h.diff \
    6162                                patch-startup.diff
    6263
     
    9394        reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" \
    9495            ${worksrcpath}/LocalConfig.kmk
    95     # TODO: The deployment target should be set dynamically, but, because of incompatibilities
    96     # with OpenGL headers in 10.7, it's fixed at 10.6 for now.
    97         reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|10.6|g" \
     96        reinplace "s|@MACOSX_DEPLOYMENT_TARGET@|10.[expr [lindex [split ${macosx_deployment_target} "."] 1] - 1]|g" \
    9897           ${worksrcpath}/LocalConfig.kmk
    9998        reinplace "s|@KEXT_DIR@|${prefix}${kext_dir}|g" \
     
    203202    distfiles               VBoxGuestAdditions_${version}.iso
    204203
    205     checksums               rmd160  d2ec9130a0235ce38bb702779b6ab722e3ff684c \
    206                             sha256  0b670a698dcb427ebf69cdec1e040b26e93538e1ca76f58506c1db70308152ff
     204    checksums               rmd160  52741ca396fb507dcebfb4af04df61e567d2bba3 \
     205                            sha256  04ab744725c17db441077ef471eeb41db5fc6e4569ac54e6c4f52923737b0494
    207206
    208207    depends_run             port:virtualbox
     
    260259    distname            ${name_extpack}-${version}
    261260
    262     checksums           rmd160  d2ddd423cc799309d2a352d92b13aae20ec83628 \
    263                         sha256  1c8cf8d67d9adf75fd02d529c03ee2f960ec4be08970fd8030ba7912ef1e3198
     261    checksums           rmd160  84c1662501fe7be803f3ab470cfc6b2a3739414c \
     262                        sha256  3aa9a2d65e63b8fcf3fc02070bde23d27f4e061953c8c8f1a1e1d492244bfa2a
    264263
    265264    worksrcdir          ${name_extpack}
  • trunk/dports/emulators/virtualbox/files/patch-build.diff

    r96841 r96944  
    5353 else
    5454 VBOX_GCC_CHECK_CC = $(shell \
    55 -   if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
    56 +   if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(1) -S -xc /dev/null > /dev/null 2>&1; \
     55-   if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
     56+   if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -xc /dev/null > /dev/null 2>&1; \
    5757    then echo "$(1)"; \
    5858    else echo "$(2)"; fi; )
    5959 
    6060 VBOX_GCC_CHECK_CXX = $(shell \
    61 -   if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(1) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
    62 +   if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(1) -S -xc++ /dev/null > /dev/null 2>&1; \
     61-   if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
     62+   if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -xc++ /dev/null > /dev/null 2>&1; \
    6363    then echo "$(1)"; \
    6464    else echo "$(2)"; fi; )
     
    7676    else echo "$(2)"; fi; )
    7777 endif
    78 @@ -3939,25 +3951,6 @@
     78@@ -3950,25 +3962,6 @@
    7979  # be cleaned up properly later some time (not important now).
    8080  #
     
    290290     else
    291291       log_failure "qt4 not working"
    292 @@ -2015,17 +1949,36 @@
     292@@ -2013,19 +1947,49 @@
     293   test_header "Darwin version"
     294   darwin_ver=`uname -r`
    293295   case "$darwin_ver" in
     296+    12\.*)
     297+      darwin_ver="10.8" # Mountain Lion
     298+
     299+      if { test -d "/Developer/SDKs/MacOSX10.7.sdk"; } then
     300+          sdk="/Developer/SDKs/MacOSX10.7.sdk"
     301+      else
     302+          sdk="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
     303+      fi
     304+
     305+      CXX_FLAGS="-mmacosx-version-min=10.7 -isysroot $sdk -Wl,-syslibroot,$sdk"
     306+      ;;
    294307     11\.*)
    295308       darwin_ver="10.7" # Lion
     
    410423 
    411424 
     425--- src/libs/xpcom18a4/python/Makefile.kmk.orig 2012-08-21 20:52:14.000000000 -0400
     426+++ src/libs/xpcom18a4/python/Makefile.kmk      2012-08-21 20:53:59.000000000 -0400
     427@@ -33,15 +33,11 @@ ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
     428   VBOX_PYTHON25_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.5
     429   VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
     430  endif
     431- if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
     432-  && (   !defined(VBOX_OSE) \
     433-      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib)" != "")
     434+ ifdef VBOX_PATH_MACOSX_SDK_10_6
     435   VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
     436   VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
     437  endif
     438- if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
     439-  && (   defined(VBOX_NOT_OSE_LATER_SOMETIME) \
     440-      || "$(wildcard $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib)" != "")
     441+ ifdef VBOX_PATH_MACOSX_SDK_10_7
     442   VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
     443   VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
     444  endif
  • trunk/dports/emulators/virtualbox/files/patch-vde.diff

    r93203 r96944  
    11--- configure.orig      2011-08-15 19:38:16.000000000 -0500
    22+++ configure   2011-08-15 19:38:16.000000000 -0500
    3 @@ -2521,7 +2521,7 @@
     3@@ -2532,7 +2532,7 @@
    44 fi
    55 
Note: See TracChangeset for help on using the changeset viewer.