Ticket #46493: cmake_3.1.3.diff

File cmake_3.1.3.diff, 10.1 KB (added by michaelld (Michael Dickens), 9 years ago)

  • Portfile

     
    55PortGroup           muniversal 1.0
    66
    77name                cmake
    8 version             3.0.2
    9 revision            1
     8version             3.1.3
    109set branch          [join [lrange [split ${version} .] 0 1] .]
    1110categories          devel
    1211license             BSD
    1312installs_libs       no
    14 maintainers         css
     13maintainers         michaelld css
    1514description         Cross-platform make
    1615long_description    An extensible, open-source system that manages the build    \
    1716                    process in an operating system and compiler independent manner. \
    … …  
    2120master_sites        http://www.cmake.org/files/v${branch}/
    2221platforms           darwin freebsd
    2322
    24 checksums           rmd160  b94ea2ed4dced373e289fa5f66674a227135f350 \
    25                     sha256  6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e
     23checksums           rmd160 2693ac550a2e08fbc34601e5d8b60f2abec99d1f \
     24                    sha256 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0
    2625
    2726depends_lib-append  port:libidn \
    2827                    port:openssl \
    … …  
    3635                    patch-Modules-FindFreetype.cmake.diff \
    3736                    patch-Modules-FindQt4.cmake.diff \
    3837                    patch-Modules-Platform-Darwin.cmake.diff \
     38                    patch-Modules-Platform-Darwin-Initialize.cmake.diff \
    3939                    patch-Modules-noArchCheck.diff
    4040
    4141configure.env-append \

  • files/patch-CMakeFindFrameworks.cmake.diff

     
    1 --- Modules/CMakeFindFrameworks.cmake   2012-11-02 10:05:18.000000000 -0700
    2 +++ Modules/CMakeFindFrameworks.cmake   2012-11-02 10:12:23.000000000 -0700
     1--- Modules/CMakeFindFrameworks.cmake.orig
     2+++ Modules/CMakeFindFrameworks.cmake
    33@@ -24,6 +24,7 @@
    44     if(APPLE)
    55       foreach(dir

  • files/patch-CMakeLists.txt.diff

     
    1 --- CMakeLists.txt
     1--- CMakeLists.txt.orig
    22+++ CMakeLists.txt
    33@@ -476,7 +476,7 @@ if(BUILD_CursesDialog)
    44 endif()

  • files/patch-Modules-FindFreetype.cmake.diff

     
    11--- Modules/FindFreetype.cmake.orig
    22+++ Modules/FindFreetype.cmake
    3 @@ -55,10 +55,6 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
     3@@ -57,10 +57,6 @@
    44   HINTS
    55     ENV FREETYPE_DIR
    66   PATHS
    … …  
    1111     ENV GTKMM_BASEPATH
    1212     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
    1313     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
    14 @@ -72,10 +68,6 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
     14@@ -78,10 +74,6 @@
    1515   HINTS
    1616     ENV FREETYPE_DIR
    1717   PATHS
    … …  
    2222     ENV GTKMM_BASEPATH
    2323     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
    2424     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
    25 @@ -88,10 +80,6 @@ find_library(FREETYPE_LIBRARY
     25@@ -99,10 +91,6 @@
     26   HINTS
    2627     ENV FREETYPE_DIR
    27    PATH_SUFFIXES lib
    2828   PATHS
    2929-    /usr/X11R6
    3030-    /usr/local/X11R6

  • files/patch-Modules-FindQt4.cmake.diff

     
    11--- Modules/FindQt4.cmake.orig
    22+++ Modules/FindQt4.cmake
    3 @@ -728,9 +728,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
     3@@ -741,9 +741,7 @@
    44       find_path(QT_IMPORTS_DIR NAMES Qt
    55         HINTS ${qt_cross_paths} ${qt_imports_dir}
    66         DOC "The location of the Qt imports"

  • files/patch-Modules-Platform-Darwin-Initialize.cmake.diff

     
     1--- Modules/Platform/Darwin-Initialize.cmake.orig
     2+++ Modules/Platform/Darwin-Initialize.cmake
     3@@ -94,11 +94,17 @@
     4         NOT CMAKE_OSX_DEPLOYMENT_TARGET VERSION_EQUAL ${_CMAKE_OSX_DEPLOYMENT_TARGET})
     5       set(_CMAKE_OSX_SDKS_VER ${CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${CMAKE_OSX_DEPLOYMENT_TARGET}})
     6       set(_CMAKE_OSX_SYSROOT_CHECK "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
     7-      message(WARNING
     8-        "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
     9-        "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
     10-        "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"."
     11-        )
     12+      if(IS_DIRECTORY "${_CMAKE_OSX_SYSROOT_DEFAULT}")
     13+        if(NOT "${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "${_CURRENT_OSX_VERSION}")
     14+         message(WARNING
     15+            "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
     16+            "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
     17+            "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"."
     18+            )
     19+       endif()
     20+      else()
     21+        set(_CMAKE_OSX_SYSROOT_DEFAULT "")
     22+      endif()
     23     endif()
     24   else()
     25     # Assume developer files are in root (such as Xcode 4.5 command-line tools).

  • files/patch-Modules-Platform-Darwin.cmake.diff

     
    1 --- Modules/Platform/Darwin.cmake.orig  2014-09-11 23:24:00.000000000 +1000
    2 +++ Modules/Platform/Darwin.cmake       2014-10-21 14:02:52.000000000 +1100
    3 @@ -140,12 +140,18 @@
    4        else()
    5          set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
    6          set(_CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
    7 -        message(WARNING
    8 -          "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
    9 -          "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
    10 -          "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"\n"
    11 -          "matching the host OS X version."
    12 -          )
    13 +        if(IS_DIRECTORY "${_CMAKE_OSX_SYSROOT_DEFAULT}")
    14 +          if (NOT "${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "${_CURRENT_OSX_VERSION}")
    15 +            message(WARNING
    16 +              "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
    17 +              "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
    18 +              "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"\n"
    19 +              "matching the host OS X version."
    20 +              )
    21 +          endif()
    22 +        else ()
    23 +          set(_CMAKE_OSX_SYSROOT_DEFAULT "")
    24 +        endif()
    25        endif()
    26      else()
    27        set(_CMAKE_OSX_SDKS_VER ${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
    28 @@ -207,6 +213,8 @@
     1--- Modules/Platform/Darwin.cmake.orig
     2+++ Modules/Platform/Darwin.cmake
     3@@ -70,7 +70,8 @@
    294     set(_sdk_ver "${CMAKE_MATCH_1}")
    305   elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$")
    316     set(_sdk_ver "${CMAKE_MATCH_1}")
    32 +  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/" OR "${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "")
    33 +    set(_sdk_ver "${_CURRENT_OSX_VERSION}")
     7-  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/")
     8+  elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/" OR
     9+         "${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "")
     10     set(_sdk_ver "${_CURRENT_OSX_VERSION}")
    3411   else()
    3512     message(FATAL_ERROR
    36        "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "

  • files/patch-Modules-noArchCheck.diff

     
    1 diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in ./Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
    2 --- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in    2013-10-08 00:31:00.000000000 +0900
    3 +++ ./Modules/BasicConfigVersion-AnyNewerVersion.cmake.in       2013-12-25 16:14:04.000000000 +0900
     1--- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
     2+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
    43@@ -17,15 +17,3 @@
    54     set(PACKAGE_VERSION_EXACT TRUE)
    65   endif()
    … …  
    1716-   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
    1817-   set(PACKAGE_VERSION_UNSUITABLE TRUE)
    1918-endif()
    20 diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-ExactVersion.cmake.in ./Modules/BasicConfigVersion-ExactVersion.cmake.in
    21 --- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-ExactVersion.cmake.in       2013-10-08 00:31:00.000000000 +0900
    22 +++ ./Modules/BasicConfigVersion-ExactVersion.cmake.in  2013-12-25 16:14:00.000000000 +0900
     19--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
     20+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
    2321@@ -32,16 +32,3 @@
    2422 if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
    2523   set(PACKAGE_VERSION_EXACT TRUE)
    … …  
    3735-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
    3836-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
    3937-endif()
    40 diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-SameMajorVersion.cmake.in ./Modules/BasicConfigVersion-SameMajorVersion.cmake.in
    41 --- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-SameMajorVersion.cmake.in   2013-10-08 00:31:00.000000000 +0900
    42 +++ ./Modules/BasicConfigVersion-SameMajorVersion.cmake.in      2013-12-25 16:13:52.000000000 +0900
     38--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
     39+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
    4340@@ -31,16 +31,3 @@
    4441       set(PACKAGE_VERSION_EXACT TRUE)
    4542   endif()