[106614] trunk/base/src
jmr at macports.org
jmr at macports.org
Fri May 31 22:12:02 PDT 2013
Revision: 106614
https://trac.macports.org/changeset/106614
Author: jmr at macports.org
Date: 2013-05-31 22:12:02 -0700 (Fri, 31 May 2013)
Log Message:
-----------
combine multiple adjacent calls to global
Modified Paths:
--------------
trunk/base/src/macports1.0/macports.tcl
trunk/base/src/package1.0/portarchivefetch.tcl
trunk/base/src/package1.0/portdmg.tcl
trunk/base/src/package1.0/portmdmg.tcl
trunk/base/src/package1.0/portrpm.tcl
trunk/base/src/package1.0/portsrpm.tcl
trunk/base/src/port/port.tcl
trunk/base/src/port1.0/fetch_common.tcl
trunk/base/src/port1.0/portchecksum.tcl
trunk/base/src/port1.0/portclean.tcl
trunk/base/src/port1.0/portconfigure.tcl
trunk/base/src/port1.0/portdestroot.tcl
trunk/base/src/port1.0/portdistcheck.tcl
trunk/base/src/port1.0/portfetch.tcl
trunk/base/src/port1.0/portinstall.tcl
trunk/base/src/port1.0/portlivecheck.tcl
trunk/base/src/port1.0/portstartupitem.tcl
trunk/base/src/port1.0/porttrace.tcl
trunk/base/src/port1.0/portutil.tcl
Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/macports1.0/macports.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -363,8 +363,7 @@
# deferred and on-need extraction of xcodeversion and xcodebuildcmd.
proc macports::setxcodeinfo {name1 name2 op} {
- global macports::xcodeversion
- global macports::xcodebuildcmd
+ global macports::xcodeversion macports::xcodebuildcmd
trace remove variable macports::xcodeversion read macports::setxcodeinfo
trace remove variable macports::xcodebuildcmd read macports::setxcodeinfo
@@ -542,51 +541,51 @@
macports::ui_init $priority
}
- global auto_path env tcl_platform
- global macports::autoconf::macports_conf_path
- global macports::macports_user_dir
- global macports::bootstrap_options
- global macports::user_options
- global macports::extra_env
- global macports::portconf
- global macports::portdbpath
- global macports::portsharepath
- global macports::registry.format
- global macports::registry.path
- global macports::sources
- global macports::sources_default
- global macports::sources_conf
- global macports::destroot_umask
- global macports::libpath
- global macports::prefix
- global macports::macportsuser
- global macports::prefix_frozen
- global macports::rsync_dir
- global macports::rsync_options
- global macports::rsync_server
- global macports::variants_conf
- global macports::xcodebuildcmd
- global macports::xcodeversion
- global macports::configureccache
- global macports::ccache_dir
- global macports::ccache_size
- global macports::configuredistcc
- global macports::configurepipe
- global macports::buildnicevalue
- global macports::buildmakejobs
- global macports::universal_archs
- global macports::build_arch
- global macports::os_arch
- global macports::os_endian
- global macports::os_version
- global macports::os_major
- global macports::os_platform
- global macports::macosx_version
- global macports::macosx_deployment_target
- global macports::archivefetch_pubkeys
- global macports::ping_cache
- global macports::host_blacklisted
- global macports::host_preferred
+ global auto_path env tcl_platform \
+ macports::autoconf::macports_conf_path \
+ macports::macports_user_dir \
+ macports::bootstrap_options \
+ macports::user_options \
+ macports::extra_env \
+ macports::portconf \
+ macports::portdbpath \
+ macports::portsharepath \
+ macports::registry.format \
+ macports::registry.path \
+ macports::sources \
+ macports::sources_default \
+ macports::sources_conf \
+ macports::destroot_umask \
+ macports::libpath \
+ macports::prefix \
+ macports::macportsuser \
+ macports::prefix_frozen \
+ macports::rsync_dir \
+ macports::rsync_options \
+ macports::rsync_server \
+ macports::variants_conf \
+ macports::xcodebuildcmd \
+ macports::xcodeversion \
+ macports::configureccache \
+ macports::ccache_dir \
+ macports::ccache_size \
+ macports::configuredistcc \
+ macports::configurepipe \
+ macports::buildnicevalue \
+ macports::buildmakejobs \
+ macports::universal_archs \
+ macports::build_arch \
+ macports::os_arch \
+ macports::os_endian \
+ macports::os_version \
+ macports::os_major \
+ macports::os_platform \
+ macports::macosx_version \
+ macports::macosx_deployment_target \
+ macports::archivefetch_pubkeys \
+ macports::ping_cache \
+ macports::host_blacklisted \
+ macports::host_preferred
# Set the system encoding to utf-8
encoding system utf-8
@@ -2176,9 +2175,9 @@
}
proc mportsync {{optionslist {}}} {
- global macports::sources macports::portdbpath macports::rsync_options tcl_platform
- global macports::portverbose
- global macports::autoconf::rsync_path macports::autoconf::tar_path macports::autoconf::openssl_path
+ global macports::sources macports::portdbpath macports::rsync_options \
+ tcl_platform macports::portverbose macports::autoconf::rsync_path \
+ macports::autoconf::tar_path macports::autoconf::openssl_path
array set options $optionslist
if {[info exists options(no_reindex)]} {
upvar $options(needed_portindex_var) any_needed_portindex
@@ -3212,9 +3211,10 @@
# selfupdate procedure
proc macports::selfupdate {{optionslist {}} {updatestatusvar ""}} {
- global macports::prefix macports::portdbpath macports::libpath macports::rsync_server macports::rsync_dir macports::rsync_options
- global macports::autoconf::macports_version macports::autoconf::rsync_path tcl_platform
- global macports::autoconf::openssl_path macports::autoconf::tar_path
+ global macports::prefix macports::portdbpath macports::libpath \
+ macports::rsync_server macports::rsync_dir macports::rsync_options \
+ macports::autoconf::macports_version macports::autoconf::rsync_path \
+ tcl_platform macports::autoconf::openssl_path macports::autoconf::tar_path
array set options $optionslist
# variable that indicates whether we actually updated base
Modified: trunk/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- trunk/base/src/package1.0/portarchivefetch.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/package1.0/portarchivefetch.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -152,10 +152,10 @@
# Perform a standard fetch, assembling fetch urls from
# the listed url variable and associated archive file
proc portarchivefetch::fetchfiles {args} {
- global archivefetch.fulldestpath UI_PREFIX
- global archivefetch.user archivefetch.password archivefetch.use_epsv \
- archivefetch.ignore_sslcert
- global portverbose ports_binary_only
+ global archivefetch.fulldestpath UI_PREFIX \
+ archivefetch.user archivefetch.password archivefetch.use_epsv \
+ archivefetch.ignore_sslcert \
+ portverbose ports_binary_only
variable archivefetch_urls
variable ::portfetch::urlmap
Modified: trunk/base/src/package1.0/portdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portdmg.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/package1.0/portdmg.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -57,8 +57,8 @@
}
proc portdmg::package_dmg {portname portversion portrevision} {
- global UI_PREFIX package.destpath portpath
- global os.platform os.arch os.version os.major
+ global UI_PREFIX package.destpath portpath \
+ os.platform os.arch os.version os.major
if {[expr (${portrevision} > 0)]} {
set imagename "${portname}-${portversion}-${portrevision}"
Modified: trunk/base/src/package1.0/portmdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portmdmg.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/package1.0/portmdmg.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -57,8 +57,8 @@
}
proc portmdmg::package_mdmg {portname portepoch portversion portrevision} {
- global UI_PREFIX package.destpath portpath
- global os.platform os.arch os.version os.major
+ global UI_PREFIX package.destpath portpath \
+ os.platform os.arch os.version os.major
if {[expr (${portrevision} > 0)]} {
set imagename "${portname}-${portversion}-${portrevision}"
Modified: trunk/base/src/package1.0/portrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portrpm.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/package1.0/portrpm.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -63,8 +63,10 @@
}
proc portrpm::rpm_pkg {portname portversion portrevision} {
- global UI_PREFIX rpm.asroot package.destpath portdbpath destpath workpath prefix categories maintainers description long_description homepage epoch portpath
- global os.platform os.arch os.version os.major supported_archs configure.build_arch license
+ global UI_PREFIX rpm.asroot package.destpath portdbpath destpath workpath \
+ prefix categories maintainers description long_description \
+ homepage epoch portpath os.platform os.arch os.version os.major \
+ supported_archs configure.build_arch license
set rpmdestpath ""
if {![string equal ${package.destpath} ${workpath}] && ![string equal ${package.destpath} ""]} {
Modified: trunk/base/src/package1.0/portsrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portsrpm.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/package1.0/portsrpm.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -59,8 +59,10 @@
}
proc portsrpm::srpm_pkg {portname portversion portrevision} {
- global UI_PREFIX package.destpath portdbpath destpath workpath distpath prefix categories maintainers description long_description homepage epoch portpath distfiles
- global os.platform os.arch os.version os.major
+ global UI_PREFIX package.destpath portdbpath destpath workpath distpath \
+ prefix categories maintainers description long_description \
+ homepage epoch portpath distfiles os.platform os.arch os.version \
+ os.major
set fetch_urls {}
portfetch::checkfiles fetch_urls
Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port/port.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -3752,8 +3752,7 @@
proc action_portcmds { action portlist opts } {
# Operations on the port's directory and Portfile
- global env boot_env
- global current_portdir
+ global env boot_env current_portdir
array set local_options $opts
@@ -4468,9 +4467,9 @@
}
proc process_cmd { argv } {
- global cmd_argc cmd_argv cmd_argn
- global global_options global_options_base private_options ui_options
- global current_portdir
+ global cmd_argc cmd_argv cmd_argn \
+ global_options global_options_base private_options ui_options \
+ current_portdir
set cmd_argv $argv
set cmd_argc [llength $argv]
set cmd_argn 0
@@ -4603,8 +4602,7 @@
# return text action beginning with $text
proc complete_action { text state } {
- global action_array
- global complete_choices complete_position
+ global action_array complete_choices complete_position
if {$state == 0} {
set complete_position 0
@@ -4795,17 +4793,15 @@
# We do this here to save it in the boot_env, in case we determined it manually
term_init_size
+global env boot_env argv0 cmdname argc argv cmd_argc cmd_argv cmd_argn \
+ current_portdir global_options_base exit_status
+
# 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]
# Setp cmd_argv to match argv
-global argc argv
-global cmd_argc cmd_argv cmd_argn
set cmd_argv $argv
set cmd_argc $argc
set cmd_argn 0
@@ -4850,16 +4846,13 @@
}
# Set up some global state for our code
-global current_portdir
set current_portdir [pwd]
# Freeze global_options into global_options_base; global_options
# will be reset to global_options_base prior to processing each command.
-global global_options_base
set global_options_base [array get global_options]
# First process any remaining args as action(s)
-global exit_status
set exit_status 0
if { [llength $remaining_args] > 0 } {
Modified: trunk/base/src/port1.0/fetch_common.tcl
===================================================================
--- trunk/base/src/port1.0/fetch_common.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/fetch_common.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -84,8 +84,8 @@
# For a given mirror site type, e.g. "gnu" or "x11", check to see if there's a
# pre-registered set of sites, and if so, return them.
proc portfetch::mirror_sites {mirrors tag subdir mirrorfile} {
- global UI_PREFIX name dist_subdir
- global global_mirror_site fallback_mirror_site
+ global UI_PREFIX name dist_subdir \
+ global_mirror_site fallback_mirror_site
if {[file exists $mirrorfile]} {
source $mirrorfile
Modified: trunk/base/src/port1.0/portchecksum.tcl
===================================================================
--- trunk/base/src/port1.0/portchecksum.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portchecksum.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -200,8 +200,8 @@
# Target main procedure. Verifies the checksums of all distfiles.
#
proc portchecksum::checksum_main {args} {
- global UI_PREFIX all_dist_files checksum_types checksums_array portverbose checksum.skip
- global usealtworkpath altprefix default_checksum_types
+ global UI_PREFIX all_dist_files checksum_types checksums_array portverbose checksum.skip \
+ usealtworkpath altprefix default_checksum_types
# If no files have been downloaded, there is nothing to checksum.
if {![info exists all_dist_files]} {
Modified: trunk/base/src/port1.0/portclean.tcl
===================================================================
--- trunk/base/src/port1.0/portclean.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portclean.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -61,9 +61,9 @@
}
proc portclean::clean_main {args} {
- global UI_PREFIX
- global ports_clean_dist ports_clean_work ports_clean_logs
- global ports_clean_all keeplogs usealtworkpath
+ global UI_PREFIX \
+ ports_clean_dist ports_clean_work ports_clean_logs \
+ ports_clean_all keeplogs usealtworkpath
if {$usealtworkpath} {
ui_warn "Only cleaning in ~/.macports; insufficient privileges for standard locations"
Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portconfigure.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -620,13 +620,13 @@
proc portconfigure::configure_main {args} {
global [info globals]
- global worksrcpath use_configure use_autoreconf use_autoconf use_automake use_xmkmf
- global configure.env configure.pipe configure.libs configure.classpath configure.universal_args
- global configure.perl configure.python configure.ruby configure.install configure.awk configure.bison
- global configure.pkg_config configure.pkg_config_path
- global configure.ccache configure.distcc configure.cpp configure.javac configure.sdkroot
- global configure.march configure.mtune
- global os.platform os.major
+ global worksrcpath use_configure use_autoreconf use_autoconf use_automake use_xmkmf \
+ configure.env configure.pipe configure.libs configure.classpath configure.universal_args \
+ configure.perl configure.python configure.ruby configure.install configure.awk configure.bison \
+ configure.pkg_config configure.pkg_config_path \
+ configure.ccache configure.distcc configure.cpp configure.javac configure.sdkroot \
+ configure.march configure.mtune \
+ os.platform os.major
foreach tool {cc cxx objc f77 f90 fc ld} {
global configure.${tool} configure.${tool}_archflags
}
Modified: trunk/base/src/port1.0/portdestroot.tcl
===================================================================
--- trunk/base/src/port1.0/portdestroot.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portdestroot.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -102,9 +102,9 @@
}
proc portdestroot::destroot_start {args} {
- global UI_PREFIX prefix subport porturl destroot os.platform destroot.clean portsharepath
- global destroot.umask destroot.asroot euid egid
- global applications_dir frameworks_dir
+ global UI_PREFIX prefix subport porturl destroot os.platform destroot.clean portsharepath \
+ destroot.umask destroot.asroot euid egid \
+ applications_dir frameworks_dir
variable oldmask
ui_notice "$UI_PREFIX [format [msgcat::mc "Staging %s into destroot"] ${subport}]"
@@ -149,9 +149,9 @@
}
proc portdestroot::destroot_finish {args} {
- global UI_PREFIX destroot prefix subport startupitem.create destroot.violate_mtree
- global applications_dir frameworks_dir destroot.keepdirs destroot.delete_la_files
- global os.platform os.version
+ global UI_PREFIX destroot prefix subport startupitem.create destroot.violate_mtree \
+ applications_dir frameworks_dir destroot.keepdirs destroot.delete_la_files \
+ os.platform os.version
variable oldmask
# Create startup-scripts/items
Modified: trunk/base/src/port1.0/portdistcheck.tcl
===================================================================
--- trunk/base/src/port1.0/portdistcheck.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portdistcheck.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -53,10 +53,8 @@
default distcheck.type moddate
proc portdistcheck::distcheck_main {args} {
- global distcheck.type
- global fetch.type
- global fetch.ignore_sslcert
- global subport portpath
+ global distcheck.type fetch.type fetch.ignore_sslcert \
+ subport portpath
set port_moddate [file mtime ${portpath}/Portfile]
Modified: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portfetch.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -323,9 +323,9 @@
# Perform a CVS login and fetch, storing the CVS login
# information in a custom .cvspass file
proc portfetch::cvsfetch {args} {
- global workpath cvs.env cvs.cmd cvs.args cvs.post_args
- global cvs.root cvs.date cvs.tag cvs.method cvs.password
- global patch_sites patchfiles filespath
+ global workpath cvs.env cvs.cmd cvs.args cvs.post_args \
+ cvs.root cvs.date cvs.tag cvs.method cvs.password
+ patch_sites patchfiles filespath
set cvs.args "${cvs.method} ${cvs.args}"
if {${cvs.method} == "export" && ![string length ${cvs.tag}] && ![string length ${cvs.date}]} {
@@ -420,8 +420,8 @@
# Perform a git fetch
proc portfetch::gitfetch {args} {
- global worksrcpath patchfiles
- global git.url git.branch git.sha1 git.cmd
+ global worksrcpath patchfiles \
+ git.url git.branch git.sha1 git.cmd
set options "-q"
if {[string length ${git.branch}] == 0} {
@@ -476,9 +476,9 @@
# Perform a standard fetch, assembling fetch urls from
# the listed url variable and associated distfile
proc portfetch::fetchfiles {args} {
- global distpath all_dist_files UI_PREFIX
- global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert fetch.remote_time
- global fallback_mirror_site portverbose usealtworkpath altprefix
+ global distpath all_dist_files UI_PREFIX \
+ fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert fetch.remote_time \
+ fallback_mirror_site portverbose usealtworkpath altprefix
variable fetch_urls
variable urlmap
Modified: trunk/base/src/port1.0/portinstall.tcl
===================================================================
--- trunk/base/src/port1.0/portinstall.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portinstall.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -54,8 +54,8 @@
set_ui_prefix
proc portinstall::install_start {args} {
- global UI_PREFIX subport version revision portvariants
- global prefix registry_open registry.path
+ global UI_PREFIX subport version revision portvariants \
+ prefix registry_open registry.path
ui_notice "$UI_PREFIX [format [msgcat::mc "Installing %s @%s_%s%s"] $subport $version $revision $portvariants]"
# start gsoc08-privileges
Modified: trunk/base/src/port1.0/portlivecheck.tcl
===================================================================
--- trunk/base/src/port1.0/portlivecheck.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portlivecheck.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -60,10 +60,10 @@
default livecheck.ignore_sslcert yes
proc portlivecheck::livecheck_main {args} {
- global livecheck.url livecheck.type livecheck.md5 livecheck.regex livecheck.name livecheck.distname livecheck.version
- global livecheck.ignore_sslcert
- global homepage portpath workpath
- global master_sites name subport distfiles
+ global livecheck.url livecheck.type livecheck.md5 livecheck.regex livecheck.name livecheck.distname livecheck.version \
+ livecheck.ignore_sslcert \
+ homepage portpath workpath \
+ master_sites name subport distfiles
set updated 0
set updated_version "unknown"
Modified: trunk/base/src/port1.0/portstartupitem.tcl
===================================================================
--- trunk/base/src/port1.0/portstartupitem.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portstartupitem.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -74,10 +74,10 @@
set_ui_prefix
proc portstartupitem::startupitem_create_rcng {args} {
- global prefix destroot os.platform
- global startupitem.name startupitem.requires
- global startupitem.start startupitem.stop startupitem.restart
- global startupitem.type
+ global prefix destroot os.platform \
+ startupitem.name startupitem.requires \
+ startupitem.start startupitem.stop startupitem.restart \
+ startupitem.type
set scriptdir ${destroot}${prefix}/etc/rc.d
@@ -120,10 +120,10 @@
}
proc portstartupitem::startupitem_create_darwin_systemstarter {args} {
- global UI_PREFIX prefix destroot destroot.keepdirs subport os.platform
- global startupitem.name startupitem.requires startupitem.init
- global startupitem.start startupitem.stop startupitem.restart startupitem.executable
- global startupitem.pidfile startupitem.logfile startupitem.logevents
+ global UI_PREFIX prefix destroot destroot.keepdirs subport os.platform \
+ startupitem.name startupitem.requires startupitem.init \
+ startupitem.start startupitem.stop startupitem.restart startupitem.executable \
+ startupitem.pidfile startupitem.logfile startupitem.logevents
set scriptdir ${prefix}/etc/startup
@@ -396,11 +396,11 @@
}
proc portstartupitem::startupitem_create_darwin_launchd {args} {
- global UI_PREFIX prefix destroot destroot.keepdirs subport macosx_deployment_target
- global startupitem.name startupitem.uniquename startupitem.plist startupitem.location
- global startupitem.init startupitem.start startupitem.stop startupitem.restart startupitem.executable
- global startupitem.pidfile startupitem.logfile startupitem.logevents startupitem.netchange
- global startupitem.install
+ global UI_PREFIX prefix destroot destroot.keepdirs subport macosx_deployment_target \
+ startupitem.name startupitem.uniquename startupitem.plist startupitem.location \
+ startupitem.init startupitem.start startupitem.stop startupitem.restart startupitem.executable \
+ startupitem.pidfile startupitem.logfile startupitem.logevents startupitem.netchange \
+ startupitem.install
set scriptdir ${prefix}/etc/startup
@@ -632,8 +632,7 @@
}
proc portstartupitem::startupitem_create {args} {
- global UI_PREFIX
- global startupitem.type os.platform
+ global UI_PREFIX startupitem.type os.platform
set startupitem.type [string tolower ${startupitem.type}]
Modified: trunk/base/src/port1.0/porttrace.tcl
===================================================================
--- trunk/base/src/port1.0/porttrace.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/porttrace.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -233,8 +233,7 @@
# Private.
# Slave method to read a line from the trace.
proc porttrace::slave_read_line {chan} {
- global ports_list trace_filemap sandbox_violation_list workpath
- global env
+ global ports_list trace_filemap sandbox_violation_list workpath env
while 1 {
# We should never get EOF, actually.
Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl 2013-06-01 02:44:30 UTC (rev 106613)
+++ trunk/base/src/port1.0/portutil.tcl 2013-06-01 05:12:02 UTC (rev 106614)
@@ -2206,8 +2206,7 @@
}
proc handle_default_variants {option action {value ""}} {
- global PortInfo
- global variations
+ global PortInfo variations
switch -regex $action {
set|append {
# Retrieve the information associated with each variant.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130531/aa92cb94/attachment-0001.html>
More information about the macports-changes
mailing list