<!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>[144959] 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/144959">144959</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-01-22 06:47:01 -0800 (Fri, 22 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>gqrx:
+ update release to 2.5.2;
+ update devel to ede17a90 (20160121);
+ fix patches to be more robust with respect to version changes;
+ fix version info to be more useful and precise.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxPortfile">trunk/dports/science/gqrx/Portfile</a></li>
<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 (144958 => 144959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/Portfile        2016-01-22 14:06:12 UTC (rev 144958)
+++ trunk/dports/science/gqrx/Portfile        2016-01-22 14:47:01 UTC (rev 144959)
</span><span class="lines">@@ -19,10 +19,10 @@
</span><span class="cx"> 
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="cx"> 
</span><del>-    github.setup    csete gqrx 2.5.1 v   
</del><ins>+    github.setup    csete gqrx 2.5.2 v   
</ins><span class="cx">     checksums       \
</span><del>-        rmd160 0bfa0aa6a9e1d1348daf0cbf7e4f87faafd2c8cc \
-        sha256 2214f2631b91f2c307ccab3c7d55b694fe1cd8a941dc8271bcf38234ab60fb05
</del><ins>+        rmd160 d646f2f3d51be02746e27820ff0101f4b04a8b9b \
+        sha256 9b6622d3ffe859f9547934de6ddfa98ca81acecf46f387f5c1be6b7d346502b4
</ins><span class="cx"> 
</span><span class="cx">     patchfiles-append   patch-gqrx.pro.release.diff
</span><span class="cx"> 
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> 
</span><span class="cx"> subport gqrx-devel {
</span><span class="cx"> 
</span><del>-    github.setup        csete gqrx 64feea72150452e71dd481b8b2e94fbf7350a1ea
-    version             20160118
-    checksums           rmd160 6566d83659225198efceba005936eadccfeec9ee \
-                        sha256 d4bef6ebdb089be570cf17a35d6a7ffe80022782afcb127d8fb6950295fd34b6
</del><ins>+    github.setup        csete gqrx ede17a90777f2156ccade6946b06a70438bd8ea6
+    version             20160121
+    checksums           rmd160 91c5fd8093225286b1516453ce11fe33be336192 \
+                        sha256 1c184a6b4137579752a1f0cd79e68be6135878beb0dbf1e9441e2b50edbab438
</ins><span class="cx"> 
</span><span class="cx">     patchfiles-append   patch-gqrx.pro.devel.diff
</span><span class="cx"> 
</span><span class="lines">@@ -107,10 +107,20 @@
</span><span class="cx"> 
</span><span class="cx">     reinplace &quot;s|@APPSDIR@|${qt_apps_dir}|g&quot; ${worksrcpath}/gqrx.pro
</span><span class="cx"> 
</span><ins>+    # remove old version setting
+
+    reinplace &quot;s|\[ #\]*VER =.*||g&quot; ${worksrcpath}/gqrx.pro
+
</ins><span class="cx">     # set version
</span><span class="cx"> 
</span><del>-    reinplace &quot;s|@VERSION@|${version}|g&quot; ${worksrcpath}/gqrx.pro
</del><ins>+    if {${name} eq ${subport}} {
+        set VERSION_INFO &quot;release-${version}&quot;
+    } else {
+        set VERSION_INFO &quot;git-[string range ${github.version} 0 7](${version})&quot;
+    }
</ins><span class="cx"> 
</span><ins>+    reinplace &quot;s|\$\${VER}|MacPorts-${VERSION_INFO}|g&quot; ${worksrcpath}/gqrx.pro
+
</ins><span class="cx">     # set arch type(s)
</span><span class="cx"> 
</span><span class="cx">     reinplace &quot;s|@ARCHES@|${qt_arch_types}|g&quot; ${worksrcpath}/gqrx.pro
</span></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchgqrxprodeveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff (144958 => 144959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff        2016-01-22 14:06:12 UTC (rev 144958)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff        2016-01-22 14:47:01 UTC (rev 144959)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- gqrx.pro.orig        2016-01-14 09:00:55.000000000 -0500
-+++ gqrx.pro        2016-01-14 09:01:42.000000000 -0500
-@@ -48,10 +48,12 @@
</del><ins>+--- gqrx.pro.orig
++++ gqrx.pro
+@@ -48,10 +48,11 @@
</ins><span class="cx">      PREFIX=/usr/local
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -10,24 +10,7 @@
</span><span class="cx">  
</span><span class="cx"> -#CONFIG += debug
</span><span class="cx"> +CONFIG -= debug
</span><del>-+VER = @VERSION@
</del><span class="cx"> +CONFIG += @ARCHES@
</span><span class="cx">  
</span><span class="cx">  # disable debug messages in release
</span><span class="cx">  CONFIG(debug, debug|release) {
</span><del>-@@ -59,13 +61,13 @@
-     #QMAKE_CFLAGS_DEBUG += '-g -O0'

-     # Define version string (see below for releases)
--    VER = $$system(git describe --abbrev=8)
-+    # VER = $$system(git describe --abbrev=8)
-     ##VER = 2.5

- } else {
-     DEFINES += QT_NO_DEBUG
-     DEFINES += QT_NO_DEBUG_OUTPUT
--    VER = $$system(git describe --abbrev=1)
-+    # VER = $$system(git describe --abbrev=1)
-     ##VER = 2.5

-     # Release binaries with gr bundled
</del></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchgqrxproreleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff (144958 => 144959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff        2016-01-22 14:06:12 UTC (rev 144958)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff        2016-01-22 14:47:01 UTC (rev 144959)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- gqrx.pro.orig        2016-01-15 15:12:02.000000000 -0500
-+++ gqrx.pro        2016-01-15 15:13:05.000000000 -0500
-@@ -48,10 +48,12 @@
</del><ins>+--- gqrx.pro.orig
++++ gqrx.pro
+@@ -48,10 +48,11 @@
</ins><span class="cx">      PREFIX=/usr/local
</span><span class="cx">  }
</span><span class="cx">  
</span><span class="lines">@@ -10,24 +10,7 @@
</span><span class="cx">  
</span><span class="cx"> -#CONFIG += debug
</span><span class="cx"> +CONFIG -= debug
</span><del>-+VER = @VERSION@
</del><span class="cx"> +CONFIG += @ARCHES@
</span><span class="cx">  
</span><span class="cx">  # disable debug messages in release
</span><span class="cx">  CONFIG(debug, debug|release) {
</span><del>-@@ -59,13 +61,13 @@
-     #QMAKE_CFLAGS_DEBUG += '-g -O0'

-     # Define version string (see below for releases)
--    VER = $$system(git describe --abbrev=8)
-+    # VER = $$system(git describe --abbrev=8)
-     ##VER = 2.4

- } else {
-     DEFINES += QT_NO_DEBUG
-     DEFINES += QT_NO_DEBUG_OUTPUT
--    VER = $$system(git describe --abbrev=1)
-+    # VER = $$system(git describe --abbrev=1)
-     ##VER = 2.4

-     # Release binaries with gr bundled
</del></span></pre>
</div>
</div>

</body>
</html>