<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/3b1c1f69cbe9f16a596774823b06c850640a21c1">https://github.com/macports/macports-ports/commit/3b1c1f69cbe9f16a596774823b06c850640a21c1</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 3b1c1f69cbe jsoncpp: update release to 1.9.4
</span>3b1c1f69cbe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3b1c1f69cbe9f16a596774823b06c850640a21c1
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Sep 26 16:41:10 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> jsoncpp: update release to 1.9.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Deprecate devel in favor of release.
</span>---
devel/jsoncpp/Portfile | 51 +++++++++-------------
.../jsoncpp/files/patch-disable-ccache.devel.diff | 21 ---------
.../files/patch-disable-ccache.release.diff | 10 ++---
3 files changed, 25 insertions(+), 57 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 c13e2d37b2b..71e21a3a5b2 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;'>@@ -17,18 +17,26 @@ description JSON C++ library
</span>
long_description JSON data format manipulation C++ library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport jsoncpp-devel {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# deprecate the devel port, if installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# can be removed after 20210926
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport jsoncpp-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by jsoncpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200720-5be07bdc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://github.com/open-source-parsers/jsoncpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup open-source-parsers jsoncpp 1.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 71a6751a4e0c77b43d9ef550d8ccbeb5f9877762 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1395f7f7aa52c9d0d9f30168a8048d0df2c1aacba64ad28d8ae8727d0a22e2ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 212977
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts jsoncpp-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup open-source-parsers jsoncpp 1.9.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 324f29d052535a6009d2b11aae7bca28408e6aec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1cfef74423173fb651aa175e3bdfe0ddf52fd70abdce5edfd7fb9f1e25514768 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 214128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
# temporary patch to fix build errors
patchfiles-append patch-fix-build.release.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,28 +45,9 @@ if {${subport} eq ${name}} {
</span> patchfiles-append patch-disable-ccache.release.diff
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup open-source-parsers jsoncpp 5be07bdc5e2d5b7715ecbc73749af3e625674dcb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200720-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 7114e1fc94df34d4a87e8484b871287d18f4e85b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 934e7d3108ebd7790259f2ea783d5a2105c2246daaef2339d412b335f89effad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 214126
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts jsoncpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description {*}${description}: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This port follows the GIT master version of ${name}, which is typically updated every few days to weeks.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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.devel.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;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCCACHE_FOUND=NO
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCCACHE_FOUND=NO
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-disable-ccache.devel.diff b/devel/jsoncpp/files/patch-disable-ccache.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 94d1b6891a1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/files/patch-disable-ccache.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,21 +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 96d3c9e..a546812 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;'>-@@ -51,16 +51,6 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
</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;'>--# use ccache if found, has to be done before project()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_program(CCACHE_EXECUTABLE "ccache" HINTS /usr/local/bin /opt/local/bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(CCACHE_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "use ccache")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" CACHE PATH "ccache" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" CACHE PATH "ccache" FORCE)
</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;'>- project(jsoncpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: version must be updated in three places when doing a release. This
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # annoying process ensures that amalgamate, CMake, and meson all report the
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-disable-ccache.release.diff b/devel/jsoncpp/files/patch-disable-ccache.release.diff
</span><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.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/files/patch-disable-ccache.release.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
</pre><pre style='margin:0'>
</pre>