<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/7f46df47ef611c5a9c5a92ad3b552bb4acc35100">https://github.com/macports/macports-ports/commit/7f46df47ef611c5a9c5a92ad3b552bb4acc35100</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7f46df47ef611c5a9c5a92ad3b552bb4acc35100
</span>Author: Gregorio Litenstein <g.litenstein@gmail.com>
AuthorDate: Wed Jan 9 00:08:19 2019 -0300
<span style='display:block; white-space:pre;color:#404040;'> nlohmann-json: Update to 3.5.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove unneeded `cmake.generator` line.
</span><span style='display:block; white-space:pre;color:#404040;'> - Added dependency on gmake because else it would fail in trace mode.
</span><span style='display:block; white-space:pre;color:#404040;'> - Removed obsolete patches.
</span>---
devel/nlohmann-json/Portfile | 15 ++++++---------
...nchmarks-thirdparty-benchmark-CMakeLists.txt.diff | 20 --------------------
...thirdparty-benchmark-cmake-HandleGTest.cmake.diff | 11 -----------
3 files changed, 6 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nlohmann-json/Portfile b/devel/nlohmann-json/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3213d13..9962a18 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nlohmann-json/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nlohmann-json/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup nlohmann json 3.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nlohmann json 3.5.0 v
</span> name nlohmann-json
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,14 +16,11 @@ maintainers {gmail.com:g.litenstein @Lord-Kamina} openmainta
</span> description Nlohmann JSON for modern C++.
long_description Nlohmann is a header-only (and optionally single-header) JSON library \
written in vanilla C++11. Has Unicode support\; DOM and SAX parsers, among other features.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3c04b206efdeaacf49f374b33eec5b86978eef6d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2131e11d0774005e68432c5c01ff0a595e6abf0ba7979738a2017ee8a69d4001 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 114561095
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-benchmarks-thirdparty-benchmark-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-benchmarks-thirdparty-benchmark-cmake-HandleGTest.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.generator "Unix Makefiles"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5cba080556d2383773fe84ab54efb39fafccf1ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f7905c052c00ec615a6e459f2dcc21b7b9c1b2e0f36f4436d0543f15db51ca09 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 114794375
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:gmake
</span>
configure.ccache no
configure.args-append -DBUILD_TESTING=OFF -DJSON_BuildTests=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nlohmann-json/files/patch-benchmarks-thirdparty-benchmark-CMakeLists.txt.diff b/devel/nlohmann-json/files/patch-benchmarks-thirdparty-benchmark-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index be44767..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nlohmann-json/files/patch-benchmarks-thirdparty-benchmark-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,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- benchmarks/thirdparty/benchmark/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ benchmarks/thirdparty/benchmark/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +140,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (GCC_RANLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_RANLIB ${GCC_RANLIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(llvm-toolchain)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,7 +165,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (BENCHMARK_USE_LIBCXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_cxx_compiler_flag(-stdlib=libc++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nlohmann-json/files/patch-benchmarks-thirdparty-benchmark-cmake-HandleGTest.cmake.diff b/devel/nlohmann-json/files/patch-benchmarks-thirdparty-benchmark-cmake-HandleGTest.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e3d20a9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nlohmann-json/files/patch-benchmarks-thirdparty-benchmark-cmake-HandleGTest.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(ExternalProject)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(GTEST_FLAGS "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (BENCHMARK_USE_LIBCXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND GTEST_FLAGS -stdlib=libc++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(WARNING "Unsupported compiler (${CMAKE_CXX_COMPILER}) when using libc++")
</span></pre><pre style='margin:0'>
</pre>