<!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>[117455] 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/117455">117455</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-02-27 04:45:50 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio: update devel to 67882eec and next to 9fe1cca4, both 20140226.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
<li><a href="#trunkdportssciencegnuradiofilespatchcmakeexpanddeveldiff">trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.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 (117454 => 117455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-02-27 07:40:08 UTC (rev 117454)
+++ trunk/dports/science/gnuradio/Portfile 2014-02-27 12:45:50 UTC (rev 117455)
</span><span class="lines">@@ -89,13 +89,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_20140216
</del><ins>+ version 3.7.3_20140226
</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 cf8997ccc1e9c543aa234e561e7f002a176e13dc
</del><ins>+ git.branch 67882eec57a36c1c2537845760504b27c758607e
</ins><span class="cx">
</span><span class="cx"> patchfiles-append patch-cmake-expand.devel.diff
</span><span class="cx">
</span><span class="lines">@@ -110,13 +110,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_20140216
</del><ins>+ version 3.8.0_20140226
</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 a41a1e1b4f326ad12864142575418f9ed848656a
</del><ins>+ git.branch 9fe1cca4f5bd04d0af4c25cbf08929a34fa487e3
</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="trunkdportssciencegnuradiofilespatchcmakeexpanddeveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff (117454 => 117455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-02-27 07:40:08 UTC (rev 117454)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-02-27 12:45:50 UTC (rev 117455)
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> # Setup library
</span><span class="cx"> --- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig
</span><span class="cx"> +++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt
</span><del>-@@ -18,79 +18,36 @@
</del><ins>+@@ -18,80 +18,38 @@
</ins><span class="cx"> # Boston, MA 02110-1301, USA.
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> +# Invoke macro to generate various headers
</span><span class="cx"> ########################################################################
</span><span class="cx"> -include(GrPython)
</span><del>--
</del><ins>+
</ins><span class="cx"> -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
</span><span class="cx"> -#!${PYTHON_EXECUTABLE}
</span><span class="cx"> -
</span><span class="lines">@@ -422,6 +422,7 @@
</span><span class="cx"> -########################################################################
</span><span class="cx"> -# Invoke macro to generate various sources
</span><span class="cx"> -########################################################################
</span><ins>+-expand_h(abs_XX ss ii ff)
</ins><span class="cx"> -expand_h(add_XX ss ii cc)
</span><span class="cx"> -expand_h(add_const_XX bb ss ii ff cc)
</span><span class="cx"> -expand_h(add_const_vXX bb ss ii ff cc)
</span><span class="lines">@@ -450,6 +451,7 @@
</span><span class="cx"> -expand_h(vector_sink_X b s i f c)
</span><span class="cx"> -expand_h(vector_source_X b s i f c)
</span><span class="cx"> +include(GrMiscUtils)
</span><ins>++GR_EXPAND_X_H(blocks abs_XX ss ii ff)
</ins><span class="cx"> +GR_EXPAND_X_H(blocks add_XX ss ii cc)
</span><span class="cx"> +GR_EXPAND_X_H(blocks add_const_XX bb ss ii ff cc)
</span><span class="cx"> +GR_EXPAND_X_H(blocks add_const_vXX bb ss ii ff cc)
</span><span class="lines">@@ -482,7 +484,7 @@
</span><span class="cx"> ${generated_includes}
</span><span class="cx"> --- gr-blocks/lib/CMakeLists.txt.orig
</span><span class="cx"> +++ gr-blocks/lib/CMakeLists.txt
</span><del>-@@ -23,100 +23,36 @@
</del><ins>+@@ -23,101 +23,37 @@
</ins><span class="cx"> include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="lines">@@ -553,6 +555,7 @@
</span><span class="cx"> -########################################################################
</span><span class="cx"> # Invoke macro to generate various sources
</span><span class="cx"> ########################################################################
</span><ins>+-expand_cc_h_impl(abs_XX ss ii ff)
</ins><span class="cx"> -expand_cc_h_impl(add_XX ss ii cc)
</span><span class="cx"> -expand_cc_h_impl(add_const_XX bb ss ii ff cc)
</span><span class="cx"> -expand_cc_h_impl(add_const_vXX bb ss ii ff cc)
</span><span class="lines">@@ -581,6 +584,7 @@
</span><span class="cx"> -expand_cc_h_impl(vector_sink_X b s i f c)
</span><span class="cx"> -expand_cc_h_impl(vector_source_X b s i f c)
</span><span class="cx"> +include(GrMiscUtils)
</span><ins>++GR_EXPAND_X_CC_H_IMPL(blocks abs_XX ss ii ff)
</ins><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks add_XX ss ii cc)
</span><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks add_const_XX bb ss ii ff cc)
</span><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks add_const_vXX bb ss ii ff cc)
</span></span></pre>
</div>
</div>
</body>
</html>