[117706] trunk/dports/science/gnuradio

[michaelld at macports.org]

Revision: 117706
          https://trac.macports.org/changeset/117706
Author:   michaelld at macports.org
Date:     2014-03-08 12:35:23 -0800 (Sat, 08 Mar 2014)
Log Message:
-----------
gnuradio:
+ update devel to 24dc96ad and next to 06dab563, both 20140307;
+ when +ctrlport, use ZeroC ICE 3.5;
+ patch docs building issue (temporary);
+ use devel patches for both devel and next.

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

Added Paths:
-----------
    trunk/dports/science/gnuradio/files/patch-CMakeLists.txt.devel.diff

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2014-03-08 19:56:25 UTC (rev 117705)
+++ trunk/dports/science/gnuradio/Portfile	2014-03-08 20:35:23 UTC (rev 117706)
@@ -89,16 +89,14 @@
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly.  This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.  Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
 
-    version             3.7.3_20140306
+    version             3.7.3_20140307
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          ca69ec5d64b67dfc714917bd94162a5d1f131d69
+    git.branch          24dc96ad6c445f905af9bc3eba1c56e97e3c429d
 
-    patchfiles-append   patch-cmake-expand.devel.diff
-
     livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master
     livecheck.version   ${git.branch}
     livecheck.regex     id=(\[a-f0-9\]+).*>master<
@@ -110,18 +108,17 @@
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly.  This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.  Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
 
-    version             3.8.0_20140306
+    version             3.8.0_20140307
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          6c8d0d26fb3c6f74dbceead8f68aa340ab8d7ade
+    git.branch          06dab56378a89e39e14ff8ebf66745eee0955b31
 
     livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next
     livecheck.version   ${git.branch}
     livecheck.regex     id=(\[a-f0-9\]+).*>next<
-
 }
 
 if {${subport} ne "gnuradio-legacy"} {
@@ -135,7 +132,7 @@
 
     if {[variant_isset ctrlport]} {
 
-        depends_lib-append port:zeroc-ice34
+        depends_lib-append port:zeroc-ice35
         configure.args-append -DENABLE_GR_CTRLPORT=ON
 
     } else {
@@ -143,6 +140,22 @@
         configure.args-append -DENABLE_GR_CTRLPORT=OFF
 
     }
+
+    if {${subport} ne "gnuradio"} {
+
+        # patches for devel and next (which are kept aligned for now)
+
+        # temporary patch to fix header creation to be before dependencies
+        # are determined, such that local (to the build) headers are found
+        # before already-installed ones.
+
+        patchfiles-append   patch-cmake-expand.devel.diff
+
+        # temporary patch to fix Doxygen building
+
+        patchfiles-append   patch-CMakeLists.txt.devel.diff
+
+    }
 }
 
 use_parallel_build  yes
@@ -346,7 +359,7 @@
                 # pyice is not checked for at configure, but is
                 # required for runtime; so use depends_run.
 
-                depends_run-append port:py${s}-zeroc-ice34
+                depends_run-append port:py${s}-zeroc-ice35
 
             }
         }

Added: trunk/dports/science/gnuradio/files/patch-CMakeLists.txt.devel.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-CMakeLists.txt.devel.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-CMakeLists.txt.devel.diff	2014-03-08 20:35:23 UTC (rev 117706)
@@ -0,0 +1,18 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -308,6 +308,7 @@ list(APPEND GR_TEST_PYTHON_DIRS
+ ########################################################################
+ # Add subdirectories (in order of deps)
+ ########################################################################
++add_subdirectory(docs)
+ add_subdirectory(gnuradio-runtime)
+ add_subdirectory(gr-blocks)
+ add_subdirectory(grc)
+@@ -331,7 +332,6 @@ add_subdirectory(gr-vocoder)
+ add_subdirectory(gr-fcd)
+ add_subdirectory(gr-wavelet)
+ add_subdirectory(gr-wxgui)
+-add_subdirectory(docs)
+ 
+ # Install our Cmake modules into $prefix/lib/cmake/gnuradio
+ # See "Package Configuration Files" on page:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140308/313ee737/attachment.html>