<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/63f2a963677de68b02509ea4c484e51ff969aff3">https://github.com/macports/macports-ports/commit/63f2a963677de68b02509ea4c484e51ff969aff3</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 63f2a96 jsoncpp-devel: update to 20191203-a3c86428
</span>63f2a96 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 63f2a963677de68b02509ea4c484e51ff969aff3
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Dec 5 21:36:28 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> jsoncpp-devel: update to 20191203-a3c86428
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove now-unnecessary patch.
</span>---
devel/jsoncpp/Portfile | 18 +++++++++---------
...tch-fix-build.diff => patch-fix-build.release.diff} | 0
.../files/patch-src_test_lib_json_main.cpp.diff | 2 +-
3 files changed, 10 insertions(+), 10 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 419beb3..86c573b 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;'>@@ -28,15 +28,19 @@ if {${subport} eq ${name}} {
</span>
conflicts jsoncpp-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix build errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-build.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 9e0d70aa66e6ba993dd05723ca64c26ab00f3572
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191115-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a042fb54f4678217ae95a17ee82999b61fba3612 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 56086ac6c879abc80278e0288161b2f71fc63f6d37b17e0e84104300505a6a3a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 211430
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup open-source-parsers jsoncpp a3c8642886b348d4f8fcb5384266c3a94ffe66b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191203-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 34f9089fb8e7efd6d4324a8edbd56c19a03ffc4e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c69af6d2b71e219c8d5dfc1273ea3ccf52631d3cebeb12ae7c8317560d0aee6d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 212140
</span> revision 0
conflicts jsoncpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,10 +53,6 @@ if {${subport} eq ${name}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to fix build errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> cmake.out_of_source yes
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-fix-build.diff b/devel/jsoncpp/files/patch-fix-build.release.diff
</span>similarity index 100%
rename from devel/jsoncpp/files/patch-fix-build.diff
rename to devel/jsoncpp/files/patch-fix-build.release.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-src_test_lib_json_main.cpp.diff b/devel/jsoncpp/files/patch-src_test_lib_json_main.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b3571c..c025b0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/files/patch-src_test_lib_json_main.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/files/patch-src_test_lib_json_main.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
</span> index 87be515..174fa53 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,7 +123,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,7 +124,7 @@
</span> auto index = s.find_last_of("eE");
if (index == s.npos)
return s;
</pre><pre style='margin:0'>
</pre>