[124608] trunk/dports/science/gnuradio

[michaelld at macports.org]

Revision: 124608
          https://trac.macports.org/changeset/124608
Author:   michaelld at macports.org
Date:     2014-08-26 08:45:43 -0700 (Tue, 26 Aug 2014)
Log Message:
-----------
gnuradio:
+ update devel to df693a90 and next to 339fd5e8, both 20140821;
+ add temporary patch to fix CMAKE_MODULES_DIR, and use that variable.

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

Added Paths:
-----------
    trunk/dports/science/gnuradio/files/patch-CMAKE_MODULES_DIR.diff

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2014-08-26 14:04:49 UTC (rev 124607)
+++ trunk/dports/science/gnuradio/Portfile	2014-08-26 15:45:43 UTC (rev 124608)
@@ -91,14 +91,14 @@
         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.
 
     name                gnuradio-devel
-    github.setup        gnuradio gnuradio d07c98685c11641e3bbba16691f80855bc19b3c6
-    version             3.7.5_20140820
+    github.setup        gnuradio gnuradio df693a90525ec4a49435ed4e3fb5cfec7643b61a
+    version             3.7.5_20140821
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     checksums \
-        rmd160 e2b83db0faab6a7a39d08d7f9ec165c82f29bece \
-        sha256 6a52a00d9d088955158ce08de6cd9a86bc7c06844faa1acbbf82e7c2a4801a60
+        rmd160 bcf22cd0f85643a7c5d056212e55022dfc94ce37 \
+        sha256 8de82326693de04ded8c27e8766c8cb9fc762174691443c9aaa792c47a6a0e2a
 
 }
 
@@ -108,14 +108,14 @@
         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.
 
     name                gnuradio-next
-    github.setup        gnuradio gnuradio ba6e8b28b5e8faca1c4f7b06efcff2ef798299d2
-    version             3.8.0_20140820
+    github.setup        gnuradio gnuradio 339fd5e817396479466efb0d0252c647036ca81f
+    version             3.8.0_20140821
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     checksums \
-        rmd160 63d6425e5f841277be7ce0b7a37399b8890e3b71 \
-        sha256 0b83e6c09940420dc521b2eb8bf684da92b5ff90f0714339edae2aba88d26aa1
+        rmd160 c5d6d0091356ec64d8d792080a3ddd137b82b898 \
+        sha256 3c7a6d21ad471aeb2ed9bc69491118e338576a696973feba22f77d8b28cadc59
 
     # overload the github livecheck URL with the correct branch
 
@@ -134,6 +134,10 @@
 
     patchfiles-append patch-remove-SIZE_T_32.diff
 
+    # temporary patch to fix CMAKE_MODULES_DIR
+
+    patchfiles-append patch-CMAKE_MODULES_DIR.diff
+
     # 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.
@@ -233,6 +237,12 @@
 
 configure.args-append -DENABLE_VOLK=ON
 
+# install CMake files into this directory;
+# for 3.7+, but will not hurt for legacy.
+
+configure.args-append \
+    -DCMAKE_MODULES_DIR=${prefix}/share/cmake
+
 # set last configure argument to the reletive path
 # to the top-level cmake source
 

Added: trunk/dports/science/gnuradio/files/patch-CMAKE_MODULES_DIR.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-CMAKE_MODULES_DIR.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-CMAKE_MODULES_DIR.diff	2014-08-26 15:45:43 UTC (rev 124608)
@@ -0,0 +1,38 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -364,7 +364,7 @@ SET(cmake_configs
+ )
+ 
+ if(NOT CMAKE_MODULES_DIR)
+-   set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake/gnuradio)
++  set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
+ endif(NOT CMAKE_MODULES_DIR)
+ 
+ # Install all other cmake files into same directory
+@@ -375,7 +375,7 @@ list(REMOVE_ITEM cmake_others
+ 
+ install(
+   FILES ${cmake_configs} ${cmake_others}
+-  DESTINATION ${CMAKE_MODULES_DIR}
++  DESTINATION ${CMAKE_MODULES_DIR}/gnuradio
+   COMPONENT "runtime_devel"
+ )
+ 
+--- volk/CMakeLists.txt.orig
++++ volk/CMakeLists.txt
+@@ -135,9 +135,14 @@ install(FILES
+ ########################################################################
+ # Install cmake search routine for external use
+ ########################################################################
++
++if(NOT CMAKE_MODULES_DIR)
++    set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
++endif(NOT CMAKE_MODULES_DIR)
++
+ install(
+     FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VolkConfig.cmake
+-    DESTINATION lib${LIB_SUFFIX}/cmake/volk/
++    DESTINATION ${CMAKE_MODULES_DIR}/volk
+     COMPONENT "volk_devel"
+ )
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140826/bbff587f/attachment.html>