<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/ef6cc82a0c29a47af8d23572fee13cef05c1d654">https://github.com/macports/macports-ports/commit/ef6cc82a0c29a47af8d23572fee13cef05c1d654</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ef6cc82a0c29a47af8d23572fee13cef05c1d654
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Feb 1 12:34:07 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> libxml2-bootstrap: delete subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No longer needed since 57b3421.
</span>---
textproc/libxml2/Portfile | 43 ++++++-------------------------------------
1 file changed, 6 insertions(+), 37 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 e96d8fc..cac18ad 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;'>@@ -34,46 +34,15 @@ checksums rmd160 455f81e1f121c63dac96802de7f83ce4483f1afe \
</span> sha256 aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f \
size 5624761
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set icu_prefix ${prefix}
</span> set icu_cxx_version 201103L
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set iconv_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This port is used by clang-3.4 to bootstrap libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-bootstrap {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set icu_cxx_version 199711L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args --prefix=${my_prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set icu_prefix ${my_prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set iconv_prefix ${my_prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${my_prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${my_prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${my_prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-replace port:pkgconfig port:pkgconfig-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:libiconv port:libiconv-bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:icu port:icu-bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz port:xz-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 10.7 has libc++ but still needs a C++11 compiler for icu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:icu port:icu58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set icu_prefix ${prefix}/libexec/icu58
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path ${icu_prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${icu_prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${icu_prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
patchfiles-append include.patch
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@ICONV_PREFIX@|${iconv_prefix}|" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@ICU_PREFIX@|${icu_prefix}|" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@ICONV_PREFIX@|${prefix}|" ${worksrcpath}/include/libxml/encoding.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@ICU_PREFIX@|${prefix}|" ${worksrcpath}/include/libxml/encoding.h
</span> reinplace "s|@ICU_CXX_VERSION@|${icu_cxx_version}|" ${worksrcpath}/include/libxml/encoding.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|/etc|${my_prefix}/etc|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C "s|/etc|${prefix}/etc|g" \
</span> ${worksrcpath}/catalog.c \
${worksrcpath}/runtest.c \
${worksrcpath}/xmlcatalog.c \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,10 +56,10 @@ configure.args --disable-silent-rules \
</span> --with-icu \
--without-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs ${destroot}${my_prefix}/etc/xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs ${destroot}${prefix}/etc/xml
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${my_prefix}/etc/xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${icu_prefix}/include/unicode ${destroot}${my_prefix}/include/libxml2/unicode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/etc/xml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/include/unicode ${destroot}${prefix}/include/libxml2/unicode
</span> }
test.run yes
</pre><pre style='margin:0'>
</pre>