[107526] trunk/dports/science/gr-osmosdr/Portfile

michaelld at macports.org michaelld at macports.org
Mon Jul 1 19:55:02 PDT 2013


Revision: 107526
          https://trac.macports.org/changeset/107526
Author:   michaelld at macports.org
Date:     2013-07-01 19:55:02 -0700 (Mon, 01 Jul 2013)
Log Message:
-----------
gr-osmosdr:
* whitespace: tabs -> spaces;
* update names to mirror those used by gnuradio, to a point;
* create gr-osmosdr-legacy to match gnuradio-legacy;
* replace gr-osmosdr-next by gr-osmosdr;
* update legacy version to latest;
* fix descriptions and checking to match needs and provides.

Modified Paths:
--------------
    trunk/dports/science/gr-osmosdr/Portfile

Modified: trunk/dports/science/gr-osmosdr/Portfile
===================================================================
--- trunk/dports/science/gr-osmosdr/Portfile	2013-07-02 02:24:18 UTC (rev 107525)
+++ trunk/dports/science/gr-osmosdr/Portfile	2013-07-02 02:55:02 UTC (rev 107526)
@@ -6,75 +6,99 @@
 PortGroup           active_variants 1.1
 
 name                gr-osmosdr
-maintainers		    michaelld openmaintainer
+maintainers         michaelld openmaintainer
 
-description		    gr-osmosdr provides support for OsmoSDR hardware within GNU Radio
+description         gr-osmosdr provides support for OsmoSDR hardware within GNU Radio
 
-categories		    science comms
+categories          science comms
 homepage            http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
 license             GPL-3
 platforms           darwin macosx
 
-set description_common {Includes OSMO SDR support GNU Radio source and sink blocks in C++, Python, and GNU Radio Companion (grc).  This port also offers a wrapper functionality for the FunCube Dongle, Ettus UHD, and rtl-sdr radios.  By using gr-osmosdr source you can take advantage of a common software api in your applications independent of the underlying radio hardware.}
+set description_common {Includes OSMO SDR support GNU Radio source and sink blocks in C++, Python, and GNU Radio Companion (grc).  This port also offers a wrapper functionality for the FunCube Dongle, Ettus UHD, and rtl-sdr radios.  By using gr-osmosdr source you can take advantage of a common software API in your applications independent of the underlying radio hardware.}
 
 if {${subport} == ${name}} {
 
-    long_description    ${description}: \
-        This port is for the gr-osmosdr gr3.6 branch, providing compatibility with GNU Radio release 3.6 API, the gnuradio and gnuradio-devel ports.  ${description_common}
+    long_description    ${description}.  \
+        This port is kept up with the gr-osmosdr GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.  ${description_common}
 
     version             20130610
+    revision            1
 
     fetch.type          git
     git.url             git://git.osmocom.org/gr-osmosdr
-    git.branch          e42752826ccd142b25ef8f9f5d33a70bc0506bb9
+    git.branch          6b0f84f4ed63d7524e02b66684a63cd251a1885a
 
-    conflicts           gr-osmosdr-next
+    conflicts           gr-osmosdr
 
     # allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
 
-    depends_lib-append	path:lib/libgnuradio-audio.dylib:gnuradio
+    depends_lib-append  path:lib/libgnuradio-audio.dylib:gnuradio
 
-    # ... but not with gnuradio-next
+    # ... 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 gnuradio-next.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
-            return -code error "Invalid port dependency"
+            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"
         }
     }
 
-    livecheck.url       http://cgit.osmocom.org/gr-osmosdr/log/?h=gr3.6
+    livecheck.url       http://cgit.osmocom.org/gr-osmosdr/log/?h=master
     livecheck.version   ${git.branch}
-    livecheck.regex     id=(\[a-f0-9\]+).*>gr3.6<
+    livecheck.regex     id=(\[a-f0-9\]+).*>HEAD<
 
 }
 
-subport gr-osmosdr-next {
+subport gr-osmosdr-legacy {
 
-    long_description    ${description}: \
-        This port is kept up with the gr-osmosdr GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API, the gnuradio-next port.  ${description_common}
+    long_description    ${description}.  \
+        This port is for the gr-osmosdr gr3.6 branch, providing compatibility with GNU Radio release 3.6 API: the gnuradio-legacy port.  ${description_common}
 
-    version             20130610
+    version             20130612
 
     fetch.type          git
     git.url             git://git.osmocom.org/gr-osmosdr
-    git.branch          6b0f84f4ed63d7524e02b66684a63cd251a1885a
+    git.branch          ffd2bbf424963ae2c4249fbeb9dbca9b2c3870c4
 
     conflicts           gr-osmosdr
 
-    # gr-osmosdr-next works with gnuradio-next only
+    # gr-osmosdr-legacy works with gnuradio-legacy only
 
-    depends_lib-append	port:gnuradio-next
+    depends_lib-append  port:gnuradio-legacy
 
-    livecheck.url       http://cgit.osmocom.org/gr-osmosdr/log/?h=master
+    livecheck.url       http://cgit.osmocom.org/gr-osmosdr/log/?h=gr3.6
     livecheck.version   ${git.branch}
-    livecheck.regex     id=(\[a-f0-9\]+).*>HEAD<
+    livecheck.regex     id=(\[a-f0-9\]+).*>gr3.6<
 
 }
 
-depends_lib-append	port:rtl-sdr
+subport gr-osmosdr-next {
 
+    replaced_by gr-osmosdr
+
+    version             20130610
+    revision            1
+
+    distfiles
+
+    pre-configure {
+        ui_error "${name} has been renamed to ${replaced_by}. Please install ${replaced_by} instead."
+        return -code error "obsolete port"
+    }
+
+    livecheck.type      none
+
+}
+
+depends_lib-append  port:rtl-sdr
+
 # do VPATH build
 
 set vpath           ${workpath}/build
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130701/a79b87a6/attachment-0001.html>


More information about the macports-changes mailing list