<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/2fca05924a0f4dad23a54bdd5c8651fc32ae0cae">https://github.com/macports/macports-ports/commit/2fca05924a0f4dad23a54bdd5c8651fc32ae0cae</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 2fca059 [volk-]gnss-sdr-next: update to c74b9527 (20181126)
</span>2fca059 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2fca05924a0f4dad23a54bdd5c8651fc32ae0cae
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Nov 28 11:27:12 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> [volk-]gnss-sdr-next: update to c74b9527 (20181126)
</span>---
science/gnss-sdr/Portfile | 11 ++++-----
science/gnss-sdr/files/patch-CMakeLists.txt.diff | 30 ++++++++++++------------
science/volk-gnss-sdr/Portfile | 15 ++++--------
science/volk-gnss-sdr/files/patch-fix_cxx1z.diff | 14 -----------
4 files changed, 25 insertions(+), 45 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 860a52d..fc727d6 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,12 +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 b9fb38d71ef2295e80b8f58f0eacb21f4ffdd2bd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181112
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5d28c6386b1800653178b175d3b22193eae41078 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 84cd2e68b4ec638e604c3e5f7c3a5b6d3b9126e9e963d80fa4ba82b1153a0069 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3569608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr c74b9527cd67ee217cb7ccc73832776fa4ed261c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20181126
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0b76d39a906cecceb96ebaa1d5017d04e66d225b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8fe7a5118b8a1be26b3e23336e71f31299565c134876a0aa46b25dfd8a58b3b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3566982
</span>
conflicts gnss-sdr gnss-sdr-devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/files/patch-CMakeLists.txt.diff b/science/gnss-sdr/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dd71b2e..b4212d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnss-sdr/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnss-sdr/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,22 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,20 +97,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,20 +96,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###############################
</span> set(THIS_IS_A_RELEASE OFF) # only related to version name, no further implications.
if(NOT ${THIS_IS_A_RELEASE})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the current working branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Get the current working branch
</span> - execute_process(
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND git rev-parse --abbrev-ref HEAD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_VARIABLE GIT_BRANCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND git rev-parse --abbrev-ref HEAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_VARIABLE GIT_BRANCH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Get the latest abbreviated commit hash of the working branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND git log -1 --format=%h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_VARIABLE GIT_COMMIT_HASH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OUTPUT_STRIP_TRAILING_WHITESPACE
</span> - )
+ # was this info set in the CMake commandline?
+ if(NOT GIT_BRANCH)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,14 +29,6 @@
</span> + OUTPUT_QUIET ERROR_QUIET
+ )
+ endif(NOT GIT_BRANCH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the latest abbreviated commit hash of the working branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND git log -1 --format=%h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_VARIABLE GIT_COMMIT_HASH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span> + # was this info set in the CMake commandline?
+ if(NOT GIT_COMMIT_HASH)
+ execute_process(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,6 @@
</span> + OUTPUT_QUIET ERROR_QUIET
+ )
+ endif(NOT GIT_COMMIT_HASH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(NOT ${THIS_IS_A_RELEASE})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span>
set(VERSION_INFO_MAJOR_VERSION 0)
<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 44690b0..0460a84 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;'>@@ -57,11 +57,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 b9fb38d71ef2295e80b8f58f0eacb21f4ffdd2bd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181112
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5d28c6386b1800653178b175d3b22193eae41078 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 84cd2e68b4ec638e604c3e5f7c3a5b6d3b9126e9e963d80fa4ba82b1153a0069 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3569608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr c74b9527cd67ee217cb7ccc73832776fa4ed261c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20181126
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0b76d39a906cecceb96ebaa1d5017d04e66d225b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8fe7a5118b8a1be26b3e23336e71f31299565c134876a0aa46b25dfd8a58b3b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3566982
</span>
conflicts volk-gnss-sdr volk-gnss-sdr-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,11 +69,6 @@ subport volk-gnss-sdr-next {
</span>
github.livecheck.branch next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix setting of C++ standard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix_cxx1z.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 698e10a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk-gnss-sdr/files/patch-fix_cxx1z.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,9 +83,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/wiki/XcodeVersionInfo for Apple Clang version equivalences
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CLANG_VERSION VERSION_LESS "600")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else(CLANG_VERSION VERSION_LESS "600")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_STANDARD 14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(CLANG_VERSION VERSION_LESS "600")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
</span></pre><pre style='margin:0'>
</pre>