[129048] trunk/dports/science/gqrx

michaelld at macports.org michaelld at macports.org
Thu Dec 4 10:11:21 PST 2014


Revision: 129048
          https://trac.macports.org/changeset/129048
Author:   michaelld at macports.org
Date:     2014-12-04 10:11:21 -0800 (Thu, 04 Dec 2014)
Log Message:
-----------
gqrx:
+ replace gqrx-devel with gqrx;
+ update gqrx to 9648a148 (20141127);
+ rearrange various parts;
+ update patches for the changes above.

Modified Paths:
--------------
    trunk/dports/science/gqrx/Portfile

Added Paths:
-----------
    trunk/dports/science/gqrx/files/patch-gqrx.pro.diff

Removed Paths:
-------------
    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	2014-12-04 18:09:59 UTC (rev 129047)
+++ trunk/dports/science/gqrx/Portfile	2014-12-04 18:11:21 UTC (rev 129048)
@@ -44,52 +44,69 @@
 
 configure.post_args gqrx.pro
 
-post-destroot {
+if {${subport} eq ${name}} {
 
-    # link the executable back to $qt_bins_dir
+    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}
 
-    ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
-        ${destroot}${qt_bins_dir}
+    github.setup        csete gqrx 9648a148e04d0e5fc15b26151f44f8b10e8180e9
+    version             20141127
 
-}
+    checksums           rmd160 294112a97efa962bd61816c46ee453068d275402 \
+                        sha256 f1af5448b8f4603e1564b166e20f2d31ce9a91f6ee0861767301245bcf3d2f90
 
-if {${subport} eq ${name}} {
+    conflicts           gqrx-legacy
 
-    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}
+    patchfiles-append   patch-gqrx.pro.diff
 
-    github.setup        csete gqrx 2.3.1 v
-    revision            4
+    # allow gqrx to work with both gnuradio and gnuradio-devel ...
 
-    checksums           rmd160 e49cd7e9280cca10bd6ac4ba7e2b4ee88f9b4cf2 \
-                        sha256 8e07337a628e7b172cec8aabb3108e0cb21c243891520cb78349624771cf8c72
+    depends_lib-append  port:gr-osmosdr \
+        path:lib/libgnuradio-audio.dylib:gnuradio
 
-    conflicts           gqrx-legacy gqrx-devel
+    # ... but not with gnuradio-legacy or gnuradio-next
 
-    patchfiles-append   patch-gqrx.pro-release.diff
+    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
+    }
 }
 
 subport gqrx-devel {
 
-    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}
+    # This port can be removed on December 4, 2015.
 
+    replaced_by         gqrx
+    PortGroup           obsolete 1.0
+
+    name                gqrx-devel
+
     github.setup        csete gqrx 9648a148e04d0e5fc15b26151f44f8b10e8180e9
-    version             2.3_20141025
-    revision            1
+    version             20141127
 
-    checksums           rmd160 294112a97efa962bd61816c46ee453068d275402 \
-                        sha256 f1af5448b8f4603e1564b166e20f2d31ce9a91f6ee0861767301245bcf3d2f90
+    depends_lib
+    depends_build
+    depends_run
 
     # fix port name set by github PortGroup
 
     name                gqrx-devel
 
-    conflicts           gqrx-legacy gqrx
+    conflicts           gqrx-legacy
 
-    patchfiles-append   patch-gqrx.pro-devel.diff
-
 }
 
 subport gqrx-legacy {
@@ -128,30 +145,11 @@
 
 homepage            http://gqrx.dk/
 
-if {${subport} ne "gqrx-legacy"} {
+post-destroot {
 
-    # allow gqrx to work with both gnuradio and gnuradio-devel ...
+    # link the executable back to $qt_bins_dir
 
-    depends_lib-append  port:gr-osmosdr \
-        path:lib/libgnuradio-audio.dylib:gnuradio
+    ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
+        ${destroot}${qt_bins_dir}
 
-    # ... 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
-    }
 }

Deleted: trunk/dports/science/gqrx/files/patch-gqrx.pro-devel.diff
===================================================================
Deleted: trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff	2014-12-04 18:09:59 UTC (rev 129047)
+++ trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff	2014-12-04 18:11:21 UTC (rev 129048)
@@ -1,31 +0,0 @@
---- 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

Copied: trunk/dports/science/gqrx/files/patch-gqrx.pro.diff (from rev 129034, trunk/dports/science/gqrx/files/patch-gqrx.pro-release.diff)
===================================================================
--- 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)
@@ -0,0 +1,31 @@
+--- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141204/816629ff/attachment.html>


More information about the macports-changes mailing list