<!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>[117031] 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/117031">117031</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-02-13 05:38:17 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio: update devel to 295ba353 and next to 1e6a0dcd, both 20140211.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
<li><a href="#trunkdportssciencegnuradiofilespatchcmakeexpanddiff">trunk/dports/science/gnuradio/files/patch-cmake-expand.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 (117030 => 117031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-02-13 12:47:04 UTC (rev 117030)
+++ trunk/dports/science/gnuradio/Portfile 2014-02-13 13:38:17 UTC (rev 117031)
</span><span class="lines">@@ -86,13 +86,13 @@
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
</span><span class="cx">
</span><del>- version 3.7.3_20140128
</del><ins>+ version 3.7.3_20140211
</ins><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-next
</span><span class="cx">
</span><span class="cx"> fetch.type git
</span><span class="cx"> git.url http://git.gnuradio.org/git/gnuradio.git
</span><del>- git.branch 19d111e2448a58e20ff5c1c80ca69751376b2544
</del><ins>+ git.branch 295ba353abebfedf90ece523343bcfeea2c2149d
</ins><span class="cx">
</span><span class="cx"> livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master
</span><span class="cx"> livecheck.version ${git.branch}
</span><span class="lines">@@ -105,13 +105,13 @@
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
</span><span class="cx">
</span><del>- version 3.8.0_20140128
</del><ins>+ version 3.8.0_20140211
</ins><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-devel
</span><span class="cx">
</span><span class="cx"> fetch.type git
</span><span class="cx"> git.url http://git.gnuradio.org/git/gnuradio.git
</span><del>- git.branch aa98220e51be7c3cfb3738b8f82d4154f96e86ed
</del><ins>+ git.branch 1e6a0dcdb925bd38cd6e67773e6c30c32e386fd3
</ins><span class="cx">
</span><span class="cx"> livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next
</span><span class="cx"> livecheck.version ${git.branch}
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchcmakeexpanddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.diff (117030 => 117031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-cmake-expand.diff 2014-02-13 12:47:04 UTC (rev 117030)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.diff 2014-02-13 13:38:17 UTC (rev 117031)
</span><span class="lines">@@ -857,7 +857,7 @@
</span><span class="cx"> - string(REGEX REPLACE "X+" ${sig} name ${root})
</span><span class="cx"> - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
</span><span class="cx"> - endforeach(sig)
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #create a command to generate the files
</span><span class="cx"> - add_custom_command(
</span><span class="cx"> - OUTPUT ${expanded_files_h}
</span><span class="lines">@@ -924,7 +924,7 @@
</span><span class="cx"> - list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
</span><span class="cx"> - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
</span><span class="cx"> - endforeach(sig)
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #create a command to generate the source files
</span><span class="cx"> - add_custom_command(
</span><span class="cx"> - OUTPUT ${expanded_files_cc}
</span><span class="lines">@@ -942,15 +942,15 @@
</span><span class="cx"> - ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
</span><span class="cx"> - ${root} ${root}.h.t ${ARGN}
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #make source files depends on headers to force generation
</span><span class="cx"> - set_source_files_properties(${expanded_files_cc}
</span><span class="cx"> - PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #install rules for the generated cc files
</span><del>-- list(APPEND generated_sources ${expanded_files_cc})
-- list(APPEND generated_headers ${expanded_files_h})
</del><ins>+- list(APPEND generated_sources ${expanded_files_cc})
+- list(APPEND generated_headers ${expanded_files_h})
</ins><span class="cx"> -endmacro(expand_cc)
</span><span class="cx"> -
</span><span class="cx"> -########################################################################
</span></span></pre>
</div>
</div>
</body>
</html>