<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/a8af551088edbea18926c0c535f3a934abb7bf37">https://github.com/macports/macports-ports/commit/a8af551088edbea18926c0c535f3a934abb7bf37</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 a8af551088e jsoncpp-devel: update to 20200720-5be07bdc
</span>a8af551088e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a8af551088edbea18926c0c535f3a934abb7bf37
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Aug 29 16:53:35 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> jsoncpp-devel: update to 20200720-5be07bdc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Specialize patch for release and devel
</span>---
devel/jsoncpp/Portfile | 22 +++++++++++++---------
...ccache.diff => patch-disable-ccache.devel.diff} | 10 +++++-----
...ache.diff => patch-disable-ccache.release.diff} | 0
3 files changed, 18 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/Portfile b/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a4737efcbb..c13e2d37b2b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,26 +33,30 @@ if {${subport} eq ${name}} {
</span> # temporary patch to fix build errors
patchfiles-append patch-fix-build.release.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disable CCACHE discovery and use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-disable-ccache.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup open-source-parsers jsoncpp c161f4ac69633deb2ed43bc8569cb9b183f63c32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200521-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 077b03d839291002d046481140a6ac74c0444f40 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 25b7e4409a564fdba38d4d65e6714b1f33437f182e25fb52720f1461b2d11c6f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 212960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup open-source-parsers jsoncpp 5be07bdc5e2d5b7715ecbc73749af3e625674dcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200720-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7114e1fc94df34d4a87e8484b871287d18f4e85b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 934e7d3108ebd7790259f2ea783d5a2105c2246daaef2339d412b335f89effad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 214126
</span> revision 0
conflicts jsoncpp
long_description {*}${description}: \
This port follows the GIT master version of ${name}, which is typically updated every few days to weeks.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disable CCACHE discovery and use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-disable-ccache.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable CCACHE discovery and use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-disable-ccache.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args-append \
-DBUILD_SHARED_LIBS=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-disable-ccache.diff b/devel/jsoncpp/files/patch-disable-ccache.devel.diff
</span>similarity index 81%
copy from devel/jsoncpp/files/patch-disable-ccache.diff
copy to devel/jsoncpp/files/patch-disable-ccache.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index e0115e54afa..94d1b6891a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/files/patch-disable-ccache.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/files/patch-disable-ccache.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> diff --git a/CMakeLists.txt b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 01b8c9d..9338d7a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 96d3c9e..a546812 100644
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,16 +49,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Coverage.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,16 +51,6 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
</span>
-# ---------------------------------------------------------------------------
-# use ccache if found, has to be done before project()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +16,6 @@ index 01b8c9d..9338d7a 100644
</span> - set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" CACHE PATH "ccache" FORCE)
-endif()
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- project(JSONCPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(jsoncpp
</span> # Note: version must be updated in three places when doing a release. This
# annoying process ensures that amalgamate, CMake, and meson all report the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-disable-ccache.diff b/devel/jsoncpp/files/patch-disable-ccache.release.diff
</span>similarity index 100%
rename from devel/jsoncpp/files/patch-disable-ccache.diff
rename to devel/jsoncpp/files/patch-disable-ccache.release.diff
</pre><pre style='margin:0'>
</pre>