Skip to content
Permalink
Browse files

Fix namespace collission. This is not a permanent fix

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@229 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
landonf committed Aug 21, 2002
1 parent 266f200 commit 416b91e757186243d79c9cb7a853345349f266a7
Showing with 7 additions and 7 deletions.
  1. +3 −3 src/darwinports1.0/darwinports.tcl
  2. +1 −1 src/port1.0/portutil.tcl
  3. +3 −3 src/portbuild/portbuild.tcl
@@ -8,7 +8,7 @@ set bootstrap_options "sysportpath libpath auto_path"
set portinterp_options "sysportpath portpath auto_path portconf"
set uniqid 0

proc init {args} {
proc dportinit {args} {
global auto_path env bootstrap_options sysportpath portconf

if [file isfile /etc/ports.conf] {
@@ -43,15 +43,15 @@ proc init {args} {
}
}

proc build {portdir chain target {options ""}} {
proc dportbuild {portdir chain target {options ""}} {
global targets portpath portinterp_options uniqid

if [file isdirectory $portdir] {
cd $portdir
set portpath [pwd]
set workername workername[incr uniqid]
interp create $workername
$workername alias build build
$workername alias dportbuild dportbuild

foreach opt $portinterp_options {
upvar #0 $opt upopt
@@ -114,7 +114,7 @@ proc swdep_resolve {name chain} {
}
}
puts "Executing $portname"
build $sysportpath/software/$portname build build
dportbuild $sysportpath/software/$portname build build
return 0
}

@@ -37,9 +37,9 @@ for {set i 0} {$i < $argc} {incr i} {
default { print_usage; exit }
}
}
init
dportinit
if [info exists options] {
build $portdir build $target $options
dportbuild $portdir build $target $options
} else {
build $portdir build $target
dportbuild $portdir build $target
}

0 comments on commit 416b91e

Please sign in to comment.
You can’t perform that action at this time.