<!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>[117706] 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/117706">117706</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-03-08 12:35:23 -0800 (Sat, 08 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio:
+ update devel to 24dc96ad and next to 06dab563, both 20140307;
+ when +ctrlport, use ZeroC ICE 3.5;
+ patch docs building issue (temporary);
+ use devel patches for both devel and next.</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="#trunkdportssciencegnuradiofilespatchCMakeListstxtdeveldiff">trunk/dports/science/gnuradio/files/patch-CMakeLists.txt.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 (117705 => 117706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-03-08 19:56:25 UTC (rev 117705)
+++ trunk/dports/science/gnuradio/Portfile 2014-03-08 20:35:23 UTC (rev 117706)
</span><span class="lines">@@ -89,16 +89,14 @@
</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_20140306
</del><ins>+ version 3.7.3_20140307
</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 ca69ec5d64b67dfc714917bd94162a5d1f131d69
</del><ins>+ git.branch 24dc96ad6c445f905af9bc3eba1c56e97e3c429d
</ins><span class="cx">
</span><del>- patchfiles-append patch-cmake-expand.devel.diff
-
</del><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="cx"> livecheck.regex id=(\[a-f0-9\]+).*>master<
</span><span class="lines">@@ -110,18 +108,17 @@
</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_20140306
</del><ins>+ version 3.8.0_20140307
</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 6c8d0d26fb3c6f74dbceead8f68aa340ab8d7ade
</del><ins>+ git.branch 06dab56378a89e39e14ff8ebf66745eee0955b31
</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 class="cx"> livecheck.regex id=(\[a-f0-9\]+).*>next<
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${subport} ne "gnuradio-legacy"} {
</span><span class="lines">@@ -135,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> if {[variant_isset ctrlport]} {
</span><span class="cx">
</span><del>- depends_lib-append port:zeroc-ice34
</del><ins>+ depends_lib-append port:zeroc-ice35
</ins><span class="cx"> configure.args-append -DENABLE_GR_CTRLPORT=ON
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="lines">@@ -143,6 +140,22 @@
</span><span class="cx"> configure.args-append -DENABLE_GR_CTRLPORT=OFF
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+ if {${subport} ne "gnuradio"} {
+
+ # patches for devel and next (which are kept aligned for now)
+
+ # temporary patch to fix header creation to be before dependencies
+ # are determined, such that local (to the build) headers are found
+ # before already-installed ones.
+
+ patchfiles-append patch-cmake-expand.devel.diff
+
+ # temporary patch to fix Doxygen building
+
+ patchfiles-append patch-CMakeLists.txt.devel.diff
+
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -346,7 +359,7 @@
</span><span class="cx"> # pyice is not checked for at configure, but is
</span><span class="cx"> # required for runtime; so use depends_run.
</span><span class="cx">
</span><del>- depends_run-append port:py${s}-zeroc-ice34
</del><ins>+ depends_run-append port:py${s}-zeroc-ice35
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchCMakeListstxtdeveldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/gnuradio/files/patch-CMakeLists.txt.devel.diff (0 => 117706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-CMakeLists.txt.devel.diff (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-CMakeLists.txt.devel.diff 2014-03-08 20:35:23 UTC (rev 117706)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -308,6 +308,7 @@ list(APPEND GR_TEST_PYTHON_DIRS
+ ########################################################################
+ # Add subdirectories (in order of deps)
+ ########################################################################
++add_subdirectory(docs)
+ add_subdirectory(gnuradio-runtime)
+ add_subdirectory(gr-blocks)
+ add_subdirectory(grc)
+@@ -331,7 +332,6 @@ add_subdirectory(gr-vocoder)
+ add_subdirectory(gr-fcd)
+ add_subdirectory(gr-wavelet)
+ add_subdirectory(gr-wxgui)
+-add_subdirectory(docs)
+
+ # Install our Cmake modules into $prefix/lib/cmake/gnuradio
+ # See "Package Configuration Files" on page:
</ins></span></pre>
</div>
</div>
</body>
</html>