Ticket #33388: patch-cmake-2.8.7-port.diff

File patch-cmake-2.8.7-port.diff, 6.6 KB (added by maehne (Torsten Maehne), 12 years ago)

Patch to update port cmake from 2.8.6 to 2.8.7

  • Portfile 

    diff -urN cmake-orig/Portfile cmake/Portfile
    old new  
    55PortGroup       muniversal 1.0
    66
    77name            cmake
    8 version         2.8.6
     8version         2.8.7
    99set branch      [join [lrange [split ${version} .] 0 1] .]
    1010categories      devel
    1111license         BSD
    … …  
    2121master_sites    http://www.cmake.org/files/v${branch}/
    2222platforms       darwin freebsd
    2323
    24 checksums           md5     2147da452fd9212bb9b4542a9eee9d5b \
    25                     sha1    7c2cbd42d27e26580cd4923892197b84b2a90675 \
    26                     rmd160  c3095a4776367496f895b8075fda373568f01878
     24checksums           md5     e1b237aeaed880f65dec9c20602452f6 \
     25                    sha1    d206182b454f4d1ddeb0f11d7d1be8a66e5c2464 \
     26                    rmd160  13b188e75152feef4e5692807e3a9e7c34b26fe3
    2727
    2828depends_lib-append port:libidn port:openssl
    2929
    … …  
    3838configure.post_args
    3939
    4040patchfiles      patch-CMakeFindFrameworks.cmake.diff \
    41                         patch-Modules-FindQt4.cmake.diff
     41                        patch-Modules-FindQt4.cmake.diff \
     42                        patch-Xcode_4.3.diff
    4243
    4344post-patch {
    4445        # copy cmake init file, ready to be patched below

  • files/patch-CMakeLists.txt.diff 

    diff -urN cmake-orig/files/patch-CMakeLists.txt.diff cmake/files/patch-CMakeLists.txt.diff
    old new  
    1 diff -ur cmake-2.8.4-orig/CMakeLists.txt cmake-2.8.4/CMakeLists.txt
    2 --- CMakeLists.txt      2011-02-27 20:41:54.000000000 +0100
    3 +++ CMakeLists.txt      2011-02-27 20:43:04.000000000 +0100
    4 @@ -547,7 +547,7 @@
     1diff -ur cmake-2.8.7-orig/CMakeLists.txt cmake-2.8.7/CMakeLists.txt
     2--- CMakeLists.txt      2012-02-27 16:55:54.000000000 +0100
     3+++ CMakeLists.txt      2012-02-27 16:56:56.000000000 +0100
     4@@ -541,7 +541,7 @@
    55 ENDIF(BUILD_CursesDialog)
    66 
    77 IF(BUILD_QtDialog)
    … …  
    1010     SET(CMAKE_BUNDLE_NAME
    1111       "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
    1212     SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
    13 @@ -560,7 +560,7 @@
     13@@ -554,7 +554,7 @@
    1414     ENDIF(NOT "${ENDCH}" STREQUAL "/")
    1515     SET(CMAKE_INSTALL_PREFIX
    1616       "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
    … …  
    1919   
    2020   SET(QT_NEED_RPATH FALSE)
    2121   IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
    22 diff -ur cmake-2.8.4-orig/Source/QtDialog/CMakeLists.txt cmake-2.8.4/Source/QtDialog/CMakeLists.txt
    23 --- Source/QtDialog/CMakeLists.txt      2011-02-27 20:41:55.000000000 +0100
    24 +++ Source/QtDialog/CMakeLists.txt      2011-02-27 20:43:22.000000000 +0100
     22Only in cmake-2.8.7: CMakeLists.txt.orig
     23diff -ur cmake-2.8.7-orig/Source/QtDialog/CMakeLists.txt cmake-2.8.7/Source/QtDialog/CMakeLists.txt
     24--- Source/QtDialog/CMakeLists.txt      2012-02-27 16:55:54.000000000 +0100
     25+++ Source/QtDialog/CMakeLists.txt      2012-02-27 16:56:56.000000000 +0100
    2526@@ -59,23 +59,23 @@
    2627   IF(Q_WS_WIN)
    2728     SET(SRCS ${SRCS} CMakeSetup.rc)

  • files/patch-Xcode_4.3.diff 

    diff -urN cmake-orig/files/patch-Xcode_4.3.diff cmake/files/patch-Xcode_4.3.diff
    old new  
     1diff -ur cmake-2.8.7-orig/Modules/Platform/Darwin.cmake cmake-2.8.7/Modules/Platform/Darwin.cmake
     2--- Modules/Platform/Darwin.cmake       2012-02-27 16:55:54.000000000 +0100
     3+++ Modules/Platform/Darwin.cmake       2012-03-01 14:37:31.000000000 +0100
     4@@ -58,20 +58,22 @@
     5 
     6 # Set the assumed (Pre 10.5 or Default) location of the developer tools
     7 SET(OSX_DEVELOPER_ROOT "/Developer")
     8+# Use the xcode-select tool if it's available (Xcode >= 3.0 installations)
     9+FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select)
     10+IF(CMAKE_XCODE_SELECT)
     11+  EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path"
     12+    OUTPUT_VARIABLE OSX_DEVELOPER_ROOT
     13+    OUTPUT_STRIP_TRAILING_WHITESPACE)
     14+ENDIF(CMAKE_XCODE_SELECT)
     15 
     16 # Find installed SDKs
     17-FILE(GLOB _CMAKE_OSX_SDKS "${OSX_DEVELOPER_ROOT}/SDKs/*")
     18-
     19-# If nothing is found there, then try locating the dev tools based on the xcode-select tool
     20-# (available in Xcode >= 3.0 installations)
     21+# Start with pre-Xcode-4.3 default SDKs directory
     22+SET(_CMAKE_OSX_SDKS_DIR "${OSX_DEVELOPER_ROOT}/SDKs")
     23+FILE(GLOB _CMAKE_OSX_SDKS "${_CMAKE_OSX_SDKS_DIR}/*")
     24+# If not present, try 4.3+ SDKs directory
     25 IF(NOT _CMAKE_OSX_SDKS)
     26-  FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select)
     27-  IF(CMAKE_XCODE_SELECT)
     28-    EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path"
     29-      OUTPUT_VARIABLE OSX_DEVELOPER_ROOT
     30-      OUTPUT_STRIP_TRAILING_WHITESPACE)
     31-    FILE(GLOB _CMAKE_OSX_SDKS "${OSX_DEVELOPER_ROOT}/SDKs/*")
     32-  ENDIF(CMAKE_XCODE_SELECT)
     33+  SET(_CMAKE_OSX_SDKS_DIR "${OSX_DEVELOPER_ROOT}/Platforms/MacOSX.platform/Developer/SDKs")
     34+  FILE(GLOB _CMAKE_OSX_SDKS "${_CMAKE_OSX_SDKS_DIR}/*")
     35 ENDIF(NOT _CMAKE_OSX_SDKS)
     36 
     37 EXECUTE_PROCESS(COMMAND sw_vers -productVersion
     38@@ -103,16 +105,16 @@
     39 # Set CMAKE_OSX_SYSROOT_DEFAULT based on _CURRENT_OSX_VERSION,
     40 # accounting for the known specially named SDKs.
     41 SET(CMAKE_OSX_SYSROOT_DEFAULT
     42-  "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX${_CURRENT_OSX_VERSION}.sdk")
     43+  "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CURRENT_OSX_VERSION}.sdk")
     44 
     45 IF(_CURRENT_OSX_VERSION STREQUAL "10.4")
     46   SET(CMAKE_OSX_SYSROOT_DEFAULT
     47-    "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.4u.sdk")
     48+    "${_CMAKE_OSX_SDKS_DIR}/MacOSX10.4u.sdk")
     49 ENDIF(_CURRENT_OSX_VERSION STREQUAL "10.4")
     50 
     51 IF(_CURRENT_OSX_VERSION STREQUAL "10.3")
     52   SET(CMAKE_OSX_SYSROOT_DEFAULT
     53-    "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.3.9.sdk")
     54+    "${_CMAKE_OSX_SDKS_DIR}/MacOSX10.3.9.sdk")
     55 ENDIF(_CURRENT_OSX_VERSION STREQUAL "10.3")
     56 
     57 # Use environment or default as initial cache value:
     58diff -ur cmake-2.8.7-orig/Source/cmGlobalXCodeGenerator.cxx cmake-2.8.7/Source/cmGlobalXCodeGenerator.cxx
     59--- Source/cmGlobalXCodeGenerator.cxx   2012-02-27 16:55:54.000000000 +0100
     60+++ Source/cmGlobalXCodeGenerator.cxx   2012-02-27 17:11:59.000000000 +0100
     61@@ -135,8 +135,16 @@
     62 {
     63 #if defined(CMAKE_BUILD_WITH_CMAKE)
     64   cmXcodeVersionParser parser;
     65-  parser.ParseFile
     66-    ("/Developer/Applications/Xcode.app/Contents/version.plist");
     67+  if (cmSystemTools::FileExists("/Applications/Xcode.app/Contents/version.plist"))
     68+    {
     69+    parser.ParseFile
     70+      ("/Applications/Xcode.app/Contents/version.plist");
     71+    }
     72+  else
     73+    {
     74+    parser.ParseFile
     75+      ("/Developer/Applications/Xcode.app/Contents/version.plist");
     76+    }
     77   cmsys::auto_ptr<cmGlobalXCodeGenerator>
     78     gg(new cmGlobalXCodeGenerator(parser.Version));
     79   if (gg->XcodeVersion == 20)