[149992] trunk/dports/devel/cmake

[michaelld at macports.org]

Revision: 149992
          https://trac.macports.org/changeset/149992
Author:   michaelld at macports.org
Date:     2016-07-07 14:03:25 -0700 (Thu, 07 Jul 2016)
Log Message:
-----------
cmake: update to 3.6.0; remove superseded patch and tweak qt* release patches to apply cleanly.

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile
    trunk/dports/devel/cmake/files/patch-qt4gui.release.diff
    trunk/dports/devel/cmake/files/patch-qt5gui.release.diff

Removed Paths:
-------------
    trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2016-07-07 20:06:51 UTC (rev 149991)
+++ trunk/dports/devel/cmake/Portfile	2016-07-07 21:03:25 UTC (rev 149992)
@@ -23,15 +23,15 @@
 
 subport cmake-devel {}
 
-set branch          3.5
+set branch          3.6
 
 if {${subport} eq ${name}} {
 
     # release
 
-    version         ${branch}.2
-    checksums       rmd160 9053820870f124dee5845eb5ba4717ac71477231 \
-                    sha256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a
+    version         ${branch}.0
+    checksums       rmd160 f7c17e920b9d6c7eb66cccd4fc3f4d4986f6ac38 \
+                    sha256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670
 
     master_sites    http://www.cmake.org/files/v${branch}/
     conflicts       cmake-devel
@@ -39,9 +39,6 @@
     long_description ${base_long_description} \
         The ${subport} release port is updated roughly every few months.
 
-    # keep this patch until the next version (major or minor)
-    patchfiles-append patch-Modules-Platform-Darwin-Initialize.cmake.diff
-
     # release-only patches
     patchfiles-append \
         patch-Modules-FindQt4.cmake.release.diff \

Deleted: trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff	2016-07-07 20:06:51 UTC (rev 149991)
+++ trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff	2016-07-07 21:03:25 UTC (rev 149992)
@@ -1,25 +0,0 @@
---- Modules/Platform/Darwin-Initialize.cmake.orig
-+++ Modules/Platform/Darwin-Initialize.cmake
-@@ -94,11 +94,17 @@
-         NOT CMAKE_OSX_DEPLOYMENT_TARGET VERSION_EQUAL ${_CMAKE_OSX_DEPLOYMENT_TARGET})
-       set(_CMAKE_OSX_SDKS_VER ${CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${CMAKE_OSX_DEPLOYMENT_TARGET}})
-       set(_CMAKE_OSX_SYSROOT_CHECK "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
--      message(WARNING
--        "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
--        "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
--        "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"."
--        )
-+      if(IS_DIRECTORY "${_CMAKE_OSX_SYSROOT_DEFAULT}")
-+        if(NOT "${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "${_CURRENT_OSX_VERSION}")
-+	  message(WARNING
-+            "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
-+            "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
-+            "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"."
-+            )
-+	endif()
-+      else()
-+        set(_CMAKE_OSX_SYSROOT_DEFAULT "")
-+      endif()
-     endif()
-     if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
-       set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING

Modified: trunk/dports/devel/cmake/files/patch-qt4gui.release.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-qt4gui.release.diff	2016-07-07 20:06:51 UTC (rev 149991)
+++ trunk/dports/devel/cmake/files/patch-qt4gui.release.diff	2016-07-07 21:03:25 UTC (rev 149992)
@@ -133,7 +133,7 @@
    install(CODE "
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -584,12 +584,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+@@ -592,12 +592,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
        set(CMAKE_BUNDLE_VERSION
          "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
        set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")

Modified: trunk/dports/devel/cmake/files/patch-qt5gui.release.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-qt5gui.release.diff	2016-07-07 20:06:51 UTC (rev 149991)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.release.diff	2016-07-07 21:03:25 UTC (rev 149992)
@@ -78,7 +78,7 @@
    install(CODE "
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -584,12 +584,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+@@ -592,12 +592,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
        set(CMAKE_BUNDLE_VERSION
          "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
        set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160707/86c5a4f4/attachment.html>