<!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>[151275] 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/151275">151275</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-08-11 12:48:10 -0700 (Thu, 11 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake:
+ update devel to 20160809 (g1b020);
+ split CMakeFindFrameworks patch between release and devel versions;
+ update noArchCheck devel patch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakePortfile">trunk/dports/devel/cmake/Portfile</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchModulesnoArchCheckdeveldiff">trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakedeveldiff">trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakereleasediff">trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakediff">trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.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 (151274 => 151275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/Portfile 2016-08-11 13:58:03 UTC (rev 151274)
+++ trunk/dports/devel/cmake/Portfile 2016-08-11 19:48:10 UTC (rev 151275)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-Modules-FindQt4.cmake.release.diff \
</span><span class="cx"> patch-Modules-FindFreetype.cmake.release.diff \
</span><del>- patch-Modules-noArchCheck.release.diff
</del><ins>+ patch-Modules-noArchCheck.release.diff \
+ patch-CMakeFindFrameworks.cmake.release.diff
</ins><span class="cx">
</span><del>-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span><span class="cx"> livecheck.url [lindex $master_sites 0]
</span><span class="lines">@@ -54,12 +54,12 @@
</span><span class="cx">
</span><span class="cx"> # devel
</span><span class="cx">
</span><del>- version 20160801
</del><ins>+ version 20160809
</ins><span class="cx"> set dist_branch 3.6
</span><del>- set dist_date 20160801
- set dist_hash g62452
- checksums rmd160 f56ce4926d0082255b52615c238c2db3dd8e13fe \
- sha256 caad99c3864bd019ffc2d9a7e8cf76aae99588f71dd4e65b56f046c023e4c61f
</del><ins>+ set dist_date 20160809
+ set dist_hash g1b020
+ checksums rmd160 34ccf32593e0b13c25650019c265a5cb0f575541 \
+ sha256 869ccfb3bfb2b2f16c7bc36238c3bfd2f2678c942f3efa15da32e68884e15c42
</ins><span class="cx">
</span><span class="cx"> master_sites http://www.cmake.org/files/dev/
</span><span class="cx"> distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
</span><span class="lines">@@ -72,7 +72,8 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-Modules-FindQt4.cmake.devel.diff \
</span><span class="cx"> patch-Modules-FindFreetype.cmake.devel.diff \
</span><del>- patch-Modules-noArchCheck.devel.diff
</del><ins>+ patch-Modules-noArchCheck.devel.diff \
+ patch-CMakeFindFrameworks.cmake.devel.diff
</ins><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.regex (${name}-\[0-9a-g.-\]+)${extract.suffix}
</span><span class="lines">@@ -92,8 +93,7 @@
</span><span class="cx"> # jsoncpp 1.0+ requires CMake for building. catch 22. So, have CMake
</span><span class="cx"> # use its internal jsoncpp until a better solution comes about.
</span><span class="cx">
</span><del>-patchfiles-append patch-CMakeFindFrameworks.cmake.diff \
- patch-Modules-Platform-Darwin.cmake.diff
</del><ins>+patchfiles-append patch-Modules-Platform-Darwin.cmake.diff
</ins><span class="cx">
</span><span class="cx"> configure.env-append \
</span><span class="cx"> CMAKE_PREFIX_PATH=${prefix} \
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakedeveldifffromrev151214trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff (from rev 151214, trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff) (0 => 151275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff 2016-08-11 19:48:10 UTC (rev 151275)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- Modules/CMakeFindFrameworks.cmake.orig
++++ Modules/CMakeFindFrameworks.cmake
+@@ -28,6 +28,7 @@
+ if(APPLE)
+ foreach(dir
+ ~/Library/Frameworks/${fwk}.framework
++ __PREFIX__/Library/Frameworks/${fwk}.framework
+ /usr/local/Frameworks/${fwk}.framework
+ /Library/Frameworks/${fwk}.framework
+ /System/Library/Frameworks/${fwk}.framework
</ins></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff (151274 => 151275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff 2016-08-11 13:58:03 UTC (rev 151274)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff 2016-08-11 19:48:10 UTC (rev 151275)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- Modules/CMakeFindFrameworks.cmake.orig
-+++ Modules/CMakeFindFrameworks.cmake
-@@ -24,6 +24,7 @@
- if(APPLE)
- foreach(dir
- ~/Library/Frameworks/${fwk}.framework
-+ __PREFIX__/Library/Frameworks/${fwk}.framework
- /Library/Frameworks/${fwk}.framework
- /System/Library/Frameworks/${fwk}.framework
- /Network/Library/Frameworks/${fwk}.framework)
</del></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakereleasedifffromrev151274trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff (from rev 151274, trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff) (0 => 151275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff 2016-08-11 19:48:10 UTC (rev 151275)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- Modules/CMakeFindFrameworks.cmake.orig
++++ Modules/CMakeFindFrameworks.cmake
+@@ -24,6 +24,7 @@
+ if(APPLE)
+ foreach(dir
+ ~/Library/Frameworks/${fwk}.framework
++ __PREFIX__/Library/Frameworks/${fwk}.framework
+ /Library/Frameworks/${fwk}.framework
+ /System/Library/Frameworks/${fwk}.framework
+ /Network/Library/Frameworks/${fwk}.framework)
</ins></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesnoArchCheckdeveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff (151274 => 151275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff 2016-08-11 13:58:03 UTC (rev 151274)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff 2016-08-11 19:48:10 UTC (rev 151275)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> -# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span class="cx"> -if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span class="cx"> - math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><del>-- string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
</del><ins>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</ins><span class="cx"> - set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span class="cx"> -endif()
</span><span class="cx"> --- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> -# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span class="cx"> -if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span class="cx"> - math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><del>-- string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
</del><ins>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</ins><span class="cx"> - set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span class="cx"> -endif()
</span><span class="cx"> --- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
</span><span class="lines">@@ -51,6 +51,6 @@
</span><span class="cx"> -# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span class="cx"> -if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span class="cx"> - math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><del>-- string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
</del><ins>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</ins><span class="cx"> - set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span class="cx"> -endif()
</span></span></pre>
</div>
</div>
</body>
</html>