<!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>[129048] trunk/dports/science/gqrx</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/129048">129048</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-12-04 10:11:21 -0800 (Thu, 04 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gqrx:
+ replace gqrx-devel with gqrx;
+ update gqrx to 9648a148 (20141127);
+ rearrange various parts;
+ update patches for the changes above.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxPortfile">trunk/dports/science/gqrx/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxfilespatchgqrxprodiff">trunk/dports/science/gqrx/files/patch-gqrx.pro.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxfilespatchgqrxprodeveldiff">trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff</a></li>
<li><a href="#trunkdportssciencegqrxfilespatchgqrxproreleasediff">trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegqrxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gqrx/Portfile (129047 => 129048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/Portfile 2014-12-04 18:09:59 UTC (rev 129047)
+++ trunk/dports/science/gqrx/Portfile 2014-12-04 18:11:21 UTC (rev 129048)
</span><span class="lines">@@ -44,52 +44,69 @@
</span><span class="cx">
</span><span class="cx"> configure.post_args gqrx.pro
</span><span class="cx">
</span><del>-post-destroot {
</del><ins>+if {${subport} eq ${name}} {
</ins><span class="cx">
</span><del>- # link the executable back to $qt_bins_dir
</del><ins>+ long_description ${description} \
+ This port is kept up with the Gqrx GIT 'master' branch, is typically updated weekly to monthly, and provides compatibility with the GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
</ins><span class="cx">
</span><del>- ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
- ${destroot}${qt_bins_dir}
</del><ins>+ github.setup csete gqrx 9648a148e04d0e5fc15b26151f44f8b10e8180e9
+ version 20141127
</ins><span class="cx">
</span><del>-}
</del><ins>+ checksums rmd160 294112a97efa962bd61816c46ee453068d275402 \
+ sha256 f1af5448b8f4603e1564b166e20f2d31ce9a91f6ee0861767301245bcf3d2f90
</ins><span class="cx">
</span><del>-if {${subport} eq ${name}} {
</del><ins>+ conflicts gqrx-legacy
</ins><span class="cx">
</span><del>- long_description ${description} \
- This port is kept up with the latest Gqrx tagged release, is typically updated every few months, and provides compatibility with the GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
</del><ins>+ patchfiles-append patch-gqrx.pro.diff
</ins><span class="cx">
</span><del>- github.setup csete gqrx 2.3.1 v
- revision 4
</del><ins>+ # allow gqrx to work with both gnuradio and gnuradio-devel ...
</ins><span class="cx">
</span><del>- checksums rmd160 e49cd7e9280cca10bd6ac4ba7e2b4ee88f9b4cf2 \
- sha256 8e07337a628e7b172cec8aabb3108e0cb21c243891520cb78349624771cf8c72
</del><ins>+ depends_lib-append port:gr-osmosdr \
+ path:lib/libgnuradio-audio.dylib:gnuradio
</ins><span class="cx">
</span><del>- conflicts gqrx-legacy gqrx-devel
</del><ins>+ # ... but not with gnuradio-legacy or gnuradio-next
</ins><span class="cx">
</span><del>- patchfiles-append patch-gqrx.pro-release.diff
</del><ins>+ pre-fetch {
+ if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
+ # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
+ ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
+ return -code error "Invalid port dependency: gnuradio-legacy"
+ }
+ if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
+ # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
+ ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
+ return -code error "Invalid port dependency: gnuradio-next"
+ }
+ }
</ins><span class="cx">
</span><ins>+ variant portaudio description "Use PortAudio 2.0 for the audio interface" {
+ depends_lib-append port:portaudio
+ configure.args-append AUDIO_BACKEND=portaudio
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport gqrx-devel {
</span><span class="cx">
</span><del>- long_description ${description} \
- This port is kept up with the Gqrx GIT 'master' branch, is typically updated weekly to monthly, and provides compatibility with the GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
</del><ins>+ # This port can be removed on December 4, 2015.
</ins><span class="cx">
</span><ins>+ replaced_by gqrx
+ PortGroup obsolete 1.0
+
+ name gqrx-devel
+
</ins><span class="cx"> github.setup csete gqrx 9648a148e04d0e5fc15b26151f44f8b10e8180e9
</span><del>- version 2.3_20141025
- revision 1
</del><ins>+ version 20141127
</ins><span class="cx">
</span><del>- checksums rmd160 294112a97efa962bd61816c46ee453068d275402 \
- sha256 f1af5448b8f4603e1564b166e20f2d31ce9a91f6ee0861767301245bcf3d2f90
</del><ins>+ depends_lib
+ depends_build
+ depends_run
</ins><span class="cx">
</span><span class="cx"> # fix port name set by github PortGroup
</span><span class="cx">
</span><span class="cx"> name gqrx-devel
</span><span class="cx">
</span><del>- conflicts gqrx-legacy gqrx
</del><ins>+ conflicts gqrx-legacy
</ins><span class="cx">
</span><del>- patchfiles-append patch-gqrx.pro-devel.diff
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport gqrx-legacy {
</span><span class="lines">@@ -128,30 +145,11 @@
</span><span class="cx">
</span><span class="cx"> homepage http://gqrx.dk/
</span><span class="cx">
</span><del>-if {${subport} ne "gqrx-legacy"} {
</del><ins>+post-destroot {
</ins><span class="cx">
</span><del>- # allow gqrx to work with both gnuradio and gnuradio-devel ...
</del><ins>+ # link the executable back to $qt_bins_dir
</ins><span class="cx">
</span><del>- depends_lib-append port:gr-osmosdr \
- path:lib/libgnuradio-audio.dylib:gnuradio
</del><ins>+ ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
+ ${destroot}${qt_bins_dir}
</ins><span class="cx">
</span><del>- # ... but not with gnuradio-legacy or gnuradio-next
-
- pre-fetch {
- if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
- # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port. deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-legacy"
- }
- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
- # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
- return -code error "Invalid port dependency: gnuradio-next"
- }
- }
-
- variant portaudio description "Use PortAudio 2.0 for the audio interface" {
- depends_lib-append port:portaudio
- configure.args-append AUDIO_BACKEND=portaudio
- }
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchgqrxprodeveldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff ( => )</h4>
<pre class="diff"><span>
<span class="info">Deleted: trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff
===================================================================
</span><del>--- trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff 2014-12-04 18:09:59 UTC (rev 129047)
</del><ins>+++ trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff 2014-12-04 18:11:21 UTC (rev 129048)
</ins><span class="lines">@@ -1,31 +0,0 @@
</span><del>---- gqrx.pro.orig 2014-08-09 08:49:25.000000000 -0400
-+++ gqrx.pro 2014-08-09 08:50:38.000000000 -0400
-@@ -47,24 +47,21 @@
- PREFIX=/usr/local
- }
-
--target.path = $$PREFIX/bin
-+target.path = @APPSDIR@
- INSTALLS += target
-
--#CONFIG += debug
-+CONFIG -= debug
-+VER = @VERSION@
-+CONFIG += @ARCHES@
-
- # disable debug messages in release
- CONFIG(debug, debug|release) {
- # Use for valgrind
- #QMAKE_CFLAGS_DEBUG += '-g -O0'
-
-- # Define version string (see below for releases)
-- VER = $$system(git describe --abbrev=8)
--
- } else {
- DEFINES += QT_NO_DEBUG
- DEFINES += QT_NO_DEBUG_OUTPUT
-- ## VER = $$system(git describe --abbrev=1)
-- VER = 2.3.1
-
- # Release binaries with gr bundled
- # QMAKE_RPATH & co won't work with origin
</del></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchgqrxprodifffromrev129034trunkdportssciencegqrxfilespatchgqrxproreleasediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/gqrx/files/patch-gqrx.pro.diff (from rev 129034, trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff) (0 => 129048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/files/patch-gqrx.pro.diff (rev 0)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.diff 2014-12-04 18:11:21 UTC (rev 129048)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+--- gqrx.pro.orig 2014-12-04 12:58:29.000000000 -0500
++++ gqrx.pro 2014-12-04 12:58:33.000000000 -0500
+@@ -47,24 +47,20 @@
+ PREFIX=/usr/local
+ }
+
+-target.path = $$PREFIX/bin
++target.path = @APPSDIR@
+ INSTALLS += target
+
+-#CONFIG += debug
++CONFIG -= debug
++VER = @VERSION@
++CONFIG += @ARCHES@
+
+ # disable debug messages in release
+ CONFIG(debug, debug|release) {
+ # Use for valgrind
+ #QMAKE_CFLAGS_DEBUG += '-g -O0'
+-
+- # Define version string (see below for releases)
+- VER = $$system(git describe --abbrev=8)
+-
+ } else {
+ DEFINES += QT_NO_DEBUG
+ DEFINES += QT_NO_DEBUG_OUTPUT
+- VER = $$system(git describe --abbrev=1)
+- ## VER = v2.3.1-37-g78ea9469
+
+ # Release binaries with gr bundled
+ # QMAKE_RPATH & co won't work with origin
</ins></span></pre>
</div>
</div>
</body>
</html>