<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a3aebb22321848d55779d94f409e78be72025c1a">https://github.com/macports/macports-ports/commit/a3aebb22321848d55779d94f409e78be72025c1a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new a3aebb2  [volk-]gnss-sdr-next: update to c2dfc82b (20180411).
</span>a3aebb2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a3aebb22321848d55779d94f409e78be72025c1a
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Apr 11 21:09:28 2018 -0400

<span style='display:block; white-space:pre;color:#404040;'>    [volk-]gnss-sdr-next: update to c2dfc82b (20180411).
</span>---
 science/gnss-sdr/Portfile                        | 10 +++++-----
 science/volk-gnss-sdr/Portfile                   | 15 ++++++++++-----
 science/volk-gnss-sdr/files/patch-fix_cxx1z.diff | 23 +++++++++++++++++++++++
 3 files changed, 38 insertions(+), 10 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/Portfile b/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4219f7d..c75dda6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,11 +70,11 @@ subport gnss-sdr-next {
</span>         This port is kept up with the GNSS-SDR GIT next branch, which is typically updated daily to weekly.  This version of GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnuradio-next port, which represents GNU Radio GIT next branch.  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 acti [...]
 
     name                gnss-sdr-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup        gnss-sdr gnss-sdr 4a52e74b3157391e88c188b4a8c848cf96ff0ef1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version             20180330
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160 3f5a58af16addd1cfca505e0e2a3759a58f9f087 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256 b3c10e95909fb4fea427e6423b2093bb82ecd35771e783c040bcea25061ce9a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size   3430291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup        gnss-sdr gnss-sdr c2dfc82bf373788f91debc1d02a98e768ee1df9c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version             20180411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           rmd160 8947dcb410400e1658f93660a220a63ab5ef2b51 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256 11272d5de98dbe81ea821319e053aaef8110d6a14c765f7ceb7e9361f04c006d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size   3407499
</span> 
     conflicts           gnss-sdr gnss-sdr-devel
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk-gnss-sdr/Portfile b/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 64b0454..6dfc3b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,11 +62,11 @@ subport volk-gnss-sdr-next {
</span>         This port is kept up with the VOLK-GNSS-SDR GIT next branch, which is typically updated daily to weekly.  This version of VOLK-GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnss-sdr-next and gnuradio-next ports.  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 gnss-sdr and [...]
 
     name                volk-gnss-sdr-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup        gnss-sdr gnss-sdr 4a52e74b3157391e88c188b4a8c848cf96ff0ef1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version             20180330
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160 3f5a58af16addd1cfca505e0e2a3759a58f9f087 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256 b3c10e95909fb4fea427e6423b2093bb82ecd35771e783c040bcea25061ce9a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size   3430291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup        gnss-sdr gnss-sdr c2dfc82bf373788f91debc1d02a98e768ee1df9c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version             20180411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums           rmd160 8947dcb410400e1658f93660a220a63ab5ef2b51 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256 11272d5de98dbe81ea821319e053aaef8110d6a14c765f7ceb7e9361f04c006d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size   3407499
</span> 
     conflicts           volk-gnss-sdr volk-gnss-sdr-devel
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,6 +74,11 @@ subport volk-gnss-sdr-next {
</span> 
     github.livecheck.branch next
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to fix setting of C++ standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix_cxx1z.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
 
 # override github PortGroup homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk-gnss-sdr/files/patch-fix_cxx1z.diff b/science/volk-gnss-sdr/files/patch-fix_cxx1z.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..76346e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk-gnss-sdr/files/patch-fix_cxx1z.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,16 +78,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable C++17 support in Clang >= 6.0.0 or AppleClang >= 900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable C++14 support in 6.0.0 > Clang >= 3.5.0 or 900 > AppleClang >= 600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fallback to C++11 if older version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # See https://trac.macports.org/wiki/XcodeVersionInfo for Apple Clang version equivalences
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if(CLANG_VERSION VERSION_LESS "600")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            set(CMAKE_CXX_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         else(CLANG_VERSION VERSION_LESS "600")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if(CLANG_VERSION VERSION_LESS "900")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                set(CMAKE_CXX_STANDARD 14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             else(CLANG_VERSION VERSION_LESS "900")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                set(CMAKE_CXX_STANDARD 17)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             endif(CLANG_VERSION VERSION_LESS "900")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         endif(CLANG_VERSION VERSION_LESS "600")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
</span></pre><pre style='margin:0'>

</pre>