<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/134cb9c9d05ee6e044dc330204d9dc33ee495f73">https://github.com/macports/macports-ports/commit/134cb9c9d05ee6e044dc330204d9dc33ee495f73</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 134cb9c9d05ee6e044dc330204d9dc33ee495f73
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Nov 21 19:49:53 2019 +1100

<span style='display:block; white-space:pre;color:#404040;'>    libxml2: update to 2.9.10
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Also, don't expose the ICU C++ API via libxml/encoding.h if the C++
</span><span style='display:block; white-space:pre;color:#404040;'>    version is too old.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59499
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59519
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59565
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59567
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59645
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59721
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59736
</span>---
 textproc/libxml2/Portfile            | 22 +++++++++++-----------
 textproc/libxml2/files/include.patch | 13 +++++++++----
 2 files changed, 20 insertions(+), 15 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxml2/Portfile b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58cc8d5..3d017a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxml2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup           clang_dependency 1.0
</span> # Please keep the version of the libxml2 and py-libxml2 ports the same.
 
 name                libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2.9.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.9.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          textproc
 platforms           darwin
 license             MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,18 +30,20 @@ depends_lib         port:libiconv \
</span> master_sites        ${homepage}sources/ \
                     ftp://xmlsoft.org/${name}/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  a7d5f9ca4a24db329108f4bfb6bd4eed0f61ab21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    5476717
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160 455f81e1f121c63dac96802de7f83ce4483f1afe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size   5624761
</span> 
 set my_prefix ${prefix}
 set icu_prefix ${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set icu_cxx_version 201103L
</span> set iconv_prefix ${prefix}
 
 # This port is used by clang-3.4 to bootstrap libcxx
 subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        0
</span>     configure.cxx_stdlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set icu_cxx_version 199711L
</span>     set my_prefix ${prefix}/libexec/libcxx-bootstrap
     configure.pre_args      --prefix=${my_prefix}
     if {${os.major} <= 10} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,8 +74,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span> patchfiles-append   include.patch
 
 post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|@ICONV_PREFIX@|${iconv_prefix}|g" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|@ICU_PREFIX@|${icu_prefix}|g" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@ICONV_PREFIX@|${iconv_prefix}|" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@ICU_PREFIX@|${icu_prefix}|" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@ICU_CXX_VERSION@|${icu_cxx_version}|" ${worksrcpath}/include/libxml/encoding.h
</span>     reinplace -locale C "s|/etc|${my_prefix}/etc|g" \
         ${worksrcpath}/catalog.c \
         ${worksrcpath}/runtest.c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,9 +84,6 @@ post-patch {
</span>         ${worksrcpath}/xmllint.c \
         ${worksrcpath}/doc/xmlcatalog.1 \
         ${worksrcpath}/doc/xmllint.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace -locale C "s|-Wno-array-bounds||" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/configure
</span> }
 
 configure.args      --disable-silent-rules \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxml2/files/include.patch b/textproc/libxml2/files/include.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d5ec699..6cc0a3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxml2/files/include.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxml2/files/include.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,9 @@
</span> Ensure MacPorts libiconv and icu are found even if -I/opt/local/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-is not in CPPFLAGS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/libxml/encoding.h.orig 2016-06-07 05:04:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/libxml/encoding.h      2019-02-01 14:37:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,10 +25,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is not in CPPFLAGS. Also don't expose the ICU C++ API if using a C++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version that is too old.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/libxml/encoding.h.orig 2017-11-14 08:00:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/libxml/encoding.h      2019-11-21 19:10:55.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,10 +25,14 @@
</span>  #include <libxml/xmlversion.h>
  
  #ifdef LIBXML_ICONV_ENABLED
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +12,10 @@ is not in CPPFLAGS.
</span>  #endif
  #ifdef LIBXML_ICU_ENABLED
 -#include <unicode/ucnv.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++/* ICU C++ API requires C++11 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__cplusplus) && __cplusplus < @ICU_CXX_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define U_SHOW_CPLUSPLUS_API 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span> +#include <@ICU_PREFIX@/include/unicode/ucnv.h>
  #endif
  #ifdef __cplusplus
</pre><pre style='margin:0'>

</pre>