Ticket #33629: patch-port-option-e.diff

src/port/port.tcl

@@ -43 +43 @@
 proc print_usage {{verbose 1}} {
     global cmdname
     set syntax {
-        [-bcdfknopqRstuvy] [-D portdir] [-F cmdfile] action [privopts] [actionflags]
+        [-bcdefknopqRstuvy] [-D portdir] [-F cmdfile] action [privopts] [actionflags]
         [[portname|pseudo-portname|port-url] [@version] [+-variant]... [option=value]...]...
     }
 
@@ -4281 +4281 @@
             set opts [string range $arg 1 end]
             foreach c [split $opts {}] {
                 switch -- $c {
+                    e {
+                        set ui_options(ports_env) yes
+                    }
                     v {
                         set ui_options(ports_verbose) yes
+                        # verbose implies env
+                        set ui_options(ports_env) yes
                     }
                     d {
                         set ui_options(ports_debug) yes
                         # debug implies verbose
                         set ui_options(ports_verbose) yes
+                        # debug implies env
+                        set ui_options(ports_env) yes
                     }
                     q {
                         set ui_options(ports_quiet) yes
@@ -4703 +4710 @@
 # Save off a copy of the environment before mportinit monkeys with it
 global env boot_env
 array set boot_env [array get env]
-
 global argv0
 global cmdname
 set cmdname [file tail $argv0]
@@ -4753 +4759 @@
     puts "$errorInfo"
     fatal "Failed to initialize MacPorts, $result"
 }
+if {[info exists macports::ui_options(ports_env)]} {
+    puts "--->  PATH: $boot_env(PATH)"
+}
 
 # Set up some global state for our code
 global current_portdir

src/macports1.0/macports.tcl

@@ -638 +638 @@
                 if {[regexp {^(\w+)([ \t]+(.*))?$} $line match option ignore val] == 1} {
                     if {[lsearch $bootstrap_options $option] >= 0} {
                         set macports::$option [string trim $val]
+                        if {[info exists macports::ui_options(ports_env)]} {
+                            puts "--->  ${option}: [string trim $val]"
+                        }
                         global macports::$option
                     }
                 }
@@ -682 +685 @@
                     }
                 }
                 lappend sources [concat [list $url] $flags]
+                if {[info exists macports::ui_options(ports_env)]} {
+                    puts "--->  sources_conf: [lindex $sources end]"
+                }
             } else {
                 ui_warn "$sources_conf specifies invalid source '$line', ignored."
             }
@@ -715 +721 @@
                             if {![info exists variations($opt)]} {
                                 set variations($opt) $sign
                             }
+                            if {[info exists macports::ui_options(ports_env)]} {
+                                puts "--->  variants_conf: ${sign}${opt}"
+                            }
                         } else {
                             ui_warn "$variants_conf specifies invalid variant syntax '$arg', ignored."
                         }

doc/port.1

@@ -236 +236 @@
 .Ar targets :
 .Sh OPTIONS
 .Bl -tag -width -indent
+.It Fl e
+environment mode (generate environment messages)
 .It Fl v
-verbose mode (generate verbose messages)
+verbose mode (generate verbose messages, implies
+.Fl e )
 .It Fl d
 debug mode (generate debugging messages, implies
-.Fl v )
+.Fl v e )
 .It Fl q
 quiet mode (suppress messages)
 .It Fl n