<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/99b91e604816abe5187beb2f8fa8ba46d7fc2c6f">https://github.com/macports/macports-base/commit/99b91e604816abe5187beb2f8fa8ba46d7fc2c6f</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 99b91e604 port diagnose: fix multiple issues with check_for_clt
</span>99b91e604 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 99b91e604816abe5187beb2f8fa8ba46d7fc2c6f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Oct 2 04:19:44 2023 +1100

<span style='display:block; white-space:pre;color:#404040;'>    port diagnose: fix multiple issues with check_for_clt
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    OS versions newer than 10.9 also use /Library/Developer/CommandLineTools.
</span><span style='display:block; white-space:pre;color:#404040;'>    `xcode-select --install` doesn't work on pre-10.9. There is no
</span><span style='display:block; white-space:pre;color:#404040;'>    xcode-select on Tiger. Also check for missing CLTs receipt.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/53909
</span>---
 src/macports1.0/diagnose.tcl | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 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 c90bdaacc..f78d413ff 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;'>@@ -138,8 +138,8 @@ namespace eval diagnose {
</span>     proc check_for_clt {} {
 
         # Checks to see if the Xcode Command Line Tools are installed by checking if the file
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # /Library/Developer/CommandLineTools exists if the system is running 10.9, or if they're
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # running an older version, if the command xcode-select -p outputs something.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # /Library/Developer/CommandLineTools exists if the system is running 10.9+, or if they're
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # running an older version, if /usr/include exists.
</span>         #
         # Args:
         #           None
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,26 +148,29 @@ namespace eval diagnose {
</span> 
         output "command line tools"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {${macports::macos_version_major} eq "10.9"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp ${macports::macos_version_major} >= "10.9"]} {
</span> 
             if {![file exists "/Library/Developer/CommandLineTools/"]} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                ui_warn "Xcode Command Line Tools are not installed! To install them, please enter the command:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_warn "Xcode Command Line Tools do not appear to be installed. To install them, please enter the command:
</span>                                     xcode-select --install"
                 success_fail 0
                 return
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            } elseif {$macports::xcodecltversion eq "none"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_warn "The Xcode Command Line Tools package appears to be installed, but its receipt appears to be missing."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_warn "The Command Line Tools may be outdated, which can cause problems."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_warn "Please see: <https://trac.macports.org/wiki/ProblemHotlist#reinstall-clt>"
</span>             }
             success_fail 1
             return
 
         } else {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            set xcode_select [exec xcode-select -print-path]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {![file exists "/usr/include"]} {
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {$xcode_select eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ui_warn "Xcode Command Line Tools are not installed! To install them, please enter the command:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    xcode-select --install"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_warn "Xcode Command Line Tools do not appear to be installed. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                         To install them, please follow the instructions for your OS version at:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    <https://guide.macports.org/#installing.xcode>"
</span>                 success_fail 0
                 return
             }
</pre><pre style='margin:0'>

</pre>