[154357] trunk/dports/science/gqrx

[michaelld at macports.org]

Revision: 154357
          https://trac.macports.org/changeset/154357
Author:   michaelld at macports.org
Date:     2016-10-28 15:14:44 +0200 (Fri, 28 Oct 2016)
Log Message:
-----------
gqrx:
+ devel has moved to using Qt5 only, so just use Qt5 throughout even though release can technically support Qt4;
+ rev-bump release for Qt5 change;
+ update devel to ce985924 (20161027).

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

Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile	2016-10-28 13:12:06 UTC (rev 154356)
+++ trunk/dports/science/gqrx/Portfile	2016-10-28 13:14:44 UTC (rev 154357)
@@ -3,12 +3,13 @@
 
 PortSystem          1.0
 PortGroup           github 1.0
+PortGroup           qmake5 1.0
 
 name                gqrx
 maintainers         michaelld openmaintainer
 
-description         Gqrx is a software defined radio (SDR) receiver using GNU Radio, OSMOSDR, and Qt (4 or 5).
-long_description {Gqrx is a software defined radio receiver for Funcube Dongle (FCD), RTL2832U-based DVB-T devices (RTL-SDR), Universal Software Radio Peripherals (USRP) and Osmo SDR devices.  Gqrx is powered by GNU Radio and the Qt GUI toolkit.  Gqrx is free and open source software and anyone is invited to hack the source code to suit their needs.}
+description         Gqrx is a software defined radio (SDR) receiver using GNU Radio, OSMOSDR, and Qt5.
+long_description {Gqrx is a software defined radio receiver for Funcube Dongle (FCD), RTL2832U-based DVB-T devices (RTL-SDR), Universal Software Radio Peripherals (USRP) and Osmo SDR devices.  Gqrx is powered by GNU Radio and the Qt5 GUI toolkit.  Gqrx is free and open source software and anyone is invited to hack the source code to suit their needs.}
 
 categories          science comms
 license             GPL-3 BSD
@@ -20,7 +21,7 @@
 if {${subport} eq ${name}} {
 
     github.setup    csete gqrx 2.5.3 v
-    revision        2
+    revision        3
     checksums       \
         rmd160 99c662f04fa924c95f5b419a90f2816588003ca3 \
         sha256 427de19213539edd56ebc0977b5844a55cc100a6cb7bfc38df3f0e0e0f52bd46
@@ -38,10 +39,10 @@
 
 subport gqrx-devel {
 
-    github.setup        csete gqrx 2ca5471c0af21686cb8529fa29cf40a8d6cfcac9
-    version             20160926
-    checksums           rmd160 1ebfe70db277e1a919a4877caef44583f3de2713 \
-                        sha256 6f45d17a923b0d11696e42872785a958706fa1966285156903cf779171ba5ca5
+    github.setup        csete gqrx ce9859248e3593fd3b73a847292727bcb1c84af4
+    version             20161027
+    checksums           rmd160 5a593797fdf06d459922b748a1a71af009f05563 \
+                        sha256 bf795d8f5c17d875f1a3902de86506eff239b9bcdbf88a86971b355e94e565d3
 
     patchfiles-append   patch-gqrx.pro.devel.diff
 
@@ -70,38 +71,6 @@
 
 homepage            http://gqrx.dk/
 
-variant qt4 conflicts qt5 description {Build ${subport} using Qt4} {
-    PortGroup qmake 1.0
-}
-
-variant qt5 conflicts qt4 description {Build ${subport} using Qt5} {
-
-    PortGroup qmake5 1.0
-    PortGroup active_variants 1.1
-
-    # make sure gnuradio* is installed with -qtgui, because we
-    # can't have Qt4 and Qt5 installed at the same time (yet),
-    # and gnuradio* does not (yet) support Qt5.
-
-    require_active_variants path:lib/libgnuradio-audio.dylib:gnuradio "" qtgui
-
-}
-
-# default to +qt4
-
-if {![variant_isset qt4] && ![variant_isset qt5]} {
-    default_variants +qt4
-}
-
-# make sure -qt4 is not used alone
-
-if {![variant_isset qt4] && ![variant_isset qt5]} {
-
-    ui_error "\n\nYou must select either the +qt4 or +qt5 variant.\n"
-    return -code error "Invalid variant selection"
-
-}
-
 post-patch {
 
     # set install location
@@ -124,6 +93,7 @@
 
     # set arch type(s)
 
+    set qt_arch_types {[string map {i386 x86} [get_canonical_archs]]}
     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-10-28 13:12:06 UTC (rev 154356)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro.devel.diff	2016-10-28 13:14:44 UTC (rev 154357)
@@ -1,6 +1,6 @@
 --- gqrx.pro.orig
 +++ gqrx.pro
-@@ -55,10 +55,11 @@
+@@ -56,10 +56,11 @@
      PREFIX=/usr/local
  }
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161028/6152726d/attachment-0002.html>