<!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>[135412] trunk/dports/science/gnuradio/Portfile</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/135412">135412</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-04-23 08:53:34 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio:
+ update release to 3.7.7;
+ update devel to d8a491fd and next to 58486e91, both 20150421;
+ Volk now optional with release too, so use port:volk (as with devel and next already);
+ disable CTRLPORT entirely for now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegnuradioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/Portfile (135411 => 135412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2015-04-23 15:33:49 UTC (rev 135411)
+++ trunk/dports/science/gnuradio/Portfile 2015-04-23 15:53:34 UTC (rev 135412)
</span><span class="lines">@@ -21,8 +21,7 @@
</span><span class="cx">
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio 3.7.6.1 v
- revision 2
</del><ins>+ github.setup gnuradio gnuradio 3.7.7 v
</ins><span class="cx">
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
</span><span class="lines">@@ -30,8 +29,8 @@
</span><span class="cx"> conflicts gnuradio-legacy gnuradio-next gnuradio-devel
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 9d3e85ee174730a5d9fae1af5bbfdf40e8a2a567 \
- sha256 b724db3228cff71d9bdba0faf3e5a0dd2917887eef125e79f3f5edd09d9e8aa8
</del><ins>+ rmd160 daf6a200fd887503f417170a47070c9e7d03242b \
+ sha256 83a67a8a7bf3bfec850dc1b1d28d5df0739ea5ded053ae82a24eb9764028c1fe
</ins><span class="cx">
</span><span class="cx"> # overload the github livecheck regex to look for versions that
</span><span class="cx"> # are just numbers and '.', no letters (e.g., "3.7.3git").
</span><span class="lines">@@ -90,14 +89,14 @@
</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><span class="cx"> name gnuradio-devel
</span><del>- github.setup gnuradio gnuradio 7b468a0220941791453df5b3479ed76c4d9e12b4
- version 20150412
</del><ins>+ github.setup gnuradio gnuradio d8a491fde1f29e10d77f536ea1234ee96089202a
+ version 20150421
</ins><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-next
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 ac6a91b45d471d0c1fda4a89f608907ce1f167b2 \
- sha256 4c46d05ecb324a51aa31872e00e3ff472dfb8e437afc572ecc43a3ad291f3dda
</del><ins>+ rmd160 204d6b9caa9efd37e9b7211d8e7fb6fbe6f4a739 \
+ sha256 c6204bebc9517e815da155edf7915637a64651d5e2338b3f824cdddba4c27596
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -107,14 +106,14 @@
</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><span class="cx"> name gnuradio-next
</span><del>- github.setup gnuradio gnuradio 23a810bb21ff813a2c1be100760bab117e5957df
- version 20150412
</del><ins>+ github.setup gnuradio gnuradio 58486e918fc4c67cd4bb29c0e30a23b8425afd0e
+ version 20150421
</ins><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-devel
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 d6beaa08a885f717ad7c9c7fcfd59aa2c77f708e \
- sha256 3354ad65e46e066c2dfcbd47fb6ee9b8abeea8ad15b001dbe3baecddc011a7d6
</del><ins>+ rmd160 657d6dfdc55883b06c22f3add991367be7125531 \
+ sha256 685ca4a056d847641ea28b2eb0a9f079ee832f3510660d0790e7793f6991a9a2
</ins><span class="cx">
</span><span class="cx"> # overload the github livecheck URL with the correct branch
</span><span class="cx">
</span><span class="lines">@@ -123,10 +122,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Volk split off on 2015-03-29, so it is relevant for devel and next,
</span><del>-# and will come with release 3.7.7. legacy and release still provide
-# Volk.
</del><ins>+# and will come with release 3.7.6.2 / 3.7.7. legacy will always
+# provide Volk.
</ins><span class="cx">
</span><del>-if {${subport} eq "gnuradio" || ${subport} eq "gnuradio-legacy"} {
</del><ins>+if {${subport} eq "gnuradio-legacy"} {
</ins><span class="cx">
</span><span class="cx"> # now conflicts with the Volk port
</span><span class="cx">
</span><span class="lines">@@ -207,16 +206,12 @@
</span><span class="cx"> # because of an issue with ICE. So, allow +ctrlport, but it won't do
</span><span class="cx"> # anything until this is fixed.
</span><span class="cx">
</span><del>-# depends_lib-append port:zeroc-ice35
</del><ins>+# as of commit 621c086b (2015-04-16), CTRLPORT has been moved to using
+# thrift, which needs debugging when building on OSX. Just disable
+# CTRLPORT for now.
</ins><span class="cx">
</span><del>- # pyice is not checked for at configure, but is
- # required for runtime; so use depends_run.
</del><ins>+ configure.args-append -DENABLE_GR_CTRLPORT=OFF
</ins><span class="cx">
</span><del>-# depends_run-append \
-# port:py27-zeroc-ice35
-
- configure.args-append -DENABLE_GR_CTRLPORT=ON
-
</del><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> configure.args-append -DENABLE_GR_CTRLPORT=OFF
</span></span></pre>
</div>
</div>
</body>
</html>