<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/2fc8ff4dd22f7268dbfe420566081855333a9eb6">https://github.com/macports/macports-ports/commit/2fc8ff4dd22f7268dbfe420566081855333a9eb6</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 2fc8ff4 volk-devel: update to d2a4c5ce (20180222), removing integrated patch.
</span>2fc8ff4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2fc8ff4dd22f7268dbfe420566081855333a9eb6
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Feb 26 15:21:25 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> volk-devel: update to d2a4c5ce (20180222), removing integrated patch.
</span>---
science/volk/Portfile | 11 ++++-------
science/volk/files/patch-apps-volk_option_helpers.cc.diff | 14 --------------
2 files changed, 4 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/Portfile b/science/volk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea3e9d2..2692017 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,11 +36,11 @@ provides the release version, which is typically updated every month or so.
</span>
subport volk-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk 75eb3ec0c961ceffdcd37103934b52b7249753eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk d2a4c5ce0f1aaae5dbd7939eece3e6892ebb0e16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180222
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 78edaa04d98bde5132aa2230df42c519915c0624 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 74c14235739073816068ef265ef35aa521ea1ae570e64171d8332ffb1989b6d4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a09c1dd80126fd251342565fe5256e7d3bb249df \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b7dad00252fcc213f60a296b4bdc33a4f5c66da9bf3302c54cac91576ad4b14c
</span>
conflicts volk
long_description ${long_description} ${subport} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,9 +58,6 @@ provides the Volk GIT maint or master branch, depending on which is more advance
</span> # fix C++11 for internal use only
patchfiles-append patch-fix-cxx11.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix #include's for volk_option_helpers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-apps-volk_option_helpers.cc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-apps-volk_option_helpers.cc.diff b/science/volk/files/patch-apps-volk_option_helpers.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9c14514..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-apps-volk_option_helpers.cc.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;'>-diff --git a/apps/volk_option_helpers.cc b/apps/volk_option_helpers.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c938d90..1cc864c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/apps/volk_option_helpers.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/apps/volk_option_helpers.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,6 +4,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "volk_option_helpers.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <limits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span></pre><pre style='margin:0'>
</pre>