[144959] trunk/dports/science/gqrx

[michaelld at macports.org]

Revision: 144959
          https://trac.macports.org/changeset/144959
Author:   michaelld at macports.org
Date:     2016-01-22 06:47:01 -0800 (Fri, 22 Jan 2016)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/dports/science/gqrx/Portfile
    trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff
    trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff

Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- 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)
@@ -19,10 +19,10 @@
 
 if {${subport} eq ${name}} {
 
-    github.setup    csete gqrx 2.5.1 v   
+    github.setup    csete gqrx 2.5.2 v   
     checksums       \
-        rmd160 0bfa0aa6a9e1d1348daf0cbf7e4f87faafd2c8cc \
-        sha256 2214f2631b91f2c307ccab3c7d55b694fe1cd8a941dc8271bcf38234ab60fb05
+        rmd160 d646f2f3d51be02746e27820ff0101f4b04a8b9b \
+        sha256 9b6622d3ffe859f9547934de6ddfa98ca81acecf46f387f5c1be6b7d346502b4
 
     patchfiles-append   patch-gqrx.pro.release.diff
 
@@ -37,10 +37,10 @@
 
 subport gqrx-devel {
 
-    github.setup        csete gqrx 64feea72150452e71dd481b8b2e94fbf7350a1ea
-    version             20160118
-    checksums           rmd160 6566d83659225198efceba005936eadccfeec9ee \
-                        sha256 d4bef6ebdb089be570cf17a35d6a7ffe80022782afcb127d8fb6950295fd34b6
+    github.setup        csete gqrx ede17a90777f2156ccade6946b06a70438bd8ea6
+    version             20160121
+    checksums           rmd160 91c5fd8093225286b1516453ce11fe33be336192 \
+                        sha256 1c184a6b4137579752a1f0cd79e68be6135878beb0dbf1e9441e2b50edbab438
 
     patchfiles-append   patch-gqrx.pro.devel.diff
 
@@ -107,10 +107,20 @@
 
     reinplace "s|@APPSDIR@|${qt_apps_dir}|g" ${worksrcpath}/gqrx.pro
 
+    # remove old version setting
+
+    reinplace "s|\[ #\]*VER =.*||g" ${worksrcpath}/gqrx.pro
+
     # set version
 
-    reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/gqrx.pro
+    if {${name} eq ${subport}} {
+        set VERSION_INFO "release-${version}"
+    } else {
+        set VERSION_INFO "git-[string range ${github.version} 0 7](${version})"
+    }
 
+    reinplace "s|\$\${VER}|MacPorts-${VERSION_INFO}|g" ${worksrcpath}/gqrx.pro
+
     # set arch type(s)
 
     reinplace "s|@ARCHES@|${qt_arch_types}|g" ${worksrcpath}/gqrx.pro

Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- gqrx.pro.orig
++++ gqrx.pro
+@@ -48,10 +48,11 @@
      PREFIX=/usr/local
  }
  
@@ -10,24 +10,7 @@
  
 -#CONFIG += debug
 +CONFIG -= debug
-+VER = @VERSION@
 +CONFIG += @ARCHES@
  
  # disable debug messages in release
  CONFIG(debug, debug|release) {
-@@ -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

Modified: trunk/dports/science/gqrx/files/patch-gqrx.pro.release.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- gqrx.pro.orig
++++ gqrx.pro
+@@ -48,10 +48,11 @@
      PREFIX=/usr/local
  }
  
@@ -10,24 +10,7 @@
  
 -#CONFIG += debug
 +CONFIG -= debug
-+VER = @VERSION@
 +CONFIG += @ARCHES@
  
  # disable debug messages in release
  CONFIG(debug, debug|release) {
-@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160122/e779f54b/attachment.html>