<!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>[149764] 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/149764">149764</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-06-29 13:40:59 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake:
+ update devel to 20160628 (gc664b9);
+ fix some patches to be release or devel specific.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakePortfile">trunk/dports/devel/cmake/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakefilespatchModulesFindFreetypecmakedeveldiff">trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchModulesFindFreetypecmakereleasediff">trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchModulesFindQt4cmakedeveldiff">trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchModulesFindQt4cmakereleasediff">trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakefilespatchModulesFindFreetypecmakediff">trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchModulesFindQt4cmakediff">trunk/dports/devel/cmake/files/patch-Modules-FindQt4.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 (149763 => 149764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/Portfile 2016-06-29 20:40:15 UTC (rev 149763)
+++ trunk/dports/devel/cmake/Portfile 2016-06-29 20:40:59 UTC (rev 149764)
</span><span class="lines">@@ -42,6 +42,11 @@
</span><span class="cx"> # keep this patch until the next version (major or minor)
</span><span class="cx"> patchfiles-append patch-Modules-Platform-Darwin-Initialize.cmake.diff
</span><span class="cx">
</span><ins>+ # release-only patches
+ patchfiles-append \
+ patch-Modules-FindQt4.cmake.release.diff \
+ patch-Modules-FindFreetype.cmake.release.diff
+
</ins><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">@@ -50,12 +55,12 @@
</span><span class="cx">
</span><span class="cx"> # devel
</span><span class="cx">
</span><del>- version 20160621
</del><ins>+ version 20160628
</ins><span class="cx"> set dist_branch 3.6
</span><del>- set dist_date 20160621
- set dist_hash gdbfd5
- checksums rmd160 8b536bbda1334cab7954724f8bdc485d1330e5ba \
- sha256 ff99a623f1a95313ac4b8a648ca185db8468ad0a5edaa888fcf4564e6c66d5e9
</del><ins>+ set dist_date 20160628
+ set dist_hash gc664b9
+ checksums rmd160 ad455843f0e63a9e53f9b3956fb0f13b4bf1a3b7 \
+ sha256 7c05845754a48d6e7cf584614c9e354185c219c516f6721029ad279e77f63c2d
</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">@@ -64,6 +69,11 @@
</span><span class="cx"> long_description ${base_long_description} \
</span><span class="cx"> The ${subport} port is updated roughly every week.
</span><span class="cx">
</span><ins>+ # devel-only patches
+ patchfiles-append \
+ patch-Modules-FindQt4.cmake.devel.diff \
+ patch-Modules-FindFreetype.cmake.devel.diff
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.regex (${name}-\[0-9a-g.-\]+)${extract.suffix}
</span><span class="cx"> livecheck.version ${distname}
</span><span class="lines">@@ -83,8 +93,6 @@
</span><span class="cx"> # use its internal jsoncpp until a better solution comes about.
</span><span class="cx">
</span><span class="cx"> patchfiles-append patch-CMakeFindFrameworks.cmake.diff \
</span><del>- patch-Modules-FindFreetype.cmake.diff \
- patch-Modules-FindQt4.cmake.diff \
</del><span class="cx"> patch-Modules-Platform-Darwin.cmake.diff \
</span><span class="cx"> patch-Modules-noArchCheck.diff
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesFindFreetypecmakedeveldifffromrev149679trunkdportsdevelcmakefilespatchModulesFindFreetypecmakediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff (from rev 149679, trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff) (0 => 149764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff 2016-06-29 20:40:59 UTC (rev 149764)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- Modules/FindFreetype.cmake.orig
++++ Modules/FindFreetype.cmake
+@@ -56,10 +56,6 @@
+ HINTS
+ ENV FREETYPE_DIR
+ PATHS
+- /usr/X11R6
+- /usr/local/X11R6
+- /usr/local/X11
+- /usr/freeware
+ ENV GTKMM_BASEPATH
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
</ins></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesFindFreetypecmakediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff (149763 => 149764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff 2016-06-29 20:40:15 UTC (rev 149763)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff 2016-06-29 20:40:59 UTC (rev 149764)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- Modules/FindFreetype.cmake.orig
-+++ Modules/FindFreetype.cmake
-@@ -56,10 +56,6 @@
- HINTS
- ENV FREETYPE_DIR
- PATHS
-- /usr/X11R6
-- /usr/local/X11R6
-- /usr/local/X11
-- /usr/freeware
- ENV GTKMM_BASEPATH
- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
</del></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesFindFreetypecmakereleasedifffromrev149763trunkdportsdevelcmakefilespatchModulesFindFreetypecmakediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff (from rev 149763, trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff) (0 => 149764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff 2016-06-29 20:40:59 UTC (rev 149764)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+--- Modules/FindFreetype.cmake.orig
++++ Modules/FindFreetype.cmake
+@@ -57,10 +57,6 @@
+ HINTS
+ ENV FREETYPE_DIR
+ PATHS
+- /usr/X11R6
+- /usr/local/X11R6
+- /usr/local/X11
+- /usr/freeware
+ ENV GTKMM_BASEPATH
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+@@ -78,10 +74,6 @@
+ HINTS
+ ENV FREETYPE_DIR
+ PATHS
+- /usr/X11R6
+- /usr/local/X11R6
+- /usr/local/X11
+- /usr/freeware
+ ENV GTKMM_BASEPATH
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+@@ -99,10 +91,6 @@
+ HINTS
+ ENV FREETYPE_DIR
+ PATHS
+- /usr/X11R6
+- /usr/local/X11R6
+- /usr/local/X11
+- /usr/freeware
+ ENV GTKMM_BASEPATH
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
</ins></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesFindQt4cmakedeveldifffromrev149679trunkdportsdevelcmakefilespatchModulesFindQt4cmakediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff (from rev 149679, trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff) (0 => 149764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff 2016-06-29 20:40:59 UTC (rev 149764)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- Modules/FindQt4.cmake.orig
++++ Modules/FindQt4.cmake
+@@ -743,9 +743,7 @@
+ find_path(QT_IMPORTS_DIR NAMES Qt
+ HINTS ${qt_cross_paths} ${qt_imports_dir}
+ DOC "The location of the Qt imports"
+- NO_CMAKE_FIND_ROOT_PATH
+- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
+- NO_CMAKE_SYSTEM_PATH)
++ NO_DEFAULT_PATH)
+ mark_as_advanced(QT_IMPORTS_DIR)
+ endif()
+ endif ()
</ins></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesFindQt4cmakediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff (149763 => 149764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2016-06-29 20:40:15 UTC (rev 149763)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2016-06-29 20:40:59 UTC (rev 149764)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- Modules/FindQt4.cmake.orig
-+++ Modules/FindQt4.cmake
-@@ -741,9 +741,7 @@
- find_path(QT_IMPORTS_DIR NAMES Qt
- HINTS ${qt_cross_paths} ${qt_imports_dir}
- DOC "The location of the Qt imports"
-- NO_CMAKE_FIND_ROOT_PATH
-- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
-- NO_CMAKE_SYSTEM_PATH)
-+ NO_DEFAULT_PATH)
- mark_as_advanced(QT_IMPORTS_DIR)
- endif()
- endif ()
</del></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesFindQt4cmakereleasedifffromrev149763trunkdportsdevelcmakefilespatchModulesFindQt4cmakediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff (from rev 149763, trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff) (0 => 149764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff 2016-06-29 20:40:59 UTC (rev 149764)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- Modules/FindQt4.cmake.orig
++++ Modules/FindQt4.cmake
+@@ -741,9 +741,7 @@
+ find_path(QT_IMPORTS_DIR NAMES Qt
+ HINTS ${qt_cross_paths} ${qt_imports_dir}
+ DOC "The location of the Qt imports"
+- NO_CMAKE_FIND_ROOT_PATH
+- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
+- NO_CMAKE_SYSTEM_PATH)
++ NO_DEFAULT_PATH)
+ mark_as_advanced(QT_IMPORTS_DIR)
+ endif()
+ endif ()
</ins></span></pre>
</div>
</div>
</body>
</html>