<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/d38df7ed0a76ad1d6bde5683e8062e1bf0681e3e">https://github.com/macports/macports-ports/commit/d38df7ed0a76ad1d6bde5683e8062e1bf0681e3e</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 d38df7e  libxml2-bootstrap: fix icu header paths
</span>d38df7e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit d38df7ed0a76ad1d6bde5683e8062e1bf0681e3e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 5 20:19:57 2019 +1100

<span style='display:block; white-space:pre;color:#404040;'>    libxml2-bootstrap: fix icu header paths
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Handle different prefixes for icu and libiconv.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/59602
</span>---
 textproc/libxml2/Portfile            | 20 ++++++++++++--------
 textproc/libxml2/files/include.patch |  4 ++--
 2 files changed, 14 insertions(+), 10 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 4ed3f0c..510c067 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;'>@@ -35,14 +35,18 @@ checksums           rmd160  a7d5f9ca4a24db329108f4bfb6bd4eed0f61ab21 \
</span>                     size    5476717
 
 set my_prefix ${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set icu_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set iconv_prefix ${prefix}
</span> 
 # This port is used by clang-3.4 to bootstrap libcxx
 subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        5
</span>     configure.cxx_stdlib
     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:#e0ffe0;'>+        set icu_prefix ${my_prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set iconv_prefix ${my_prefix}
</span>         configure.cppflags-prepend   -I${my_prefix}/include
         configure.ldflags-prepend    -L${my_prefix}/lib
         configure.env-append    PATH=${my_prefix}/bin:$::env(PATH)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +58,10 @@ subport ${name}-bootstrap {
</span>     } else {
         # 10.7 has libc++ but still needs a C++11 compiler for icu
         depends_lib-replace     port:icu port:icu58
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.pkg_config_path   ${prefix}/libexec/icu58/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.cppflags-prepend   -I${prefix}/libexec/icu58/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.ldflags-prepend    -L${prefix}/libexec/icu58/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set icu_prefix ${prefix}/libexec/icu58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.pkg_config_path   ${icu_prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.cppflags-prepend   -I${icu_prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.ldflags-prepend    -L${icu_prefix}/lib
</span>     }
 }
 # Also needed by later clangs.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,12 +69,11 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
</span>     clang_dependency.extra_versions 3.7
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport ne "${name}-bootstrap"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   include.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   include.patch
</span> 
 post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|@PREFIX@|${my_prefix}|g" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@ICONV_PREFIX@|${iconv_prefix}|g" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@ICU_PREFIX@|${icu_prefix}|g" ${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;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 093e43d..d5ec699 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;'>@@ -7,11 +7,11 @@ is not in CPPFLAGS.
</span>  
  #ifdef LIBXML_ICONV_ENABLED
 -#include <iconv.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <@PREFIX@/include/iconv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@ICONV_PREFIX@/include/iconv.h>
</span>  #endif
  #ifdef LIBXML_ICU_ENABLED
 -#include <unicode/ucnv.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <@PREFIX@/include/unicode/ucnv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@ICU_PREFIX@/include/unicode/ucnv.h>
</span>  #endif
  #ifdef __cplusplus
  extern "C" {
</pre><pre style='margin:0'>

</pre>