<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dcef2c394d854e1cade1dd1a706039dc4929d2c4">https://github.com/macports/macports-ports/commit/dcef2c394d854e1cade1dd1a706039dc4929d2c4</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 dcef2c3 libxml2: Include iconv and icu by absolute path
</span>dcef2c3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dcef2c394d854e1cade1dd1a706039dc4929d2c4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Feb 1 14:46:22 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> libxml2: Include iconv and icu by absolute path
</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/57990
</span>---
textproc/libxml2/Portfile | 8 ++++++--
textproc/libxml2/files/include.patch | 17 +++++++++++++++++
2 files changed, 23 insertions(+), 2 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 905b20b..3283d3e1 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,6 +6,7 @@ PortSystem 1.0
</span>
name libxml2
version 2.9.9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories textproc
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +33,10 @@ checksums rmd160 a7d5f9ca4a24db329108f4bfb6bd4eed0f61ab21 \
</span> sha256 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 \
size 5476717
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append include.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/include/libxml/encoding.h
</span> reinplace -locale C "s|/etc|${prefix}/etc|g" \
${worksrcpath}/catalog.c \
${worksrcpath}/runtest.c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +56,7 @@ configure.args --disable-silent-rules \
</span>
destroot.keepdirs ${destroot}${prefix}/etc/xml
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/etc/xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/etc/xml
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxml2/files/include.patch b/textproc/libxml2/files/include.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..093e43d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ensure MacPorts libiconv and icu are found even if -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is not in CPPFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/libxml/encoding.h.orig 2016-06-07 05:04:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/libxml/encoding.h 2019-02-01 14:37:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,10 +25,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libxml/xmlversion.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LIBXML_ICONV_ENABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <iconv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@PREFIX@/include/iconv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LIBXML_ICU_ENABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <unicode/ucnv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <@PREFIX@/include/unicode/ucnv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" {
</span></pre><pre style='margin:0'>
</pre>