[151280] trunk/dports/science/gnuradio

[michaelld at macports.org]

Revision: 151280
          https://trac.macports.org/changeset/151280
Author:   michaelld at macports.org
Date:     2016-08-11 13:03:23 -0700 (Thu, 11 Aug 2016)
Log Message:
-----------
gnuradio:
+ update devel to e106376b and next to e73324ff, both 20160809, with testing;
+ split cmake-expand patch into devel and next versions.

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

Added Paths:
-----------
    trunk/dports/science/gnuradio/files/patch-cmake-expand.next.diff

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2016-08-11 19:58:18 UTC (rev 151279)
+++ trunk/dports/science/gnuradio/Portfile	2016-08-11 20:03:23 UTC (rev 151280)
@@ -51,11 +51,11 @@
     name                gnuradio-devel
     conflicts           gnuradio gnuradio-next
 
-    github.setup        gnuradio gnuradio 5af80cc3146a908f3d3fd4fb201f8eebe03eff1e
-    version             20160801
+    github.setup        gnuradio gnuradio e106376bfc380abe3e0df3504da34e1982f9feee
+    version             20160809
     checksums \
-        rmd160 c7999af862be367ad2177574d9f1334c4f12738f \
-        sha256 a3b67a7d23a0d330d699fd11eb50bdc8f80db77716534ee7dd2d9f4920e59997
+        rmd160 54d3d4d1d48e11a4c9b910e3d3203cbdf36b51d1 \
+        sha256 e5251c88a2278e813d4c6bf2a90122e8023919142e1915f1373b1209036f4d83
 
     # set the version override string
 
@@ -71,11 +71,11 @@
     name                gnuradio-next
     conflicts           gnuradio gnuradio-devel
 
-    github.setup        gnuradio gnuradio cfda705a5e07f9611f5b8d0e3425fe58a851b61b
-    version             20160801
+    github.setup        gnuradio gnuradio e73324ffcd8f9ab883c79d76644acfa7c9929cd2
+    version             20160809
     checksums \
-        rmd160 2c8c0d4ab54b5765a0f722b7718744acf89dc309 \
-        sha256 1e92e8e09c59e9bc7e0a968392f43304aaf7169a87fcfaba7f2a13d2899eaba3
+        rmd160 9d85f94b71fd8bcb3ee0cc0ae94f9254160df509 \
+        sha256 f408d8b9c2a6f15edacb39ef96703a9cfeb57f5d582442e2503f543ebe4d0526
 
     # set the version override string
 
@@ -97,12 +97,18 @@
     patchfiles-append \
         patch-cmake-expand.release.diff
 
-} else {
+} elseif {${subport} eq "gnuradio-devel"} {
 
-    # patches for devel and next (which are kept aligned for now)
+    # patches for devel
     patchfiles-append \
         patch-cmake-expand.devel.diff
 
+} else {
+    
+    # patches for next
+    patchfiles-append \
+        patch-cmake-expand.next.diff
+
 }
 
 # override githib PortGroup homepage setting

Copied: trunk/dports/science/gnuradio/files/patch-cmake-expand.next.diff (from rev 151214, trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff)
===================================================================
--- trunk/dports/science/gnuradio/files/patch-cmake-expand.next.diff	                        (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.next.diff	2016-08-11 20:03:23 UTC (rev 151280)
@@ -0,0 +1,72 @@
+--- cmake/Modules/GrMiscUtils.cmake.orig
++++ cmake/Modules/GrMiscUtils.cmake
+@@ -335,6 +335,13 @@
+   endforeach(sig)
+   unset(name)
+ 
++  #try to force generate the headers
++  execute_process(
++    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++    ${root} ${root}.h.t ${ARGN}
++  )
++
+   #create a command to generate the headers
+   add_custom_command(
+     OUTPUT ${expanded_files_h}
+@@ -380,6 +387,13 @@
+   endforeach(sig)
+   unset(name)
+ 
++  #try to force generate the source files
++  execute_process(
++    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++    ${root} ${root}.cc.t ${ARGN}
++  )
++
+   #create a command to generate the source files
+   add_custom_command(
+     OUTPUT ${expanded_files_cc}
+@@ -389,6 +403,13 @@
+     ${root} ${root}.cc.t ${ARGN}
+   )
+ 
++  #try to force generate the header files
++  execute_process(
++    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++    ${root} ${root}.h.t ${ARGN}
++  )
++
+   #create a command to generate the header files
+   add_custom_command(
+     OUTPUT ${expanded_files_h}
+@@ -442,6 +463,13 @@
+   endforeach(sig)
+   unset(name)
+ 
++  #try to force generate the _impl.cc files
++  execute_process(
++    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++    ${root} ${root}_impl.cc.t ${ARGN}
++  )
++
+   #create a command to generate the _impl.cc files
+   add_custom_command(
+     OUTPUT ${expanded_files_cc_impl}
+@@ -451,6 +479,13 @@
+     ${root} ${root}_impl.cc.t ${ARGN}
+   )
+ 
++  #try to force generate the _impl.h files
++  execute_process(
++    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
++    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
++    ${root} ${root}_impl.h.t ${ARGN}
++  )
++
+   #create a command to generate the _impl.h files
+   add_custom_command(
+     OUTPUT ${expanded_files_h_impl}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160811/2d383286/attachment.html>