<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.7
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/9f114bca49b67b1b97ee1f9159943a84ca720954">https://github.com/macports/macports-base/commit/9f114bca49b67b1b97ee1f9159943a84ca720954</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9f114bca49b67b1b97ee1f9159943a84ca720954
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon May 24 12:29:52 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> diagnose: fix messages with double spaces, via correct line continuation
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 55da32098bbda9c70b1e454a4b67515d6b6f310f)
</span>---
src/macports1.0/diagnose.tcl | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/diagnose.tcl b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f53ea3da..46d4c67e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -324,7 +324,7 @@ namespace eval diagnose {
</span> output "HomeBrew"
if {[file exists "/usr/local/Cellar"]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "it seems you have Homebrew installed on this system -- Because Homebrew uses /usr/local, this can potentially cause issues \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "it seems you have Homebrew installed on this system -- Because Homebrew uses /usr/local, this can potentially cause issues\
</span> with MacPorts. We'd recommend you either uninstall it, or move it from /usr/local for now."
success_fail 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,7 +336,7 @@ namespace eval diagnose {
</span>
output "Fink"
if {[file exists "/sw"]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "it seems you have Fink installed on your system -- This could potentially cause issues with MacPorts. We'd recommend you \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "it seems you have Fink installed on your system -- This could potentially cause issues with MacPorts. We'd recommend you\
</span> either uninstall it, or move it from /sw for now."
success_fail 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -456,7 +456,7 @@ namespace eval diagnose {
</span> output "dylibs in /usr/local/lib"
if {[glob -nocomplain -directory "/usr/local/lib" *.dylib *.la *.prl] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "found dylibs in your /usr/local/lib directory. These are known to cause problems. We'd recommend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "found dylibs in your /usr/local/lib directory. These are known to cause problems. We'd recommend\
</span> you remove them."
success_fail 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -469,7 +469,7 @@ namespace eval diagnose {
</span> output "header files in /usr/local/include"
if {[glob -nocomplain -directory "/usr/local/include" *.h *.hpp *.hxx] ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "found header files in your /usr/local/include directory. These are known to cause problems. We'd recommend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "found header files in your /usr/local/include directory. These are known to cause problems. We'd recommend\
</span> you remove them."
success_fail 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,8 +493,8 @@ namespace eval diagnose {
</span> output "X11.app on Mac OS X 10.6 systems"
if {[file exists /Applications/X11.app]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "it seems you have Mac OS X 10.6 installed, and are using X11 from \"X11.app\". This has been known to cause issues. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- To fix this, please install xorg-server, by using the command 'sudo port install xorg-server', or installing it from \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "it seems you have Mac OS X 10.6 installed, and are using X11 from \"X11.app\". This has been known to cause issues.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ To fix this, please install xorg-server, by using the command 'sudo port install xorg-server', or installing it from\
</span> their website, https://www.xquartz.org/releases/."
success_fail 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,7 +521,7 @@ namespace eval diagnose {
</span> set available [lindex $disk_info 3]
if {$available < 5} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "you have less than 5 GiB of free disk space! This can cause serious errors. We recommend trying to clear out unnecessary \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "you have less than 5 GiB of free disk space! This can cause serious errors. We recommend trying to clear out unnecessary\
</span> programs and files by running 'sudo port reclaim', or manually uninstalling/deleting programs and folders on your drive."
success_fail 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -563,7 +563,7 @@ namespace eval diagnose {
</span> output "for '$app'"
if {![file exists /usr/bin/$app]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$app is needed by MacPorts to function normally, but wasn't found on this system. We'd recommend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$app is needed by MacPorts to function normally, but wasn't found on this system. We'd recommend\
</span> installing it for continued use of MacPorts."
success_fail 0
return
</pre><pre style='margin:0'>
</pre>