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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/32a9c88ce254922a8ea5029ee9f417f8905947fc">https://github.com/macports/macports-ports/commit/32a9c88ce254922a8ea5029ee9f417f8905947fc</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 32a9c88ce25 [volk]-gnss-sdr-devel: fix collision of cpu_features files installed by the volk port
</span>32a9c88ce25 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 32a9c88ce254922a8ea5029ee9f417f8905947fc
</span>Author: Carles Fernandez <carles.fernandez@gmail.com>
AuthorDate: Mon Jan 11 21:19:50 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    [volk]-gnss-sdr-devel: fix collision of cpu_features files installed by the volk port
</span>---
 science/gnss-sdr/Portfile      | 10 +++++-----
 science/volk-gnss-sdr/Portfile | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 15 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 9723da0ce0a..9cc837ce259 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;'>@@ -40,11 +40,11 @@ subport gnss-sdr-devel {
</span>     long_description    ${description}: \
         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.
     name      gnss-sdr-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup gnss-sdr gnss-sdr 87882d3d23d4d3d0e7381bb4f076e4e0383392d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version   20210108-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums rmd160 f7caa6aa3b164dc002993c935341f36cdafe9514 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              sha256 71f8fe704978c86ed8e97ee35ceca0b5f218ff668a095637fdbc35d4a401a026 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              size   4269904
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup gnss-sdr gnss-sdr f75017e5206a2803f8dcd9dc6d1385bb939586c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version   20210111-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums rmd160 6c5c60d95184c23a302c2f6867ec1ac619cd7cdc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              sha256 29e715beb64877486ea9b09302ac3b4587dd85098a178ae4f98bb7d61fdbc95a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              size   4271026
</span>     revision  0
 
     conflicts gnss-sdr
<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 1ef678e79df..95fb2aea482 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;'>@@ -37,11 +37,11 @@ subport volk-gnss-sdr-devel {
</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.
 
     name      volk-gnss-sdr-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup gnss-sdr gnss-sdr 87882d3d23d4d3d0e7381bb4f076e4e0383392d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version   20210108-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums rmd160 f7caa6aa3b164dc002993c935341f36cdafe9514 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              sha256 71f8fe704978c86ed8e97ee35ceca0b5f218ff668a095637fdbc35d4a401a026 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              size   4269904
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup gnss-sdr gnss-sdr f75017e5206a2803f8dcd9dc6d1385bb939586c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version   20210111-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums rmd160 6c5c60d95184c23a302c2f6867ec1ac619cd7cdc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              sha256 29e715beb64877486ea9b09302ac3b4587dd85098a178ae4f98bb7d61fdbc95a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              size   4271026
</span>     revision  0
 
     conflicts volk-gnss-sdr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,9 +137,11 @@ configure.args-append \
</span> test.run yes
 
 # temporary fix to remove same-named files from 'volk' install
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    file delete ${destroot}${prefix}/bin/list_cpu_features
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    file delete ${destroot}${prefix}/lib/libcpu_features.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    file delete -force ${destroot}${prefix}/include/cpu_features
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    file delete -force ${destroot}${prefix}/lib/cmake/CpuFeatures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "volk-gnss-sdr"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file delete ${destroot}${prefix}/bin/list_cpu_features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file delete ${destroot}${prefix}/lib/libcpu_features.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file delete -force ${destroot}${prefix}/include/cpu_features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file delete -force ${destroot}${prefix}/lib/cmake/CpuFeatures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
</pre><pre style='margin:0'>

</pre>