<!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>[151280] trunk/dports/science/gnuradio</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/151280">151280</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-08-11 13:03:23 -0700 (Thu, 11 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio:
+ update devel to e106376b and next to e73324ff, both 20160809, with testing;
+ split cmake-expand patch into devel and next versions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradiofilespatchcmakeexpandnextdiff">trunk/dports/science/gnuradio/files/patch-cmake-expand.next.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegnuradioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/Portfile (151279 => 151280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2016-08-11 19:58:18 UTC (rev 151279)
+++ trunk/dports/science/gnuradio/Portfile 2016-08-11 20:03:23 UTC (rev 151280)
</span><span class="lines">@@ -51,11 +51,11 @@
</span><span class="cx"> name gnuradio-devel
</span><span class="cx"> conflicts gnuradio gnuradio-next
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio 5af80cc3146a908f3d3fd4fb201f8eebe03eff1e
- version 20160801
</del><ins>+ github.setup gnuradio gnuradio e106376bfc380abe3e0df3504da34e1982f9feee
+ version 20160809
</ins><span class="cx"> checksums \
</span><del>- rmd160 c7999af862be367ad2177574d9f1334c4f12738f \
- sha256 a3b67a7d23a0d330d699fd11eb50bdc8f80db77716534ee7dd2d9f4920e59997
</del><ins>+ rmd160 54d3d4d1d48e11a4c9b910e3d3203cbdf36b51d1 \
+ sha256 e5251c88a2278e813d4c6bf2a90122e8023919142e1915f1373b1209036f4d83
</ins><span class="cx">
</span><span class="cx"> # set the version override string
</span><span class="cx">
</span><span class="lines">@@ -71,11 +71,11 @@
</span><span class="cx"> name gnuradio-next
</span><span class="cx"> conflicts gnuradio gnuradio-devel
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio cfda705a5e07f9611f5b8d0e3425fe58a851b61b
- version 20160801
</del><ins>+ github.setup gnuradio gnuradio e73324ffcd8f9ab883c79d76644acfa7c9929cd2
+ version 20160809
</ins><span class="cx"> checksums \
</span><del>- rmd160 2c8c0d4ab54b5765a0f722b7718744acf89dc309 \
- sha256 1e92e8e09c59e9bc7e0a968392f43304aaf7169a87fcfaba7f2a13d2899eaba3
</del><ins>+ rmd160 9d85f94b71fd8bcb3ee0cc0ae94f9254160df509 \
+ sha256 f408d8b9c2a6f15edacb39ef96703a9cfeb57f5d582442e2503f543ebe4d0526
</ins><span class="cx">
</span><span class="cx"> # set the version override string
</span><span class="cx">
</span><span class="lines">@@ -97,12 +97,18 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-cmake-expand.release.diff
</span><span class="cx">
</span><del>-} else {
</del><ins>+} elseif {${subport} eq "gnuradio-devel"} {
</ins><span class="cx">
</span><del>- # patches for devel and next (which are kept aligned for now)
</del><ins>+ # patches for devel
</ins><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-cmake-expand.devel.diff
</span><span class="cx">
</span><ins>+} else {
+
+ # patches for next
+ patchfiles-append \
+ patch-cmake-expand.next.diff
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # override githib PortGroup homepage setting
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchcmakeexpandnextdifffromrev151214trunkdportssciencegnuradiofilespatchcmakeexpanddeveldiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/gnuradio/files/patch-cmake-expand.next.diff (from rev 151214, trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff) (0 => 151280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-cmake-expand.next.diff (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.next.diff 2016-08-11 20:03:23 UTC (rev 151280)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+--- cmake/Modules/GrMiscUtils.cmake.orig
++++ cmake/Modules/GrMiscUtils.cmake
+@@ -335,6 +335,13 @@
+ endforeach(sig)
+ unset(name)
+
++ #try to force generate the headers
++ execute_process(
++ COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++ ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++ ${root} ${root}.h.t ${ARGN}
++ )
++
+ #create a command to generate the headers
+ add_custom_command(
+ OUTPUT ${expanded_files_h}
+@@ -380,6 +387,13 @@
+ endforeach(sig)
+ unset(name)
+
++ #try to force generate the source files
++ execute_process(
++ COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++ ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++ ${root} ${root}.cc.t ${ARGN}
++ )
++
+ #create a command to generate the source files
+ add_custom_command(
+ OUTPUT ${expanded_files_cc}
+@@ -389,6 +403,13 @@
+ ${root} ${root}.cc.t ${ARGN}
+ )
+
++ #try to force generate the header files
++ execute_process(
++ COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++ ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++ ${root} ${root}.h.t ${ARGN}
++ )
++
+ #create a command to generate the header files
+ add_custom_command(
+ OUTPUT ${expanded_files_h}
+@@ -442,6 +463,13 @@
+ endforeach(sig)
+ unset(name)
+
++ #try to force generate the _impl.cc files
++ execute_process(
++ COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++ ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++ ${root} ${root}_impl.cc.t ${ARGN}
++ )
++
+ #create a command to generate the _impl.cc files
+ add_custom_command(
+ OUTPUT ${expanded_files_cc_impl}
+@@ -451,6 +479,13 @@
+ ${root} ${root}_impl.cc.t ${ARGN}
+ )
+
++ #try to force generate the _impl.h files
++ execute_process(
++ COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++ ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++ ${root} ${root}_impl.h.t ${ARGN}
++ )
++
+ #create a command to generate the _impl.h files
+ add_custom_command(
+ OUTPUT ${expanded_files_h_impl}
</ins></span></pre>
</div>
</div>
</body>
</html>