[31193] branches/release_1_6/base/src
jmpp at macports.org
jmpp at macports.org
Sat Nov 17 21:09:02 PST 2007
Revision: 31193
http://trac.macosforge.org/projects/macports/changeset/31193
Author: jmpp at macports.org
Date: 2007-11-17 21:09:01 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
Temporarily revert Landon's hiding of the Tcl cd command until remaining Portfiles are cleaned up.
Currently there are still almost 300 ports that use the command and breaking them all in one fell
swoop is not something we want to do!
One thing we should do is find a way to issue a suitable warning when Tcl's cd is called from a Portfile
but not from port1.0, as that would be useless information.
Modified Paths:
--------------
branches/release_1_6/base/src/macports1.0/macports.tcl
branches/release_1_6/base/src/port1.0/portdestroot.tcl
branches/release_1_6/base/src/port1.0/portinstall.tcl
branches/release_1_6/base/src/port1.0/portpatch.tcl
branches/release_1_6/base/src/port1.0/resources/group/gnustep-1.0.tcl
branches/release_1_6/base/src/port1.0/resources/group/ruby-1.0.tcl
Modified: branches/release_1_6/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_6/base/src/macports1.0/macports.tcl 2007-11-18 04:54:31 UTC (rev 31192)
+++ branches/release_1_6/base/src/macports1.0/macports.tcl 2007-11-18 05:09:01 UTC (rev 31193)
@@ -691,7 +691,7 @@
interp hide $workername exit
# cd: This is necessary for some code in port1.0, but should be hidden
- interp eval $workername "rename cd _cd"
+ #interp eval $workername "rename cd _cd"
# Tell the sub interpreter about all the Tcl packages we already
# know about so it won't glob for packages.
Modified: branches/release_1_6/base/src/port1.0/portdestroot.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/portdestroot.tcl 2007-11-18 04:54:31 UTC (rev 31192)
+++ branches/release_1_6/base/src/port1.0/portdestroot.tcl 2007-11-18 05:09:01 UTC (rev 31193)
@@ -191,7 +191,7 @@
set mandir [file dirname $manlink]
set mandirpath [file join $manpath $mandir]
set pwd [pwd]
- if {[catch {_cd $mandirpath} err]} {
+ if {[catch {cd $mandirpath} err]} {
puts $err
return
}
@@ -209,7 +209,7 @@
file delete $manlinkpath
system "ln -s \"${manlinksrc}.gz\" \"$manlinkpath\""
}
- _cd $pwd
+ cd $pwd
}
}
} else {
Modified: branches/release_1_6/base/src/port1.0/portinstall.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/portinstall.tcl 2007-11-18 04:54:31 UTC (rev 31192)
+++ branches/release_1_6/base/src/port1.0/portinstall.tcl 2007-11-18 05:09:01 UTC (rev 31193)
@@ -78,7 +78,7 @@
proc directory_dig {rootdir workdir regref {cwd ""}} {
global installPlist
set pwd [pwd]
- if {[catch {_cd $workdir} err]} {
+ if {[catch {cd $workdir} err]} {
puts $err
return
}
@@ -124,7 +124,7 @@
directory_dig $rootdir $name $regref [file join $cwd $name]
}
}
- _cd $pwd
+ cd $pwd
}
proc install_main {args} {
Modified: branches/release_1_6/base/src/port1.0/portpatch.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/portpatch.tcl 2007-11-18 04:54:31 UTC (rev 31192)
+++ branches/release_1_6/base/src/port1.0/portpatch.tcl 2007-11-18 05:09:01 UTC (rev 31193)
@@ -69,7 +69,7 @@
if {![info exists patchlist]} {
return -code error [msgcat::mc "Patch files missing"]
}
- _cd [option worksrcpath]
+ cd [option worksrcpath]
foreach patch $patchlist {
ui_info "$UI_PREFIX [format [msgcat::mc "Applying %s"] $patch]"
if {[option os.platform] == "linux"} {
Modified: branches/release_1_6/base/src/port1.0/resources/group/gnustep-1.0.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/resources/group/gnustep-1.0.tcl 2007-11-18 04:54:31 UTC (rev 31192)
+++ branches/release_1_6/base/src/port1.0/resources/group/gnustep-1.0.tcl 2007-11-18 05:09:01 UTC (rev 31193)
@@ -228,7 +228,7 @@
ui_msg "---> Making Documentation for ${name}"
- _cd ${worksrcpath}/Documentation
+ cd ${worksrcpath}/Documentation
system "${destroot.env} ${destroot.cmd} \
${destroot.pre_args} ${destroot.destdir}"
Modified: branches/release_1_6/base/src/port1.0/resources/group/ruby-1.0.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/resources/group/ruby-1.0.tcl 2007-11-18 04:54:31 UTC (rev 31192)
+++ branches/release_1_6/base/src/port1.0/resources/group/ruby-1.0.tcl 2007-11-18 05:09:01 UTC (rev 31193)
@@ -180,7 +180,7 @@
build {}
destroot {
- _cd ${worksrcpath}/${ruby.srcdir}
+ cd ${worksrcpath}/${ruby.srcdir}
xinstall -d -m 0755 ${destroot}${ruby.lib}
foreach dir [exec find . -type d] {
set dir [strsed ${dir} {s|^[.]/||}]
@@ -272,12 +272,12 @@
}
destroot {
- _cd ${worksrcpath}
+ cd ${worksrcpath}
system "${prefix}/bin/gem install --local --force --install-dir ${destroot}${prefix}/lib/ruby/gems/${ruby.version} ${distpath}/${distname}"
set binDir ${destroot}${prefix}/lib/ruby/gems/${ruby.version}/bin
if {[file isdirectory $binDir]} {
- _cd $binDir
+ cd $binDir
foreach file [readdir $binDir] {
file copy $file ${destroot}${prefix}/bin
}
@@ -291,7 +291,7 @@
}
post-destroot {
- _cd ${worksrcpath}
+ cd ${worksrcpath}
# Install documentation files (if specified)
if {[llength ${ruby.docs}] > 0} {
set docPath ${prefix}/share/doc/${name}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071117/ce6e0425/attachment.html
More information about the macports-changes
mailing list