<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/1b127f3c5f6066dc2d84aefd1ef553cb695d3cb7">https://github.com/macports/macports-ports/commit/1b127f3c5f6066dc2d84aefd1ef553cb695d3cb7</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 1b127f3c5f6 Ensure pkgconfig dependency is only added once
</span>1b127f3c5f6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1b127f3c5f6066dc2d84aefd1ef553cb695d3cb7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jul 7 18:09:34 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Ensure pkgconfig dependency is only added once
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Delete any existing pkgconfig dependency before adding it so that it
</span><span style='display:block; white-space:pre;color:#404040;'> doesn't appear in the dependency list twice in ports that have already
</span><span style='display:block; white-space:pre;color:#404040;'> depended on pkgconfig (or included another portgroup that does so) by
</span><span style='display:block; white-space:pre;color:#404040;'> the time they include this portgroup.
</span>---
_resources/port1.0/group/old_openssl-1.0.tcl | 1 +
_resources/port1.0/group/qt4-1.0.tcl | 1 +
_resources/port1.0/group/qt5-1.0.tcl | 1 +
3 files changed, 3 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/old_openssl-1.0.tcl b/_resources/port1.0/group/old_openssl-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index eac296e1cab..6740d93a524 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/old_openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/old_openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,7 @@ proc openssl.configure {method} {
</span> switch ${method} {
pkgconfig {
configure.env-append PKG_CONFIG_PATH=${prefix}/lib/openssl-${openssl.branch}/pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:pkgconfig
</span> depends_build-append port:pkgconfig
}
build_flags {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt4-1.0.tcl b/_resources/port1.0/group/qt4-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d167ff1c336..3f57faceab2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt4-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt4-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,6 +215,7 @@ if {![info exists building_qt4]} {
</span> }
# use PKGCONFIG for Qt discovery in configure scripts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-delete port:pkgconfig
</span> depends_build-append port:pkgconfig
# standard destroot environment
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c93dfe201bf..25b454e2cd5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -648,6 +648,7 @@ options qt5.min_version
</span> default qt5.min_version 5.0
# use PKGCONFIG for Qt discovery in configure scripts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-delete port:pkgconfig
</span> depends_build-append port:pkgconfig
# standard qmake spec
</pre><pre style='margin:0'>
</pre>