<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/db03888f820e5fd76663b4bbfbcd1f7c5b1e9ee3">https://github.com/macports/macports-ports/commit/db03888f820e5fd76663b4bbfbcd1f7c5b1e9ee3</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 db03888  volk: update release to 2.0.0 and devel to 20190805-1299d72c
</span>db03888 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit db03888f820e5fd76663b4bbfbcd1f7c5b1e9ee3
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Aug 16 16:08:48 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    volk: update release to 2.0.0 and devel to 20190805-1299d72c
</span>---
 science/volk/Portfile                           | 32 +++-------
 science/volk/files/patch-CMakeLists.txt.diff    | 84 -------------------------
 science/volk/files/patch-fix-cxx11.devel.diff   | 13 ----
 science/volk/files/patch-fix-cxx11.release.diff | 14 -----
 4 files changed, 10 insertions(+), 133 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 9d0bbaf..850de54 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;'>@@ -20,12 +20,11 @@ platforms           darwin
</span> 
 if {${name} eq ${subport}} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup    gnuradio volk 1.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        rmd160 cf9e7a2a6d981871cc3321135f2f97fa872da94f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        sha256 369dffa2ad16c0439f72bdb6d948d91a66cc274388e3bb343e1c19348dcb0ead \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        size   233428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup gnuradio volk 2.0.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums rmd160 ab6e7a497cd9efcd6873d4edd5b36fd8dbdf9e16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              sha256 33eb98eeb036186665b0f941be1570e5a3350cb0193bbf67b28ef5d9a5ada617 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              size   261506
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision  0
</span> 
     # bump the epoch because I moved the version from 20150707 to 1.0.1
     epoch           1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,32 +32,21 @@ if {${name} eq ${subport}} {
</span> provides the release version, which is typically updated every month or so.
     conflicts       volk-devel
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # fix C++11 for internal use only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-fix-cxx11.release.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # fix include_directories ordering so-as to pick up project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # headers before external headers. allows for in-place building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # while a prior version is already installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
 
 subport volk-devel {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup gnuradio volk cd4b1b28c1e4cb351b39136a365e016cc08896cd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version   20190623-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums rmd160 d943b1a9ca5211fdfd015669d0de7668bf49da60 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              sha256 6ae77dc2a96d4ca4890236fd6217871a92332b174e1c90b263390adb4d58f63a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              size   254198
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup gnuradio volk 1299d72c396a88fd2679adfd7a919ac00d2cf678
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version   20190805-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums rmd160 58e8d5f767e754e9270ebffa1d9a1d6a61c37ab0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              sha256 afd5b0011e7f1f2be254f42a3cf63e0bdfb950391c165d6a38b24da996c0a178 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              size   261505
</span>     revision  0
 
     conflicts       volk
     long_description ${long_description} ${subport} \
 provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # fix C++11 for internal use only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-fix-cxx11.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
 
 # fix naming of *Clang compiler to just "Clang" for internal use
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-CMakeLists.txt.diff b/science/volk/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d7b001..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,84 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2438a40..9bfd3c5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -443,6 +443,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set initial include directories for finding headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include_directories(volk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Handle orc support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -522,24 +534,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #Create a volk object library (requires cmake >= 2.8.8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     add_library(volk_obj OBJECT ${volk_sources})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # a better cmake-fu user may make this more repeatable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    target_include_directories(volk_obj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PUBLIC ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PUBLIC ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #Add dynamic library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     target_link_libraries(volk ${volk_libraries})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    target_include_directories(volk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PUBLIC ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PUBLIC ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #Configure target properties
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -556,13 +554,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #Configure static library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     if(ENABLE_STATIC_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         add_library(volk_static STATIC $<TARGET_OBJECTS:volk_obj>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        target_include_directories(volk_static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            PUBLIC ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            PUBLIC ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         set_target_properties(volk_static PROPERTIES OUTPUT_NAME volk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -575,13 +566,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     #create the volk runtime library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     add_library(volk SHARED ${volk_sources})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     target_link_libraries(volk ${volk_libraries})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    include_directories(volk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PUBLIC ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PUBLIC ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -605,6 +589,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     endif(ENABLE_STATIC_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build the QA test application
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-fix-cxx11.devel.diff b/science/volk/files/patch-fix-cxx11.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 019cf3f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-fix-cxx11.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d6b8478..2c5d980 100644
</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;'>-@@ -32,7 +32,7 @@ enable_testing()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-fix-cxx11.release.diff b/science/volk/files/patch-fix-cxx11.release.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3cd6bff..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-fix-cxx11.release.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/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 34c6fdf..51dbddb 100644
</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;'>-@@ -27,7 +27,8 @@ enable_testing()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
</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;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
</span></pre><pre style='margin:0'>

</pre>