[106683] trunk/dports/science/gr-osmosdr

[michaelld at macports.org]

Revision: 106683
          https://trac.macports.org/changeset/106683
Author:   michaelld at macports.org
Date:     2013-06-04 19:05:18 -0700 (Tue, 04 Jun 2013)
Log Message:
-----------
gr-osmosdr:
* update to latest;
* split into 2 versions using GNU Radio APIs for 3.6 and 3.7;
* add extra check for non-next version for the presence of gnuradio-next.

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

Added Paths:
-----------
    trunk/dports/science/gr-osmosdr/files/
    trunk/dports/science/gr-osmosdr/files/patch-lib-CMakeLists.txt.diff

Modified: trunk/dports/science/gr-osmosdr/Portfile
===================================================================
--- trunk/dports/science/gr-osmosdr/Portfile	2013-06-05 01:46:16 UTC (rev 106682)
+++ trunk/dports/science/gr-osmosdr/Portfile	2013-06-05 02:05:18 UTC (rev 106683)
@@ -15,22 +15,57 @@
 license             GPL-3
 platforms           darwin macosx
 
-long_description    ${description}: \
-    Support includes 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.}
 
-version             20130526
+if {${subport} == ${name}} {
 
-fetch.type          git
-git.url             git://git.osmocom.org/gr-osmosdr
-git.branch          ceb14f0f13e7b2ba8f9d4fb8f5ea0f8a34e554a6
+    long_description    ${description}: \
+        This port is for the gr-osmosdr '0.0.1' tag, providing compatibility with GNU Radio release 3.6 API, the gnuradio and gnuradio-devel ports.  ${description_common}
 
-livecheck.url       http://cgit.osmocom.org/cgit/gr-osmosdr/
-livecheck.version   ${git.branch}
-livecheck.regex     id=(\[a-f0-9\]+).>HEAD<
+    version             20130526
 
-depends_lib-append	path:lib/libgnuradio-audio.dylib:gnuradio \
-                    port:rtl-sdr
+    fetch.type          git
+    git.url             git://git.osmocom.org/gr-osmosdr
+    git.branch          a19c9f84ff302258f33d2371d8b395d7ae43acd9
 
+    conflicts           gr-osmosdr-next
+
+    depends_lib-append	path:lib/libgnuradio-audio.dylib:gnuradio
+
+    pre-fetch {
+        if {[file exists /opt/local/lib/libgnuradio-runtime.dylib]} {
+            # gnuradio-next is installed
+            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"
+        }
+    }
+}
+
+subport gr-osmosdr-next {
+
+    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}
+
+    version             20130602
+
+    fetch.type          git
+    git.url             git://git.osmocom.org/gr-osmosdr
+    git.branch          40ca42013b6165c6681d810c7aa175b53b5704f6
+
+    conflicts           gr-osmosdr
+
+    depends_lib-append	port:gnuradio-next
+
+    patchfiles          patch-lib-CMakeLists.txt.diff
+
+    livecheck.url       http://cgit.osmocom.org/cgit/gr-osmosdr/
+    livecheck.version   ${git.branch}
+    livecheck.regex     id=(\[a-f0-9\]+).>HEAD<
+
+}
+
+depends_lib-append	port:rtl-sdr
+
 # do VPATH build
 
 set vpath           ${workpath}/build

Added: trunk/dports/science/gr-osmosdr/files/patch-lib-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/gr-osmosdr/files/patch-lib-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/science/gr-osmosdr/files/patch-lib-CMakeLists.txt.diff	2013-06-05 02:05:18 UTC (rev 106683)
@@ -0,0 +1,10 @@
+--- lib/CMakeLists.txt.orig	2013-06-04 21:37:21.000000000 -0400
++++ lib/CMakeLists.txt	2013-06-04 21:37:39.000000000 -0400
+@@ -46,6 +46,7 @@
+     ${Boost_LIBRARIES}
+     ${GNURADIO_RUNTIME_LIBRARIES}
+     ${GNURADIO_BLOCKS_LIBRARIES}
++    -lgnuradio-pmt
+ )
+ 
+ ########################################################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130604/72ff9689/attachment.html>