<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/ac1ff92e64bca6e08fc2e2179abbaf49ceb0bb37">https://github.com/macports/macports-base/commit/ac1ff92e64bca6e08fc2e2179abbaf49ceb0bb37</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 ac1ff92e6 misc: use list constructor
</span>ac1ff92e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ac1ff92e64bca6e08fc2e2179abbaf49ceb0bb37
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Nov 22 06:50:19 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> misc: use list constructor
</span>---
src/cxx_stdlib_overridden.tcl.in | 2 +-
src/images_to_archives.tcl.in | 2 +-
src/macports1.0/macports_util.tcl | 6 +++---
src/macports1.0/reclaim.tcl | 4 ++--
src/package1.0/portmpkg.tcl | 6 +++---
src/port1.0/fetch_common.tcl | 4 ++--
src/port1.0/portactivate.tcl | 2 +-
src/port1.0/portbump.tcl | 11 +++++------
src/port1.0/portchecksum.tcl | 4 ++--
src/port1.0/portclean.tcl | 2 +-
src/port1.0/portconfigure.tcl | 14 +++++++-------
src/port1.0/portdistcheck.tcl | 4 ++--
src/port1.0/portdistfiles.tcl | 2 +-
src/port1.0/portfetch.tcl | 4 ++--
src/port1.0/portinstall.tcl | 4 ++--
src/port1.0/portlint.tcl | 2 +-
src/port1.0/portstartupitem.tcl | 8 ++++----
src/port1.0/porttrace.tcl | 8 ++++----
src/port1.0/portutil.tcl | 34 +++++++++++++++++-----------------
19 files changed, 61 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cxx_stdlib_overridden.tcl.in b/src/cxx_stdlib_overridden.tcl.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 26e257a8d..eb6556ea4 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cxx_stdlib_overridden.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cxx_stdlib_overridden.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ foreach portname $known_ports {
</span> ui_msg "$macports::ui_prefix Setting C++ stdlib usage for $portname"
foreach entry $entries {
registry::write {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set binary_files {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set binary_files [list]
</span> foreach filehandle [registry::file search id [$entry id] binary 1] {
lappend binary_files [$filehandle actual_path]
registry::file close $filehandle
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/images_to_archives.tcl.in b/src/images_to_archives.tcl.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 1fb47cd88..5f831da53 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/images_to_archives.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/images_to_archives.tcl.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ puts "This could take a while..."
</span>
# list of ports we successfully create an archive of, to be used to update
# the registry only after we know all creation attempts were successful.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set archived_list {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set archived_list [list]
</span> set installed_len [llength $ilist]
set counter 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports_util.tcl b/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 440d4653f..179b15e74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports_util.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ namespace eval macports_util {
</span> # @param list A list of obscured maintainers
# @return A list of associative arrays in serialized list format
proc unobscure_maintainers {list} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set result {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set result [list]
</span> foreach sublist $list {
array set maintainer {}
foreach token $sublist {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,7 @@ proc ldindex {varName args} {
</span> }
} else {
set item $var
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set var {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set var [list]
</span> }
return $item
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +179,7 @@ proc lshift {varName} {
</span> proc lunshift {varName args} {
upvar 1 $varName var
if {![info exists var]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set var {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set var [list]
</span> }
# the [set] in the index argument ensures the list is not shared
set var [lreplace $var [set var -1] -1 {*}$args]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/reclaim.tcl b/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index dcd5f3644..38f6f935a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/reclaim.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -587,13 +587,13 @@ namespace eval reclaim {
</span> set portname [$port name]
lappend ports_for_name($portname) $port
if {![info exists dependents($portname)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set dependents($portname) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dependents($portname) [list]
</span> foreach result [$port dependents] {
lappend dependents($portname) [$result name]
}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ret {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ret [list]
</span> foreach port $portlist {
sortdependents_helper $port ports_for_name dependents seen ret
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portmpkg.tcl b/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ca761d521..279f8aca7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@ proc portmpkg::mpkg_main {args} {
</span>
proc portmpkg::make_dependency_list {portname destination} {
global requested_variations prefix package.destpath package.flat
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set result {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set result [list]
</span> if {[catch {set res [mport_lookup $portname]} error]} {
ui_debug $::errorInfo
return -code error "port lookup failed: $error"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ proc portmpkg::make_dependency_list {portname destination} {
</span> array set portinfo [mport_info $mport]
# get the union of depends_run and depends_lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set depends {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set depends [list]
</span> if {[info exists portinfo(depends_run)]} { lappend depends {*}$portinfo(depends_run) }
if {[info exists portinfo(depends_lib)]} { lappend depends {*}$portinfo(depends_lib) }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +140,7 @@ proc portmpkg::package_mpkg {portname portepoch portversion portrevision} {
</span> system "mkdir -p -m 0755 [shellescape ${packages_path}]"
system "mkdir -p -m 0755 [shellescape ${resources_path}]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set dependencies {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dependencies [list]
</span> # get deplist
set deps [make_dependency_list $portname $packages_path]
set deps [lsort -unique $deps]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/fetch_common.tcl b/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index cd8cd93fd..b3fc443d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +93,7 @@ proc portfetch::mirror_sites {mirrors tag subdir mirrorfile} {
</span> if {$mirrors ne $global_mirror_site} {
ui_warn "[format [msgcat::mc "No mirror sites on file for class %s"] $mirrors]"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [list]
</span> }
set ret [list]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,7 +247,7 @@ proc portfetch::sortsites {urls default_listvar} {
</span> seteuid 0; setegid 0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set hosts {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set hosts [list]
</span> foreach site $urllist {
if {[string range $site 0 6] eq "file://"} {
set pingtimes(localhost) 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portactivate.tcl b/src/port1.0/portactivate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 45094ab50..b7b519316 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portactivate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portactivate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ proc portactivate::activate_main {args} {
</span> }
set optionlist [array get user_options]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set renames {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set renames [list]
</span> portstartupitem::foreach_startupitem {
if {$si_install} {
lappend renames ${prefix}/etc/${si_location}/${si_plist} /Library/${si_location}/${si_plist}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portbump.tcl b/src/port1.0/portbump.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c1306cbe..69c1d4a58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portbump.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portbump.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,8 +95,8 @@ proc portbump::bump_main {args} {
</span> } else {
# Retrieve the list of types/values from the array.
set portfile_checksums $checksums_array($distfile)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set calculated_checksums {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set both_checksums {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set calculated_checksums [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set both_checksums [list]
</span>
# Iterate on this list to check the actual values.
foreach {type sum} $portfile_checksums {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +157,6 @@ proc portbump::bump_main {args} {
</span> } else {
# Show the desired checksum line for easy cut-paste
# based on the previously calculated values, plus our default types
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sums {}
</span>
global version revision
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,7 +166,7 @@ proc portbump::bump_main {args} {
</span> ui_msg [format "New %-8s %s" ${type}: $calculated_sum]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set patterns {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set patterns [list]
</span>
set whitespace {[[:space:]\\]+}
# Create substitution pattern(s) for checksum
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +177,7 @@ proc portbump::bump_main {args} {
</span> lappend patterns {s/(revision[[:space:]\\]+)[0-9]+/\10/g}
# Construct sed command
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdline {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdline [list]
</span> lappend cmdline $portutil::autoconf::sed_command -E
foreach pattern $patterns {
lappend cmdline -e $pattern
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -225,7 +224,7 @@ proc portbump::bump_main {args} {
</span> set patchfd [open $patchfile w]
# Construct diff command
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set diffcmd {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set diffcmd [list]
</span> lappend diffcmd $portutil::autoconf::diff_path -u --label old/Portfile --label new/Portfile
lappend diffcmd $portfile $tmpfile >@$patchfd
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portchecksum.tcl b/src/port1.0/portchecksum.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c32499cc..dfaa73f17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portchecksum.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portchecksum.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,7 +286,7 @@ proc portchecksum::checksum_main {args} {
</span> } else {
# retrieve the list of types/values from the array.
set portfile_checksums $checksums_array($distfile)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set calculated_checksums {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set calculated_checksums [list]
</span>
# iterate on this list to check the actual values.
foreach {type sum} $portfile_checksums {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,7 +344,7 @@ proc portchecksum::checksum_main {args} {
</span> } else {
# Show the desired checksum line for easy cut-paste
# based on the previously calculated values, plus our default types
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sums {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sums [list]
</span>
foreach distfile $all_dist_files {
if {[llength $all_dist_files] > 1} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portclean.tcl b/src/port1.0/portclean.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 05812e0c8..e7fa394c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portclean.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portclean.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +117,7 @@ proc portclean::clean_dist {args} {
</span>
set count 0
if {![info exists patchfiles]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set patchfiles ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set patchfiles [list]
</span> }
foreach file $patchfiles {
set patchfile [getdistname $file]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e23abfe3a..0eb334983 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -432,7 +432,7 @@ proc portconfigure::choose_supported_archs {archs} {
</span> if {[vercmp ${configure.sdk_version} 11] >= 0} {
set sdk_archs [list arm64 x86_64]
} elseif {[vercmp ${configure.sdk_version} 10.14] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_archs [list x86_64]
</span> } elseif {[vercmp ${configure.sdk_version} 10.7] >= 0} {
set sdk_archs [list x86_64 i386]
} elseif {[vercmp ${configure.sdk_version} 10.6] >= 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -458,7 +458,7 @@ proc portconfigure::choose_supported_archs {archs} {
</span> }
if {$intersection_archs eq ""} {
# No archs in common.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [list]
</span> }
}
} elseif {$supported_archs eq ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1645,7 +1645,7 @@ proc portconfigure::add_compiler_port_dependencies {compiler} {
</span>
# add C++ runtime dependency if necessary
if {[regexp {^macports-gcc-(\d+(?:\.\d+)?)?$} ${compiler} -> gcc_version]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgccs ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs [list]
</span> set dependencies_file [getportresourcepath $porturl "port1.0/compilers/gcc_dependencies.tcl"]
if {[file exists ${dependencies_file}]} {
source ${dependencies_file}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1662,16 +1662,16 @@ proc portconfigure::add_compiler_port_dependencies {compiler} {
</span>
# compiler links against libraries in libgcc\d* and/or libgcc-devel
if {[vercmp ${gcc_version} 4.6] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgccs "path:share/doc/libgcc/README:libgcc port:libgcc45"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs [list path:share/doc/libgcc/README:libgcc port:libgcc45]
</span> } elseif {[vercmp ${gcc_version} 7] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgccs "path:share/doc/libgcc/README:libgcc port:libgcc6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs [list path:share/doc/libgcc/README:libgcc port:libgcc6]
</span> } elseif {[vercmp ${gcc_version} ${gcc_main_version}] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgccs "path:share/doc/libgcc/README:libgcc port:libgcc${gcc_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs [list path:share/doc/libgcc/README:libgcc port:libgcc${gcc_version}]
</span> } else {
# Using primary GCC version
# Do not depend directly on primary runtime port, as implied by libgcc
# and doing so prevents libgcc-devel being used as an alternative.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgccs "path:share/doc/libgcc/README:libgcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs [list path:share/doc/libgcc/README:libgcc]
</span> }
}
foreach libgcc_dep $libgccs {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portdistcheck.tcl b/src/port1.0/portdistcheck.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f2bc7f40..dc2f2082f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portdistcheck.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portdistcheck.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ proc portdistcheck::distcheck_main {args} {
</span>
ui_debug "Portfile modification date is [clock format $port_moddate]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set curl_options {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set curl_options [list]
</span> if {[tbool fetch.ignore_sslcert]} {
lappend curl_options "--ignore-ssl-cert"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ proc portdistcheck::distcheck_main {args} {
</span> if {"${distcheck.type}" ne "none"
&& "${fetch.type}" eq "standard"} {
# portfetch 1.0::checkfiles sets fetch_urls list.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set fetch_urls {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fetch_urls [list]
</span> portfetch::checkfiles fetch_urls
set totalsize 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portdistfiles.tcl b/src/port1.0/portdistfiles.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a7caf6a85..06b30fae1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portdistfiles.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portdistfiles.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ proc portdistfiles::distfiles_main {args} {
</span> }
# from portfetch... process the sites, files and patches
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set fetch_urls {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fetch_urls [list]
</span> portfetch::checkfiles fetch_urls
# also give up on ports that don't have any distfiles
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 572815f45..38866e5fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portfetch.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,8 +278,8 @@ proc portfetch::checkfiles {urls} {
</span> global global_mirror_site ports_fetch_no-mirrors license
upvar $urls fetch_urls
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sites [list patch_sites {} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites {}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sites [list patch_sites [list] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites [list]]
</span> if {(![info exists ports_fetch_no-mirrors] || ${ports_fetch_no-mirrors} eq "no") \
&& [lsearch -exact -nocase $license "nomirror"] == -1} {
set sites [list patch_sites [list $global_mirror_site PATCH_SITE_LOCAL] \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portinstall.tcl b/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a18240f33..de52f1095 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portinstall.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,9 +262,9 @@ proc portinstall::create_archive {location archive.type} {
</span> }
set have_fileIsBinary [expr {[option os.platform] eq "darwin"}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set binary_files {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set binary_files [list]
</span> # also save the contents for our own use later
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set installPlist {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installPlist [list]
</span> set destpathLen [string length $destpath]
fs-traverse -depth fullpath [list $destpath] {
if {[file type $fullpath] eq "directory"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlint.tcl b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d96043d80..d77eacde4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -645,7 +645,7 @@ proc portlint::lint_main {args} {
</span> incr variantnumber
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set all_depends {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set all_depends [list]
</span> if {[info exists depends_fetch]} {
lappend all_depends {*}$depends_fetch
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portstartupitem.tcl b/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 98c561bf4..17b17bb31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,8 +201,8 @@ proc portstartupitem::foreach_startupitem {body} {
</span> # Add user notes regarding any installed startupitem
proc portstartupitem::add_notes {} {
global subport startupitem_autostart
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set autostart_names {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set normal_names {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set autostart_names [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set normal_names [list]
</span>
foreach_startupitem {
if {$si_type eq "none"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -541,9 +541,9 @@ proc portstartupitem::loaded {} {
</span> set launchctl_path ${portutil::autoconf::launchctl_path}
if {$launchctl_path eq ""} {
# assuming not loaded if there's no launchctl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [list]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ret {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ret [list]
</span> global os.major sudo_user
foreach_startupitem {
if {$si_type ne "launchd"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/porttrace.tcl b/src/port1.0/porttrace.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e3beab91e..26d64adce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/porttrace.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/porttrace.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@ namespace eval porttrace {
</span> proc appendEntry {sandbox path action} {
upvar 2 $sandbox sndbxlst
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set mapping {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mapping [list]
</span> # Escape backslashes with backslashes
lappend mapping "\\" "\\\\"
# Escape colons with \:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,7 +226,7 @@ namespace eval porttrace {
</span> }
# Allow access to some Xcode specifics
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set xcode_paths {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xcode_paths [list]
</span> lappend xcode_paths "/var/db/xcode_select_link"
lappend xcode_paths "/var/db/mds"
lappend xcode_paths [file normalize ~${macportsuser}/Library/Preferences/com.apple.dt.Xcode.plist]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -440,8 +440,8 @@ namespace eval porttrace {
</span> set workpath $p_workpath
# Initialize the sandbox violation lists
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sandbox_violation_list {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sandbox_unknown_list {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sandbox_violation_list [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sandbox_unknown_list [list]
</span>
# Create the socket
tracelib setname $fifo
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a3f8c083..0d38e079e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -591,7 +591,7 @@ proc variant {args} {
</span> # * is_default: This key exists iff the variant is a default variant.
# * requires
if {![info exists PortInfo(vinfo)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set PortInfo(vinfo) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PortInfo(vinfo) [list]
</span> }
array set vinfo $PortInfo(vinfo)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -640,7 +640,7 @@ proc variant {args} {
</span> } else {
# Create an array to contain the variant's information.
if {![info exists vinfo($variant_provides)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set vinfo($variant_provides) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vinfo($variant_provides) [list]
</span> }
array set variant $vinfo($variant_provides)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1098,7 +1098,7 @@ proc reinplace {args} {
</span> set tmpfile [join [lrange $tmpfile 1 end]]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdline {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmdline [list]
</span> lappend cmdline $portutil::autoconf::sed_command
if {$extended} {
lappend cmdline -E
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1535,31 +1535,31 @@ proc target_run {ditem} {
</span> set tracing yes
# collect deps
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set depends {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set deptypes {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set depends [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set deptypes [list]
</span>
# Determine deptypes to look for based on target
switch $target {
fetch -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksum { set deptypes "depends_fetch" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract { set deptypes "depends_fetch depends_extract" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch { set deptypes "depends_fetch depends_extract depends_patch" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksum { set deptypes [list depends_fetch] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract { set deptypes [list depends_fetch depends_extract] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch { set deptypes [list depends_fetch depends_extract depends_patch] }
</span> configure -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build { set deptypes "depends_fetch depends_extract depends_patch depends_lib depends_build" }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test { set deptypes "depends_fetch depends_extract depends_patch depends_lib depends_build depends_run depends_test" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build { set deptypes [list depends_fetch depends_extract depends_patch depends_lib depends_build] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test { set deptypes [list depends_fetch depends_extract depends_patch depends_lib depends_build depends_run depends_test] }
</span> destroot -
dmg -
pkg -
portpkg -
mpkg -
mdmg -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "" { set deptypes "depends_fetch depends_extract depends_patch depends_lib depends_build depends_run" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "" { set deptypes [list depends_fetch depends_extract depends_patch depends_lib depends_build depends_run] }
</span>
# install may be run given an archive, which means
# depends_fetch, _extract, _build dependencies have
# never been installed
activate -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- install { set deptypes "depends_lib depends_run" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install { set deptypes [list depends_lib depends_run] }
</span> }
# Gather the dependencies for deptypes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2159,7 +2159,7 @@ proc eval_variants {variations} {
</span> foreach dvar $newlist {
set thevar [ditem_key $dvar provides]
if {[info exists upvariations($thevar)] && $upvariations($thevar) eq "-"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set chosenlist ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set chosenlist [list]
</span> foreach choice $chosen {
lappend chosenlist +[ditem_key $choice provides]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2386,7 +2386,7 @@ proc handle_default_variants {option action {value ""}} {
</span> set|append {
# Retrieve the information associated with each variant.
if {![info exists PortInfo(vinfo)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set PortInfo(vinfo) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PortInfo(vinfo) [list]
</span> }
array set vinfo $PortInfo(vinfo)
set re {([-+])([-A-Za-z0-9_.]+)}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2760,7 +2760,7 @@ proc get_portimage_path {} {
</span> proc supportedArchiveTypes {} {
global supported_archive_types
if {![info exists supported_archive_types]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set supported_archive_types {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set supported_archive_types [list]
</span> foreach type {tbz2 tbz tgz tar txz tlz xar zip cpgz cpio} {
if {[catch {archiveTypeIsSupported $type}] == 0} {
lappend supported_archive_types $type
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3011,11 +3011,11 @@ proc merge {base} {
</span> global destroot configure.universal_archs
# test which architectures are available, set one as base-architecture
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set archs ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set archs [list]
</span> set base_arch ""
foreach arch ${configure.universal_archs} {
if {[file exists "${base}/${arch}"]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set archs [concat ${archs} ${arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend archs ${arch}
</span> set base_arch ${arch}
}
}
</pre><pre style='margin:0'>
</pre>