<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/19cb39ef40035e5d16bfe7db9b8051933e954f2e">https://github.com/macports/macports-ports/commit/19cb39ef40035e5d16bfe7db9b8051933e954f2e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 19cb39ef40035e5d16bfe7db9b8051933e954f2e
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Feb 18 13:09:19 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> pkgconfig-bootstrap: removed
</span>---
devel/pkgconfig/Portfile | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/pkgconfig/Portfile b/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 69dcc0e2ade..a36eae19aa0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/pkgconfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,23 +33,8 @@ depends_lib port:libiconv
</span> patchfiles patch-glib-configure.diff \
patch-glib-glib-gmessages.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set myprefix ${prefix}
</span> set docdir ${prefix}/share/doc/${name}
<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;'>- set myprefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${myprefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args --prefix=${myprefix}
</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;'>- configure.cppflags-prepend -I${myprefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${myprefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${myprefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PATH=${myprefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Avoid macports-clang dep (doesn't use C++ anyway)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist clang gcc-4.2 apple-gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # Also needed by later clangs.
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
clang_dependency.extra_versions 3.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,12 +50,7 @@ configure.args --disable-silent-rules \
</span> --with-internal-glib \
--docdir=${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq "${name}-bootstrap"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # search bootstrap prefix and then normal prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pc-path=${myprefix}/lib/pkgconfig:${myprefix}/share/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig
</span>
configure.env-append PKG_CONFIG=false
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +61,7 @@ post-configure {
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs ${destroot}${myprefix}/lib/pkgconfig ${destroot}${myprefix}/share/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs ${destroot}${prefix}/lib/pkgconfig ${destroot}${prefix}/share/pkgconfig
</span>
post-destroot {
xinstall -m 644 -W ${worksrcpath} \
</pre><pre style='margin:0'>
</pre>