<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149992] trunk/dports/devel/cmake</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/149992">149992</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-07-07 14:03:25 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake: update to 3.6.0; remove superseded patch and tweak qt* release patches to apply cleanly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakePortfile">trunk/dports/devel/cmake/Portfile</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt4guireleasediff">trunk/dports/devel/cmake/files/patch-qt4gui.release.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt5guireleasediff">trunk/dports/devel/cmake/files/patch-qt5gui.release.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakefilespatchModulesPlatformDarwinInitializecmakediff">trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcmakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/Portfile (149991 => 149992)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,15 +23,15 @@
</span><span class="cx">
</span><span class="cx"> subport cmake-devel {}
</span><span class="cx">
</span><del>-set branch 3.5
</del><ins>+set branch 3.6
</ins><span class="cx">
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="cx">
</span><span class="cx"> # release
</span><span class="cx">
</span><del>- version ${branch}.2
- checksums rmd160 9053820870f124dee5845eb5ba4717ac71477231 \
- sha256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a
</del><ins>+ version ${branch}.0
+ checksums rmd160 f7c17e920b9d6c7eb66cccd4fc3f4d4986f6ac38 \
+ sha256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670
</ins><span class="cx">
</span><span class="cx"> master_sites http://www.cmake.org/files/v${branch}/
</span><span class="cx"> conflicts cmake-devel
</span><span class="lines">@@ -39,9 +39,6 @@
</span><span class="cx"> long_description ${base_long_description} \
</span><span class="cx"> The ${subport} release port is updated roughly every few months.
</span><span class="cx">
</span><del>- # keep this patch until the next version (major or minor)
- patchfiles-append patch-Modules-Platform-Darwin-Initialize.cmake.diff
-
</del><span class="cx"> # release-only patches
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-Modules-FindQt4.cmake.release.diff \
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesPlatformDarwinInitializecmakediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff (149991 => 149992)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>---- 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
</del></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt4guireleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt4gui.release.diff (149991 => 149992)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -584,12 +584,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</del><ins>+@@ -592,12 +592,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt5guireleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt5gui.release.diff (149991 => 149992)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -584,12 +584,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</del><ins>+@@ -592,12 +592,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre>
</div>
</div>
</body>
</html>