<!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>[134053] trunk/dports/devel/cmake/Portfile</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/134053">134053</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-03-17 12:47:23 -0700 (Tue, 17 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake:
+ update to 3.2.1;
+ CMake 3.2 changed dependency requirements to include jsoncpp. jsoncpp 1.0 requires CMake for building. catch 22. So, have CMake use its internal jsoncpp until a better solution comes about.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakePortfile">trunk/dports/devel/cmake/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcmakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/Portfile (134052 => 134053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/Portfile 2015-03-17 19:43:36 UTC (rev 134052)
+++ trunk/dports/devel/cmake/Portfile 2015-03-17 19:47:23 UTC (rev 134053)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name cmake
</span><del>-version 3.1.3
</del><ins>+version 3.2.1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel
</span><span class="cx"> license BSD
</span><span class="lines">@@ -20,17 +20,19 @@
</span><span class="cx"> master_sites http://www.cmake.org/files/v${branch}/
</span><span class="cx"> platforms darwin freebsd
</span><span class="cx">
</span><del>-checksums rmd160 2693ac550a2e08fbc34601e5d8b60f2abec99d1f \
- sha256 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0
</del><ins>+checksums rmd160 8c102bce34d3c9ccb328ec8b629dcc91142a7243 \
+ sha256 759f1cf6b1a26b037726a9acca6da501235c20ad3671df29d43f29052ef1502c
</ins><span class="cx">
</span><del>-depends_lib-append port:libidn \
- port:openssl \
- port:curl \
</del><ins>+depends_lib-append port:curl \
</ins><span class="cx"> port:expat \
</span><span class="cx"> port:zlib \
</span><span class="cx"> port:bzip2 \
</span><span class="cx"> port:libarchive
</span><span class="cx">
</span><ins>+# CMake 3.2 changed dependency requirements to include jsoncpp.
+# jsoncpp 1.0+ requires CMake for building. catch 22. So, have CMake
+# use its internal jsoncpp until a better solution comes about.
+
</ins><span class="cx"> patchfiles patch-CMakeFindFrameworks.cmake.diff \
</span><span class="cx"> patch-Modules-FindFreetype.cmake.diff \
</span><span class="cx"> patch-Modules-FindQt4.cmake.diff \
</span><span class="lines">@@ -57,7 +59,8 @@
</span><span class="cx"> configure.args --docdir=share/doc/cmake \
</span><span class="cx"> --parallel=${build.jobs} \
</span><span class="cx"> --init=${worksrcpath}/macports.cmake \
</span><del>- --system-libs
</del><ins>+ --system-libs \
+ --no-system-jsoncpp
</ins><span class="cx">
</span><span class="cx"> configure.universal_args
</span><span class="cx"> configure.post_args
</span><span class="lines">@@ -88,6 +91,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+build.post_args VERBOSE=ON
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> # copy cmake init file, ready to be patched below
</span><span class="cx"> copy ${filespath}/macports.cmake ${worksrcpath}
</span></span></pre>
</div>
</div>
</body>
</html>