<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fe7158845aa5208881afa22a39416b694d257815">https://github.com/macports/macports-ports/commit/fe7158845aa5208881afa22a39416b694d257815</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fe7158845aa5208881afa22a39416b694d257815
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Nov 6 23:06:32 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: don't add non-existent ports; warn instead
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
<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 061652c..0bcc772 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;'>@@ -717,7 +717,7 @@ proc eval_variants {variations} {
</span>
namespace eval qt5pg {
proc register_dependents {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global qt5_private_components qt5_private_build_components qt5_private_runtime_components qt5.name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt5_private_components qt5_private_build_components qt5_private_runtime_components qt5.name qt5.version
</span>
if { ![exists qt5_private_components] } {
# no Qt components have been requested
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -788,7 +788,12 @@ namespace eval qt5pg {
</span> } elseif { [info exists qt5pg::qt5_component_lib(${component})] } {
set component_info $qt5pg::qt5_component_lib(${component})
set path [lindex ${component_info} 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:${path}:${qt5.name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set version_intro [lindex ${component_info} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:${path}:${qt5.name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "${component} does not exist in Qt ${qt5.version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
return -code error "unknown component ${component}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -797,7 +802,12 @@ namespace eval qt5pg {
</span> if { [info exists qt5pg::qt5_component_lib(${component})] } {
set component_info $qt5pg::qt5_component_lib(${component})
set path [lindex ${component_info} 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append path:${path}:${qt5.name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set version_intro [lindex ${component_info} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append path:${path}:${qt5.name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "${component} does not exist in Qt ${qt5.version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
return -code error "unknown component ${component}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -806,7 +816,12 @@ namespace eval qt5pg {
</span> if { [info exists qt5pg::qt5_component_lib(${component})] } {
set component_info $qt5pg::qt5_component_lib(${component})
set path [lindex ${component_info} 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append path:${path}:${qt5.name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set version_intro [lindex ${component_info} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${qt5.version} ${version_intro}] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append path:${path}:${qt5.name}-${component}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "${component} does not exist in Qt ${qt5.version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
return -code error "unknown component ${component}"
}
</pre><pre style='margin:0'>
</pre>